From 791a68be65007c7c718e910d1ddacf308266ab8f Mon Sep 17 00:00:00 2001 From: Justin Gordon Date: Wed, 26 Apr 2017 00:11:03 -1000 Subject: [PATCH] Cleanup node package require for webpackConfigLoader --- .../base/base/client/webpack.config.js | 6 ++-- node_package/src/ReactOnRails.js | 5 --- node_package/src/webpackConfigLoader.js | 36 +++++++++---------- spec/dummy/client/server-rails-hot.js | 5 +-- .../client/webpack.client.base.config.js | 5 +-- .../webpack.client.rails.build.config.js | 5 +-- .../client/webpack.client.rails.hot.config.js | 5 +-- .../webpack.server.rails.build.config.js | 6 ++-- spec/dummy/client/yarn.lock | 4 +-- 9 files changed, 38 insertions(+), 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 index 899b8f033..76bce0156 100644 --- 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 index c950882d0..5800547a3 100644 --- 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 index b03c0acea..32c862dcc 100644 --- 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/client/server-rails-hot.js b/spec/dummy/client/server-rails-hot.js index 3b0b0c3ff..0b5e5b4d2 100644 --- a/spec/dummy/client/server-rails-hot.js +++ b/spec/dummy/client/server-rails-hot.js @@ -19,8 +19,9 @@ import WebpackDevServer from 'webpack-dev-server'; const { resolve } = require('path'); import webpackConfig from './webpack.client.rails.hot.config'; -const webpackConfigLoader = require('react-on-rails').default.webpackConfigLoader; -const { devServer: devServerConfig, publicPath } = webpackConfigLoader(resolve('..', 'config', 'webpack')); +const webpackConfigLoader = require('react-on-rails/node_package/lib/webpackConfigLoader').default; +const configPath = resolve('..', 'config', 'webpack'); +const { devServer: devServerConfig, publicPath } = webpackConfigLoader(configPath); const compiler = webpack(webpackConfig); diff --git a/spec/dummy/client/webpack.client.base.config.js b/spec/dummy/client/webpack.client.base.config.js index 53ecdecde..5d200357b 100644 --- a/spec/dummy/client/webpack.client.base.config.js +++ b/spec/dummy/client/webpack.client.base.config.js @@ -7,8 +7,9 @@ const webpackCommon = require('./webpack.common'); const { assetLoaderRules } = webpackCommon; const ManifestPlugin = require('webpack-manifest-plugin'); -const webpackConfigLoader = require('react-on-rails').default.webpackConfigLoader; -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 { paths, publicPath } = webpackConfigLoader(configPath); const devBuild = process.env.NODE_ENV !== 'production'; diff --git a/spec/dummy/client/webpack.client.rails.build.config.js b/spec/dummy/client/webpack.client.rails.build.config.js index 65f8e3f59..ca6814f45 100644 --- a/spec/dummy/client/webpack.client.rails.build.config.js +++ b/spec/dummy/client/webpack.client.rails.build.config.js @@ -7,8 +7,9 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin'); const config = require('./webpack.client.base.config'); const { resolve } = require('path'); -const webpackConfigLoader = require('react-on-rails').default.webpackConfigLoader; -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 { paths, publicPath } = webpackConfigLoader(configPath); const devBuild = process.env.NODE_ENV !== 'production'; diff --git a/spec/dummy/client/webpack.client.rails.hot.config.js b/spec/dummy/client/webpack.client.rails.hot.config.js index 8c2ee667e..ec6555b6d 100644 --- a/spec/dummy/client/webpack.client.rails.hot.config.js +++ b/spec/dummy/client/webpack.client.rails.hot.config.js @@ -8,8 +8,9 @@ const { resolve } = require('path'); const webpack = require('webpack'); const config = require('./webpack.client.base.config'); -const webpackConfigLoader = require('react-on-rails').default.webpackConfigLoader; -const { devServer, paths, publicPath } = webpackConfigLoader(resolve('..', 'config', 'webpack')); +const webpackConfigLoader = require('react-on-rails/node_package/lib/webpackConfigLoader').default; +const configPath = resolve('..', 'config', 'webpack'); +const { devServer, paths, publicPath } = webpackConfigLoader(configPath); config.entry.app.push( `webpack-dev-server/client?${devServer.host}:${devServer.port}`, diff --git a/spec/dummy/client/webpack.server.rails.build.config.js b/spec/dummy/client/webpack.server.rails.build.config.js index cca944908..24c4ed446 100644 --- a/spec/dummy/client/webpack.server.rails.build.config.js +++ b/spec/dummy/client/webpack.server.rails.build.config.js @@ -3,12 +3,12 @@ const webpack = require('webpack'); const { resolve, join } = require('path'); -const { imageLoaderRules } = require('./webpack.common'); const webpackCommon = require('./webpack.common'); const { assetLoaderRules } = webpackCommon; -const webpackConfigLoader = require('react-on-rails').default.webpackConfigLoader; -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 { paths } = webpackConfigLoader(configPath); const devBuild = process.env.NODE_ENV !== 'production'; const nodeEnv = devBuild ? 'development' : 'production'; diff --git a/spec/dummy/client/yarn.lock b/spec/dummy/client/yarn.lock index 4d1db74da..38d176e70 100644 --- a/spec/dummy/client/yarn.lock +++ b/spec/dummy/client/yarn.lock @@ -4177,8 +4177,8 @@ react-helmet@^5.0.3: prop-types "^15.5.4" react-side-effect "^1.1.0" -"react-on-rails@file:../../..": - version "6.10.1" +"react-on-rails@file:../../../": + version "7.0.0" react-proptypes@^0.0.1: version "0.0.1"