Skip to content

Commit 861e5b0

Browse files
committed
Use rollup plugin replace
1 parent d0ce18e commit 861e5b0

File tree

7 files changed

+24
-11
lines changed

7 files changed

+24
-11
lines changed

packages/util/autoinit_env.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/util/autoinit_env.mjs

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/util/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"tslib": "^2.1.0"
5353
},
5454
"devDependencies": {
55+
"@rollup/plugin-replace": "6.0.2",
5556
"rollup": "2.79.2",
5657
"rollup-plugin-typescript2": "0.36.0",
5758
"typescript": "5.5.4"

packages/util/postinstall.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ getConfigFromEnv().then((partialConfig) => {
8080
const defaults = (config || emulatorHosts) ? { config, emulatorHosts } : undefined;
8181

8282
return Promise.all([
83-
writeFile(join(__dirname, "autoinit_env.js"), `module.exports = ${JSON.stringify(defaults)}`),
84-
writeFile(join(__dirname, "autoinit_env.mjs"), `export default ${JSON.stringify(defaults)}`),
83+
writeFile(join(__dirname, "dist", "autoinit_env.js"), `module.exports = ${JSON.stringify(defaults)}`),
84+
writeFile(join(__dirname, "dist", "autoinit_env.mjs"), `export default ${JSON.stringify(defaults)}`),
8585
]);
8686

8787
}).then(

packages/util/rollup.config.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,22 @@
1616
*/
1717

1818
import typescriptPlugin from 'rollup-plugin-typescript2';
19+
import replacePlugin from '@rollup/plugin-replace';
1920
import typescript from 'typescript';
2021
import pkg from './package.json';
2122
import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file';
2223

23-
const deps = Object.keys(
24-
Object.assign({}, pkg.peerDependencies, pkg.dependencies)
25-
);
24+
const deps = [
25+
...Object.keys(
26+
Object.assign({}, pkg.peerDependencies, pkg.dependencies)
27+
),
28+
'./autoinit_env'
29+
];
2630

27-
const buildPlugins = [typescriptPlugin({ typescript })];
31+
const buildPlugins = [
32+
typescriptPlugin({ typescript }),
33+
replacePlugin({ './src/autoinit_env': '"@firebase/util/autoinit_env"', delimiters: ["'", "'"], preventAssignment: true })
34+
];
2835

2936
const browserBuilds = [
3037
{

packages/util/src/defaults.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717

1818
import { base64Decode } from './crypt';
1919
import { getGlobal } from './global';
20-
// @ts-expect-error
21-
import postinstallDefaults from "@firebase/util/autoinit_env";
20+
import postinstallDefaults from "./autoinit_env";
2221

2322
/**
2423
* Keys for experimental properties on the `FirebaseDefaults` object.

yarn.lock

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2633,6 +2633,14 @@
26332633
is-module "^1.0.0"
26342634
resolve "^1.22.1"
26352635

2636+
2637+
version "6.0.2"
2638+
resolved "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-6.0.2.tgz#2f565d312d681e4570ff376c55c5c08eb6f1908d"
2639+
integrity sha512-7QaYCf8bqF04dOy7w/eHmJeNExxTYwvKAmlSAH/EaWWUzbT0h5sbF6bktFoX/0F/0qwng5/dWFMyf3gzaM8DsQ==
2640+
dependencies:
2641+
"@rollup/pluginutils" "^5.0.1"
2642+
magic-string "^0.30.3"
2643+
26362644
26372645
version "2.1.0"
26382646
resolved "https://registry.npmjs.org/@rollup/plugin-strip/-/plugin-strip-2.1.0.tgz#04c2d2ccfb2c6b192bb70447fbf26e336379a333"
@@ -11233,7 +11241,7 @@ magic-string@^0.25.2, magic-string@^0.25.7:
1123311241
dependencies:
1123411242
sourcemap-codec "^1.4.8"
1123511243

11236-
magic-string@^0.30.2, magic-string@~0.30.0:
11244+
magic-string@^0.30.2, magic-string@^0.30.3, magic-string@~0.30.0:
1123711245
version "0.30.17"
1123811246
resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz#450a449673d2460e5bbcfba9a61916a1714c7453"
1123911247
integrity sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==

0 commit comments

Comments
 (0)