m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix production builds (#12488)

Browse Source 
The production build was accidentally broken in #12440 because of a
merge conflict with a #12441 that wasn't initially noticed. The
conflict was the renaming of the `BuildTypes` variable to `BuildType`.

This variable is used to check the current build type, but only for
production builds. `BuildTypes` is `undefined`, so this would result in
a crash when that enum was used.
This commit is contained in:
Mark Stacey 2021-10-27 13:20:55 -02:30 committed by GitHub
parent 681ab33537
commit 8e5acee421
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
development/build/scripts.js
View File

@ -55,7 +55,7 @@ const {
const { const {
createRemoveFencedCodeTransform, createRemoveFencedCodeTransform,
} = require('./transforms/remove-fenced-code'); } = require('./transforms/remove-fenced-code');
const { BuildTypes } = require('./utils'); const { BuildType } = require('./utils');
/** /**
* The build environment. This describes the environment this build was produced in. * The build environment. This describes the environment this build was produced in.
@ -89,7 +89,7 @@ function getConfigValue(key) {
* Get the appropriate Infura project ID. * Get the appropriate Infura project ID.
* *
* @param {object} options - The Infura project ID options. * @param {object} options - The Infura project ID options.
* @param {BuildTypes} options.buildType - The current build type. * @param {BuildType} options.buildType - The current build type.
* @param {ENVIRONMENT[keyof ENVIRONMENT]} options.environment - The build environment. * @param {ENVIRONMENT[keyof ENVIRONMENT]} options.environment - The build environment.
* @param {boolean} options.testing - Whether the current build is a test build or not. * @param {boolean} options.testing - Whether the current build is a test build or not.
* @returns {string} The Infura project ID. * @returns {string} The Infura project ID.
@ -100,11 +100,11 @@ function getInfuraProjectId({ buildType, environment, testing }) {
} else if (environment !== ENVIRONMENT.PRODUCTION) { } else if (environment !== ENVIRONMENT.PRODUCTION) {
// Skip validation because this is unset on PRs from forks. // Skip validation because this is unset on PRs from forks.
return metamaskrc.INFURA_PROJECT_ID; return metamaskrc.INFURA_PROJECT_ID;
} else if (buildType === BuildTypes.main) { } else if (buildType === BuildType.main) {
return getConfigValue('INFURA_PROD_PROJECT_ID'); return getConfigValue('INFURA_PROD_PROJECT_ID');
} else if (buildType === BuildTypes.beta) { } else if (buildType === BuildType.beta) {
return getConfigValue('INFURA_BETA_PROJECT_ID'); return getConfigValue('INFURA_BETA_PROJECT_ID');
} else if (buildType === BuildTypes.flask) { } else if (buildType === BuildType.flask) {
return getConfigValue('INFURA_FLASK_PROJECT_ID'); return getConfigValue('INFURA_FLASK_PROJECT_ID');
} }
throw new Error(`Invalid build type: '${buildType}'`); throw new Error(`Invalid build type: '${buildType}'`);
@ -114,7 +114,7 @@ function getInfuraProjectId({ buildType, environment, testing }) {
* Get the appropriate Segment write key. * Get the appropriate Segment write key.
* *
* @param {object} options - The Segment write key options. * @param {object} options - The Segment write key options.
* @param {BuildTypes} options.buildType - The current build type. * @param {BuildType} options.buildType - The current build type.
* @param {keyof ENVIRONMENT} options.enviroment - The current build environment. * @param {keyof ENVIRONMENT} options.enviroment - The current build environment.
* @returns {string} The Segment write key. * @returns {string} The Segment write key.
*/ */
@ -122,11 +122,11 @@ function getSegmentWriteKey({ buildType, environment }) {
if (environment !== ENVIRONMENT.PRODUCTION) { if (environment !== ENVIRONMENT.PRODUCTION) {
// Skip validation because this is unset on PRs from forks, and isn't necessary for development builds. // Skip validation because this is unset on PRs from forks, and isn't necessary for development builds.
return metamaskrc.SEGMENT_WRITE_KEY; return metamaskrc.SEGMENT_WRITE_KEY;
} else if (buildType === BuildTypes.main) { } else if (buildType === BuildType.main) {
return getConfigValue('SEGMENT_PROD_WRITE_KEY'); return getConfigValue('SEGMENT_PROD_WRITE_KEY');
} else if (buildType === BuildTypes.beta) { } else if (buildType === BuildType.beta) {
return getConfigValue('SEGMENT_BETA_WRITE_KEY'); return getConfigValue('SEGMENT_BETA_WRITE_KEY');
} else if (buildType === BuildTypes.flask) { } else if (buildType === BuildType.flask) {
return getConfigValue('SEGMENT_FLASK_WRITE_KEY'); return getConfigValue('SEGMENT_FLASK_WRITE_KEY');
} }
throw new Error(`Invalid build type: '${buildType}'`); throw new Error(`Invalid build type: '${buildType}'`);