firebase packaging update (#5348)

Feiyang1 · Feiyang1 · commit 521ccbf9e2cf · 2021-08-23T18:50:39.000-07:00
diff --git a/packages/firebase/analytics/package.json b/packages/firebase/analytics/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/analytics",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/analytics/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/analytics/index.d.ts"
 }
diff --git a/packages/firebase/app-check/package.json b/packages/firebase/app-check/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/app-check",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/app-check/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/app-check/index.d.ts"
 }
diff --git a/packages/firebase/app/package.json b/packages/firebase/app/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/app",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/app/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/app/index.d.ts"
 }
diff --git a/packages/firebase/auth/cordova/package.json b/packages/firebase/auth/cordova/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/auth/cordova",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/auth/cordova/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/auth/cordova/index.d.ts"
 }
diff --git a/packages/firebase/auth/package.json b/packages/firebase/auth/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/auth",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/auth/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/auth/index.d.ts"
 }
diff --git a/packages/firebase/auth/react-native/package.json b/packages/firebase/auth/react-native/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/auth/react-native",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/auth/react-native/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/auth/react-native/index.d.ts"
 }
diff --git a/packages/firebase/compat/analytics/package.json b/packages/firebase/compat/analytics/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/compat/analytics",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/compat/analytics/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/compat/analytics/index.d.ts"
 }
diff --git a/packages/firebase/compat/app-check/package.json b/packages/firebase/compat/app-check/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/compat/app-check",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/compat/app-check/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/compat/app-check/index.d.ts"
 }
diff --git a/packages/firebase/compat/app/package.json b/packages/firebase/compat/app/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/compat/app",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "../index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "../index.d.ts"
 }
diff --git a/packages/firebase/compat/auth/package.json b/packages/firebase/compat/auth/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/compat/auth",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/compat/auth/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/compat/auth/index.d.ts"
 }
diff --git a/packages/firebase/compat/database/package.json b/packages/firebase/compat/database/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/compat/database",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/compat/database/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/compat/database/index.d.ts"
 }
diff --git a/packages/firebase/compat/firestore/package.json b/packages/firebase/compat/firestore/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/compat/firestore",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/compat/firestore/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/compat/firestore/index.d.ts"
 }
diff --git a/packages/firebase/compat/functions/package.json b/packages/firebase/compat/functions/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/compat/functions",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/compat/functions/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/compat/functions/index.d.ts"
 }
diff --git a/packages/firebase/compat/messaging/package.json b/packages/firebase/compat/messaging/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/compat/messaging",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/compat/messaging/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/compat/messaging/index.d.ts"
 }
diff --git a/packages/firebase/compat/package.json b/packages/firebase/compat/package.json
@@ -2,7 +2,7 @@
   "name": "firebase/compat",
   "main": "dist/index.node.cjs",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
+  "module": "dist/index.mjs",
   "react-native": "dist/index.rn.cjs.js",
   "typings": "index.d.ts",
   "components": [
@@ -17,6 +17,5 @@
     "firestore",
     "storage",
     "database"
-  ],
-  "type": "module"
+  ]
 }
diff --git a/packages/firebase/compat/performance/package.json b/packages/firebase/compat/performance/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/compat/performance",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/compat/performance/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/compat/performance/index.d.ts"
 }
diff --git a/packages/firebase/compat/remote-config/package.json b/packages/firebase/compat/remote-config/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/compat/remote-config",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/compat/remote-config/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/compat/remote-config/index.d.ts"
 }
diff --git a/packages/firebase/compat/rollup.config.js b/packages/firebase/compat/rollup.config.js
@@ -102,6 +102,11 @@ const appBuilds = [
         file: resolve(__dirname, 'app', appPkg.module),
         format: 'es',
         sourcemap: true
+      },
+      {
+        file: resolve(__dirname, 'app', appPkg.browser),
+        format: 'es',
+        sourcemap: true
       }
     ],
     plugins: [...plugins, typescriptPlugin],
@@ -140,6 +145,11 @@ const componentBuilds = compatPkg.components
             file: resolve(__dirname, component, pkg.module),
             format: 'es',
             sourcemap: true
