Merge pull request #16602 from Snuffleupagus/gulpfile-TESTING-nullish-coalescing
Use nullish coalescing when handling the `TESTING` build-target
This commit is contained in:
commit
21383fb2d1
15
gulpfile.js
15
gulpfile.js
@ -185,10 +185,7 @@ function createWebpackConfig(
|
|||||||
const bundleDefines = builder.merge(defines, {
|
const bundleDefines = builder.merge(defines, {
|
||||||
BUNDLE_VERSION: versionInfo.version,
|
BUNDLE_VERSION: versionInfo.version,
|
||||||
BUNDLE_BUILD: versionInfo.commit,
|
BUNDLE_BUILD: versionInfo.commit,
|
||||||
TESTING:
|
TESTING: defines.TESTING ?? process.env.TESTING === "true",
|
||||||
defines.TESTING !== undefined
|
|
||||||
? defines.TESTING
|
|
||||||
: process.env.TESTING === "true",
|
|
||||||
DEFAULT_PREFERENCES: defaultPreferencesDir
|
DEFAULT_PREFERENCES: defaultPreferencesDir
|
||||||
? getDefaultPreferences(defaultPreferencesDir)
|
? getDefaultPreferences(defaultPreferencesDir)
|
||||||
: {},
|
: {},
|
||||||
@ -769,10 +766,7 @@ function buildDefaultPreferences(defines, dir) {
|
|||||||
SKIP_BABEL: false,
|
SKIP_BABEL: false,
|
||||||
BUNDLE_VERSION: 0, // Dummy version
|
BUNDLE_VERSION: 0, // Dummy version
|
||||||
BUNDLE_BUILD: 0, // Dummy build
|
BUNDLE_BUILD: 0, // Dummy build
|
||||||
TESTING:
|
TESTING: defines.TESTING ?? process.env.TESTING === "true",
|
||||||
defines.TESTING !== undefined
|
|
||||||
? defines.TESTING
|
|
||||||
: process.env.TESTING === "true",
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const inputStream = merge([
|
const inputStream = merge([
|
||||||
@ -1547,10 +1541,7 @@ function buildLib(defines, dir) {
|
|||||||
const bundleDefines = builder.merge(defines, {
|
const bundleDefines = builder.merge(defines, {
|
||||||
BUNDLE_VERSION: versionInfo.version,
|
BUNDLE_VERSION: versionInfo.version,
|
||||||
BUNDLE_BUILD: versionInfo.commit,
|
BUNDLE_BUILD: versionInfo.commit,
|
||||||
TESTING:
|
TESTING: defines.TESTING ?? process.env.TESTING === "true",
|
||||||
defines.TESTING !== undefined
|
|
||||||
? defines.TESTING
|
|
||||||
: process.env.TESTING === "true",
|
|
||||||
DEFAULT_PREFERENCES: getDefaultPreferences(
|
DEFAULT_PREFERENCES: getDefaultPreferences(
|
||||||
defines.SKIP_BABEL ? "lib/" : "lib-legacy/"
|
defines.SKIP_BABEL ? "lib/" : "lib-legacy/"
|
||||||
),
|
),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user