Skip to content

Commit 0ca540e

Browse files
committed
3.3.1 RC 1
1 parent 9d895db commit 0ca540e

File tree

4 files changed

+48
-41
lines changed

4 files changed

+48
-41
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,9 @@ module.exports = function(webpackEnv) {
269269
}
270270
: false,
271271
},
272+
cssProcessorPluginOptions: {
273+
preset: ['default', { minifyFontValues: { removeQuotes: false } }],
274+
},
272275
}),
273276
],
274277
// Automatically split vendor and commons
@@ -528,7 +531,7 @@ module.exports = function(webpackEnv) {
528531
exclude: sassModuleRegex,
529532
use: getStyleLoaders(
530533
{
531-
importLoaders: 2,
534+
importLoaders: 3,
532535
sourceMap: isEnvProduction && shouldUseSourceMap,
533536
},
534537
'sass-loader'
@@ -545,7 +548,7 @@ module.exports = function(webpackEnv) {
545548
test: sassModuleRegex,
546549
use: getStyleLoaders(
547550
{
548-
importLoaders: 2,
551+
importLoaders: 3,
549552
sourceMap: isEnvProduction && shouldUseSourceMap,
550553
modules: {
551554
getLocalIdent: getCSSModuleLocalIdent,

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,13 +278,6 @@ module.exports = function(webpackEnv) {
278278
ascii_only: true,
279279
},
280280
},
281-
// Use multi-process parallel running to improve the build speed
282-
// Default number of concurrent runs: os.cpus().length - 1
283-
// Disabled on WSL (Windows Subsystem for Linux) due to an issue with Terser
284-
// https://github.com/webpack-contrib/terser-webpack-plugin/issues/21
285-
parallel: !isWsl,
286-
// Enable file caching
287-
cache: true,
288281
sourceMap: shouldUseSourceMap,
289282
}),
290283
// This is only used in production mode
@@ -302,6 +295,9 @@ module.exports = function(webpackEnv) {
302295
}
303296
: false,
304297
},
298+
cssProcessorPluginOptions: {
299+
preset: ['default', { minifyFontValues: { removeQuotes: false } }],
300+
},
305301
}),
306302
],
307303
// Automatically split vendor and commons
@@ -561,7 +557,7 @@ module.exports = function(webpackEnv) {
561557
exclude: sassModuleRegex,
562558
use: getStyleLoaders(
563559
{
564-
importLoaders: 2,
560+
importLoaders: 3,
565561
sourceMap: isEnvProduction && shouldUseSourceMap,
566562
},
567563
'sass-loader'
@@ -578,7 +574,7 @@ module.exports = function(webpackEnv) {
578574
test: sassModuleRegex,
579575
use: getStyleLoaders(
580576
{
581-
importLoaders: 2,
577+
importLoaders: 3,
582578
sourceMap: isEnvProduction && shouldUseSourceMap,
583579
modules: {
584580
getLocalIdent: getCSSModuleLocalIdent,

packages/react-scripts/scripts/wpbuild.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
9090
}
9191

9292
// Generate configuration
93-
const config = configFactory(process.env.NODE_ENV);
93+
const config = configFactory('production');
9494

9595
// We require that you explicitly set browsers and do not fall back to
9696
// browserslist defaults.
@@ -200,8 +200,18 @@ function build(previousFileSizes) {
200200
if (!err.message) {
201201
return reject(err);
202202
}
203+
204+
let errMessage = err.message;
205+
206+
// Add additional information for postcss errors
207+
if (Object.prototype.hasOwnProperty.call(err, 'postcssNode')) {
208+
errMessage +=
209+
'\nCompileError: Begins at CSS selector ' +
210+
err['postcssNode'].selector;
211+
}
212+
203213
messages = formatWebpackMessages({
204-
errors: [err.message],
214+
errors: [errMessage],
205215
warnings: [],
206216
});
207217
} else {

packages/react-scripts/scripts/wpstart.js

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -44,35 +44,9 @@ const {
4444
prepareUrls,
4545
} = require('react-dev-utils/WebpackDevServerUtils');
4646
const openBrowser = require('react-dev-utils/openBrowser');
47-
//const paths = require('../config/paths'); // wptheme - remarked out
48-
//const configFactory = require('../config/webpack.config'); // wptheme - remarked out
49-
//const createDevServerConfig = require('../config/webpackDevServer.config'); // wptheme - remarked out
50-
51-
// wptheme - added section - start
5247
const paths = require('../config/paths-wptheme'); // wptheme - touched
53-
const configFactory = require('../config/webpack.config.wptheme');
54-
const config = configFactory('development');
55-
const appPackage = require(paths.appPackageJson);
56-
const wpThemeUserConfig = require('@devloco/create-react-wptheme-utils/getUserConfig')(
57-
paths,
58-
process.env.NODE_ENV
59-
);
60-
const wpThemePostInstallerInfo = require('@devloco/create-react-wptheme-utils/postInstallerInfo');
61-
const wpThemeFileFunctions = require('@devloco/create-react-wptheme-utils/fileFunctions');
62-
63-
const copyPublicFolder = wpThemeFileFunctions.copyPublicFolder;
64-
const copyToThemeFolder = wpThemeFileFunctions.copyToThemeFolder;
65-
const deleteDeployFolder = wpThemeFileFunctions.deleteDeployFolder;
66-
const setupCopyToThemeFolder = wpThemeFileFunctions.setupCopyToThemeFolder;
67-
const writeDoNotEditFile = wpThemeFileFunctions.writeDoNotEditFile;
68-
69-
const _wpThemeServer =
70-
wpThemeUserConfig &&
71-
wpThemeUserConfig.wpThemeServer &&
72-
wpThemeUserConfig.wpThemeServer.enable === true
73-
? require('@devloco/create-react-wptheme-utils/wpThemeServer')
74-
: null;
75-
// wptheme - added section - end
48+
const configFactory = require('../config/webpack.config.wptheme'); // wptheme - touched
49+
//const createDevServerConfig = require('../config/webpackDevServer.config'); // wptheme - remarked out
7650

7751
const useYarn = fs.existsSync(paths.yarnLockFile);
7852
const isInteractive = process.stdout.isTTY;
@@ -103,6 +77,30 @@ if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
10377
// console.log();
10478
// }
10579

80+
// wptheme - added section - start
81+
const config = configFactory('development');
82+
const appPackage = require(paths.appPackageJson);
83+
const wpThemeUserConfig = require('@devloco/create-react-wptheme-utils/getUserConfig')(
84+
paths,
85+
process.env.NODE_ENV
86+
);
87+
const wpThemePostInstallerInfo = require('@devloco/create-react-wptheme-utils/postInstallerInfo');
88+
const wpThemeFileFunctions = require('@devloco/create-react-wptheme-utils/fileFunctions');
89+
90+
const copyPublicFolder = wpThemeFileFunctions.copyPublicFolder;
91+
const copyToThemeFolder = wpThemeFileFunctions.copyToThemeFolder;
92+
const deleteDeployFolder = wpThemeFileFunctions.deleteDeployFolder;
93+
const setupCopyToThemeFolder = wpThemeFileFunctions.setupCopyToThemeFolder;
94+
const writeDoNotEditFile = wpThemeFileFunctions.writeDoNotEditFile;
95+
96+
const _wpThemeServer =
97+
wpThemeUserConfig &&
98+
wpThemeUserConfig.wpThemeServer &&
99+
wpThemeUserConfig.wpThemeServer.enable === true
100+
? require('@devloco/create-react-wptheme-utils/wpThemeServer')
101+
: null;
102+
// wptheme - added section - end
103+
106104
// We require that you explicitly set browsers and do not fall back to
107105
// browserslist defaults.
108106
const { checkBrowsers } = require('react-dev-utils/browsersHelper');

0 commit comments

Comments
 (0)