+          },
+          {
+            file: resolve(__dirname, component, pkg.browser),
+            format: 'es',
+            sourcemap: true
           }
         ],
         plugins: [...plugins, typescriptPlugin],
diff --git a/packages/firebase/compat/storage/package.json b/packages/firebase/compat/storage/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/compat/storage",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/compat/storage/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/compat/storage/index.d.ts"
 }
diff --git a/packages/firebase/database/package.json b/packages/firebase/database/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/database",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/database/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/database/index.d.ts"
 }
diff --git a/packages/firebase/firestore/lite/package.json b/packages/firebase/firestore/lite/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/firestore/lite",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/firestore/lite/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/firestore/lite/index.d.ts"
 }
diff --git a/packages/firebase/firestore/package.json b/packages/firebase/firestore/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/firestore",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/firestore/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/firestore/index.d.ts"
 }
diff --git a/packages/firebase/functions/package.json b/packages/firebase/functions/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/functions",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/functions/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/functions/index.d.ts"
 }
diff --git a/packages/firebase/gulpfile.js b/packages/firebase/gulpfile.js
@@ -16,21 +16,23 @@
  */
 
 var gulp = require('gulp');
-var concat = require('gulp-concat');
 var sourcemaps = require('gulp-sourcemaps');
+const replace = require('gulp-replace');
 
-const OUTPUT_FILE = 'firebase.js';
 const pkgJson = require('./package.json');
 const files = pkgJson.components.map(component => {
   const componentName = component.replace('/', '-');
   return `firebase-${componentName}.js`;
 });
+const FIREBASE_APP_URL = `https://www.gstatic.com/firebasejs/${pkgJson.version}/firebase-app.js`;
 
