react_on_rails 9.0.0.beta.2 → 9.0.0.beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -2
  3. data/CHANGELOG.md +19 -5
  4. data/README.md +3 -3
  5. data/lib/generators/react_on_rails/templates/base/base/Procfile.dev.tt +8 -0
  6. data/lib/generators/react_on_rails/templates/base/base/client/package.json.tt +10 -10
  7. data/lib/react_on_rails/version.rb +1 -1
  8. data/package.json +16 -16
  9. data/webpackConfigLoader.js +1 -1
  10. data/yarn.lock +481 -192
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 98c1f91f81fb4480f4288d3e657c158b83e02203
4
- data.tar.gz: 56f19a20fed88353f3d5a5ecb5c3603b3f57988e
3
+ metadata.gz: 509ebfdde924aac348bd30a055d17bea050aef6d
4
+ data.tar.gz: d1a9ca76764a3d59ca4a918a2e0b8c8ebdb259a4
5
5
  SHA512:
6
- metadata.gz: 2d6af3cb3b79bd7bdfcf1b85995a0ce100472765646d736b5d9879cf46c715ee3bef6d1db769c3f16f351729762eb36162590fd4ca50ce34166522b9b43884d6
7
- data.tar.gz: b5ab80353b799b800a8aa50a708f119020c5462e313f2c723c63cfcecc174dc618824441100f2c30576b1c71fa60a4e755e122ae8a74c9940c46e5a4672a461b
6
+ metadata.gz: 5c7c554bb2891a1ce468bb8296722b797d62ab17646b79ae9522e313f63b70602bd5e0c5f2c0194d03ccb3cf063e8355b25904f8ccdf83490acf5f6c16e05b29
7
+ data.tar.gz: 7970e69e95915f851ede92515fd63f2029876c6b73f32bfd62438b46258183a33eedcc10cb23952afb1edae3fccec6de1bd249740f973a174453b4e95b4374a9
data/.gitignore CHANGED
@@ -25,9 +25,8 @@ node_modules
25
25
  /node_package/lib
26
26
 
27
27
  yarn-debug.*
28
- spec/dummy/client/yarn-debug.log*
28
+ yarn-error.*
29
29
  npm-debug.*
30
- spec/dummy/client/npm-debug.log*
31
30
 
32
31
  /gen-examples
33
32
 
data/CHANGELOG.md CHANGED
@@ -45,14 +45,26 @@ gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
45
45
  - For hot loading, either:
46
46
  - Set the hot key in your `webpacker.yml` to `true`.
47
47
  - Edit your hot procfile to set env value WEBPACKER_HMR=TRUE
48
+
49
+
50
+ #### Troubleshooting
51
+ If you want to skip using the dev server (as is current for beta.3 and below), then be sure to either
52
+ set WEBPACKER_DEV_SERVER=FALSE or comment out the dev_server section of your `config/webpacker.yml` file.
53
+
54
+ Otherwise, you'll get an error that the bundle can't be found, because your Rails server thinks you are
55
+ deploying assets using the webpack-dev-server.
56
+
48
57
 
49
58
  ### [9.0.0]
50
59
  *Diffs for the beta to master*
51
60
 
52
- ### [9.0.0.beta.2]
61
+ ### [9.0.0-beta.3]
62
+ - Fix typo on webpackConfigLoader.js
63
+
64
+ ### [9.0.0-beta.2]
53
65
  - Fixed problems when running in development mode for both the generator and spec/dummy.
54
66
 
55
- ### [9.0.0.beta.1]
67
+ ### [9.0.0-beta.1]
56
68
  - First version of depending on Webpacker rather than Webpacker Lite
57
69
 
58
70
  ### [8.0.6]
@@ -673,10 +685,12 @@ Best done with Object destructing:
673
685
  ##### Fixed
674
686
  - Fix several generator related issues.
675
687
 
676
- [Unreleased]: https://github.com/shakacode/react_on_rails/compare/8.0.5...master
677
- [9.0.0]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.1...master
678
- [9.0.0-beta.2]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.1...9.0.0-beta.1r
688
+ [Unreleased]: https://github.com/shakacode/react_on_rails/compare/rails-webpacker...9.0.0-beta.3
689
+ [9.0.0]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.3...master
690
+ [9.0.0-beta.3]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.2...9.0.0-beta.1
691
+ [9.0.0-beta.2]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.2...9.0.0-beta.1
679
692
  [9.0.0-beta.1]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.1...master
693
+ [8.0.6]: https://github.com/shakacode/react_on_rails/compare/8.0.5...8.0.6
680
694
  [8.0.5]: https://github.com/shakacode/react_on_rails/compare/8.0.3...8.0.5
681
695
  [8.0.3]: https://github.com/shakacode/react_on_rails/compare/8.0.2...8.0.3
682
696
  [8.0.2]: https://github.com/shakacode/react_on_rails/compare/8.0.1...8.0.2
