Skip to content

Commit

Permalink
package versioning and dependencies in working state with reason-react
Browse files Browse the repository at this point in the history
   - added bs-react-on-rails
   -
  • Loading branch information
Leora Juster committed May 9, 2019
1 parent bedc479 commit 61c49ed
Show file tree
Hide file tree
Showing 9 changed files with 1,230 additions and 1,294 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<%= react_component("HelloWorldReason", props: @app_props_server_render, prerender: false, trace: true, id: "HelloWorld-react-component-0") %>
<hr/>

<h1>React Rails Client Side Only Rendering</h1>
<h1>React Rails ReasonML Client Side Only Rendering</h1>
<p>
This example demonstrates client side only rendering.<br/><br/>
The source HTML of this page will only show a DIV with an ID matching HelloWorld.<br/>
This example demonstrates client side only rendering using ReasonML.<br/><br/>
The source HTML of this page will only show a DIV with an ID matching HelloWorldReason.<br/>
<pre>
<%= "<div id=\"HelloWorld-reason-react-component-0\"></div>" %>
</pre><br/><br/>
Expand Down
19 changes: 4 additions & 15 deletions spec/dummy/client/.merlin
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
####{BSB GENERATED: NO EDIT
FLG -ppx '/Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/bs-platform/lib/reactjs_jsx_ppx_2.exe'
FLG -ppx /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/bs-platform/lib/bsppx.exe
FLG -ppx '/Users/leorajuster/.nvm/versions/node/v10.9.0/lib/node_modules/bs-platform/lib/bsppx.exe -bs-jsx 2'
S /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/bs-platform/lib/ocaml
B /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/bs-platform/lib/ocaml
FLG -nostdlib -color always
FLG -w -30-40+6+7+27+32..39+44+45+101-45
FLG -w -30-40+6+7+27+32..39+44+45+101
S /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/reason-react/lib/ocaml
B /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/reason-react/lib/ocaml
S /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/re-classnames/lib/ocaml
B /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/re-classnames/lib/ocaml
S /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/re-debouncer/lib/ocaml
B /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/re-debouncer/lib/ocaml
S /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/@glennsl/bs-json/lib/ocaml
B /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/@glennsl/bs-json/lib/ocaml
S /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/bs-log/lib/ocaml
B /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/bs-log/lib/ocaml
S /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/bs-fetch/lib/ocaml
B /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/bs-fetch/lib/ocaml
S /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/bs-date-fns/lib/ocaml
B /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/bs-date-fns/lib/ocaml
S /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/bs-react-on-rails/lib/ocaml
B /Users/leorajuster/Desktop/repos/react_on_rails/spec/dummy/client/node_modules/bs-react-on-rails/lib/ocaml
S app/components
B lib/bs/app/components
####BSB GENERATED: NO EDIT}
17 changes: 0 additions & 17 deletions spec/dummy/client/app/components/HelloWorldReason.bs.js

This file was deleted.

15 changes: 1 addition & 14 deletions spec/dummy/client/app/components/HelloWorldReason.re
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,5 @@ let make = (~name: string, _) => {
switch (action) {
| UpdateName(name) => ReasonReact.Update({name: name})
},
render: ({state, send}) =>
<div>
<h3> {"Hello, " ++ state.name ++ "!" |> ReasonReact.stringToElement} </h3>
<hr />
<form>
<label htmlFor="name"> {"Say hello to:" |> ReasonReact.stringToElement} </label>
<input
id="name"
_type="text"
value={state.name}
onChange={event => UpdateName(event |> Utils.eventTargetValue) |> send}
/>
</form>
</div>,
render: ({state, send}) => <div> <hr /> <form> <input id="name" value={state.name} /> </form> </div>,
};
2 changes: 1 addition & 1 deletion spec/dummy/client/app/startup/clientRegistration.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'es5-shim';
import ReactOnRails from 'react-on-rails';

import HelloWorld from '../components/HelloWorld';
import HelloWorldReason from '../components/HelloWorldReason.re';
import HelloWorldReason from '../components/HelloWorldReason.bs';
import HelloWorldWithLogAndThrow from '../components/HelloWorldWithLogAndThrow';
import HelloWorldES5 from '../components/HelloWorldES5';
import HelloWorldRehydratable from '../components/HelloWorldRehydratable';
Expand Down
6 changes: 2 additions & 4 deletions spec/dummy/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
"@glennsl/bs-json": "^3.0.0",
"autoprefixer": "^7.1.2",
"babel-loader": "^8.0.2",
"bs-date-fns": "0.1.6",
"bs-fetch": "0.3.1",
"bs-log": "0.1.1",
"bs-platform": "4.0.5",
"bs-platform": "^5.0.4",
"bs-react-on-rails": "^0.2.0",
"create-react-class": "^15.6.3",
"css-loader": "^0.28.4",
"es5-shim": "^4.5.9",
Expand Down
Loading

0 comments on commit 61c49ed

Please sign in to comment.