Merge pull request #810 from eisbuk/fix/copy-paste-bug

Some copy/paste related fixes:
eisbuk · Sep 11, 2023 · 04def4b · 04def4b
2 parents 393ac53 + 944df5a
commit 04def4b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflow.templates/storybook.yml b/.github/workflow.templates/storybook.yml
@@ -27,6 +27,8 @@ jobs:
       - name: Publish to Chromatic
         uses: chromaui/action@v1
         if: steps.has_secret.outputs.HAS_SECRETS
+        #! We expect this to fail with `Command failed with ENOENT: pnpm --version`
+        continue-on-error: true
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           projectToken: ${{ secrets.CHROMAUI_PROJECT_TOKEN }}

diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
@@ -37,6 +37,7 @@ jobs:
     - name: Publish to Chromatic
       uses: chromaui/action@v1
       if: steps.has_secret.outputs.HAS_SECRETS
+      continue-on-error: true
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         projectToken: ${{ secrets.CHROMAUI_PROJECT_TOKEN }}

diff --git a/.github/workflows/vitest-matrix.yml b/.github/workflows/vitest-matrix.yml
@@ -27,15 +27,15 @@ jobs:
         - 5
         - 6
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
         fetch-depth: 1
     - uses: actions/setup-node@v2
       with:
         node-version: "18"
     - name: Cache node modules and firebase emulators
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: |
           ~/.rush

diff --git a/packages/client/src/utils/firestore/compat.ts b/packages/client/src/utils/firestore/compat.ts
@@ -94,12 +94,11 @@ export const doc = (
   return match(node, {
     [FirestoreEnv.Client]: ({ instance }) =>
       FirestoreDocVariant.client({
-        // Even though 'doc' (aliased as 'clientDoc' here) works on both firestore and collection instanceerences,
+        // Even though 'doc' (aliased as 'clientDoc' here) works on both firestore and collection references,
         // it doesn't work well on unions because of slightly different type overloads, hence the typecast.
-        instance: clientDoc(
-          instance as ClientFirestore,
-          pathSegments.join("/")
-        ),
+        instance: docPath.length
+          ? clientDoc(instance as ClientCollectionReference, docPath)
+          : clientDoc(instance as ClientCollectionReference),
       }),
     [FirestoreEnv.Server]: ({ instance }) =>
       FirestoreDocVariant.server({
@@ -235,7 +234,7 @@ export const writeBatch = (db: FirestoreVariant) =>
           }
           return batch.set(doc.instance, data);
         },
-        commit: batch.commit,
+        commit: batch.commit.bind(batch),
       };
     },
     [FirestoreEnv.Server]: ({ instance }) => {
@@ -248,7 +247,7 @@ export const writeBatch = (db: FirestoreVariant) =>
           }
           return batch.set(doc.instance, data);
         },
-        commit: batch.commit,
+        commit: batch.commit.bind(batch),
       };
     },
   });