Merge branch 'master' into release

GitHub Actions Bot · GitHub Actions Bot · commit 1dc160fdc5ab · 2022-05-27T18:52:54.000Z
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -35,9 +35,9 @@
 *       @allspain @hsubox76 @firebase/jssdk-global-approvers
 
 # Database Code
-packages/database @schmidt-sebastian @jsdt @firebase/jssdk-global-approvers
-packages/database-compat @schmidt-sebastian @jsdt @firebase/jssdk-global-approvers
-packages/database-types @schmidt-sebastian @jsdt @firebase/jssdk-global-approvers
+packages/database @maneesht @jsdt @firebase/jssdk-global-approvers
+packages/database-compat @maneesht @jsdt @firebase/jssdk-global-approvers
+packages/database-types @maneesht @jsdt @firebase/jssdk-global-approvers
 
 # Firestore Code
 packages/firestore  @firebase/firestore-js-team @firebase/jssdk-global-approvers
@@ -47,9 +47,9 @@ packages/firestore-types  @firebase/firestore-js-team @firebase/jssdk-global-app
 integration/firestore  @firebase/firestore-js-team @firebase/jssdk-global-approvers
 
 # Storage Code
-packages/storage  @schmidt-sebastian @firebase/jssdk-global-approvers
-packages/storage-compat  @schmidt-sebastian @firebase/jssdk-global-approvers
-packages/storage-types  @schmidt-sebastian @firebase/jssdk-global-approvers
+packages/storage @maneesht @tonyjhuang @firebase/jssdk-global-approvers
+packages/storage-compat @maneesht @tonyjhuang @firebase/jssdk-global-approvers
+packages/storage-types @maneesht @tonyjhuang @firebase/jssdk-global-approvers
 
 # Messaging Code
 packages/messaging  @zwu52 @firebase/jssdk-global-approvers
diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml
@@ -0,0 +1,103 @@
+name: Production Release
+
+on: workflow_dispatch
+
+jobs:
+  deploy:
+    name: Production Release
+    runs-on: ubuntu-latest
+    # Allow GITHUB_TOKEN to have write permissions
+    permissions:
+      contents: write
+
+    steps:
+    - name: Set up Node (14)
+      uses: actions/setup-node@v2
+      with:
+        node-version: 14.x
+    - name: Checkout release branch (with history)
+      uses: actions/checkout@master
+      with:
+        # Release script requires git history and tags.
+        fetch-depth: 0
+        ref: release
+    - name: Yarn install
+      run: yarn
+    - name: Publish to NPM
+      # --skipTests No need to run tests
+      # --skipReinstall Yarn install has already been run
+      # --ignoreUnstaged Adding the @firebase/app changeset file means
+      # there's unstaged changes. Ignore.
+      # TODO: Make these flags defaults in the release script.
+      run: yarn release --releaseType Production --ci --skipTests --skipReinstall --ignoreUnstaged
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        NPM_TOKEN_ANALYTICS: ${{secrets.NPM_TOKEN_ANALYTICS}}
+        NPM_TOKEN_ANALYTICS_INTEROP_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_INTEROP_TYPES}}
+        NPM_TOKEN_ANALYTICS_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_TYPES}}
+        NPM_TOKEN_APP: ${{secrets.NPM_TOKEN_APP}}
+        NPM_TOKEN_APP_TYPES: ${{secrets.NPM_TOKEN_APP_TYPES}}
+        NPM_TOKEN_APP_CHECK: ${{secrets.NPM_TOKEN_APP_CHECK}}
+        NPM_TOKEN_APP_CHECK_INTEROP_TYPES: ${{secrets.NPM_TOKEN_APP_CHECK_INTEROP_TYPES}}
+        NPM_TOKEN_APP_CHECK_TYPES: ${{secrets.NPM_TOKEN_APP_CHECK_TYPES}}
+        NPM_TOKEN_AUTH: ${{secrets.NPM_TOKEN_AUTH}}
+        NPM_TOKEN_AUTH_INTEROP_TYPES: ${{secrets.NPM_TOKEN_AUTH_INTEROP_TYPES}}
+        NPM_TOKEN_AUTH_TYPES: ${{secrets.NPM_TOKEN_AUTH_TYPES}}
+        NPM_TOKEN_COMPONENT: ${{secrets.NPM_TOKEN_COMPONENT}}
+        NPM_TOKEN_DATABASE: ${{secrets.NPM_TOKEN_DATABASE}}
+        NPM_TOKEN_DATABASE_TYPES: ${{secrets.NPM_TOKEN_DATABASE_TYPES}}
+        NPM_TOKEN_FIRESTORE: ${{secrets.NPM_TOKEN_FIRESTORE}}
+        NPM_TOKEN_FIRESTORE_TYPES: ${{secrets.NPM_TOKEN_FIRESTORE_TYPES}}
+        NPM_TOKEN_FUNCTIONS: ${{secrets.NPM_TOKEN_FUNCTIONS}}
+        NPM_TOKEN_FUNCTIONS_TYPES: ${{secrets.NPM_TOKEN_FUNCTIONS_TYPES}}
+        NPM_TOKEN_INSTALLATIONS: ${{secrets.NPM_TOKEN_INSTALLATIONS}}
+        NPM_TOKEN_INSTALLATIONS_TYPES: ${{secrets.NPM_TOKEN_INSTALLATIONS_TYPES}}
+        NPM_TOKEN_LOGGER: ${{secrets.NPM_TOKEN_LOGGER}}
+        NPM_TOKEN_MESSAGING: ${{secrets.NPM_TOKEN_MESSAGING}}
+        NPM_TOKEN_MESSAGING_TYPES: ${{secrets.NPM_TOKEN_MESSAGING_TYPES}}
+        NPM_TOKEN_PERFORMANCE: ${{secrets.NPM_TOKEN_PERFORMANCE}}
+        NPM_TOKEN_PERFORMANCE_TYPES: ${{secrets.NPM_TOKEN_PERFORMANCE_TYPES}}
+        NPM_TOKEN_POLYFILL: ${{secrets.NPM_TOKEN_POLYFILL}}
+        NPM_TOKEN_REMOTE_CONFIG: ${{secrets.NPM_TOKEN_REMOTE_CONFIG}}
+        NPM_TOKEN_REMOTE_CONFIG_TYPES: ${{secrets.NPM_TOKEN_REMOTE_CONFIG_TYPES}}
+        NPM_TOKEN_RULES_UNIT_TESTING: ${{secrets.NPM_TOKEN_RULES_UNIT_TESTING}}
+        NPM_TOKEN_STORAGE: ${{secrets.NPM_TOKEN_STORAGE}}
+        NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
+        NPM_TOKEN_TESTING: ${{secrets.NPM_TOKEN_TESTING}}
+        NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
+        NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
+        NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
+        NPM_TOKEN_APP_COMPAT: ${{ secrets.NPM_TOKEN_APP_COMPAT }}
+        NPM_TOKEN_INSTALLATIONS_COMPAT: ${{ secrets.NPM_TOKEN_INSTALLATIONS_COMPAT }}
+        NPM_TOKEN_ANALYTICS_COMPAT: ${{ secrets.NPM_TOKEN_ANALYTICS_COMPAT }}
+        NPM_TOKEN_AUTH_COMPAT: ${{ secrets.NPM_TOKEN_AUTH_COMPAT }}
+        NPM_TOKEN_MESSAGING_INTEROP_TYPES: ${{ secrets.NPM_TOKEN_MESSAGING_INTEROP_TYPES }}
+        NPM_TOKEN_FUNCTIONS_COMPAT: ${{ secrets.NPM_TOKEN_FUNCTIONS_COMPAT }}
+        NPM_TOKEN_MESSAGING_COMPAT: ${{ secrets.NPM_TOKEN_MESSAGING_COMPAT }}
+        NPM_TOKEN_PERFORMANCE_COMPAT: ${{ secrets.NPM_TOKEN_PERFORMANCE_COMPAT }}
+        NPM_TOKEN_REMOTE_CONFIG_COMPAT: ${{ secrets.NPM_TOKEN_REMOTE_CONFIG_COMPAT }}
+        NPM_TOKEN_DATABASE_COMPAT: ${{ secrets.NPM_TOKEN_DATABASE_COMPAT }}
+        NPM_TOKEN_FIRESTORE_COMPAT: ${{ secrets.NPM_TOKEN_FIRESTORE_COMPAT }}
+        NPM_TOKEN_STORAGE_COMPAT: ${{ secrets.NPM_TOKEN_STORAGE_COMPAT }}
+        NPM_TOKEN_APP_CHECK_COMPAT: ${{ secrets.NPM_TOKEN_APP_CHECK_COMPAT }}
+        NPM_TOKEN_API_DOCUMENTER: ${{ secrets.NPM_TOKEN_API_DOCUMENTER }}
+        CI: true
+    - name: Get release version
+      id: get-version
+      # In production, there is only one version number
+      run: |
+        VERSION_SCRIPT="const pkg = require('./packages/firebase/package.json'); console.log(pkg.version);"
+        VERSION=`node -e "${VERSION_SCRIPT}"`
+        echo "::set-output name=BASE_VERSION::$VERSION"
+    - name: Echo version in shell
+      run: |
+        echo "Base version: ${{ steps.get-version.outputs.BASE_VERSION }}"
+    - name: Log to release tracker
+      # Sends release information to cloud functions endpoint of release tracker.
+      run: |
+        DATE=$(date +'%m/%d/%Y')
+        BASE_VERSION=${{ steps.get-version.outputs.BASE_VERSION }}
+        RELEASE_TRACKER_URL=${{ secrets.RELEASE_TRACKER_URL }}
+        curl -X POST -H "Content-Type:application/json" \
+        -d "{\"version\":\"$BASE_VERSION\",\"date\":\"$DATE\"}" \
+        $RELEASE_TRACKER_URL/logProduction
diff --git a/packages/firestore/src/local/query_engine.ts b/packages/firestore/src/local/query_engine.ts
@@ -154,7 +154,7 @@ export class QueryEngine {
           return null;
         }
 
