react_on_rails 9.0.0.beta.6 → 9.0.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87401aa3f78e7c02c43df0ba13f2befc6c0d6f7a
-  data.tar.gz: 6fee72ba5bdab701ae4c270ebd2622b2c20005e3
+  metadata.gz: 55bfe083238d38b5106cdc776bf9f96ec6a93b5c
+  data.tar.gz: '03907dec757d9ac37df327e9f002d56a3f529fe2'
 SHA512:
-  metadata.gz: 43b5ea95a1424cac2a0537bd727158e7903a59174438335bcdfe29a0d744f9f9e1faab21397bb0787b6da6a978d061f81fd98d1718447824b12324262d0d9bdd
-  data.tar.gz: 6429193a7bd2741c5d0a7ea26d00e3dd6dad7a4c64d84e497a0e5f89fda1f5af301b7d576b308b3b1f2b9174c4c298639c251d216ad66bc9d8a1ea2d1f77f234
+  metadata.gz: e1d670a7c73bc79180efbfef68012e0e5119b29d0e2cdf53a6ce0e3101299b0d2b471d997e85b1b3b826069105bd5ac8a0574732d3c808ef52f2a7620a02a973
+  data.tar.gz: 2b75e5a43ca5b0294751f43c087429fb49bf69c8d76b55c7c8b2ee8108f99d4b6139e0212919a696b630bb070ba9676d403a544db9147f4254ac9d4deb724797

data/CHANGELOG.md

