Merge branch 'main' into false_memory_import

jspsych · Jun 22, 2023 · d2d5168 · d2d5168
2 parents 6af0a04 + 7e56592
commit d2d5168
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 78 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [14.x, 16.x]
+        node: [18.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -22,8 +22,8 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
-      - name: Install npm@v7
-        run: npm install -g npm@7
+      - name: Install npm@v9
+        run: npm install -g npm@9
 
       - name: Install dependencies
         run: npm ci

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,10 +15,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Setup Node.js 16.x
+      - name: Setup Node.js 18.x
         uses: actions/setup-node@v2
         with:
-          node-version: 16.x
+          node-version: 18.x
 
       - name: Install dependencies
         run: npm ci

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.0",
     "@changesets/cli": "^2.16.0",
-    "@jspsych/config": "^1.3.2",
+    "@jspsych/config": "^1.3.3",
     "husky": "^7.0.1",
     "import-sort-style-module": "^6.0.0",
     "jest": "*",