-        if (indexType === IndexType.PARTIAL) {
+        if (query.limit !== null && indexType === IndexType.PARTIAL) {
           // We cannot apply a limit for targets that are served using a partial
           // index. If a partial index will be used to serve the target, the
           // query may return a superset of documents that match the target
@@ -301,7 +301,7 @@ export class QueryEngine {
    * Determines if a limit query needs to be refilled from cache, making it
    * ineligible for index-free execution.
    *
-   * @param query The query.
+   * @param query - The query.
    * @param sortedPreviousResults - The documents that matched the query when it
    * was last synchronized, sorted by the query's comparator.
    * @param remoteKeys - The document keys that matched the query at the last
diff --git a/scripts/release/release.ts b/scripts/release/release.ts
@@ -27,6 +27,7 @@ import { reinstallDeps, buildPackages } from './utils/yarn';
 import { runTests, setupTestDeps } from './utils/tests';
 import { bumpVersionForStaging } from './staging';
 import { ReleaseType } from './utils/enums';
+import { getAllPackages } from './utils/workspace';
 const prompt = createPromptModule();
 
 interface releaseOptions {
@@ -94,12 +95,11 @@ export async function runRelease({
     console.log(`Publishing ${inputReleaseType} release.`);
 
     let packagesToPublish = [];
-
-    /**
-     * Bump versions for staging release
-     * NOTE: For prod, versions are bumped in a PR which should be merged before running this script
-     */
     if (releaseType === ReleaseType.Staging) {
+      /**
+       * Bump versions for staging release
+       * NOTE: For prod, versions are bumped in a PR which should be merged before running this script
+       */
       const updatedPackages = await bumpVersionForStaging();
 
       if (!ci) {
@@ -117,6 +117,13 @@ export async function runRelease({
       for (const key of updatedPackages.keys()) {
         packagesToPublish.push(key);
       }
+    } else {
+      /**
+       * For production releases, pass all packages to publishToCI().
+       * It will only publish if it finds the local version is newer
+       * than NPM's.
+       */
+      packagesToPublish = await getAllPackages();
     }
 
     /**
diff --git a/scripts/release/utils/publish.ts b/scripts/release/utils/publish.ts
@@ -42,34 +42,49 @@ export async function publishInCI(
   npmTag: string,
   dryRun: boolean
 ) {
-  const taskArray = await Promise.all(
-    updatedPkgs.map(async pkg => {
-      const path = await mapPkgNameToPkgPath(pkg);
-
-      /**
-       * Can't require here because we have a cached version of the required JSON
-       * in memory and it doesn't contain the updates
-       */
-      const { version, private: isPrivate } = JSON.parse(
-        await readFile(`${path}/package.json`, 'utf8')
-      );
-
-      /**
-       * Skip private packages
-       */
-      if (isPrivate) {
-        return {
-          title: `Skipping private package: ${pkg}.`,
-          task: () => {}
-        };
+  const taskArray = [];
+  for (const pkg of updatedPkgs) {
+    const path = await mapPkgNameToPkgPath(pkg);
+
+    /**
+     * Can't require here because we have a cached version of the required JSON
+     * in memory and it doesn't contain the updates
+     */
+    const { version, private: isPrivate } = JSON.parse(
+      await readFile(`${path}/package.json`, 'utf8')
+    );
+
+    /**
+     * Skip private packages
+     */
+    if (isPrivate) {
+      console.log(`Skipping private package: ${pkg}.`);
+      continue;
+    }
+
+    /**
+     * Skip if this version has already been published.
+     */
+    try {
+      const { stdout: npmVersion } = await exec(`npm info ${pkg} version`);
+      if (version === npmVersion.trim()) {
+        console.log(
+          `Skipping publish of ${pkg} - version ${version} is already published`
+        );
+        continue;
       }
+    } catch (e) {
+      // 404 from NPM indicates the package doesn't exist there.
+      console.log(`Skipping pkg: ${pkg} - it has never been published to NPM.`);
+      continue;
+    }
+
+    taskArray.push({
+      title: `📦  ${pkg}@${version}`,
+      task: () => publishPackageInCI(pkg, npmTag, dryRun)
+    });
+  }
 
-      return {
-        title: `📦  ${pkg}@${version}`,
-        task: () => publishPackageInCI(pkg, npmTag, dryRun)
-      };
-    })
-  );
   const tasks = new Listr(taskArray, {
     concurrent: false,
     exitOnError: false
