Skip to content

Commit

Permalink
Remove json path and fix process check (#6665)
Browse files Browse the repository at this point in the history
  • Loading branch information
hsubox76 authored Oct 7, 2022
1 parent 0a112bd commit 29d0340
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 21 deletions.
5 changes: 5 additions & 0 deletions .changeset/strong-squids-dress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@firebase/util': patch
---

Remove `__FIREBASE_DEFAULTS_PATH__` option for now, as the current implementation causes Webpack warnings. Also fix `process.env` check to work in environments where `process` exists but `process.env` does not.
22 changes: 1 addition & 21 deletions packages/util/src/defaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,33 +57,13 @@ const getDefaultsFromGlobal = (): FirebaseDefaults | undefined =>
* process.env.__FIREBASE_DEFAULTS_PATH__
*/
const getDefaultsFromEnvVariable = (): FirebaseDefaults | undefined => {
if (typeof process === 'undefined') {
if (typeof process === 'undefined' || typeof process.env === 'undefined') {
return;
}
const defaultsJsonString = process.env.__FIREBASE_DEFAULTS__;
const defaultsJsonPath = process.env.__FIREBASE_DEFAULTS_PATH__;
if (defaultsJsonString) {
if (defaultsJsonPath) {
console.warn(
`Values were provided for both __FIREBASE_DEFAULTS__ ` +
`and __FIREBASE_DEFAULTS_PATH__. __FIREBASE_DEFAULTS_PATH__ ` +
`will be ignored.`
);
}
return JSON.parse(defaultsJsonString);
}
if (defaultsJsonPath && typeof require !== 'undefined') {
try {
// eslint-disable-next-line @typescript-eslint/no-require-imports
const json = require(defaultsJsonPath);
return json;
} catch (e) {
console.warn(
`Unable to read defaults from file provided to ` +
`__FIREBASE_DEFAULTS_PATH__: ${defaultsJsonPath}`
);
}
}
};

const getDefaultsFromCookie = (): FirebaseDefaults | undefined => {
Expand Down

0 comments on commit 29d0340

Please sign in to comment.