Skip to content

Commit e01b8a0

Browse files
committed
Update react-on-rails import to /client as needed
1 parent 28e3924 commit e01b8a0

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Many projects will have different entry points for client and server rendering.
99
Your Client Entry can look like this:
1010

1111
```js
12-
import ReactOnRails from 'react-on-rails';
12+
import ReactOnRails from 'react-on-rails/client';
1313
import App from './ClientApp';
1414
ReactOnRails.register({ App });
1515
```
@@ -22,7 +22,7 @@ import App from './ServerApp';
2222
ReactOnRails.register({ App });
2323
```
2424

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

2727
## B. Two Options for Using Webpack Resolve Alias in the Webpack Config
2828

docs/javascript/code-splitting.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Here's an example of how you might use this in practice:
3939
#### clientRegistration.js
4040

4141
```js
42-
import ReactOnRails from 'node_package/lib/ReactOnRails';
42+
import ReactOnRails from 'react-on-rails/client';
4343
import NavigationApp from './NavigationApp';
4444

4545
// Note that we're importing a different RouterApp than in serverRegistration.js
@@ -76,9 +76,9 @@ Note that you should not register a renderer on the server, since there won't be
7676
#### RouterAppRenderer.jsx
7777

7878
```jsx
79-
import ReactOnRails from 'react-on-rails';
79+
import ReactOnRails from 'react-on-rails/client';
8080
import React from 'react';
81-
import ReactDOM from 'react-dom';
81+
import ReactDOM from 'react-dom/client';
8282
import Router from 'react-router/lib/Router';
8383
import match from 'react-router/lib/match';
8484
import browserHistory from 'react-router/lib/browserHistory';

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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)