Skip to content

Commit dc501d9

Browse files
committed
Misc readability changes
1 parent de23424 commit dc501d9

38 files changed

+150
-151
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
run: cd spec/dummy && rm -rf public/webpack/test && yarn run build:rescript && RAILS_ENV="test" NODE_ENV="test" bin/${{ matrix.versions == 'oldest' && 'web' || 'shaka' }}packer
8080
- id: get-sha
8181
run: echo "sha=\"$(git rev-parse HEAD)\"" >> "$GITHUB_OUTPUT"
82-
- name: Save test webpack bundles to cache (for build number checksum used by rspec job)
82+
- name: Save test Webpack bundles to cache (for build number checksum used by RSpec job)
8383
uses: actions/cache/save@v4
8484
with:
8585
path: spec/dummy/public/webpack
@@ -139,7 +139,7 @@ jobs:
139139
key: dummy-app-node-modules-cache-${{ hashFiles('spec/dummy/package.json') }}-${{ matrix.versions }}
140140
- id: get-sha
141141
run: echo "sha=\"$(git rev-parse HEAD)\"" >> "$GITHUB_OUTPUT"
142-
- name: Save test webpack bundles to cache (for build number checksum used by rspec job)
142+
- name: Save test Webpack bundles to cache (for build number checksum used by RSpec job)
143143
uses: actions/cache@v4
144144
with:
145145
path: spec/dummy/public/webpack

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ See [Release Notes](docs/release-notes/15.0.0.md) for full details.
5555

5656
#### Fixed
5757

