Merge pull request #46 from firstlookmedia/entry-config

adds 'clientEntry' and 'serverEntry' as package.json config

Author: tomconroy

config/packageConfig.js

@@ -0,0 +1,9 @@
+const path = require('path');
+
+const packageConfig = require(path.resolve('package.json'));
+
+const reactScriptPackageConfig = {
+  ...packageConfig['react-scripts'],
+};
+
+module.exports = reactScriptPackageConfig;

config/webpack.defaults.js

@@ -2,6 +2,7 @@ const path = require('path');
 const autoprefixer = require('autoprefixer');
 const precss = require('precss');
 const postcssCalc = require('postcss-calc');
+const packageConfig = require('./packageConfig');
 
 const cssOptions = {
   sourceMap: true,
@@ -20,7 +21,10 @@ const babelOptions = {
 module.exports = {
   mode: 'development',
   context: __dirname,
-  entry: ['babel-polyfill', path.resolve('src/index.js')],
+  entry: [
+    'babel-polyfill',
+    path.resolve(packageConfig.clientEntry || 'src/index.js'),
+  ],
   output: {
     filename: '[name].js',
     path: path.resolve('build/assets'),

config/webpack.server.js

@@ -4,6 +4,7 @@ const nodeExternals = require('webpack-node-externals');
 const ProgressBarPlugin = require('progress-bar-webpack-plugin');
 const merge = require('webpack-merge');
 const defaults = require('./webpack.defaults.js');
+const packageConfig = require('./packageConfig');
 
 module.exports = merge.smart({
   module: {
@@ -26,7 +27,7 @@ module.exports = merge.smart({
     __dirname: false,
     setImmediate: false,
   },
-  entry: path.resolve('server.js'),
+  entry: path.resolve(packageConfig.serverEntry || 'server.js'),
   output: {
     filename: 'server.js',
     path: path.resolve('build'),

scripts/utils/relayCompilerArguments.js

@@ -1,16 +1,13 @@
 const path = require('path');
-
-const packageConfig = require(path.resolve('package.json'));
+const packageConfig = require('../../config/packageConfig.js');
 
 // relay compiler
 
 let includePaths = ['src/**'];
 const excludePaths = ['**/__generated__/**'];
-if ('react-scripts' in packageConfig) {
-  const moduleName = packageConfig['react-scripts'].sharedComponentModule;
-  if (moduleName) {
-    includePaths = includePaths.concat(`node_modules/${moduleName}/src/**`);
-  }
+const moduleName = packageConfig.sharedComponentModule;
+if (moduleName) {
+  includePaths = includePaths.concat(`node_modules/${moduleName}/src/**`);
 }
 const extensions = ['js', 'jsx', 'ts', 'tsx'];