Merge remote-tracking branch 'origin/master' into fz/storage-list

Author: fredzqm

.github/CODEOWNERS

@@ -13,9 +13,9 @@
 #  Used for approving minor changes, large-scale refactorings, and emergency situations.
 #  (secret team to avoid review requests)
 #
-#   - @Feiyang1 
-#   - @hiranya911 
-#   - @mikelehen 
+#   - @Feiyang1
+#   - @hiranya911
+#   - @mikelehen
 #   - @bojeil-google
 #   - @depoll
 #   - @hsubox76
@@ -27,9 +27,9 @@
 #  Used for approving firestore changes.
 #  (secret team to avoid review requests)
 #
-# - @mikelehen 
-# - @schmidt-sebastian 
-# - @wilhuff 
+# - @mikelehen
+# - @schmidt-sebastian
+# - @wilhuff
 # - @gsoltis
 # - @var-const
 # - @rsgowman
@@ -63,7 +63,15 @@ packages/auth  @bojeil-google @wti806 @firebase/jssdk-global-approvers
 packages/auth-types  @bojeil-google @wti806 @firebase/jssdk-global-approvers
 
 # Testing Code
-packages/testing  @tonymeng @ryanpbrewster @firebase/jssdk-global-approvers
+packages/testing  @ryanpbrewster @scottcrossen @yuchenshi @firebase/jssdk-global-approvers
 
 # RxFire Code
 packages/rxfire @davideast @jamesdaniels @firebase/jssdk-global-approvers
+
+# Installations
+packages/installations @mmermerkaya @dwoffinden @andirayo @firebase/jssdk-global-approvers
+packages/installations-types @mmermerkaya @dwoffinden @andirayo @firebase/jssdk-global-approvers
+
+# Performance Code
+packages/performance  @alikn @zijianjoy @firebase/jssdk-global-approvers
+packages/performance-types  @alikn @zijianjoy @firebase/jssdk-global-approvers

.travis.yml

@@ -8,11 +8,17 @@ env:
   global:
     - CXX=g++-4.8
 before_install:
-  # Yarn defaults to an old version, make sure we
-  # get an up to date version
-  - npm install -g [email protected]
+  # Yarn defaults to an old version, make sure we get an up to date version
+  - npm install -g [email protected]
   - '[ "${NPM_TOKEN+x}" ] && echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > $HOME/.npmrc || echo "Skipping .npmrc creation";'
-
+install:
+  # --frozen-lockfile doesn’t generate a yarn.lock lockfile and should fail if an update is needed.
+  # This will make sure that yarn.lock file in the PR is consistent with package.json.
+  #
+  # Due to a yarn issue (https://github.com/yarnpkg/yarn/issues/5840), --frozen-lockfile doesn't
+  # actually fail if an update is required, but integrity check from tools/pretest.js will catch
+  # the issue, so it still works as expected.
+  - yarn install --frozen-lockfile
 before_script:
   - cp config/ci.config.json config/project.json
   - yarn build
@@ -21,6 +27,7 @@ before_script:
 dist: trusty
 sudo: required
 addons:
+  firefox: "66.0"
   apt:
     sources:
       - google-chrome
@@ -35,20 +42,15 @@ matrix:
 jobs:
   allow_failures:
     - script: yarn test:saucelabs
-    - script: yarn test:saucelabs --database-firestore-only
   include:
     - name: Node.js and Browser (Chrome) Test
       stage: test
       script: xvfb-run yarn test
       after_success: yarn test:coverage
-    - name: Cross Browser Test for SDKs except Database and Firestore
+    - name: Cross Browser Test for SDKs
       stage: test
       script: yarn test:saucelabs
       if: type = push
-    - name: Cross Browser Test for Database and Firestore SDK
-      stage: test
-      script: yarn test:saucelabs --database-firestore-only
-      if: type = push
     - stage: deploy
       script: skip
       # NPM Canary Build Config

ENVIRONMENTS.md

