From 5b7a306cba1dd7e9dae2a178efa1a661ae51fb37 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 23 Sep 2016 12:41:02 +0100
Subject: [PATCH] Minor tweaks
---
packages/react-scripts/config/webpack.config.dev.js | 3 ++-
packages/react-scripts/config/webpack.config.prod.js | 3 ++-
packages/react-scripts/scripts/test.js | 6 ++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
index d756c9142..d2d4009ac 100644
--- a/packages/react-scripts/config/webpack.config.dev.js
+++ b/packages/react-scripts/config/webpack.config.dev.js
@@ -96,13 +96,14 @@ module.exports = {
'react-native': 'react-native-web'
}
},
+ // @remove-on-eject-begin
// Resolve loaders (webpack plugins for CSS, images, transpilation) from the
// directory of `react-scripts` itself rather than the project directory.
- // You can remove this after ejecting.
resolveLoader: {
root: paths.ownNodeModules,
moduleTemplates: ['*-loader']
},
+ // @remove-on-eject-end
module: {
// First, run the linter.
// It's important to do this before Babel processes the JS.
diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
index 8087bf7d0..a1e3e831b 100644
--- a/packages/react-scripts/config/webpack.config.prod.js
+++ b/packages/react-scripts/config/webpack.config.prod.js
@@ -96,13 +96,14 @@ module.exports = {
'react-native': 'react-native-web'
}
},
+ // @remove-on-eject-begin
// Resolve loaders (webpack plugins for CSS, images, transpilation) from the
// directory of `react-scripts` itself rather than the project directory.
- // You can remove this after ejecting.
resolveLoader: {
root: paths.ownNodeModules,
moduleTemplates: ['*-loader']
},
+ // @remove-on-eject-end
module: {
// First, run the linter.
// It's important to do this before Babel processes the JS.
diff --git a/packages/react-scripts/scripts/test.js b/packages/react-scripts/scripts/test.js
index 018a0f1ea..5fafb458b 100644
--- a/packages/react-scripts/scripts/test.js
+++ b/packages/react-scripts/scripts/test.js
@@ -19,9 +19,6 @@ process.env.PUBLIC_URL = '';
require('dotenv').config({silent: true});
const jest = require('jest');
-const path = require('path');
-const paths = require('../config/paths');
-
const argv = process.argv.slice(2);
// Watch unless on CI
@@ -32,11 +29,12 @@ if (!process.env.CI) {
// @remove-on-eject-begin
// This is not necessary after eject because we embed config into package.json.
const createJestConfig = require('./utils/createJestConfig');
+const path = require('path');
+const paths = require('../config/paths');
argv.push('--config', JSON.stringify(createJestConfig(
relativePath => path.resolve(__dirname, '..', relativePath),
path.resolve(paths.appSrc, '..'),
false
)));
// @remove-on-eject-end
-
jest.run(argv);
--
GitLab