1.0.5 fixing the i18n merge issues

Author: joeycozza

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.

packages/react-scripts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-scripts",
   "version": "2.1.2",
-  "frontierVersion": "1.0.4",
+  "frontierVersion": "1.0.5",
   "description": "Configuration and scripts for Create React App.",
   "repository": "fs-webdev/create-react-app",
   "license": "MIT",

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

@@ -53,7 +53,7 @@ function installFrontierDependencies(appPath, answers, useYarn, ownPath) {
   const defaultModules = [
     '[email protected]',
     '[email protected]',
-    'fs-webdev/exo'
+    'fs-webdev/exo',
   ];
   installModulesSync(defaultModules, useYarn);
 }

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);
-}
+};

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);
-}
+};

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);
-}
+};