diff --git a/.travis.yml b/.travis.yml index 88f475c4a10..70859cd2aa2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ install: - "cd packages/react-scripts && npm i" - "cd ../../" before_deploy: +# I don't think we need to put node_modules in the tarball + - "rm -r packages/react-scripts/node_modules" - "cd packages && tar -zcf react-scripts-$TRAVIS_TAG.tgz react-scripts" - "echo \"we should have tarred the script\"" - "ls" diff --git a/packages/react-scripts/config/webpack.config.js b/packages/react-scripts/config/webpack.config.js index ff5df1da495..6f517ff4f4d 100644 --- a/packages/react-scripts/config/webpack.config.js +++ b/packages/react-scripts/config/webpack.config.js @@ -402,45 +402,47 @@ module.exports = function(webpackEnv) { { loader: require.resolve('webpack-wci18n'), }, + { + loader: require.resolve('babel-loader'), + options: { + babelrc: false, + configFile: false, + compact: false, + presets: [ + [ + require.resolve('babel-preset-react-app/dependencies'), + { helpers: true }, + ], + ], + plugins: [ + [ + require.resolve('babel-plugin-bundled-import-meta'), + { importStyle: 'iife' }, + ], + ], + cacheDirectory: true, + cacheCompression: isEnvProduction, + // @remove-on-eject-begin + cacheIdentifier: getCacheIdentifier( + isEnvProduction + ? 'production' + : isEnvDevelopment && 'development', + [ + 'babel-plugin-named-asset-import', + 'babel-preset-react-app', + 'react-dev-utils', + 'react-scripts', + ] + ), + // @remove-on-eject-end + // If an error happens in a package, it's possible to be + // because it was compiled. Thus, we don't want the browser + // debugger to show the original code. Instead, the code + // being evaluated would be much more helpful. + sourceMaps: false, + }, + }, ], - loader: require.resolve('babel-loader'), - options: { - babelrc: false, - configFile: false, - compact: false, - presets: [ - [ - require.resolve('babel-preset-react-app/dependencies'), - { helpers: true }, - ], - ], - plugins: [ - [ - require.resolve('babel-plugin-bundled-import-meta'), - { importStyle: 'iife' }, - ], - ], - cacheDirectory: true, - cacheCompression: isEnvProduction, - // @remove-on-eject-begin - cacheIdentifier: getCacheIdentifier( - isEnvProduction - ? 'production' - : isEnvDevelopment && 'development', - [ - 'babel-plugin-named-asset-import', - 'babel-preset-react-app', - 'react-dev-utils', - 'react-scripts', - ] - ), - // @remove-on-eject-end - // If an error happens in a package, it's possible to be - // because it was compiled. Thus, we don't want the browser - // debugger to show the original code. Instead, the code - // being evaluated would be much more helpful. - sourceMaps: false, - }, }, // "postcss" loader applies autoprefixer to our CSS. // "css" loader resolves paths in CSS and adds assets as dependencies. diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index fc351f7425a..1304b5a1d16 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -1,7 +1,7 @@ { "name": "react-scripts", "version": "2.1.2", - "frontierVersion": "1.0.4", + "frontierVersion": "1.0.6", "description": "Configuration and scripts for Create React App.", "repository": "fs-webdev/create-react-app", "license": "MIT", diff --git a/packages/react-scripts/scripts/utils/frontierInit.js b/packages/react-scripts/scripts/utils/frontierInit.js index 962f6564385..0605e6cb31b 100644 --- a/packages/react-scripts/scripts/utils/frontierInit.js +++ b/packages/react-scripts/scripts/utils/frontierInit.js @@ -53,7 +53,7 @@ function installFrontierDependencies(appPath, answers, useYarn, ownPath) { const defaultModules = [ 'http-proxy-middleware@0.19.0', 'react-router-dom@4.3.1', - 'fs-webdev/exo' + 'fs-webdev/exo', ]; installModulesSync(defaultModules, useYarn); } diff --git a/packages/react-scripts/template-redux/src/setupProxy.js b/packages/react-scripts/template-redux/src/setupProxy.js index d45fe63c2de..7ce23701fde 100644 --- a/packages/react-scripts/template-redux/src/setupProxy.js +++ b/packages/react-scripts/template-redux/src/setupProxy.js @@ -2,6 +2,6 @@ // docs here: https://github.com/fs-webdev/exo#proxy const setProxies = require('exo/proxy'); -module.exports = (app) => { +module.exports = app => { setProxies(app); -} +}; diff --git a/packages/react-scripts/template-typescript/src/setupProxy.js b/packages/react-scripts/template-typescript/src/setupProxy.js index d45fe63c2de..7ce23701fde 100644 --- a/packages/react-scripts/template-typescript/src/setupProxy.js +++ b/packages/react-scripts/template-typescript/src/setupProxy.js @@ -2,6 +2,6 @@ // docs here: https://github.com/fs-webdev/exo#proxy const setProxies = require('exo/proxy'); -module.exports = (app) => { +module.exports = app => { setProxies(app); -} +}; diff --git a/packages/react-scripts/template/src/setupProxy.js b/packages/react-scripts/template/src/setupProxy.js index d45fe63c2de..7ce23701fde 100644 --- a/packages/react-scripts/template/src/setupProxy.js +++ b/packages/react-scripts/template/src/setupProxy.js @@ -2,6 +2,6 @@ // docs here: https://github.com/fs-webdev/exo#proxy const setProxies = require('exo/proxy'); -module.exports = (app) => { +module.exports = app => { setProxies(app); -} +};