@@ -3,6 +3,7 @@
 <!-- BADGES -->
 [![Build Status](https://travis-ci.org/firebase/firebase-js-sdk.svg?branch=master)](https://travis-ci.org/firebase/firebase-js-sdk)
 [![Build Status](https://saucelabs.com/buildstatus/firebase-oss)](https://saucelabs.com/u/firebase-oss)
+[![Version](https://img.shields.io/npm/v/firebase.svg?label=version)](https://www.npmjs.com/package/firebase)
 <!-- END BADGES -->
 
 The Firebase JavaScript SDK implements the client-side libraries used by
@@ -15,7 +16,10 @@ applications using Firebase services. This SDK is distributed via:
 To get started using Firebase, see
 [Add Firebase to your JavaScript Project](https://firebase.google.com/docs/web/setup).
 
-Current [Release Notes](https://firebase.google.com/support/release-notes/js)
+[![Release Notes](https://img.shields.io/npm/v/firebase.svg?style=flat-square&label=Release%20Notes%20for&labelColor=039be5&color=666)](https://firebase.google.com/support/release-notes/js)
+
+## Supported Environments
+Please see [Environment Support](https://firebase.google.com/support/guides/environments_js-sdk).
 
 ## SDK Dev Workflow
 

README.md

@@ -3,8 +3,8 @@
   "description": "Cloud Functions for Firebase",
   "dependencies": {
     "cors": "2.8.5",
-    "firebase-admin": "7.2.0",
-    "firebase-functions": "2.2.1"
+    "firebase-admin": "7.3.0",
+    "firebase-functions": "2.3.0"
   },
   "private": true
 }

config/functions/package.json

@@ -16,42 +16,98 @@
  */
 
 const argv = require('yargs').argv;
-const glob = require('glob');
-const karma = require('karma');
 const path = require('path');
 const karmaBase = require('./karma.base');
 
+// karma.conf.js test configuration file to run.
+const testConfigFile = argv['testConfigFile'];
+if (!testConfigFile) {
+  console.error('No test file path provided.');
+  process.exit(1);
+}
+
+/**
+ * Custom SauceLabs Launchers
+ */
+const browserMap = {
+  // Desktop
+  Chrome_Windows: seleniumLauncher('chrome', 'Windows 10', 'latest'),
+  Firefox_Windows: seleniumLauncher('firefox', 'Windows 10', 'latest'),
+  Safari_macOS: seleniumLauncher('safari', 'macOS 10.13', 'latest'),
+  Edge_Windows: seleniumLauncher('MicrosoftEdge', 'Windows 10', 'latest'),
+  IE_Windows: seleniumLauncher('internet explorer', 'Windows 10', 'latest')
+
+  // Mobile
+  // Safari_iOS: appiumLauncher('Safari', 'iPhone Simulator', 'iOS', '11.2'),
+  // Chrome_Android: appiumLauncher('Chrome', 'Android Emulator', 'Android', '6.0')
+};
+
+/**
+ * Any special options per package.
+ */
+const packageConfigs = {
+  messaging: {
+    // Messaging currently only supports these browsers.
+    browsers: ['Chrome_Windows', 'Firefox_Windows', 'Edge_Windows']
+  }
+};
+
+/**
+ * Gets the browser/launcher map for this package.
+ *
+ * @param {string} packageName Name of package being tested (e.g., "firestore")
+ */
+function getSauceLabsBrowsers(packageName) {
+  if (packageConfigs[packageName]) {
+    const filteredBrowserMap = {};
+    for (const browserKey in browserMap) {
+      if (packageConfigs[packageName].browsers.includes(browserKey)) {
+        filteredBrowserMap[browserKey] = browserMap[browserKey];
+      }
+    }
+    return filteredBrowserMap;
+  } else {
+    return browserMap;
+  }
+}
+
+/**
+ * Get package name from package path command line arg.
+ */
+function getPackageLabels() {
+  const match = testConfigFile.match(
+    /([a-zA-Z]+)\/([a-zA-Z]+)\/karma\.conf\.js/
+  );
+  return {
+    type: match[1],
+    name: match[2]
+  };
+}
+
 /**
  * Gets a list of file patterns for test, defined individually
  * in karma.conf.js in each package under worksapce packages or
  * integration.
  */
 function getTestFiles() {
   let root = path.resolve(__dirname, '..');
-  configs = argv['database-firestore-only']
-    ? glob.sync('packages/{database,firestore}/karma.conf.js')
-    : glob.sync('{packages,integration}/*/karma.conf.js', {
-        // Excluded due to flakiness or long run time.
-        ignore: [
-          'packages/database/*',
-          'packages/firestore/*',
-          'integration/firestore/*',
-          'integration/messaging/*'
-        ]
-      });
-  files = configs.map(x => {
-    let patterns = require(path.join(root, x)).files;
-    let dirname = path.dirname(x);
-    return patterns.map(p => path.join(dirname, p));
-  });
-  return [].concat(...files);
+  const { name: packageName } = getPackageLabels();
+  let patterns = require(path.join(root, testConfigFile)).files;
+  let dirname = path.dirname(testConfigFile);
+  return { packageName, files: patterns.map(p => path.join(dirname, p)) };
 }
 
 function seleniumLauncher(browserName, platform, version) {
+  const { name, type } = getPackageLabels();
+  const testName =
+    type === 'integration'
+      ? `${type}-${name}-${browserName}`
+      : `${name}-${browserName}`;
   return {
     base: 'SauceLabs',
     browserName: browserName,
     extendedDebugging: 'true',
+    name: testName,
     recordLogs: 'true',
     recordVideo: 'true',
     recordScreenshots: 'true',
@@ -81,27 +137,32 @@ function appiumLauncher(
   };
 }
 
-/**
- * Custom SauceLabs Launchers
- */
-const sauceLabsBrowsers = {
-  // Desktop
-  Chrome_Windows: seleniumLauncher('chrome', 'Windows 10', 'latest'),
-  Firefox_Windows: seleniumLauncher('firefox', 'Windows 10', 'latest'),
-  Safari_macOS: seleniumLauncher('safari', 'macOS 10.13', 'latest'),
-  Edge_Windows: seleniumLauncher('MicrosoftEdge', 'Windows 10', 'latest'),
-  IE_Windows: seleniumLauncher('internet explorer', 'Windows 10', 'latest')
-
-  // Mobile
-  // Safari_iOS: appiumLauncher('Safari', 'iPhone Simulator', 'iOS', '11.2'),
-  // Chrome_Android: appiumLauncher('Chrome', 'Android Emulator', 'Android', '6.0')
-};
-
 module.exports = function(config) {
+  const { packageName, files: testFiles } = getTestFiles();
+  const sauceLabsBrowsers = getSauceLabsBrowsers(packageName);
+
+  const sauceLabsConfig = {
+    tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER + '-' + packageName,
+    build: process.env.TRAVIS_BUILD_NUMBER || argv['buildNumber'],
+    username: process.env.SAUCE_USERNAME,
+    accessKey: process.env.SAUCE_ACCESS_KEY,
+    startConnect: true,
+    connectOptions: {
+      // Realtime Database uses WebSockets to connect to firebaseio.com
+      // so we have to set noSslBumpDomains. Theoretically SSL Bumping
+      // only needs to be disabled for 'firebaseio.com'. However, we are
+      // seeing much longer test time with that configuration, so leave
+      // it as 'all' for now.
+      // See https://wiki.saucelabs.com/display/DOCS/Troubleshooting+Sauce+Connect
+      // for more details.
+      noSslBumpDomains: 'all'
+    }
+  };
+
   const karmaConfig = Object.assign({}, karmaBase, {
     basePath: '../',
 
-    files: ['packages/polyfill/index.ts', ...getTestFiles()],
+    files: ['packages/polyfill/index.ts', ...testFiles],
 
     logLevel: config.LOG_INFO,
 
@@ -151,22 +212,7 @@ module.exports = function(config) {
       overviewColumn: false
     },
 
-    sauceLabs: {
-      tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER,
-      username: process.env.SAUCE_USERNAME,
-      accessKey: process.env.SAUCE_ACCESS_KEY,
-      startConnect: true,
-      connectOptions: {
-        // Realtime Database uses WebSockets to connect to firebaseio.com
-        // so we have to set noSslBumpDomains. Theoretically SSL Bumping
-        // only needs to be disabled for 'firebaseio.com'. However, we are
-        // seeing much longer test time with that configuration, so leave
-        // it as 'all' for now.
-        // See https://wiki.saucelabs.com/display/DOCS/Troubleshooting+Sauce+Connect
-        // for more details.
-        noSslBumpDomains: 'all'
-      }
-    }
+    sauceLabs: sauceLabsConfig
   });
 
   config.set(karmaConfig);

config/karma.saucelabs.js

@@ -30,7 +30,8 @@ module.exports = {
           loader: 'ts-loader',
           options: {
             compilerOptions: {
-              module: 'commonjs'
+              module: 'commonjs',
+              downlevelIteration: true
             }
           }
         }

config/webpack.test.js

@@ -7,21 +7,21 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.9.4"
+    "firebase": "6.0.2"
   },
   "devDependencies": {
-    "@babel/core": "7.4.3",
-    "@babel/preset-env": "7.4.3",
+    "@babel/core": "7.4.4",
+    "@babel/preset-env": "7.4.4",
     "browserify": "16.2.3",
     "chai": "4.2.0",
-    "karma": "4.0.1",
+    "karma": "4.1.0",
     "karma-babel-preprocessor": "8.0.0",
     "karma-chrome-launcher": "2.2.0",
     "karma-firefox-launcher": "1.1.0",
     "karma-mocha": "1.3.0",
     "karma-sauce-launcher": "1.2.0",
     "karma-spec-reporter": "0.0.32",
     "mkdirp": "0.5.1",
-    "mocha": "6.1.3"
+    "mocha": "6.1.4"
   }
 }

integration/browserify/package.json

@@ -6,9 +6,9 @@
     "test": "tsc index.ts --outDir dist"
   },
   "dependencies": {
-    "firebase": "5.9.4"
+    "firebase": "6.0.2"
   },
   "devDependencies": {
-    "typescript": "3.4.3"
+    "typescript": "3.4.5"
   }
 }