re-incorporate changes for spring-boot

Author: athill

packages/create-react-app/createReactApp.js

@@ -343,7 +343,7 @@ function run(
 }
 
 function getInstallPackage(version) {
-  let packageToInstall = 'react-scripts';
+  let packageToInstall = '@jwbennet/spring-boot-react-scripts';
   const validSemver = semver.valid(version);
   if (validSemver) {
     packageToInstall += `@${validSemver}`;
@@ -492,7 +492,7 @@ function checkAppName(appName) {
 
   // TODO: there should be a single place that holds the dependencies
   const dependencies = ['react', 'react-dom'];
-  const devDependencies = ['react-scripts'];
+  const devDependencies = ['@jwbennet/spring-boot-react-scripts'];
   const allDependencies = dependencies.concat(devDependencies).sort();
   if (allDependencies.indexOf(appName) >= 0) {
     console.error(
@@ -565,12 +565,19 @@ function isSafeToCreateProjectIn(root) {
     '.idea',
     'README.md',
     'LICENSE',
-    'web.iml',
     '.hg',
     '.hgignore',
     '.hgcheck',
+    '.mvn',
+    'mvnw',
+    'mvnw.cmd',
+    'pom.xml',
+    'src',
   ];
-  return fs.readdirSync(root).every(file => validFiles.indexOf(file) >= 0);
+  return fs
+    .readdirSync(root)
+    .filter(file => !file.endsWith('.iml'))
+    .every(file => validFiles.indexOf(file) >= 0);
 }
 
 function checkIfOnline(useYarn) {

packages/create-react-app/package.json

@@ -1,24 +1,24 @@
 {
-  "name": "create-react-app",
-  "version": "1.3.1",
+  "name": "@jwbennet/spring-boot-create-react-app",
+  "version": "1.3.2",
   "keywords": [
     "react"
   ],
   "description": "Create React apps with no build configuration.",
-  "repository": "facebookincubator/create-react-app",
+  "repository": "jwbennet/create-react-app",
   "license": "BSD-3-Clause",
   "engines": {
     "node": ">=4"
   },
   "bugs": {
-    "url": "https://github.com/facebookincubator/create-react-app/issues"
+    "url": "https://github.com/jwbennet/create-react-app/issues"
   },
   "files": [
     "index.js",
     "createReactApp.js"
   ],
   "bin": {
-    "create-react-app": "./index.js"
+    "spring-boot-create-react-app": "./index.js"
   },
   "dependencies": {
     "chalk": "^1.1.1",

packages/react-scripts/config/paths.js

@@ -51,14 +51,15 @@ function getServedPath(appPackageJson) {
 // config after eject: we're in ./config/
 module.exports = {
   dotenv: resolveApp('.env'),
-  appBuild: resolveApp('build'),
-  appPublic: resolveApp('public'),
-  appHtml: resolveApp('public/index.html'),
-  appIndexJs: resolveApp('src/index.js'),
+  appBuild: resolveApp('target/classes/static'),
+  appPublic: resolveApp('src/main/resources/static'),
+  appHtml: resolveApp('src/main/resources/index.html'),
+  appIndexJs: resolveApp('src/main/js/index.js'),
   appPackageJson: resolveApp('package.json'),
-  appSrc: resolveApp('src'),
+  appSrc: resolveApp('src/main/js'),
+  appTest: resolveApp('src/test/js'),
   yarnLockFile: resolveApp('yarn.lock'),
-  testsSetup: resolveApp('src/setupTests.js'),
+  testsSetup: resolveApp('src/test/js/setupTests.js'),
   appNodeModules: resolveApp('node_modules'),
   publicUrl: getPublicUrl(resolveApp('package.json')),
   servedPath: getServedPath(resolveApp('package.json')),

packages/react-scripts/config/webpack.config.dev.js

@@ -72,7 +72,7 @@ module.exports = {
     // This does not produce a real file. It's just the virtual path that is
     // served by WebpackDevServer in development. This is the JS bundle
     // containing code from all our entry points, and the Webpack runtime.
-    filename: 'static/js/bundle.js',
+    filename: 'js/bundle.js',
     // There are also additional JS chunk files if you use code splitting.
     chunkFilename: 'static/js/[name].chunk.js',
     // This is the URL that app is served from. We use "/" in development.
@@ -175,7 +175,7 @@ module.exports = {
         ],
         loader: require.resolve('file-loader'),
         options: {
-          name: 'static/media/[name].[hash:8].[ext]',
+          name: 'media/[name].[hash:8].[ext]',
         },
       },
       // "url" loader works like "file" loader except that it embeds assets
@@ -186,7 +186,7 @@ module.exports = {
         loader: require.resolve('url-loader'),
         options: {
           limit: 10000,
-          name: 'static/media/[name].[hash:8].[ext]',
+          name: 'media/[name].[hash:8].[ext]',
         },
       },
       // Process JS with Babel.

packages/react-scripts/config/webpack.config.prod.js

@@ -22,19 +22,6 @@ const eslintFormatter = require('react-dev-utils/eslintFormatter');
 const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
 const paths = require('./paths');
 const getClientEnvironment = require('./env');
-var autoprefixer = require('autoprefixer');
-var webpack = require('webpack');
-var HtmlWebpackPlugin = require('html-webpack-plugin');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var ManifestPlugin = require('webpack-manifest-plugin');
-var InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
-var paths = require('./paths');
-var getClientEnvironment = require('./env');
-
-// @remove-on-eject-begin
-// `path` is not used after eject - see https://github.com/facebookincubator/create-react-app/issues/1174
-var path = require('path');
-// @remove-on-eject-end
 
 // Webpack uses `publicPath` to determine where the app is being served from.
 // It requires a trailing slash, or the file assets will get an incorrect path.
@@ -56,7 +43,7 @@ if (env.stringified['process.env'].NODE_ENV !== '"production"') {
 }
 
 // Note: defined here because it will be used more than once.
-const cssFilename = 'static/css/[name].[contenthash:8].css';
+const cssFilename = 'css/[name].[contenthash:8].css';
 
 // ExtractTextPlugin expects the build output to be flat.
 // (See https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/27)
@@ -84,7 +71,7 @@ module.exports = {
     // Generated JS file names (with nested folders).
     // There will be one main bundle, and one file per asynchronous chunk.
     // We don't currently advertise code splitting but Webpack supports it.
-    filename: 'static/js/[name].[chunkhash:8].js',
+    filename: 'js/[name].[chunkhash:8].js',
     chunkFilename: 'static/js/[name].[chunkhash:8].chunk.js',
     // We inferred the "public path" (such as / or /my-project) from homepage.
     publicPath: publicPath,
@@ -181,7 +168,7 @@ module.exports = {
         ],
         loader: require.resolve('file-loader'),
         options: {
-          name: 'static/media/[name].[hash:8].[ext]',
+          name: 'media/[name].[hash:8].[ext]',
         },
       },
       // "url" loader works just like "file" loader but it also embeds
@@ -191,7 +178,7 @@ module.exports = {
         loader: require.resolve('url-loader'),
         options: {
           limit: 10000,
-          name: 'static/media/[name].[hash:8].[ext]',
+          name: 'media/[name].[hash:8].[ext]',
         },
       },
       // Process JS with Babel.
@@ -273,6 +260,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       inject: true,
       template: paths.appHtml,
+      filename: '../templates/index.html',
       minify: {
         removeComments: true,
         collapseWhitespace: true,

packages/react-scripts/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "react-scripts",
-  "version": "1.0.6",
+  "name": "@jwbennet/spring-boot-react-scripts",
+  "version": "1.0.7",
   "description": "Configuration and scripts for Create React App.",
   "repository": "jwbennet/create-react-app",
   "license": "BSD-3-Clause",
@@ -44,6 +44,7 @@
     "fs-extra": "3.0.1",
     "html-webpack-plugin": "2.28.0",
     "jest": "20.0.3",
+    "nunjucks": "3.0.0",
     "object-assign": "4.1.1",
     "postcss-flexbugs-fixes": "3.0.0",
     "postcss-loader": "2.0.5",

packages/react-scripts/scripts/build.js

@@ -97,11 +97,44 @@ measureFileSizesBeforeBuild(paths.appBuild)
     }
   );
 
+// Print out errors
+function printErrors(summary, errors) {
+  console.log(chalk.red(summary));
+  console.log();
+  errors.forEach(err => {
+    console.log(err.message || err);
+    console.log();
+  });
+}
+
 // Create the production build and print the deployment instructions.
 function build(previousFileSizes) {
   console.log('Creating an optimized production build...');
+  const compilationCallback = (err, stats) => {
+    if (err) {
+      printErrors('Failed to compile.', [err]);
+      process.exit(1);
+    }
 
+    if (stats.compilation.errors.length) {
+      printErrors('Failed to compile.', stats.compilation.errors);
+      process.exit(1);
+    }
+
+    if (process.env.CI && stats.compilation.warnings.length) {
+      printErrors(
+        'Failed to compile. When process.env.CI = true, warnings are treated as failures. Most CI servers set this automatically.',
+        stats.compilation.warnings
+      );
+      process.exit(1);
+    }
+  };
   let compiler = webpack(config);
+  if (process.argv.includes('--watch')) {
+    webpack(config).watch({}, compilationCallback);
+  } else {
+    webpack(config).run(compilationCallback);
+  }
   return new Promise((resolve, reject) => {
     compiler.run((err, stats) => {
       if (err) {

packages/react-scripts/scripts/init.js

@@ -21,6 +21,9 @@ const path = require('path');
 const chalk = require('chalk');
 const spawn = require('react-dev-utils/crossSpawn');
 
+const addDependencies = require('../utils/addDependencies');
+const copyTemplates = require('../utils/copyTemplates');
+
 module.exports = function(
   appPath,
   appName,
@@ -37,8 +40,19 @@ module.exports = function(
   const appPackage = require(path.join(appPath, 'package.json'));
   const useYarn = fs.existsSync(path.join(appPath, 'yarn.lock'));
 
+  const activeModules = {
+    bootstrap: true,
+    fontawesome: true,
+    form: true,
+    redux: true,
+    router: true,
+  };
+
   // Copy over some of the devDependencies
-  appPackage.dependencies = appPackage.dependencies || {};
+  appPackage.dependencies = addDependencies(
+    appPackage.dependencies,
+    activeModules
+  );
   appPackage.devDependencies = appPackage.devDependencies || {};
 
   // Setup the script rules
@@ -47,6 +61,7 @@ module.exports = function(
     build: 'react-scripts build',
     test: 'react-scripts test --env=jsdom',
     eject: 'react-scripts eject',
+    watch: 'react-scripts build --watch',
   };
 
   fs.writeFileSync(
@@ -67,7 +82,7 @@ module.exports = function(
     ? path.resolve(originalDirectory, template)
     : path.join(ownPath, 'template');
   if (fs.existsSync(templatePath)) {
-    fs.copySync(templatePath, appPath);
+    copyTemplates(appName, appPath, templatePath, activeModules);
   } else {
     console.error(
       `Could not locate supplied template: ${chalk.green(templatePath)}`

packages/react-scripts/scripts/start.js

@@ -49,7 +49,7 @@ if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
 
 // Tools like Cloud9 rely on this.
 const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000;
-const HOST = process.env.HOST || '0.0.0.0';
+const HOST = process.env.HOST || 'localhost';
 
 // We attempt to use the default port but if it is busy, we offer the user to
 // run on a different port. `detect()` Promise resolves to the next free port.

packages/react-scripts/scripts/utils/createJestConfig.js

@@ -10,20 +10,24 @@
 'use strict';
 
 const fs = require('fs');
+const path = require('path');
 const chalk = require('chalk');
 const paths = require('../../config/paths');
 
 module.exports = (resolve, rootDir, isEjecting) => {
   // Use this instead of `paths.testsSetup` to avoid putting
   // an absolute filename into configuration after ejecting.
   const setupTestsFile = fs.existsSync(paths.testsSetup)
-    ? '<rootDir>/src/setupTests.js'
+    ? '<rootDir>/src/test/js/setupTests.js'
     : undefined;
 
   // TODO: I don't know if it's safe or not to just use / as path separator
   // in Jest configs. We need help from somebody with Windows to determine this.
   const config = {
-    collectCoverageFrom: ['src/**/*.{js,jsx}'],
+    collectCoverageFrom: [
+      path.relative(rootDir, paths.appSrc) + '/**/*.{js,jsx}',
+    ],
+    roots: [paths.appSrc, paths.appTest],
     setupFiles: [resolve('config/polyfills.js')],
     setupTestFrameworkScriptFile: setupTestsFile,
     testMatch: [