58-
- Separated streamServerRenderedReactComponent from the ReactOnRails object in order to stop users from getting errors during webpack compilation about needing the `stream-browserify` package. [PR 1680](https://github.com/shakacode/react_on_rails/pull/1680) by [judahmeek](https://github.com/judahmeek).
58+
- Separated streamServerRenderedReactComponent from the ReactOnRails object in order to stop users from getting errors during Webpack compilation about needing the `stream-browserify` package. [PR 1680](https://github.com/shakacode/react_on_rails/pull/1680) by [judahmeek](https://github.com/judahmeek).
5959
- Removed obsolete `js-yaml` peer dependency. [PR 1678](https://github.com/shakacode/react_on_rails/pull/1678) by [alexeyr-ci](https://github.com/alexeyr-ci).
6060

6161
### [14.1.0] - 2025-01-06

NEWS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ _A history of the news. A few bullets at the top will also show on the [README.m
55
- **October 14, 2020**: [RUBY ROGUES
66
RR 474: React on Rails V12 – Don’t Shave That Yak! with Justin Gordon](https://devchat.tv/ruby-rogues/rr-474-react-on-rails-v12-dont-shave-that-yak-with-justin-gordon/).
77

8-
- **October 1, 2020**: See the [spec/dummy](https://github.com/shakacode/react_on_rails/tree/master/spec/dummy) example repo for a simple configuration of webpack via the rails/webpacker gem
8+
- **October 1, 2020**: See the [spec/dummy](https://github.com/shakacode/react_on_rails/tree/master/spec/dummy) example repo for a simple configuration of Webpack via the rails/webpacker gem
99
that supports SSR.
1010
- **August 2, 2020**: See the example repo of [React on Rails Tutorial With SSR, HMR fast refresh, and TypeScript](https://github.com/shakacode/react_on_rails_demo_ssr_hmr) for a new way to setup the creation of your SSR bundle with `rails/webpacker`.
1111
- July 8, 2020: Release **v12**.
@@ -23,7 +23,7 @@ _A history of the news. A few bullets at the top will also show on the [README.m
2323
- 2017-03-06: Updated to Webpack v2!
2424
- 2017-03-02: Demo of internationalization (i18n) is live at [reactrails.com](https://www.reactrails.com/). Docs [here](docs/guides/i18n.md).
2525
- 2017-02-28: See [discussions here on Webpacker](https://github.com/rails/webpacker/issues/139) regarding how Webpacker will allow React on Rails to avoid using the asset pipeline in the near future.
26-
- 2017-02-28: Upgrade to Webpack v2 or use the `--bail` option in your webpack script for test and production builds. See the discussion on [PR #730](https://github.com/shakacode/react_on_rails/pull/730).
26+
- 2017-02-28: Upgrade to Webpack v2 or use the `--bail` option in your Webpack script for test and production builds. See the discussion on [PR #730](https://github.com/shakacode/react_on_rails/pull/730).
2727
- 2016-11-03: Spoke at [LA Ruby: "React on Rails: Why, What, and How?"](http://www.meetup.com/laruby/events/234825187/). [Video and pictures in this article](https://blog.shakacode.com/my-react-on-rails-talk-at-the-la-ruby-rails-meetup-november-10-2016-eaaa83aff800#.ej6h4eglp).
2828
- 2016-12-20: New Video on Egghead.io: [Creating a component with React on Rails](https://egghead.io/lessons/react-creating-a-component-with-react-on-rails)
2929
- 2016-11-03: Spoke at [LA Ruby, 7pm, Thursday, November 10 in Venice, CA: "React on Rails: Why, What, and How?"](http://www.meetup.com/laruby/events/234825187/). [Video and pictures in this article](https://blog.shakacode.com/my-react-on-rails-talk-at-the-la-ruby-rails-meetup-november-10-2016-eaaa83aff800#.ej6h4eglp).

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ If you think ShakaCode can help your project, [click here](https://meetings.hubs
4444

4545
## React on Rails Pro
4646

47-
Are you interested in optimizing your webpack setup for React on Rails, including code splitting with [react-router](https://github.com/ReactTraining/react-router#readme) and [loadable-components](https://loadable-components.com/) with server-side rendering for SEO and hot-reloading for developers?
47+
Are you interested in optimizing your Webpack setup for React on Rails, including code splitting with [react-router](https://github.com/ReactTraining/react-router#readme) and [loadable-components](https://loadable-components.com/) with server-side rendering for SEO and hot-reloading for developers?
4848
We did this for Popmenu, [lowering Heroku costs 20-25% while getting a 73% decrease in average response times](https://www.shakacode.com/recent-work/popmenu/). Several years later, Popmenu serves tens of millions of SSR requests daily with React on Rails Pro.
4949

5050
If you're interested, read more about [React on Rails Pro](https://www.shakacode.com/react-on-rails-pro/) and [book a call](https://meetings.hubspot.com/justingordon/30-minute-consultation).

docs/additional-details/generator-details.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Another good option is to create a simple test app per the [Tutorial](https://ww
4343

4444
The generated client code follows our organization scheme. Each unique set of functionality is given its own folder inside of `app/javascript/app/bundles`. This encourages modularity of _domains_.
4545

46-
Inside of the generated "HelloWorld" domain you will find the following folders:
46+
Inside the generated "HelloWorld" domain you will find the following folders:
4747

4848
- `startup`: contains the entry point files for webpack. It defaults to a single file that is used for both server and client compilation. But if these need to be different, then you can create two Webpack configurations with separate endpoints. Since RoR v14.2 this is strongly recommended because the client can import `react-on-rails/client` instead of `react-on-rails` for decreased bundle size.
4949
- `containers`: contains "smart components" (components that have functionality and logic that is passed to child "dumb components").

docs/additional-details/manual-installation-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ The only requirements within this directory for basic React on Rails integration
1515
1. Provide server rendering if you wish to use that feature.
1616
1. Your JavaScript code "registers" any components and stores per the ReactOnRails APIs of ReactOnRails.register(components) and ReactOnRails.registerStore(stores). See [our javascript API docs](https://www.shakacode.com/react-on-rails/docs/api/javascript-api/) and the [ReactOnRails.js source](https://github.com/shakacode/react_on_rails/tree/master/node_package/src/ReactOnRails.js).
1717
1. Set your registration file as an "entry" point in your Webpack configs.
18-
1. You create scripts in `client/package.json` per the example apps. These are used for building your Webpack assets. Also do this for your top level `package.json`.
18+
1. You create scripts in `client/package.json` per the example apps. These are used for building your Webpack assets. Also do this for your top-level `package.json`.
1919

2020
## Rails Steps (outside of /client)
2121

22-
1. Add `gem "webpacker"` to the Gemfile, run bundle. The gem provides the `stylesheet_pack_tag` and `javascript_pack_tag` helpers which is used to load the bundled assets to your layouts.[Dummy Example](https://github.com/shakacode/react_on_rails/tree/master/spec/dummy/app/views/layouts/application.html.erb)
22+
1. Add `gem "shakapacker"` to the Gemfile, run `bundle`. The gem provides the `stylesheet_pack_tag` and `javascript_pack_tag` helpers, which are used to load the bundled assets to your layouts. [Dummy Example](https://github.com/shakacode/react_on_rails/tree/master/spec/dummy/app/views/layouts/application.html.erb).
2323
1. Configure the `config/initializers/react_on_rails.rb`. You can adjust some necessary settings and defaults. See file [https://github.com/shakacode/react_on_rails/tree/master/spec/dummy/config/initializers/react_on_rails.rb](https://github.com/shakacode/react_on_rails/tree/master/spec/dummy/config/initializers/react_on_rails.rb) for a detailed example of configuration, including comments on the different values to configure.
2424
1. Configure your Procfiles per the example apps. These are at the root of your Rails installation.
25-
1. Configure your top level JavaScript files for inclusion in your layout. You'll want a version that you use for static assets, and you want a file for any files in your setup that are not part of your webpack build. The reason for this is for use with hot-reloading. If you are not using hot reloading, then you only need to configure your `application.js` file to include your Webpack generated files.
26-
1. If you are deploying to Heroku, see [our heroku deployment documentation](https://www.shakacode.com/react-on-rails/docs/deployment/heroku-deployment/)
25+
1. Configure your top-level JavaScript files for inclusion in your layout. You'll want a version that you use for static assets, and a separate file for any files in your setup that are not part of your Webpack build. The reason for this is for use with hot reloading. If you are not using hot reloading, then you only need to configure your `application.js` file to include your Webpack generated files.
26+
1. If you are deploying to Heroku, see [our Heroku deployment documentation](https://www.shakacode.com/react-on-rails/docs/deployment/heroku-deployment/).
2727

2828
If I missed anything, please submit a PR or file an issue.

docs/additional-details/recommended-project-structure.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
The React on Rails generator uses the standard Shakapacker convention of this structure:
44

5-
```yml
5+
```text
66
app/javascript:
77
├── bundles:
8-
# Logical groups of files that can be used for code splitting
8+
│ # Logical groups of files that can be used for code splitting
99
│ └── hello-world-bundle.js
1010
├── packs:
11-
# only webpack entry files here
11+
│ # only webpack entry files here
1212
│ └── hello-world-bundle.js
1313
```
1414

@@ -19,7 +19,7 @@ you should consider keeping your codebase mostly consistent with the defaults fo
1919

2020
1. Move the directory:
2121

22-
```
22+
```sh
2323
mv app/javascript client
2424
```
2525

@@ -53,11 +53,11 @@ You have 2 basic choices:
5353

5454
### Simple Rails Way
5555

56-
This isn't really any technique, as you keep handling all your styling assets using Rails standard tools, such as using the [sass-rails gem](https://rubygems.org/gems/sass-rails/versions/5.0.4). Basically, Webpack doesn't get involved with styling. Your Rails layouts just doing the styling the standard Rails way.
56+
This isn't really a technique, as you keep handling all your styling assets using Rails standard tools, such as using the [sass-rails gem](https://rubygems.org/gems/sass-rails/versions/5.0.4). Basically, Webpack doesn't get involved with styling. Your Rails layouts just continue doing the styling the standard Rails way.
5757

5858
#### Advantages to the Simple Rails Way
5959

60-
1. Much simpler! There's no changes really from your current processes.
60+
1. Much simpler! There's no change from your current processes.
6161

6262
### Using Webpack to Manage Styling Assets
6363

@@ -70,6 +70,6 @@ This technique involves customization of the webpack config files to generate CS
7070

7171
#### Advantages to having Webpack Manage Styles
7272

73-
1. You can use [CSS modules](https://github.com/css-modules/css-modules), which is super compelling once you seen the benefits.
73+
1. You can use [CSS modules](https://github.com/css-modules/css-modules), which is super compelling once you see the benefits.
7474
1. You can use CSS in JS.
7575
1. You can do hot reloading of your assets. Thus, you do not have to refresh your web page to see asset change, including changing styles.

docs/additional-details/updating-dependencies.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Updating Dependencies
22

3-
If you frequently update you dependencies in small batches, you will avoid large and painful updates later. Then again, if you don't have good tests coverage, it's hazardous to update dependencies at any time.
3+
If you frequently update dependencies in small batches, you will avoid large and painful updates later. Then again, if you don't have good test coverage, it's hazardous to update dependencies at any time.
44

55
## Ruby
66

@@ -16,11 +16,11 @@ bundle update
1616
1. Run `yarn outdated` and read CHANGELOGs of major updated packages before you update. You might not be ready for some updates.
1717
1. Run these commands. You may or may not need to `rm -rf` your `node_modules` directory.
1818

19-
```
20-
cd client
21-
ncu -u -a
22-
yarn
23-
```
19+
```bash
20+
cd client
21+
ncu -u -a
22+
yarn
23+
```
2424

2525
Some combinations that I often run:
2626

docs/api/view-helpers-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ end %>
9797
9898
### rails_context
9999
100-
You can call `rails_context` or `rails_context(server_side: true|false)` from your controller or view to see what values are in the Rails Context. Pass true or false depending on whether you want to see the server side or the client side rails_context. Typically, for computing cache keys, you should leave server_side as the default true. When calling this from a controller method, use `helpers.rails_context`.
100+
You can call `rails_context` or `rails_context(server_side: true|false)` from your controller or view to see what values are in the Rails Context. Pass true or false depending on whether you want to see the server-side or the client-side rails_context. Typically, for computing cache keys, you should leave `server_side` as the default true. When calling this from a controller method, use `helpers.rails_context`.
101101
102102
---
103103

docs/contributor-info/linters.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,37 @@ These linters support the [ShakaCode Style Guidelines](https://www.shakacode.com
77
If you haven't tried the autofix options for `eslint` and `rubocop`, you're seriously missing out!
88

99
1. Be **SURE** you have a clean git status, as you'll want to review what the autofix does to your code!
10-
2. **Rubocop:** Be sure to be in the right directory where you have Ruby files, probably the top level of your Rails project.
10+
2. **Rubocop:** Be sure to be in the correct directory where you have Ruby files, usually the top level of your Rails project.
1111

12-
```
12+
```bash
1313
rubocop -a
1414
```
1515

16-
3. **eslint:**: Be sure to be in the right directory where you have JS files.
16+
3. **ESLint:** Be sure to be in the correct directory where you have JS files.
1717

18-
```
18+
```bash
1919
eslint --fix .
2020
```
2121

2222
or
2323

24-
```
24+
```bash
2525
npm run lint -- --fix
2626
```
2727

2828
Autofixing is a **HUGE** time saver!
2929

3030
## ESLint
3131

32+
See the [ESLint](http://eslint.org/) website for more information.
33+
3234
### Configuring Rules
3335

34-
Rules are configured with a 0, 1 or 2. Setting a rule to 0 is turning it off, setting it to 1 triggers a warning if that rule is violated, and setting it to 2 triggers an error.
36+
See [the documentation](https://eslint.org/docs/latest/use/configure/rules) first.
37+
38+
Rule severity is configured with `'off'`, `'warn'` or `'error'`. In older configurations you can see `0`, `1`, and `2` instead.
3539

36-
Rules can also take a few additional options. In this case, the rule can be set to an array, the first item of which is the 0/1/2 flag and the rest are options.
40+
Rules can also take a few additional options. In this case, the rule can be set to an array, the first item of which is the severity and the rest are options.
3741

3842
See file [.eslintrc](https://github.com/shakacode/react_on_rails/tree/master/.eslintrc) for examples of configuration
3943

@@ -63,9 +67,6 @@ alert('more alert');
6367

6468
You can disable all rules for a line or block, or only specific rules, as shown above.
6569

66-
### Useful Reference Links
70+
## RuboCop
6771

68-
- [Configuring ESLint](http://eslint.org/docs/user-guide/configuring.html#configuring-rules)
69-
- [ESLint quick start](http://untilfalse.com/eslint-quick-start/)
70-
- [RuboCop](https://github.com/bbatsov/rubocop)
71-
- [ESLint](http://eslint.org/)
72+
See the [RuboCop website](https://rubocop.org/).

0 commit comments

Comments
 (0)