Skip to content

Commit 83d0d2e

Browse files
committed
final fixes?
1 parent 07e9e2b commit 83d0d2e

File tree

8 files changed

+17
-24
lines changed

8 files changed

+17
-24
lines changed

.eslintignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
node_modules
21
coverage
32
spec/react_on_rails/dummy-for-generators
43
spec/dummy/.yalc
54
spec/dummy/public
65
spec/dummy/vendor
76
spec/dummy/tmp
87
spec/dummy/app/assets/config/manifest.js
9-
spec/dummy/client/node_modules
108
spec/dummy/client/app/components/HelloWorldReScript.res.js
119
node_package/lib/
1210
**/node_modules/**

.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ rules:
4141
object-curly-newline: 0
4242
no-restricted-syntax: ["error", "SequenceExpression"]
4343
# https://stackoverflow.com/a/59268871/5241481
44-
import/extensions: ['error', 'ignorePackages', {"js": 'never', "jsx": 'never', "ts": "never", " ": "never"}]
44+
import/extensions: ['error', 'ignorePackages', {"js": 'never', "jsx": 'never', "ts": "never"}]
45+
import/first: 0
4546

4647
# https://github.com/benmosher/eslint-plugin-import/issues/340
4748
import/no-extraneous-dependencies: 0

spec/dummy/app/views/shared/_header.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,8 @@
104104
<li>
105105
<%= link_to "Incorrectly wrapping a pure component in a function", pure_component_wrapped_in_function_path %>
106106
</li>
107+
<li>
108+
<%= link_to "TurboStream Demo", turbo_frame_tag_hello_world_path %>
109+
</li>
107110
</ul>
108111
<hr/>

spec/dummy/client/app/packs/rescript-components.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
// As per the current configuration, all files are compiled to .res.js
33
// and they are generated on the same directory as the .res file
44

5-
import HelloWorldReScript from '../components/HelloWorldReScript.res.js';
5+
import HelloWorldReScript from '../components/HelloWorldReScript.res.js'; // eslint-disable-line import/no-unresolved
66

77
export default HelloWorldReScript;

spec/dummy/client/app/packs/server-bundle.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
// import statement added by react_on_rails:generate_packs rake task
2+
import "./../generated/server-bundle-generated.js" // eslint-disable-line import/extensions
13
// Shows the mapping from the exported object to the name used by the server rendering.
24
import ReactOnRails from 'react-on-rails';
3-
// import statement added by react_on_rails:generate_packs rake task
4-
import './../generated/server-bundle-generated';
55
// Example of server rendering with no React
66
import HelloString from '../non_react/HelloString';
77

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

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
11
import PropTypes from 'prop-types';
2-
import React, { useState, useRef } from 'react';
2+
import React from 'react';
33
import RailsContext from '../components/RailsContext';
44

55
import css from '../components/HelloWorld.module.scss';
66

7-
const HelloTurboStream = ({ helloTurboStreamData, railsContext }) => {
8-
const [name, setName] = useState(helloTurboStreamData.name);
9-
const nameDomRef = useRef(null);
10-
// eslint-disable-next-line no-unused-vars
11-
const handleChange = () => {
12-
setName(nameDomRef.current.value);
13-
};
14-
15-
return (
16-
<div>
17-
<h3 className={css.brightColor}>Hello, {name}!</h3>
18-
{railsContext && <RailsContext {...{ railsContext }} />}
19-
</div>
20-
);
21-
};
7+
const HelloTurboStream = ({ helloTurboStreamData, railsContext }) => (
8+
<div>
9+
<h3 className={css.brightColor}>Hello, {helloTurboStreamData.name}!</h3>
10+
{railsContext && <RailsContext {...{ railsContext }} />}
11+
</div>
12+
);
2213

2314
HelloTurboStream.propTypes = {
2415
helloTurboStreamData: PropTypes.shape({

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function HelloWorldHooks(props) {
1919

2020
HelloWorldHooks.propTypes = {
2121
helloWorldData: PropTypes.shape({
22-
name: PropTypes.string,
22+
name: PropTypes.string.isRequired,
2323
}).isRequired,
2424
}
2525

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import HelloWorldReScript from '../components/HelloWorldReScript.res.js';
1+
import HelloWorldReScript from '../components/HelloWorldReScript.res.js'; // eslint-disable-line import/no-unresolved
22

33
export default HelloWorldReScript;

0 commit comments

Comments
 (0)