No seperate export, better naming

Author: jamesdaniels

packages/util/package.json

@@ -19,11 +19,6 @@
       },
       "default": "./dist/index.esm2017.js"
     },
-    "./autoinit_env": {
-      "require": "./dist/autoinit_env.js",
-      "import": "./dist/autoinit_env.mjs",
-      "default": "./dist/autoinit_env.mjs"
-    },
     "./package.json": "./package.json"
   },
   "files": [

packages/util/postinstall.js

@@ -132,15 +132,15 @@ getPartialConfig()
 
     await Promise.all([
       writeFile(
-        join(__dirname, 'dist', 'autoinit_env.js'),
+        join(__dirname, 'dist', 'postinstall.js'),
         `'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
-exports.postinstallDefaults = ${JSON.stringify(defaults)};`
+exports.getDefaultsFromPostinstall = () => (${JSON.stringify(defaults)});`
       ),
       writeFile(
-        join(__dirname, 'dist', 'autoinit_env.mjs'),
-        `const postinstallDefaults = ${JSON.stringify(defaults)};
-export { postinstallDefaults };`
+        join(__dirname, 'dist', 'postinstall.mjs'),
+        `const getDefaultsFromPostinstall = () => (${JSON.stringify(defaults)});
+export { getDefaultsFromPostinstall };`
       )
     ]);
 

packages/util/rollup.config.js

@@ -23,17 +23,18 @@ import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_pa
 
 const deps = [
   ...Object.keys(Object.assign({}, pkg.peerDependencies, pkg.dependencies)),
-  './autoinit_env'
+  './postinstall'
 ];
 
-const buildPlugins = [
-  typescriptPlugin({ typescript }),
-  replacePlugin({
-    './src/autoinit_env': '"@firebase/util/autoinit_env"',
+const buildPlugins = [typescriptPlugin({ typescript })];
+
+function replaceSrcPostinstallWith(path) {
+  return replacePlugin({
+    './src/postinstall': `'${path}'`,
     delimiters: ["'", "'"],
     preventAssignment: true
-  })
-];
+  });
+}
 
 const browserBuilds = [
   {
@@ -43,7 +44,7 @@ const browserBuilds = [
       format: 'es',
       sourcemap: true
     },
-    plugins: buildPlugins,
+    plugins: [...buildPlugins, replaceSrcPostinstallWith('./postinstall.mjs')],
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   },
   {
@@ -53,7 +54,7 @@ const browserBuilds = [
       format: 'cjs',
       sourcemap: true
     },
-    plugins: buildPlugins,
+    plugins: [...buildPlugins, replaceSrcPostinstallWith('./postinstall.js')],
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   }
 ];
@@ -66,7 +67,7 @@ const nodeBuilds = [
       format: 'cjs',
       sourcemap: true
     },
-    plugins: buildPlugins,
+    plugins: [...buildPlugins, replaceSrcPostinstallWith('./postinstall.js')],
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   },
   {
@@ -76,24 +77,28 @@ const nodeBuilds = [
       format: 'es',
       sourcemap: true
     },
-    plugins: [...buildPlugins, emitModulePackageFile()],
+    plugins: [
+      ...buildPlugins,
+      emitModulePackageFile(),
+      replaceSrcPostinstallWith('../postinstall.mjs')
+    ],
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   }
 ];
 
 const autoinitBuild = [
   {
-    input: './src/autoinit_env.ts',
+    input: './src/postinstall.ts',
     output: {
-      file: './dist/autoinit_env.js',
+      file: './dist/postinstall.js',
       format: 'cjs'
     },
     plugins: buildPlugins
   },
   {
-    input: './src/autoinit_env.ts',
+    input: './src/postinstall.ts',
     output: {
-      file: './dist/autoinit_env.mjs',
+      file: './dist/postinstall.mjs',
       format: 'es'
     },
     plugins: buildPlugins

packages/util/src/defaults.ts

@@ -17,7 +17,7 @@
 
 import { base64Decode } from './crypt';
 import { getGlobal } from './global';
-import { postinstallDefaults } from './autoinit_env';
+import { getDefaultsFromPostinstall } from './postinstall';
 
 /**
  * Keys for experimental properties on the `FirebaseDefaults` object.
@@ -101,7 +101,7 @@ const getDefaultsFromCookie = (): FirebaseDefaults | undefined => {
 export const getDefaults = (): FirebaseDefaults | undefined => {
   try {
     return (
-      postinstallDefaults ||
+      getDefaultsFromPostinstall() ||
       getDefaultsFromGlobal() ||
       getDefaultsFromEnvVariable() ||
       getDefaultsFromCookie()

packages/util/src/autoinit_env.ts renamed to packages/util/src/postinstall.ts

@@ -18,4 +18,4 @@
 import type { FirebaseDefaults } from './defaults';
 
 // This value is retrieved and hardcoded by the NPM postinstall script
-export const postinstallDefaults: FirebaseDefaults | undefined = undefined;
+export const getDefaultsFromPostinstall: () => FirebaseDefaults | undefined = () => undefined;