Merge branch 'master' into renovate/simple-git-2.x

Author: Feiyang1

config/functions/package.json

@@ -4,7 +4,7 @@
   "dependencies": {
     "cors": "2.8.5",
     "firebase-admin": "8.13.0",
-    "firebase-functions": "3.7.0"
+    "firebase-functions": "3.8.0"
   },
   "private": true,
   "engines": {

integration/browserify/package.json

@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "firebase": "7.17.1",
-    "@babel/core": "7.10.4",
+    "@babel/core": "7.10.5",
     "@babel/preset-env": "7.10.4",
     "browserify": "16.5.1",
     "chai": "4.2.0",

integration/firestore/package.json

@@ -30,7 +30,7 @@
     "mocha": "7.2.0",
     "ts-loader": "6.2.2",
     "typescript": "3.9.6",
-    "webpack": "4.43.0",
+    "webpack": "4.44.0",
     "webpack-stream": "5.2.1"
   }
 }

integration/messaging/package.json

@@ -10,7 +10,7 @@
   "devDependencies": {
     "firebase": "7.17.1",
     "chai": "4.2.0",
-    "chromedriver": "83.0.1",
+    "chromedriver": "84.0.1",
     "express": "4.17.1",
     "geckodriver": "1.19.1",
     "mocha": "7.2.0",

integration/typescript/package.json

@@ -8,9 +8,9 @@
   },
   "devDependencies": {
     "firebase": "7.17.1",
-    "@babel/core": "7.10.4",
+    "@babel/core": "7.10.5",
     "@babel/preset-env": "7.10.4",
-    "@types/chai": "4.2.11",
+    "@types/chai": "4.2.12",
     "@types/mocha": "7.0.2",
     "chai": "4.2.0",
     "karma": "5.1.0",

integration/webpack/package.json

@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "firebase": "7.17.1",
-    "@babel/core": "7.10.4",
+    "@babel/core": "7.10.5",
     "@babel/preset-env": "7.10.4",
     "chai": "4.2.0",
     "karma": "5.1.0",
@@ -20,7 +20,7 @@
     "karma-sauce-launcher": "1.2.0",
     "karma-spec-reporter": "0.0.32",
     "mocha": "7.2.0",
-    "webpack": "4.43.0",
+    "webpack": "4.44.0",
     "webpack-cli": "3.3.12"
   }
 }

package.json

@@ -22,9 +22,9 @@
   ],
   "scripts": {
     "dev": "lerna run --parallel --scope @firebase/* --scope firebase --scope rxfire dev",
-    "build": "lerna run --scope @firebase/* --scope firebase --scope rxfire build",
+    "build": "lerna run --scope @firebase/app-exp build:deps && lerna run --scope @firebase/* --scope firebase --scope rxfire --ignore @firebase/app-exp build",
     "build:exp": "lerna run --scope @firebase/*-exp --scope firebase-exp build",
-    "build:release": "lerna run --scope @firebase/app-exp build:deps && lerna run --scope @firebase/* --scope firebase --ignore @firebase/*-exp --ignore firebase-exp prepare",
+    "build:release": "lerna run --scope @firebase/app-exp build:deps && lerna run --scope @firebase/* --scope firebase --scope rxfire --ignore @firebase/*-exp prepare",
     "build:exp:release": "yarn --cwd packages/app build:deps && lerna run --scope @firebase/*-exp --scope firebase-exp prepare && yarn --cwd packages-exp/app-exp typings:public",
     "link:packages": "lerna exec --scope @firebase/* --scope firebase --scope rxfire -- yarn link",
     "stage:packages": "./scripts/prepublish.sh",
@@ -66,14 +66,14 @@
     "@changesets/cli": "2.9.2",
     "@microsoft/api-documenter": "7.8.21",
     "@microsoft/api-extractor": "7.9.2",
-    "@types/chai": "4.2.11",
+    "@types/chai": "4.2.12",
     "@types/chai-as-promised": "7.1.3",
     "@types/child-process-promise": "2.2.1",
     "@types/clone": "0.1.30",
     "@types/inquirer": "6.5.0",
     "@types/long": "4.0.1",
     "@types/mocha": "7.0.2",
-    "@types/node": "12.12.48",
+    "@types/node": "12.12.53",
     "@types/sinon": "9.0.4",
     "@types/sinon-chai": "3.2.4",
     "@types/tmp": "0.2.0",
@@ -91,18 +91,18 @@
     "coveralls": "3.1.0",
     "del": "5.1.0",
     "dependency-graph": "0.9.0",
-    "eslint": "7.4.0",
+    "eslint": "7.5.0",
     "eslint-plugin-import": "2.22.0",
     "express": "4.17.1",
     "find-free-port": "2.0.0",
-    "firebase-functions": "3.7.0",
-    "firebase-tools": "8.5.0",
+    "firebase-functions": "3.8.0",
+    "firebase-tools": "8.6.0",
     "git-rev-sync": "2.0.0",
     "glob": "7.1.6",
     "http-server": "0.12.3",
     "husky": "4.2.5",
     "indexeddbshim": "6.6.0",
-    "inquirer": "7.3.0",
+    "inquirer": "7.3.3",
     "istanbul-instrumenter-loader": "3.0.1",
     "js-yaml": "3.14.0",
     "karma": "5.1.0",
@@ -130,7 +130,7 @@
     "npm-run-all": "4.1.5",
     "npm-run-path": "4.0.1",
     "nyc": "15.1.0",
-    "ora": "4.0.4",
+    "ora": "4.0.5",
     "prettier": "2.0.5",
     "protractor": "5.4.2",
     "rxjs": "6.6.0",
@@ -146,8 +146,8 @@
     "typedoc": "0.16.11",
     "typescript": "3.9.6",
     "watch": "1.0.2",
-    "webpack": "4.43.0",
-    "yargs": "15.4.0"
+    "webpack": "4.44.0",
+    "yargs": "15.4.1"
   },
   "husky": {
     "hooks": {

packages-exp/app-exp/package.json

@@ -38,7 +38,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "rollup": "2.21.0",
+    "rollup": "2.23.0",
     "rollup-plugin-json": "4.0.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-typescript2": "0.27.1",

packages-exp/firebase-exp/functions/index.cdn.ts renamed to packages-exp/firebase-exp/firestore/index.ts

@@ -14,4 +14,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from '@firebase/functions-exp';
+
+export * from '@firebase/firestore';

packages-exp/firebase-exp/firestore/lite/index.ts

@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from '@firebase/firestore/lite';

packages-exp/firebase-exp/firestore/lite/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "firebase-exp/firestore/lite",
+  "main": "dist/index.cjs.js",
+  "browser": "dist/index.esm.js",
+  "module": "dist/index.esm.js",
+  "typings": "dist/firestore/lite/index.d.ts"
+}

packages-exp/firebase-exp/firestore/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "firebase-exp/firestore",
+  "main": "dist/index.cjs.js",
+  "browser": "dist/index.esm.js",
+  "module": "dist/index.esm.js",
+  "typings": "dist/firestore/index.d.ts"
+}