@@ -18,23 +18,47 @@ All 9.0.0 beta versions can be viewed in [PR 908](https://github.com/shakacode/r
 
 ```rb
 gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
-    branch: "issue-464-merge-webpacker-lite-into-webpacker"
+    branch: "issue-464-merge-webpacker-lite-into-webpacker-v2"
 ```
 
 - Update for the renaming in the `WebpackConfigLoader` in your webpack configuration.
   You will need to rename the following object properties:
-  - hotReloadingUrl       ==> devServerUrl         
-  - hotReloadingHostname  ==> devServerHost        
-  - hotReloadingPort      ==> devServerPort
+  - webpackOutputPath      ==> output.path
+  - webpackPublicOutputDir ==> output.publicPath
+  - hotReloadingUrl        ==> output.publicPathWithHost
+  - hotReloadingHostname   ==> settings.dev_server.host
+  - hotReloadingPort       ==> settings.dev_server.port
+  - hmr                    ==> settings.dev_server.hmr
+  - manifest               ==> Remove this one. We use the default for Webpack of manifest.json
+  - env                    ==> Use `const { env } = require('process');
+  - devBuild               ==> Use `const devBuild = process.env.NODE_ENV !== 'production';
+ 
+- Edit your Webpack.config files:
+  - Change your Webpack output to be like:
+    ```
+    // Leading slash is necessary
+    publicPath: `/${output.publicPath}`,
+    path: output.path,
+    ```
+  - Change your ManifestPlugin definition to include publicPath
+    ```
+    output: {
+      // Name comes from the entry section.
+      filename: '[name]-[chunkhash].js',
+   
+      publicPath: output.publicPath,
+      path: output.path,
+    },
+
+    ```
+  
 
 - Find your `webpacker_lite.yml` and rename it to `webpacker.yml`
   - Add a section like this under your development env:
     ```
     dev_server:
       host: localhost
-      port: 8080
-      https: false
-      # Can be enabled by export WEBPACKER_HMR=TRUE in env
+      port: 3035
       hmr: false
     ```
   - See the example `spec/dummy/config/webpacker.yml`.
@@ -61,6 +85,19 @@ deploying assets using the webpack-dev-server.
 ### [9.0.0]
 *Diffs for the beta to master*
 
+### [9.0.0-beta.7]
+- Depend on updated rails/webpacker in branch 
+
+gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
+    branch: "issue-464-merge-webpacker-lite-into-webpacker-v2"
+
+
+### [9.0.0-beta.6]
+- Change "hot" to "hmr".
+
+### [9.0.0-beta.3]
+- Fix typo on webpackConfigLoader.js
+
 ### [9.0.0-beta.3]
 - Fix typo on webpackConfigLoader.js
  
@@ -688,8 +725,12 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/rails-webpacker...9.0.0-beta.3
-[9.0.0]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.3...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/rails-webpacker...9.0.0-beta.7
+[9.0.0]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.7...master
+[9.0.0-beta.7]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.7...9.0.0-beta.6
+[9.0.0-beta.6]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.6...9.0.0-beta.5
+[9.0.0-beta.5]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.5...9.0.0-beta.4
+[9.0.0-beta.4]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.4...9.0.0-beta.3
 [9.0.0-beta.3]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.3...9.0.0-beta.2
 [9.0.0-beta.2]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.2...9.0.0-beta.1
 [9.0.0-beta.1]: https://github.com/shakacode/react_on_rails/compare/9.0.0-beta.1...master

data/Gemfile

@@ -39,6 +39,9 @@ gem "launchy"
 gem "poltergeist"
 gem "selenium-webdriver"
 gem "webpacker", git: "https://github.com/shakacode/webpacker.git",
-                 branch: "issue-464-merge-webpacker-lite-into-webpacker"
+                 branch: "issue-464-merge-webpacker-lite-into-webpacker-v2"
+
+# TODO: remove once we get out of beta.
+# gem 'webpacker', path: "../../forks/webpacker"
 
 gem "rainbow"

data/lib/generators/react_on_rails/base_generator.rb

@@ -75,7 +75,7 @@ module ReactOnRails
 
         gem 'mini_racer', platforms: :ruby
         gem 'webpacker', git: "https://github.com/shakacode/webpacker.git",
-                         branch: "issue-464-merge-webpacker-lite-into-webpacker"
+                         branch: "issue-464-merge-webpacker-lite-into-webpacker-v2"
         GEMS
         append_to_file("Gemfile",
                        gems)

data/lib/generators/react_on_rails/templates/base/base/client/webpack.config.js

@@ -9,8 +9,7 @@ const ManifestPlugin = require('webpack-manifest-plugin');
 const webpackConfigLoader = require('react-on-rails/webpackConfigLoader');
 
 const configPath = resolve('..', 'config');
-const { devBuild, manifest, webpackOutputPath, webpackPublicOutputDir } =
-  webpackConfigLoader(configPath);
+const { devBuild, output } = webpackConfigLoader(configPath);
 
 const config = {
 
@@ -27,11 +26,11 @@ const config = {
 
   output: {
     // Name comes from the entry section.
-    filename: '[name]-[hash].js',
+    filename: '[name]-[chunkhash].js',
 
     // Leading slash is necessary
-    publicPath: `/${webpackPublicOutputDir}`,
-    path: webpackOutputPath,
+    publicPath: `/${output.publicPath}`,
+    path: output.path,
   },
 
   resolve: {
@@ -43,7 +42,9 @@ const config = {
       NODE_ENV: 'development', // use 'development' unless process.env.NODE_ENV is defined
       DEBUG: false,
     }),
-    new ManifestPlugin({ fileName: manifest, writeToFileEmit: true }),
+    new ManifestPlugin({
+      publicPath: output.publicPath,
+      writeToFileEmit: true }),
   ],
 
   module: {

data/lib/generators/react_on_rails/templates/base/base/config/webpacker.yml

@@ -11,9 +11,7 @@ development:
 #  Temporarily disabling live-reloading until the server script is added.
 #  dev_server:
 #    host: localhost
-#    port: 8080
-#    https: false
-#    # Can be enabled by export WEBPACKER_HMR=TRUE in env
+#    port: 3035
 #    hmr: false
 
 test:

data/lib/react_on_rails/utils.rb

@@ -62,22 +62,31 @@ exitstatus: #{status.exitstatus}#{stdout_msg}#{stderr_msg}
     end
 
     def self.server_bundle_js_file_path
-      # Don't ever use the hashed file name?
-      # Cases:
-      # 1. Using same bundle for both server and client, so server bundle will be hashed
-      # 2. Using a different bundle (different Webpack config), so file is not hashed
-      bundle_js_file_path(ReactOnRails.configuration.server_bundle_js_file)
+      # Either:
+      # 1. Using same bundle for both server and client, so server bundle will be hashed in manifest
+      # 2. Using a different bundle (different Webpack config), so file is not hashed, and
+      #    bundle_js_path will throw.
+      # 3. Not using webpacker, and bundle_js_path always returns
+
+      # Note, server bundle should not be in the manifest
+      # If using webpacker gem per https://github.com/rails/webpacker/issues/571
+      return @server_bundle_path if @server_bundle_path && !Rails.env.development?
+
+      bundle_name = ReactOnRails.configuration.server_bundle_js_file
+      @server_bundle_path = begin
+        bundle_js_file_path(bundle_name)
+      rescue Webpacker::Manifest::MissingEntryError
+        Rails.root.join(File.join(Webpacker.config.public_output_path, bundle_name)).to_s
+      end
     end
 
     def self.bundle_js_file_path(bundle_name)
       if using_webpacker?
-        # Note, server bundle should not be in the manifest
-        # If using webpacker gem per https://github.com/rails/webpacker/issues/571
-        hashed_name = Webpacker::Manifest.lookup(bundle_name, throw_if_missing: false)
-        hashed_name = bundle_name if hashed_name.blank?
-        Rails.root.join(File.join(Webpacker::Configuration.output_path, hashed_name)).to_s
+        # Next line will throw if the file or manifest does not exist
+        Webpacker.manifest.lookup(bundle_name)
       else
-        # Else either the file is not in the manifest, so we'll default to the non-hashed name.
+        # Default to the non-hashed name in the specified output directory, which, for legacy
+        # React on Rails, this is the output directory picked up by the asset pipeline.
         File.join(ReactOnRails.configuration.generated_assets_dir, bundle_name)
       end
     end
@@ -107,7 +116,7 @@ exitstatus: #{status.exitstatus}#{stdout_msg}#{stderr_msg}
     end
 
     def self.manifest_exists?
-      Webpacker::Configuration.manifest_path.exist?
+      Webpacker.config.public_manifest_path.exist?
     end
 
     module Required

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "9.0.0.beta.6"
+  VERSION = "9.0.0.beta.7"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "9.0.0-beta.6",
+  "version": "9.0.0-beta.7",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

data/webpackConfigLoader.js

@@ -5,70 +5,53 @@
  * NOTE: for HMR reloading, env.WEBPACKER_HMR value will override any config value. This env value
  * should be set to TRUE to turn this on.
  */
+
 const { join, resolve } = require('path');
+const { env } = require('process');
 const { safeLoad } = require('js-yaml');
 const { readFileSync } = require('fs');
 
-const MANIFEST = 'manifest.json';
-const DEFAULT_PUBLIC_OUTPUT_PATH = 'packs';
-const DEFAULT_DEV_SERVER_HOST = 'localhost';
-const DEFAULT_DEV_SERVER_PORT = '8080';
-const DEFAULT_DEV_SERVER_HTTPS = false;
-const DEFAULT_DEV_SERVER_HMR = false;
+
+function removeOuterSlashes(string) {
+  return string.replace(/^\/*/, '').replace(/\/*$/, '');
+}
+
+function formatPublicPath(host = '', path = '') {
+  let formattedHost = removeOuterSlashes(host);
+  if (formattedHost && !/^http/i.test(formattedHost)) {
+    formattedHost = `//${formattedHost}`;
+  }
+  const formattedPath = removeOuterSlashes(path);
+  return `${formattedHost}/${formattedPath}/`;
+}
 
 /**
  * @param configPath, location where webpacker.yml will be found
+ * Return values are consistent with Webpacker's js helpers
  * @returns {{
- * devBuild,
- * hmrReloadingEnabled,
- * devServerEnabled,
- * devServerHost,
- * devServerPort,
- * devServerUrl,
- * manifest,
- * webpackOutputPath,
- * webpackPublicOutputDir
- * }}
+     settings,
+     resolvedModules,
+     output: { path, publicPath, publicPathWithHosts }
+   }}
  */
 const configLoader = (configPath) => {
-  const env = process.env;
-
   // Some test environments might not have the NODE_ENV set, so we'll have fallbacks.
   const configEnv = (process.env.NODE_ENV || process.env.RAILS_ENV || 'development');
   const ymlConfigPath = join(configPath, 'webpacker.yml');
-  const configuration = safeLoad(readFileSync(ymlConfigPath, 'utf8'))[configEnv];
-  const devServerValues = configuration.dev_server;
-  const devBuild = configEnv !== 'production';
-  const devServerHost = devServerValues && (devServerValues.host || DEFAULT_DEV_SERVER_HOST);
-  const devServerPort = devServerValues && (devServerValues.port || DEFAULT_DEV_SERVER_PORT);
-  const devServerHttps = devServerValues && (devServerValues.https || DEFAULT_DEV_SERVER_HTTPS);
-  const devServerHmr = devServerValues && (devServerValues.hmr || DEFAULT_DEV_SERVER_HMR);
+  const settings = safeLoad(readFileSync(ymlConfigPath, 'utf8'))[configEnv];
 
   // NOTE: Rails path is hard coded to `/public`
-  const webpackPublicOutputDir = configuration.public_output_path ||
-    DEFAULT_PUBLIC_OUTPUT_PATH;
-  const webpackOutputPath = resolve(configPath, '..', 'public', webpackPublicOutputDir);
-
-  const manifest = MANIFEST;
-
-  const devServerEnabled = !!devServerValues;
-  const hmrReloadingEnabled = !!devServerHmr || env.WEBPACKER_HMR === 'TRUE';
-
-  let devServerUrl = null;
-  if (devServerValues) {
-    devServerUrl = `http${devServerHttps ? 's' : ''}://${devServerHost}:${devServerPort}`;
-  }
+  const output = {
+    // Next line differs from the webpacker definition as we use the configPath to create
+    // the relative path.
+    path: resolve(configPath, '..', 'public', settings.public_output_path),
+    publicPath: `/${settings.public_output_path}/`.replace(/([^:]\/)\/+/g, '$1'),
+    publicPathWithHost: formatPublicPath(env.ASSET_HOST, settings.public_output_path),
+  };
 
   return {
-    devBuild,
-    hmrReloadingEnabled,
-    devServerEnabled,
-    devServerHost,
-    devServerPort,
-    devServerUrl,
-    manifest,
-    webpackOutputPath,
-    webpackPublicOutputDir,
+    settings,
+    output,
   };
 };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta.6
+  version: 9.0.0.beta.7
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow