Skip to content

Commit

Permalink
final fixes?
Browse files Browse the repository at this point in the history
  • Loading branch information
Judahmeek committed Mar 1, 2025
1 parent 07e9e2b commit 83d0d2e
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 24 deletions.
2 changes: 0 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
node_modules
coverage
spec/react_on_rails/dummy-for-generators
spec/dummy/.yalc
spec/dummy/public
spec/dummy/vendor
spec/dummy/tmp
spec/dummy/app/assets/config/manifest.js
spec/dummy/client/node_modules
spec/dummy/client/app/components/HelloWorldReScript.res.js
node_package/lib/
**/node_modules/**
Expand Down
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ rules:
object-curly-newline: 0
no-restricted-syntax: ["error", "SequenceExpression"]
# https://stackoverflow.com/a/59268871/5241481
import/extensions: ['error', 'ignorePackages', {"js": 'never', "jsx": 'never', "ts": "never", " ": "never"}]
import/extensions: ['error', 'ignorePackages', {"js": 'never', "jsx": 'never', "ts": "never"}]
import/first: 0

# https://github.com/benmosher/eslint-plugin-import/issues/340
import/no-extraneous-dependencies: 0
Expand Down
3 changes: 3 additions & 0 deletions spec/dummy/app/views/shared/_header.erb
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,8 @@
<li>
<%= link_to "Incorrectly wrapping a pure component in a function", pure_component_wrapped_in_function_path %>
</li>
<li>
<%= link_to "TurboStream Demo", turbo_frame_tag_hello_world_path %>
</li>
</ul>
<hr/>
2 changes: 1 addition & 1 deletion spec/dummy/client/app/packs/rescript-components.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
// As per the current configuration, all files are compiled to .res.js
// and they are generated on the same directory as the .res file

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

export default HelloWorldReScript;
4 changes: 2 additions & 2 deletions spec/dummy/client/app/packs/server-bundle.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// import statement added by react_on_rails:generate_packs rake task
import "./../generated/server-bundle-generated.js" // eslint-disable-line import/extensions
// Shows the mapping from the exported object to the name used by the server rendering.
import ReactOnRails from 'react-on-rails';
// import statement added by react_on_rails:generate_packs rake task
import './../generated/server-bundle-generated';
// Example of server rendering with no React
import HelloString from '../non_react/HelloString';

Expand Down
23 changes: 7 additions & 16 deletions spec/dummy/client/app/startup/HelloTurboStream.jsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
import PropTypes from 'prop-types';
import React, { useState, useRef } from 'react';
import React from 'react';
import RailsContext from '../components/RailsContext';

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

const HelloTurboStream = ({ helloTurboStreamData, railsContext }) => {
const [name, setName] = useState(helloTurboStreamData.name);
const nameDomRef = useRef(null);
// eslint-disable-next-line no-unused-vars
const handleChange = () => {
setName(nameDomRef.current.value);
};

return (
<div>
<h3 className={css.brightColor}>Hello, {name}!</h3>
{railsContext && <RailsContext {...{ railsContext }} />}
</div>
);
};
const HelloTurboStream = ({ helloTurboStreamData, railsContext }) => (
<div>
<h3 className={css.brightColor}>Hello, {helloTurboStreamData.name}!</h3>
{railsContext && <RailsContext {...{ railsContext }} />}
</div>
);

HelloTurboStream.propTypes = {
helloTurboStreamData: PropTypes.shape({
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/client/app/startup/HelloWorldHooks.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function HelloWorldHooks(props) {

HelloWorldHooks.propTypes = {
helloWorldData: PropTypes.shape({
name: PropTypes.string,
name: PropTypes.string.isRequired,
}).isRequired,
}

Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/client/app/startup/HelloWorldReScript.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import HelloWorldReScript from '../components/HelloWorldReScript.res.js';
import HelloWorldReScript from '../components/HelloWorldReScript.res.js'; // eslint-disable-line import/no-unresolved

export default HelloWorldReScript;

0 comments on commit 83d0d2e

Please sign in to comment.