Merge branch 'master' into mila/BloomFilter

firebase · Feb 2, 2023 · c128eaa · c128eaa
2 parents 7e2f069 + 70c042a
commit c128eaa
Show file tree

Hide file tree

Showing 40 changed files with 1,337 additions and 668 deletions.
diff --git a/.changeset/ninety-taxis-study.md b/.changeset/ninety-taxis-study.md
@@ -0,0 +1,19 @@
+---
+'@firebase/auth': patch
+'@firebase/auth-compat': patch
+'@firebase/database': patch
+'@firebase/database-compat': patch
+'firebase': patch
+'@firebase/firestore': patch
+'@firebase/firestore-compat': patch
+'@firebase/functions': patch
+'@firebase/functions-compat': patch
+'@firebase/messaging': patch
+'@firebase/messaging-compat': patch
+'@firebase/rules-unit-testing': patch
+'@firebase/storage': patch
+'@firebase/template': patch
+'@firebase/util': patch
+---
+
+Added browser CJS entry points (expected by Jest when using JSDOM mode).
diff --git a/.changeset/slimy-elephants-hear.md b/.changeset/slimy-elephants-hear.md
@@ -0,0 +1,5 @@
+---
+"@firebase/firestore": patch
+---
+
+Reduce memory usage by applying query check sooner in remote document cache.
diff --git a/e2e/karma.conf.js b/e2e/karma.conf.js
@@ -57,8 +57,6 @@ module.exports = function (config) {
         resolve: {
           directories: ['./node_modules'],
           alias: {
-            '@firebase/messaging/sw':
-              'node_modules/@firebase/messaging/dist/index.sw.esm2017.js',
             'idb': 'node_modules/idb/build/index.js'
           }
         },

diff --git a/e2e/package.json b/e2e/package.json
@@ -32,7 +32,7 @@
     "karma-typescript": "5.5.3",
     "karma-typescript-es6-transform": "5.5.3",
     "mocha": "9.2.2",
-    "typescript": "4.3.4",
+    "typescript": "4.7.4",
     "webpack": "5.75.0",
     "webpack-cli": "4.10.0",
     "webpack-dev-server": "4.10.0"

diff --git a/e2e/yarn.lock b/e2e/yarn.lock
diff --git a/packages/auth-compat/package.json b/packages/auth-compat/package.json
@@ -16,7 +16,11 @@
         "require": "./dist/index.node.cjs.js"
       },
       "esm5": "./dist/index.esm.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "browser": {
+        "require": "./dist/index.cjs.js",
+        "import": "./dist/index.esm2017.js"
+      }
     },
     "./package.json": "./package.json"
   },

diff --git a/packages/auth-compat/rollup.config.js b/packages/auth-compat/rollup.config.js
@@ -73,6 +73,19 @@ const browserBuilds = [
     treeshake: {
       moduleSideEffects: false
     }
+  },
+  {
+    input: 'index.ts',
+    output: {
+      file: 'dist/index.cjs.js',
+      format: 'cjs',
+      sourcemap: true
+    },
+    plugins: es2017BuildPlugins,
+    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    treeshake: {
+      moduleSideEffects: false
+    }
   }
 ];
 

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -31,7 +31,11 @@
         "default": "./dist/index.webworker.esm5.js"
       },
       "esm5": "./dist/esm5/index.js",
-      "default": "./dist/esm2017/index.js"
+      "default": "./dist/esm2017/index.js",
+      "browser": {
+        "require": "./dist/browser-cjs/index.js",
+        "import": "./dist/esm2017/index.js"
+      }
     },
     "./cordova": {
       "types": "./dist/cordova/index.cordova.d.ts",
@@ -57,7 +61,11 @@
         "default": "./dist/cordova/internal.js"
       },
       "esm5": "./dist/esm5/internal.js",
-      "default": "./dist/esm2017/internal.js"
+      "default": "./dist/esm2017/internal.js",
+      "browser": {
+        "require": "./dist/browser-cjs/internal.js",
+        "import": "./dist/esm2017/internal.js"
+      }
     },
     "./package.json": "./package.json"
   },

diff --git a/packages/auth/rollup.config.js b/packages/auth/rollup.config.js
@@ -97,6 +97,18 @@ const browserBuilds = [
       replace(generateBuildTargetReplaceConfig('esm', 2017))
     ],
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+  },
+  {
+    input: {
+      index: 'index.ts',
+      internal: 'internal/index.ts'
+    },
+    output: [{ dir: 'dist/browser-cjs', format: 'cjs', sourcemap: true }],
+    plugins: [
+      ...es2017BuildPlugins,
+      replace(generateBuildTargetReplaceConfig('cjs', 2017))
+    ],
+    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   }
 ];
 

diff --git a/packages/database-compat/package.json b/packages/database-compat/package.json
@@ -22,7 +22,11 @@
         "require": "./dist/index.js"
       },
       "esm5": "./dist/index.esm5.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "browser": {
+        "require": "./dist/index.js",
+        "import": "./dist/index.esm2017.js"
+      }
     },
     "./standalone": {
       "types": "./dist/database-compat/src/index.standalone.d.ts",
@@ -64,4 +68,4 @@
   "bugs": {
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   }
-}
+}
diff --git a/packages/database/package.json b/packages/database/package.json
@@ -17,7 +17,11 @@
       },
       "esm5": "./dist/index.esm5.js",
       "standalone": "./dist/index.standalone.js",
-      "default": "./dist/index.esm2017.js"
+      "default": "./dist/index.esm2017.js",
+      "browser": {
+        "require": "./dist/index.cjs.js",
+        "import": "./dist/index.esm2017.js"
+      }
     },
     "./package.json": "./package.json"
   },

diff --git a/packages/database/rollup.config.js b/packages/database/rollup.config.js
@@ -94,6 +94,25 @@ const browserBuilds = [
     },
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
     onwarn: onWarn
+  },
+  {
+    input: 'src/index.ts',
+    output: [
+      {
+        file: 'dist/index.cjs.js',
+        format: 'cjs',
+        sourcemap: true
+      }
+    ],
+    plugins: [
+      ...es2017BuildPlugins,
+      replace(generateBuildTargetReplaceConfig('cjs', 2017))
+    ],
+    treeshake: {
+      moduleSideEffects: false
+    },
+    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    onwarn: onWarn
   }
 ];