From ed3dc5b6a0fbdde79307e6d1ad58e2b6ea511077 Mon Sep 17 00:00:00 2001
From: bracesproul <braceasproul@gmail.com>
Date: Fri, 12 Apr 2024 18:23:16 -0700
Subject: [PATCH] mom I did it!

---
 .../actions/js-integration-tests/action.yml   |  6 ++---
 .github/workflows/integration_tests.yml       |  6 ++---
 .github/workflows/js_test.yml                 | 25 ++++++++++---------
 .github/workflows/release_js.yml              |  4 +--
 js/tsconfig.cjs.json                          |  2 +-
 js/tsconfig.json                              |  2 +-
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/.github/actions/js-integration-tests/action.yml b/.github/actions/js-integration-tests/action.yml
index 65320aebc..8b5a8da42 100644
--- a/.github/actions/js-integration-tests/action.yml
+++ b/.github/actions/js-integration-tests/action.yml
@@ -20,11 +20,11 @@ runs:
       uses: actions/setup-node@v3
       with:
         node-version: ${{ inputs.node-version }}
-        # cache: "yarn"
-        # cache-dependency-path: "js/yarn.lock"
+        cache: "yarn"
+        cache-dependency-path: "js/yarn.lock"
 
     - name: Install Yarn dependencies
-      run: yarn install
+      run: yarn install --immutable --mode=skip-build --ignore-scripts
       shell: bash
       working-directory: js
 
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 368d7ba49..bfc27394e 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -67,10 +67,10 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 20.x
-          # cache: "yarn"
-          # cache-dependency-path: "js/yarn.lock"
+          cache: "yarn"
+          cache-dependency-path: "js/yarn.lock"
       - name: Install dependencies
-        run: yarn install --immutable
+        run: yarn install --immutable --mode=skip-build --ignore-scripts
       - name: Run JS integration tests
         uses: ./.github/actions/js-integration-tests
         with:
diff --git a/.github/workflows/js_test.yml b/.github/workflows/js_test.yml
index 77aa5caa0..eee473e60 100644
--- a/.github/workflows/js_test.yml
+++ b/.github/workflows/js_test.yml
@@ -31,16 +31,19 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          # cache: "yarn"
-          # cache-dependency-path: "js/yarn.lock"
+          cache: "yarn"
+          cache-dependency-path: "js/yarn.lock"
       - name: Install dependencies
-        run: yarn install --immutable --mode=skip-build
+        run: yarn install --immutable --mode=skip-build --ignore-scripts
       - name: Check formatting
         run: yarn run format:check
 
   lint:
     name: Check linting
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: "js"
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js 18.x
@@ -48,13 +51,11 @@ jobs:
         with:
           node-version: 18.x
           cache: "yarn"
-          cache-dependency-path: ./js/yarn.lock
+          cache-dependency-path: "js/yarn.lock"
       - name: Install dependencies
         run: yarn install --immutable --mode=skip-build --ignore-scripts
-        working-directory: "js"
       - name: Check linting
         run: yarn run lint
-        working-directory: "js"
 
   build:
     name: Build and check types
@@ -68,10 +69,10 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          # cache: "yarn"
-          # cache-dependency-path: "js/yarn.lock"
+          cache: "yarn"
+          cache-dependency-path: "js/yarn.lock"
       - name: Install dependencies
-        run: yarn install --immutable
+        run: yarn install --immutable --mode=skip-build --ignore-scripts
       - name: Build and check types
         run: yarn run build
 
@@ -97,10 +98,10 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          # cache: "yarn"
-          # cache-dependency-path: "js/yarn.lock"
+          cache: "yarn"
+          cache-dependency-path: "js/yarn.lock"
       - name: Install dependencies
-        run: yarn install --immutable
+        run: yarn install --immutable --mode=skip-build --ignore-scripts
       - name: Build
         run: yarn run build
       - name: Check version
diff --git a/.github/workflows/release_js.yml b/.github/workflows/release_js.yml
index 990522ac0..b5151089e 100644
--- a/.github/workflows/release_js.yml
+++ b/.github/workflows/release_js.yml
@@ -18,8 +18,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          # cache: "yarn"
-          # cache-dependency-path: "js/yarn.lock"
+          cache: "yarn"
+          cache-dependency-path: "js/yarn.lock"
       - name: Install dependencies
         run: cd js && yarn install --immutable
       - name: Build
diff --git a/js/tsconfig.cjs.json b/js/tsconfig.cjs.json
index 134b3b846..959b49f6c 100644
--- a/js/tsconfig.cjs.json
+++ b/js/tsconfig.cjs.json
@@ -1,7 +1,7 @@
 {
     "extends": "./tsconfig.json",
     "compilerOptions": {
-        "module": "NodeNext",
+        "module": "commonjs",
         "declaration": false
     },
     "exclude": [
diff --git a/js/tsconfig.json b/js/tsconfig.json
index 6bda6a952..ff95d18f2 100644
--- a/js/tsconfig.json
+++ b/js/tsconfig.json
@@ -9,7 +9,7 @@
       "ES2022.Object",
       "DOM"
     ],
-    "module": "NodeNext",
+    "module": "ES2020",
     "moduleResolution": "nodenext",
     "esModuleInterop": true,
     "declaration": true,