Ensure that the TESTING
define can always be overridden in gulpfile.js
Currently a `TESTING = true` environment variable will *always* take precedence in the various build-tasks, and there's no way to explicitly disable it for a particular build. That's clearly an oversight on my part, however it's easy enough to fix this; sorry about breaking this!
This commit is contained in:
parent
a936509b77
commit
1f468e523f
18
gulpfile.js
18
gulpfile.js
@ -90,7 +90,7 @@ const AUTOPREFIXER_CONFIG = {
|
|||||||
const DEFINES = Object.freeze({
|
const DEFINES = Object.freeze({
|
||||||
PRODUCTION: true,
|
PRODUCTION: true,
|
||||||
SKIP_BABEL: true,
|
SKIP_BABEL: true,
|
||||||
TESTING: false,
|
TESTING: undefined,
|
||||||
// The main build targets:
|
// The main build targets:
|
||||||
GENERIC: false,
|
GENERIC: false,
|
||||||
MOZCENTRAL: false,
|
MOZCENTRAL: false,
|
||||||
@ -179,7 +179,10 @@ 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: defines.TESTING || process.env.TESTING === "true",
|
TESTING:
|
||||||
|
defines.TESTING !== undefined
|
||||||
|
? defines.TESTING
|
||||||
|
: process.env.TESTING === "true",
|
||||||
DEFAULT_PREFERENCES: defaultPreferencesDir
|
DEFAULT_PREFERENCES: defaultPreferencesDir
|
||||||
? getDefaultPreferences(defaultPreferencesDir)
|
? getDefaultPreferences(defaultPreferencesDir)
|
||||||
: {},
|
: {},
|
||||||
@ -677,7 +680,10 @@ 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: defines.TESTING || process.env.TESTING === "true",
|
TESTING:
|
||||||
|
defines.TESTING !== undefined
|
||||||
|
? defines.TESTING
|
||||||
|
: process.env.TESTING === "true",
|
||||||
});
|
});
|
||||||
|
|
||||||
const inputStream = merge([
|
const inputStream = merge([
|
||||||
@ -1452,7 +1458,10 @@ 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: defines.TESTING || process.env.TESTING === "true",
|
TESTING:
|
||||||
|
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/"
|
||||||
),
|
),
|
||||||
@ -1824,6 +1833,7 @@ gulp.task(
|
|||||||
const defines = builder.merge(DEFINES, {
|
const defines = builder.merge(DEFINES, {
|
||||||
CHROME: true,
|
CHROME: true,
|
||||||
SKIP_BABEL: false,
|
SKIP_BABEL: false,
|
||||||
|
TESTING: false,
|
||||||
});
|
});
|
||||||
return buildDefaultPreferences(defines, "lint-chromium/");
|
return buildDefaultPreferences(defines, "lint-chromium/");
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user