Skip to content

Commit 72040b5

Browse files
committed
Update react-on-rails import to /client as needed
1 parent e1d1c24 commit 72040b5

10 files changed

+15
-15
lines changed

docs/api/javascript-api.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you are using [jquery-ujs](https://github.com/rails/jquery-ujs) for AJAX call
1919

2020
## API
2121

22-
The best source of docs is the main [ReactOnRails.ts](https://github.com/shakacode/react_on_rails/blob/master/node_package/src/ReactOnRails.ts) file. Here's a quick summary. No guarantees that this won't be outdated!
22+
The best source of docs is the main [ReactOnRails.client.ts](https://github.com/shakacode/react_on_rails/blob/master/node_package/src/ReactOnRails.client.ts) file, and extended [ReactOnRails.full.ts](https://github.com/shakacode/react_on_rails/blob/master/node_package/src/ReactOnRails.full.ts) and [ReactOnRails.node.ts](https://github.com/shakacode/react_on_rails/blob/master/node_package/src/ReactOnRails.node.ts) for the server-only functions. Here's a quick summary. No guarantees that this won't be outdated!
2323

2424
```js
2525
/**

docs/guides/how-to-use-different-files-for-client-and-server-rendering.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Many projects will have different entry points for client and server rendering.
88
Your Client Entry can look like this:
99

1010
```js
11-
import ReactOnRails from 'react-on-rails';
11+
import ReactOnRails from 'react-on-rails/client';
1212
import App from './ClientApp';
1313
ReactOnRails.register({ App })
1414
```
@@ -21,7 +21,7 @@ import App from './ServerApp';
2121
ReactOnRails.register({ App })
2222
```
2323

24-
Note that the only difference is on the second line of each of these examples.
24+
Note that the only difference is in the imports.
2525

2626
## B. Two Options for Using Webpack Resolve Alias in the Webpack Config
2727
Per [Webpack Docs](https://webpack.js.org/configuration/resolve/#resolve-alias).

docs/javascript/code-splitting.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ Here's an example of how you might use this in practice:
3737

3838
#### clientRegistration.js
3939
```js
40-
import ReactOnRails from 'node_package/lib/ReactOnRails';
40+
import ReactOnRails from 'react-on-rails/client';
4141
import NavigationApp from './NavigationApp';
4242

4343
// Note that we're importing a different RouterApp than in serverRegistration.js
4444
// Renderer functions should not be used on the server, because there is no DOM.
4545
import RouterApp from './RouterAppRenderer';
4646
import applicationStore from '../store/applicationStore';
4747

48-
ReactOnRails.registerStore({applicationStore});
48+
ReactOnRails.registerStore({ applicationStore });
4949
ReactOnRails.register({
5050
NavigationApp,
5151
RouterApp,
@@ -61,7 +61,7 @@ import NavigationApp from './NavigationApp';
6161
import RouterApp from './RouterAppServer';
6262
import applicationStore from '../store/applicationStore';
6363

64-
ReactOnRails.registerStore({applicationStore});
64+
ReactOnRails.registerStore({ applicationStore });
6565
ReactOnRails.register({
6666
NavigationApp,
6767
RouterApp,
@@ -71,9 +71,9 @@ Note that you should not register a renderer on the server, since there won't be
7171

7272
#### RouterAppRenderer.jsx
7373
```jsx
74-
import ReactOnRails from 'react-on-rails';
74+
import ReactOnRails from 'react-on-rails/client';
7575
import React from 'react';
76-
import ReactDOM from 'react-dom';
76+
import ReactDOM from 'react-dom/client';
7777
import Router from 'react-router/lib/Router';
7878
import match from 'react-router/lib/match';
7979
import browserHistory from 'react-router/lib/browserHistory';

lib/generators/react_on_rails/templates/base/base/app/javascript/packs/registration.js.tt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ReactOnRails from 'react-on-rails';
1+
import ReactOnRails from 'react-on-rails/client';
22

33
import <%= config[:component_name] %> from '<%= config[:app_relative_path] %>';
44

spec/dummy/app/views/pages/client_side_hello_world.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<br/>
2323
<pre>
2424
import HelloWorld from '../components/HelloWorld';
25-
import ReactOnRails from 'react-on-rails';
25+
import ReactOnRails from 'react-on-rails/client';
2626
ReactOnRails.register({ HelloWorld });
2727
</pre>
2828
</li>

spec/dummy/app/views/pages/server_side_hello_world.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<br/>
4949
<pre>
5050
import HelloWorld from '../components/HelloWorld';
51-
import ReactOnRails from 'react-on-rails';
51+
import ReactOnRails from 'react-on-rails/client';
5252
ReactOnRails.register({ HelloWorld });
5353
</pre>
5454
</li>

spec/dummy/app/views/pages/server_side_redux_app.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<br/>
3838
<pre>
3939
import ReduxApp from './ClientReduxApp';
40-
import ReactOnRails from 'react-on-rails';
40+
import ReactOnRails from 'react-on-rails/client';
4141
ReactOnRails.register({ ReduxApp });
4242
</pre>
4343
</li>

spec/dummy/app/views/pages/server_side_redux_app_cached.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<br/>
4444
<pre>
4545
import ReduxApp from './ClientReduxApp';
46-
import ReactOnRails from 'react-on-rails';
46+
import ReactOnRails from 'react-on-rails/client';
4747
ReactOnRails.register({ ReduxApp });
4848
</pre>
4949
</li>

spec/dummy/app/views/pages/xhr_refresh.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<br/>
3333
<pre style='white-space: pre-wrap; word-break: keep-all;'>
3434
import HellowWorldRehydratable from '../components/HellowWorldRehydratable';
35-
import ReactOnRails from 'react-on-rails';
35+
import ReactOnRails from 'react-on-rails/client';
3636
ReactOnRails.register({ HellowWorldRehydratable });
3737
</pre>
3838
</li>

spec/dummy/client/app/startup/ReduxSharedStoreApp.client.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import React from 'react';
55
import { Provider } from 'react-redux';
6-
import ReactOnRails from 'react-on-rails';
6+
import ReactOnRails from 'react-on-rails/client';
77
import ReactDOMClient from 'react-dom/client';
88

99
import HelloWorldContainer from '../components/HelloWorldContainer';

0 commit comments

Comments
 (0)