Cleanup node package require for webpackConfigLoader

shakacode · Apr 26, 2017 · 3cea6dc · 3cea6dc
1 parent 566e2a8
commit 3cea6dc
Show file tree

Hide file tree

Showing 12 changed files with 64,106 additions and 39 deletions.
diff --git a/lib/generators/react_on_rails/templates/base/base/client/webpack.config.js b/lib/generators/react_on_rails/templates/base/base/client/webpack.config.js
@@ -5,9 +5,9 @@
 const webpack = require('webpack');
 const { resolve } = require('path');
 const ManifestPlugin = require('webpack-manifest-plugin');
-const webpackConfigLoader = require('react-on-rails').default.webpackConfigLoader; // eslint-disable-line import/no-unresolved
-
-const { env, paths, publicPath } = webpackConfigLoader(resolve('..', 'config', 'webpack'));
+const webpackConfigLoader = require('react-on-rails/node_package/lib/webpackConfigLoader').default;
+const configPath = resolve('..', 'config', 'webpack');
+const { env, paths, publicPath } = webpackConfigLoader(configPath);
 
 const devBuild = env !== 'production';
 

diff --git a/node_package/src/ReactOnRails.js b/node_package/src/ReactOnRails.js
@@ -8,7 +8,6 @@ import serverRenderReactComponent from './serverRenderReactComponent';
 import buildConsoleReplay from './buildConsoleReplay';
 import createReactElement from './createReactElement';
 import Authenticity from './Authenticity';
-import webpackConfigLoader from './webpackConfigLoader';
 import context from './context';
 
 const ctx = context();
@@ -223,10 +222,6 @@ ctx.ReactOnRails = {
  resetOptions() {
  this.options = Object.assign({}, DEFAULT_OPTIONS);
  },
-
- webpackConfigLoader(configPath) {
- return webpackConfigLoader.configLoader(configPath);
- },
 };
 
 ctx.ReactOnRails.resetOptions();

diff --git a/node_package/src/webpackConfigLoader.js b/node_package/src/webpackConfigLoader.js
@@ -3,26 +3,26 @@ const { env } = require('process');
 const { safeLoad } = require('js-yaml');
 const { readFileSync } = require('fs');
 
-export default {
- configLoader(configPath) {
- const paths = safeLoad(readFileSync(join(configPath, 'paths.yml'), 'utf8'))[env.NODE_ENV];
+const configLoader = (configPath) => {
+ const paths = safeLoad(readFileSync(join(configPath, 'paths.yml'), 'utf8'))[env.NODE_ENV];
 
-  const devServerConfig = join(configPath, 'development.server.yml');
-  const devServer = safeLoad(readFileSync(devServerConfig, 'utf8')).development;
+ const devServerConfig = join(configPath, 'development.server.yml');
+ const devServer = safeLoad(readFileSync(devServerConfig, 'utf8')).development;
 
-  if (env.REACT_ON_RAILS_ENV === 'HOT') {
-  devServer.enabled = true;
-  }
-  const productionBuild = env.NODE_ENV === 'production';
+ if (env.REACT_ON_RAILS_ENV === 'HOT') {
+ devServer.enabled = true;
+ }
+ const productionBuild = env.NODE_ENV === 'production';
 
-  const publicPath = !productionBuild && devServer.enabled ?
-  `http://${devServer.host}:${devServer.port}/` : `/${paths.assets}/`;
+ const publicPath = !productionBuild && devServer.enabled ?
+ `http://${devServer.host}:${devServer.port}/` : `/${paths.assets}/`;
 
- return {
- devServer,
- env,
- paths,
- publicPath,
- };
- },
+ return {
+ devServer,
+ env,
+ paths,
+ publicPath,
+ };
 };
+
+export default configLoader;
diff --git a/spec/dummy/app/assets/webpack/app-bundle.css b/spec/dummy/app/assets/webpack/app-bundle.css