packages-exp/firebase-exp/gulpfile.js

@@ -21,9 +21,10 @@ var sourcemaps = require('gulp-sourcemaps');
 
 const OUTPUT_FILE = 'firebase.js';
 const pkgJson = require('./package.json');
-const files = [
-  ...pkgJson.components.map(component => `firebase-${component}.js`)
-];
+const files = pkgJson.components.map(component => {
+  const componentName = component.replace('/', '-');
+  return `firebase-${componentName}.js`;
+});
 
 gulp.task('firebase-js', function () {
   return gulp

packages-exp/firebase-exp/package.json

@@ -36,15 +36,16 @@
   },
   "dependencies": {
     "@firebase/app-exp": "0.0.800",
-    "@firebase/functions-exp": "0.0.800"
+    "@firebase/functions-exp": "0.0.800",
+    "@firebase/firestore": "1.16.1"
   },
   "devDependencies": {
-    "rollup": "2.21.0",
+    "rollup": "2.23.0",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-license": "2.1.0",
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-sourcemaps": "0.6.2",
-    "rollup-plugin-terser": "5.3.0",
+    "rollup-plugin-terser": "6.1.0",
     "rollup-plugin-typescript2": "0.27.1",
     "rollup-plugin-uglify": "6.0.4",
     "gulp": "4.0.2",
@@ -54,6 +55,8 @@
   },
   "components": [
     "app",
-    "functions"
+    "functions",
+    "firestore",
+    "firestore/lite"
   ]
 }

packages-exp/firebase-exp/rollup.config.release.js

@@ -28,7 +28,7 @@ import pkg from './package.json';
 import appPkg from './app/package.json';
 
 // remove -exp from dependencies name