data/README.md CHANGED
@@ -73,9 +73,9 @@ For more testimonials, see [Live Projects](PROJECTS.md) and [Kudos](./KUDOS.md).
73
73
  ------
74
74
 
75
75
  # NEWS
76
- * **[VERSION 9.0.0.beta.1](https://github.com/shakacode/react_on_rails/tree/rails-webpacker) shipped! This version depends on Webpacker directly. See the [CHANGELOG.md](https://github.com/shakacode/react_on_rails/blob/rails-webpacker/CHANGELOG.md) for migration instructions.**
77
- * **[VERSION 8.1.0](https://rubygems.org/gems/react_on_rails/)** shipped with [webpacker_lite](https://github.com/shakacode/webpacker_lite) (soon [**webpacker**](https://github.com/rails/webpacker/issues/464#issuecomment-310986140) support! [react-webpack-rails-tutorial PR #395](https://github.com/shakacode/react-webpack-rails-tutorial/pull/395) shows the changes needed to migrate from the Asset Pipeline to Webpacker Lite. For more information, see my article: [Webpacker Lite: Why Fork Webpacker?](https://blog.shakacode.com/webpacker-lite-why-fork-webpacker-f0a7707fac92). Per recent discussions, we [will merge Webpacker Lite changes back into Webpacker](https://github.com/rails/webpacker/issues/464#issuecomment-310986140). There's no reason to wait for this. The upgrade will eventually be trivial.
78
- * The Docs here on `master` refer to 9.0.0 including support for [webpacker](https://github.com/shakacode/webpacker)!
76
+ * **[VERSION 9.0.0.beta (branch)](https://github.com/shakacode/react_on_rails/tree/rails-webpacker) shipped!** This version depends on Webpacker directly. See the [CHANGELOG.md](https://github.com/shakacode/react_on_rails/blob/rails-webpacker/CHANGELOG.md) for migration instructions.
77
+ * [VERSION 8.1.0](https://rubygems.org/gems/react_on_rails/) shipped with [webpacker_lite](https://github.com/shakacode/webpacker_lite) (soon [**webpacker**](https://github.com/rails/webpacker/issues/464#issuecomment-310986140) support! [react-webpack-rails-tutorial PR #395](https://github.com/shakacode/react-webpack-rails-tutorial/pull/395) shows the changes needed to migrate from the Asset Pipeline to Webpacker Lite. For more information, see my article: [Webpacker Lite: Why Fork Webpacker?](https://blog.shakacode.com/webpacker-lite-why-fork-webpacker-f0a7707fac92). Per recent discussions, we [will merge Webpacker Lite changes back into Webpacker](https://github.com/rails/webpacker/issues/464#issuecomment-310986140). There's no reason to wait for this. The upgrade will eventually be trivial.
78
+ * The Docs here on `master` refer to 8.1.0 including support for [webpacker_lite](https://github.com/shakacode/webpacker_lite). The docs on [on the 9.0.0 beta branch](https://github.com/shakacode/react_on_rails/tree/rails-webpacker) refer to using Webpacker rather than Webpacker Lite.
79
79
  *Use the [7.0.4 docs](https://github.com/shakacode/react_on_rails/tree/7.0.4) to refer to the older asset pipeline way.*
80
80
  * *See [NEWS.md](NEWS.md) for more notes over time.*
81
81
 
data/lib/generators/react_on_rails/templates/base/base/Procfile.dev.tt CHANGED
@@ -1,2 +1,10 @@
1
+ # To ensure that Rails uses static assets rather than the webpack-dev-server
2
+ # you may set ENV value WEBPACKER_DEV_SERVER=FALSE or delete or comment out the dev_server section
3
+ # of config/webpacker.yml
4
+ # For example:
5
+ # web: WEBPACKER_DEV_SERVER=FALSE rails s -p 3000
6
+
1
7
  web: rails s -p 3000
8
+
9
+ # Next line runs a watch process with webpack
2
10
  client: sh -c 'rm -rf public/webpack/development/* || true && cd client && bundle exec rake react_on_rails:locale && yarn run build:development'
data/lib/generators/react_on_rails/templates/base/base/client/package.json.tt CHANGED
@@ -10,9 +10,9 @@
10
10
  "cacheDirectories": ["node_modules", "client/node_modules"],
11
11
  "dependencies": {
12
12
  "babel-cli": "^6.24.1",
13
- "babel-core": "^6.24.1",
14
- "babel-loader": "^6.3.2",
15
- "babel-runtime": "^6.23.0",
13
+ "babel-core": "^6.25.0",
14
+ "babel-loader": "^7.1.1",
15
+ "babel-runtime": "^6.25.0",
16
16
  "babel-polyfill": "^6.23.0",
17
17
  "babel-preset-es2015": "^6.24.1",
18
18
  "babel-preset-react": "^6.24.1",
@@ -20,16 +20,16 @@
20
20
  "es5-shim": "^4.5.9",
21
21
  "expose-loader": "^0.7.3",
22
22
  "imports-loader": "^0.7.1",
23
- "js-yaml": "^3.8.2",
24
- "react": "^15.5.4",
25
- "react-dom": "^15.5.4",
23
+ "js-yaml": "^3.9.1",
24
+ "react": "^15.6.1",
25
+ "react-dom": "^15.6.1",
26
26
  "react-on-rails": "<%= VersionSyntaxConverter.new.rubygem_to_npm %>",
27
27
  <%- if options.redux? -%>
28
- "react-redux": "^5.0.4",
29
- "redux": "^3.6.0",
28
+ "react-redux": "^5.0.5",
29
+ "redux": "^3.7.2",
30
30
  <%- end -%>
31
- "webpack": "^2.3.3",
32
- "webpack-manifest-plugin": "^1.1.0"
31
+ "webpack": "^3.4.1",
32
+ "webpack-manifest-plugin": "^1.2.1"
33
33
  },
34
34
  "devDependencies": {
35
35
  }
data/lib/react_on_rails/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ReactOnRails
4
- VERSION = "9.0.0.beta.2"
4
+ VERSION = "9.0.0.beta.3"
5
5
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-on-rails",
3
- "version": "9.0.0-beta.2",
3
+ "version": "9.0.0-beta.3",
4
4
  "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
5
5
  "main": "node_package/lib/ReactOnRails.js",
6
6
  "directories": {
@@ -8,37 +8,37 @@
8
8
  },
9
9
  "devDependencies": {
10
10
  "babel-cli": "^6.24.1",
11
- "babel-core": "^6.24.1",
12
- "babel-loader": "^6.4.1",
11
+ "babel-core": "^6.25.0",
12
+ "babel-loader": "^7.1.1",
13
13
  "babel-plugin-react-transform": "^2.0.2",
14
14
  "babel-plugin-transform-flow-strip-types": "^6.22.0",
15
15
  "babel-plugin-transform-runtime": "^6.23.0",
16
16
  "babel-preset-es2015": "^6.24.1",
17
17
  "babel-preset-react": "^6.24.1",
18
18
  "babel-preset-stage-2": "^6.24.1",
19
- "babel-runtime": "^6.23.0",
19
+ "babel-runtime": "^6.25.0",
20
20
  "babel-tape-runner": "^2.0.1",
21
- "babel-types": "^6.24.1",
21
+ "babel-types": "^6.25.0",
22
22
  "babelify": "^7.3.0",
23
23
  "blue-tape": "^1.0.0",
24
- "create-react-class": "^15.5.2",
24
+ "create-react-class": "^15.6.0",
25
25
  "eslint": "^3.19.0",
26
26
  "eslint-config-shakacode": "^15.0.0",
27
27
  "eslint-plugin-import": "^2.6.1",
28
28
  "eslint-plugin-jsx-a11y": "^5.1.1",
29
29
  "eslint-plugin-react": "^7.1.0",
30
- "flow-bin": "^0.43.1",
31
- "jsdom": "^9.12.0",
32
- "prop-types": "^15.5.7",
33
- "react": "^15.5.4",
34
- "react-dom": "^15.5.4",
30
+ "flow-bin": "^0.51.1",
31
+ "jsdom": "^11.1.0",
32
+ "prop-types": "^15.5.10",
33
+ "react": "^15.6.1",
34
+ "react-dom": "^15.6.1",
35
35
  "react-transform-hmr": "^1.0.4",
36
- "redux": "^3.6.0",
37
- "release-it": "^2.7.1",
36
+ "redux": "^3.7.2",
37
+ "release-it": "^2.8.2",
38
38
  "tap-spec": "^4.1.1",
39
- "tape": "^4.6.3",
40
- "webpack": "^2.3.3",
41
- "webpack-manifest-plugin": "^1.1.0"
39
+ "tape": "^4.7.0",
40
+ "webpack": "^3.4.1",
41
+ "webpack-manifest-plugin": "^1.2.1"
42
42
  },
43
43
  "peerDependencies": {
44
44
  "babel-runtime": ">= 6",
data/webpackConfigLoader.js CHANGED
@@ -42,7 +42,7 @@ const configLoader = (configPath) => {
42
42
  const devServerHost = devServerValues && (devServerValues.host || DEFAULT_DEV_SERVER_HOST);
43
43
  const devServerPort = devServerValues && (devServerValues.port || DEFAULT_DEV_SERVER_PORT);
44
44
  const devServerHttps = devServerValues && (devServerValues.https || DEFAULT_DEV_SERVER_HTTPS);
45
- const devServerHot = devServerValues && (devServerValues.https || DEFAULT_DEV_SERVER_HOT);
45
+ const devServerHot = devServerValues && (devServerValues.hot || DEFAULT_DEV_SERVER_HOT);
46
46
 
47
47
  // NOTE: Rails path is hard coded to `/public`
48
48
  const webpackPublicOutputDir = configuration.public_output_path ||