Skip to content

Commit 5778617

Browse files
authored
Fix typos (#479)
* Fix typos * Fix incorrect usage of "setup" as a verb. The term "setup" is a noun, while "set up" is the correct verb form. In this context, the sentence requires a verb, so changing "setup" to "set up" is appropriate.
1 parent 0d1de8e commit 5778617

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ Note: [Rubygem is 6.3.0.pre.rc.1](https://rubygems.org/gems/shakapacker/versions
341341
## [v6.0.0.rc.6 changes from v5.4] - Forked January 16, 2022
342342

343343

344-
- `node_modules` will no longer be babel transfomed compiled by default. This primarily fixes [rails issue #35501](https://github.com/rails/rails/issues/35501) as well as [numerous other webpacker issues](https://github.com/rails/webpacker/issues/2131#issuecomment-581618497). The disabled loader can still be required explicitly via:
344+
- `node_modules` will no longer be babel transformed compiled by default. This primarily fixes [rails issue #35501](https://github.com/rails/rails/issues/35501) as well as [numerous other webpacker issues](https://github.com/rails/webpacker/issues/2131#issuecomment-581618497). The disabled loader can still be required explicitly via:
345345

346346
```js
347347
const nodeModules = require('@rails/webpacker/rules/node_modules.js')

docs/react.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
These steps describe creating a Rails/React app, using Shakapacker as the bundler.
44

55
## Easy Setup
6+
67
If you'd like easy integration of React with Ruby on Rails, see [React on Rails](https://github.com/shakacode/react_on_rails).
78

8-
The below information applies to a React on Rails app, except that you need to setup some environment variables as follows:
9+
The following information applies to a React on Rails app. Additionally, you need to set up some environment variables as follows:
910

10-
```
11+
```shell
1112
EXECJS_RUNTIME=Node
1213
```
1314

docs/troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ default: &default
180180
181181
If you want to access any dependency without importing it everywhere or use it directly in your dev tools, please check: [https://webpack.js.org/plugins/provide-plugin/](https://webpack.js.org/plugins/provide-plugin/) and the [webpack docs on shimming globals](https://webpack.js.org/guides/shimming/#shimming-globals).
182182
183-
Note, if you are exposing globals, like jQuery, to non-webpack dependencies (like an inline script) via the [expose-loader](https://webpack.js.org/loaders/expose-loader/), you will need to override the default of `defer: true` to be `defer:false` your call to the `javascript_pack_tag` so that the browser will load your bundle to setup the global variable before other code depends on it. However, you really should try to remove the dependendency on such globals.
183+
Note, if you are exposing globals, like jQuery, to non-webpack dependencies (like an inline script) via the [expose-loader](https://webpack.js.org/loaders/expose-loader/), you will need to override the default of `defer: true` to be `defer:false` your call to the `javascript_pack_tag` so that the browser will load your bundle to set up the global variable before other code depends on it. However, you really should try to remove the dependency on such globals.
184184

185185
Thus ProvidePlugin manages build-time dependencies to global symbols whereas the expose-loader manages runtime dependencies to global symbols.
186186

docs/v8_upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Setting for example:
3333
__webpack_public_path__ = 'https://mycdn.url.com/packs';
3434
```
3535

36-
In your code and ensuring it is run first in the app, will allow the dynamic imports lookup path to be overriden at runtime.
36+
In your code and ensuring it is run first in the app, will allow the dynamic imports lookup path to be overridden at runtime.
3737

3838
You can also try Webpack `output.publicPath` option of `'auto'` as per https://webpack.js.org/guides/public-path/#automatic-publicpath.
3939

spec/dummy/bin/setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def system!(*args)
99
end
1010

1111
FileUtils.chdir APP_ROOT do
12-
# This script is a way to setup or update your development environment automatically.
12+
# This script is a way to set up or update your development environment automatically.
1313
# This script is idempotent, so that you can run it at anytime and get an expectable outcome.
1414
# Add necessary setup steps to this file.
1515

spec/shakapacker/configuration_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@
363363
expect(config.asset_host).to eq "domain.abc"
364364
end
365365

366-
context "without ActionController::Base.helpers.compute_asset_host returing any value" do
366+
context "without ActionController::Base.helpers.compute_asset_host returning any value" do
367367
it "returns nil" do
368368
expect(ENV).to receive(:fetch).with("SHAKAPACKER_ASSET_HOST", nil).and_return(nil)
369369

0 commit comments

Comments
 (0)