-const external = Object.keys(pkg.dependencies || {}).map(name =>
+const deps = Object.keys(pkg.dependencies || {}).map(name =>
   name.replace('-exp', '')
 );
 
@@ -99,7 +99,7 @@ const appBuilds = [
       { file: resolve('app', appPkg.module), format: 'es', sourcemap: true }
     ],
     plugins: [...plugins, typescriptPlugin],
-    external
+    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   },
   /**
    * App UMD Builds
@@ -121,6 +121,9 @@ const componentBuilds = pkg.components
   .filter(component => component !== 'app')
   .map(component => {
     const pkg = require(`./${component}/package.json`);
+    // It is needed for handling sub modules, for example firestore/lite which should produce firebase-firestore-lite.js
+    // Otherwise, we will create a directory with '/' in the name.
+    const componentName = component.replace('/', '-');
     return [
       {
         input: `${component}/index.ts`,
@@ -137,11 +140,14 @@ const componentBuilds = pkg.components
           }
         ],
         plugins: [...plugins, typescriptPlugin],
-        external
+        external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
       },
       {
         input: `${component}/index.ts`,
-        output: createUmdOutputConfig(`firebase-${component}.js`, component),
+        output: createUmdOutputConfig(
+          `firebase-${componentName}.js`,
+          componentName
+        ),
         plugins: [...plugins, typescriptPluginUMD],
         external: ['@firebase/app']
       }

packages-exp/functions-exp/package.json

@@ -14,6 +14,7 @@
     "lint:fix": "eslint --fix -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
     "build": "rollup -c && yarn api-report",
     "build:deps": "lerna run --scope @firebase/functions-exp --include-dependencies build",
+    "build:release": "rollup -c rollup.config.release.js && yarn api-report",
     "dev": "rollup -c -w",
     "test": "yarn type-check && run-p lint test:browser test:node",
     "test:ci": "node ../../scripts/run_tests_in_ci.js",
@@ -22,7 +23,7 @@
     "test:browser:debug": "karma start --browsers=Chrome --auto-watch",
     "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'src/{,!(browser)/**/}*.test.ts' --file src/index.node.ts --config ../../config/mocharc.node.js",
     "test:emulator": "env FIREBASE_FUNCTIONS_EMULATOR_ORIGIN=http://localhost:5005 run-p test:node",
-    "prepare": "rollup -c rollup.config.release.js && yarn api-report",
+    "prepare": "yarn build:release",
     "api-report": "api-extractor run --local --verbose",
     "predoc": "node ../../scripts/exp/remove-exp.js temp",
     "doc": "api-documenter markdown --input temp --output docs",
@@ -35,7 +36,7 @@
   },
   "devDependencies": {
     "@firebase/app-exp": "0.0.800",
-    "rollup": "2.21.0",
+    "rollup": "2.23.0",
     "rollup-plugin-typescript2": "0.27.1",
     "typescript": "3.9.6"
   },

packages/analytics/package.json

@@ -33,7 +33,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "rollup": "2.21.0",
+    "rollup": "2.23.0",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-json": "4.0.0",
     "rollup-plugin-node-resolve": "5.2.0",

packages/app/package.json

@@ -36,7 +36,7 @@
     "xmlhttprequest": "1.8.0"
   },
   "devDependencies": {
-    "rollup": "2.21.0",
+    "rollup": "2.23.0",
     "rollup-plugin-json": "4.0.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-typescript2": "0.27.1",

packages/auth/demo/functions/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "firebase-admin": "8.13.0",
-    "firebase-functions": "3.7.0"
+    "firebase-functions": "3.8.0"
   },
   "private": true
 }

packages/auth/demo/functions/yarn.lock

@@ -687,10 +687,10 @@ [email protected]:
     "@google-cloud/firestore" "^3.0.0"
     "@google-cloud/storage" "^4.1.2"
 
-firebase-functions@3.7.0:
-  version "3.7.0"
-  resolved "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.7.0.tgz#e9df62f2a46775eb887835839d8b3f39139ba113"
-  integrity sha512-+ROj2Gs2/KyM+T8jYo7AKaHynFsN49sXbgZMll3zuGa9/8oiDsXp9e1Iy2JMkFmSZg67jeYw5Ue2OSpz0XiqFQ==
+firebase-functions@3.8.0:
+  version "3.8.0"
+  resolved "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.8.0.tgz#ac53c615ef365cd9a19604f84ec9835a340c7b76"
+  integrity sha512-RFvoS7ZcXrk2sQ918czsjv94p4hnSoD0/e4cZ86XFpa1HbNZBI7ZuSgBCzRvlv6dJ1ArytAL13NpB1Bp2tJ6Yg==
   dependencies:
     "@types/express" "4.17.3"
     cors "^2.8.5"

packages/component/package.json

@@ -27,7 +27,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "rollup": "2.21.0",
+    "rollup": "2.23.0",
     "rollup-plugin-typescript2": "0.27.1",
     "typescript": "3.9.6"
   },

packages/database/package.json

@@ -36,7 +36,7 @@
   "devDependencies": {
     "@firebase/app": "0.6.9",
     "@firebase/app-types": "0.6.1",
-    "rollup": "2.21.0",
+    "rollup": "2.23.0",
     "rollup-plugin-typescript2": "0.27.1",
     "typescript": "3.9.6"
   },

packages/firebase/package.json

@@ -61,12 +61,12 @@
     "@firebase/util": "0.3.0"
   },
   "devDependencies": {
-    "rollup": "2.21.0",
+    "rollup": "2.23.0",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-license": "2.1.0",
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-sourcemaps": "0.6.2",
-    "rollup-plugin-terser": "5.3.0",
+    "rollup-plugin-terser": "6.1.0",
     "rollup-plugin-typescript2": "0.27.1",
     "rollup-plugin-uglify": "6.0.4",
     "typescript": "3.9.6"