-gulp.task('firebase-js', function () {
+gulp.task('cdn-type-module-path', function () {
   return gulp
     .src(files)
     .pipe(sourcemaps.init({ loadMaps: true }))
-    .pipe(concat(OUTPUT_FILE))
+    // gulp-replace doesn't work with gulp-sourcemaps, so no change is made to the existing sourcemap. 
+    // Therefore the sourcemap become slightly inaccurate
+    .pipe(replace('@firebase/app', FIREBASE_APP_URL))
     .pipe(sourcemaps.write('.'))
     .pipe(gulp.dest('.'));
 });
diff --git a/packages/firebase/messaging/package.json b/packages/firebase/messaging/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/messaging",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/messaging/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/messaging/index.d.ts"
 }
diff --git a/packages/firebase/messaging/sw/package.json b/packages/firebase/messaging/sw/package.json
@@ -1,8 +1,7 @@
 {
   "name": "firebase/messaging/sw",
-  "main": "dist/index.cjs",
+  "main": "dist/index.cjs.js",
   "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/messaging/sw/index.d.ts",
-  "type": "module"
+  "module": "dist/index.mjs",
+  "typings": "dist/messaging/sw/index.d.ts"
 }
diff --git a/packages/firebase/package.json b/packages/firebase/package.json
diff --git a/packages/firebase/performance/package.json b/packages/firebase/performance/package.json
diff --git a/packages/firebase/remote-config/package.json b/packages/firebase/remote-config/package.json
diff --git a/packages/firebase/rollup.config.js b/packages/firebase/rollup.config.js
diff --git a/packages/firebase/storage/package.json b/packages/firebase/storage/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebase/analytics",`
`3`		`- "main": "dist/index.cjs",`
	`3`	`+ "main": "dist/index.cjs.js",`
`4`	`4`	`"browser": "dist/index.esm.js",`
`5`		`- "module": "dist/index.esm.js",`
`6`		`- "typings": "dist/analytics/index.d.ts",`
`7`		`- "type": "module"`
	`5`	`+ "module": "dist/index.mjs",`
	`6`	`+ "typings": "dist/analytics/index.d.ts"`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebase/app-check",`
`3`		`- "main": "dist/index.cjs",`
	`3`	`+ "main": "dist/index.cjs.js",`
`4`	`4`	`"browser": "dist/index.esm.js",`
`5`		`- "module": "dist/index.esm.js",`
`6`		`- "typings": "dist/app-check/index.d.ts",`
`7`		`- "type": "module"`
	`5`	`+ "module": "dist/index.mjs",`
	`6`	`+ "typings": "dist/app-check/index.d.ts"`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebase/app",`
`3`		`- "main": "dist/index.cjs",`
	`3`	`+ "main": "dist/index.cjs.js",`
`4`	`4`	`"browser": "dist/index.esm.js",`
`5`		`- "module": "dist/index.esm.js",`
`6`		`- "typings": "dist/app/index.d.ts",`
`7`		`- "type": "module"`
	`5`	`+ "module": "dist/index.mjs",`
	`6`	`+ "typings": "dist/app/index.d.ts"`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebase/auth/cordova",`
`3`		`- "main": "dist/index.cjs",`
	`3`	`+ "main": "dist/index.cjs.js",`
`4`	`4`	`"browser": "dist/index.esm.js",`
`5`		`- "module": "dist/index.esm.js",`
`6`		`- "typings": "dist/auth/cordova/index.d.ts",`
`7`		`- "type": "module"`
	`5`	`+ "module": "dist/index.mjs",`
	`6`	`+ "typings": "dist/auth/cordova/index.d.ts"`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebase/auth",`
`3`		`- "main": "dist/index.cjs",`
	`3`	`+ "main": "dist/index.cjs.js",`
`4`	`4`	`"browser": "dist/index.esm.js",`
`5`		`- "module": "dist/index.esm.js",`
`6`		`- "typings": "dist/auth/index.d.ts",`
`7`		`- "type": "module"`
	`5`	`+ "module": "dist/index.mjs",`
	`6`	`+ "typings": "dist/auth/index.d.ts"`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebase/auth/react-native",`
`3`		`- "main": "dist/index.cjs",`
	`3`	`+ "main": "dist/index.cjs.js",`
`4`	`4`	`"browser": "dist/index.esm.js",`
`5`		`- "module": "dist/index.esm.js",`
`6`		`- "typings": "dist/auth/react-native/index.d.ts",`
`7`		`- "type": "module"`
	`5`	`+ "module": "dist/index.mjs",`
	`6`	`+ "typings": "dist/auth/react-native/index.d.ts"`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebase/compat/analytics",`
`3`		`- "main": "dist/index.cjs",`
	`3`	`+ "main": "dist/index.cjs.js",`
`4`	`4`	`"browser": "dist/index.esm.js",`
`5`		`- "module": "dist/index.esm.js",`
`6`		`- "typings": "dist/compat/analytics/index.d.ts",`
`7`		`- "type": "module"`
	`5`	`+ "module": "dist/index.mjs",`
	`6`	`+ "typings": "dist/compat/analytics/index.d.ts"`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebase/compat/app-check",`
`3`		`- "main": "dist/index.cjs",`
	`3`	`+ "main": "dist/index.cjs.js",`
`4`	`4`	`"browser": "dist/index.esm.js",`
`5`		`- "module": "dist/index.esm.js",`
`6`		`- "typings": "dist/compat/app-check/index.d.ts",`
`7`		`- "type": "module"`
	`5`	`+ "module": "dist/index.mjs",`
	`6`	`+ "typings": "dist/compat/app-check/index.d.ts"`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebase/compat/app",`
`3`		`- "main": "dist/index.cjs",`
	`3`	`+ "main": "dist/index.cjs.js",`
`4`	`4`	`"browser": "dist/index.esm.js",`
`5`		`- "module": "dist/index.esm.js",`
`6`		`- "typings": "../index.d.ts",`
`7`		`- "type": "module"`
	`5`	`+ "module": "dist/index.mjs",`
	`6`	`+ "typings": "../index.d.ts"`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebase/compat/auth",`
`3`		`- "main": "dist/index.cjs",`
	`3`	`+ "main": "dist/index.cjs.js",`
`4`	`4`	`"browser": "dist/index.esm.js",`
`5`		`- "module": "dist/index.esm.js",`
`6`		`- "typings": "dist/compat/auth/index.d.ts",`
`7`		`- "type": "module"`
	`5`	`+ "module": "dist/index.mjs",`
	`6`	`+ "typings": "dist/compat/auth/index.d.ts"`
`8`	`7`	`}`