Add exports to all packages

config/tsconfig.base.json

@@ -19,6 +19,7 @@
     "module": "ES2015",
     "moduleResolution": "node",
     "resolveJsonModule": true,
+    "esModuleInterop": true,
     "sourceMap": true,
     "target": "es5",
     "typeRoots": [

packages/analytics-compat/package.json

@@ -4,8 +4,16 @@
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
-  "browser": "dist/index.esm2017.js",
-  "module": "dist/index.esm2017.js",
+  "browser": "dist/esm/index.esm2017.js",
+  "module": "dist/esm/index.esm2017.js",
+  "esm5": "dist/esm/index.esm.js",
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs.js",
+      "default": "./dist/esm/index.esm2017.js"
+    },
+    "./package.json": "./package.json"
+  },
   "files": [
     "dist"
   ],
@@ -54,6 +62,5 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
-  },
-  "esm5": "dist/index.esm.js"
+  }
 }

packages/analytics-compat/rollup.config.js

@@ -18,39 +18,20 @@
 import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
+import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file';
 import pkg from './package.json';
 
 const deps = Object.keys(
   Object.assign({}, pkg.peerDependencies, pkg.dependencies)
 );
-/**
- * ES5 Builds
- */
+
 const es5BuildPlugins = [
   typescriptPlugin({
     typescript
   }),
   json()
 ];
 
-const es5Builds = [
-  /**
-   * Browser Builds
-   */
-  {
-    input: 'src/index.ts',
-    output: [
-      { file: pkg.main, format: 'cjs', sourcemap: true },
-      { file: pkg.esm5, format: 'es', sourcemap: true }
-    ],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
-    plugins: es5BuildPlugins
-  }
-];
-
-/**
- * ES2017 Builds
- */
 const es2017BuildPlugins = [
   typescriptPlugin({
     typescript,
@@ -63,20 +44,32 @@ const es2017BuildPlugins = [
   json({ preferConst: true })
 ];
 
-const es2017Builds = [
+const esmBuilds = [
   {
-    /**
-     * Browser Build
-     */
     input: 'src/index.ts',
     output: {
       file: pkg.browser,
       format: 'es',
       sourcemap: true
     },
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
-    plugins: es2017BuildPlugins
+    plugins: [...es2017BuildPlugins, emitModulePackageFile()]
+  },
+  {
+    input: 'src/index.ts',
+    output: { file: pkg.esm5, format: 'es', sourcemap: true },
+    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    plugins: [...es5BuildPlugins, emitModulePackageFile()]
+  }
+];
+
+const cjsBuilds = [
+  {
+    input: 'src/index.ts',
+    output: { file: pkg.main, format: 'cjs', sourcemap: true },
+    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    plugins: es5BuildPlugins
   }
 ];
 
-export default [...es5Builds, ...es2017Builds];
+export default [...esmBuilds, ...cjsBuilds];

packages/analytics-compat/src/service.test.ts

@@ -19,7 +19,7 @@ import { AnalyticsService } from './service';
 import firebase, { FirebaseApp } from '@firebase/app-compat';
 import * as analyticsExp from '@firebase/analytics';
 import { stub, match, SinonStub } from 'sinon';
-import * as sinonChai from 'sinon-chai';
+import sinonChai from 'sinon-chai';
 
 use(sinonChai);
 

packages/analytics/package.json

@@ -4,8 +4,16 @@
   "description": "A analytics package for new firebase packages",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
-  "browser": "dist/index.esm2017.js",
-  "module": "dist/index.esm2017.js",
+  "browser": "dist/esm/index.esm2017.js",
+  "module": "dist/esm/index.esm2017.js",
+  "esm5": "dist/esm/index.esm.js",
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs.js",
+      "default": "./dist/esm/index.esm2017.js"
+    },
+    "./package.json": "./package.json"
+  },
   "files": [
     "dist"
   ],
@@ -60,6 +68,5 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
-  },
-  "esm5": "dist/index.esm.js"
+  }
 }

packages/analytics/rollup.config.js

@@ -20,49 +20,20 @@ import typescriptPlugin from 'rollup-plugin-typescript2';
 import replace from 'rollup-plugin-replace';
 import typescript from 'typescript';
 import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_replace_build_target';
+import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file';
 import pkg from './package.json';
 
 const deps = [
   ...Object.keys(Object.assign({}, pkg.peerDependencies, pkg.dependencies))
 ];
 
-/**
- * ES5 Builds
- */
 const es5BuildPlugins = [
   typescriptPlugin({
     typescript
   }),
   json()
 ];
 
-const es5Builds = [
-  /**
-   * Browser Builds
-   */
-  {
-    input: 'src/index.ts',
-    output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
-    plugins: [
-      ...es5BuildPlugins,
-      replace(generateBuildTargetReplaceConfig('cjs', 5))
-    ]
-  },
-  {
-    input: 'src/index.ts',
-    output: [{ file: pkg.esm5, format: 'es', sourcemap: true }],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
-    plugins: [
-      ...es5BuildPlugins,
-      replace(generateBuildTargetReplaceConfig('esm', 5))
-    ]
-  }
-];
-
-/**
- * ES2017 Builds
- */
 const es2017BuildPlugins = [
   typescriptPlugin({
     typescript,
@@ -75,11 +46,21 @@ const es2017BuildPlugins = [
   json({ preferConst: true })
 ];
 
-const es2017Builds = [
+/**
+ * ESM builds
+ */
+const esmBuilds = [
+  {
+    input: 'src/index.ts',
+    output: [{ file: pkg.esm5, format: 'es', sourcemap: true }],
+    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    plugins: [
+      ...es5BuildPlugins,
+      replace(generateBuildTargetReplaceConfig('esm', 5)),
+      emitModulePackageFile()
+    ]
+  },
   {
-    /**
-     * Browser Build
-     */
     input: 'src/index.ts',
     output: {
       file: pkg.browser,
@@ -89,9 +70,25 @@ const es2017Builds = [
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
     plugins: [
       ...es2017BuildPlugins,
-      replace(generateBuildTargetReplaceConfig('esm', 2017))
+      replace(generateBuildTargetReplaceConfig('esm', 2017)),
+      emitModulePackageFile()
+    ]
+  }
+];
+
+/**
+ * CJS builds
+ */
+const cjsBuilds = [
+  {
+    input: 'src/index.ts',
+    output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
+    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    plugins: [
+      ...es5BuildPlugins,
+      replace(generateBuildTargetReplaceConfig('cjs', 5))
     ]
   }
 ];
 
-export default [...es5Builds, ...es2017Builds];
+export default [...esmBuilds, ...cjsBuilds];

packages/analytics/testing/setup.ts

@@ -16,8 +16,8 @@
  */
 
 import { use } from 'chai';
-import * as chaiAsPromised from 'chai-as-promised';
-import * as sinonChai from 'sinon-chai';
+import chaiAsPromised from 'chai-as-promised';
+import sinonChai from 'sinon-chai';
 
 use(chaiAsPromised);
 use(sinonChai);

packages/app-check-compat/package.json

@@ -4,8 +4,16 @@
   "description": "A compat App Check package for new firebase packages",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
-  "browser": "dist/index.esm2017.js",
-  "module": "dist/index.esm2017.js",
+  "browser": "dist/esm/index.esm2017.js",
+  "module": "dist/esm/index.esm2017.js",
+  "esm5": "dist/esm/index.esm.js",
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs.js",
+      "default": "./dist/esm/index.esm2017.js"
+    },
+    "./package.json": "./package.json"
+  },
   "files": [
     "dist"
   ],
@@ -55,6 +63,5 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
-  },
-  "esm5": "dist/index.esm.js"
-}
+  }
+}

packages/app-check-compat/rollup.config.js

@@ -18,39 +18,20 @@
 import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
+import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file';
 import pkg from './package.json';
 
 const deps = Object.keys(
   Object.assign({}, pkg.peerDependencies, pkg.dependencies)
 );
-/**
- * ES5 Builds
- */
+
 const es5BuildPlugins = [
   typescriptPlugin({
     typescript
   }),
   json()
 ];
 
-const es5Builds = [
-  /**
-   * Browser Builds
-   */
-  {
-    input: 'src/index.ts',
-    output: [
-      { file: pkg.main, format: 'cjs', sourcemap: true },
-      { file: pkg.esm5, format: 'es', sourcemap: true }
-    ],
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
-    plugins: es5BuildPlugins
-  }
-];
-
-/**
- * ES2017 Builds
- */
 const es2017BuildPlugins = [
   typescriptPlugin({
     typescript,
@@ -63,20 +44,32 @@ const es2017BuildPlugins = [
   json({ preferConst: true })
 ];
 
-const es2017Builds = [
+const esmBuilds = [
+  {
+    input: 'src/index.ts',
+    output: { file: pkg.esm5, format: 'es', sourcemap: true },
+    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    plugins: [...es5BuildPlugins, emitModulePackageFile()]
+  },
   {
-    /**
-     * Browser Build
-     */
     input: 'src/index.ts',
     output: {
       file: pkg.browser,
       format: 'es',
       sourcemap: true
     },
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
-    plugins: es2017BuildPlugins
+    plugins: [...es2017BuildPlugins, emitModulePackageFile()]
+  }
+];
+
+const cjsBuilds = [
+  {
+    input: 'src/index.ts',
+    output: { file: pkg.main, format: 'cjs', sourcemap: true },
+    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    plugins: es5BuildPlugins
   }
 ];
 
-export default [...es5Builds, ...es2017Builds];
+export default [...esmBuilds, ...cjsBuilds];