Merge branch 'main' into feature-seed-rng

package-lock.json

@@ -16553,7 +16553,8 @@
       "version": "1.1.1",
       "license": "MIT",
       "devDependencies": {
-        "@jspsych/config": "^1.1.0"
+        "@jspsych/config": "^1.1.0",
+        "jspsych": "^7.0.0"
       },
       "peerDependencies": {
         "jspsych": ">=7.0.0"
@@ -18762,7 +18763,8 @@
     "@jspsych/test-utils": {
       "version": "file:packages/test-utils",
       "requires": {
-        "@jspsych/config": "^1.1.0"
+        "@jspsych/config": "^1.1.0",
+        "jspsych": "^7.0.0"
       }
     },
     "@manypkg/find-root": {

package.json

@@ -20,6 +20,7 @@
     "node": ">=14.0.0",
     "npm": ">=7.0.0"
   },
+  "packageManager": "npm@8.3.1",
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.3",
     "@changesets/cli": "^2.21.1",
@@ -46,22 +47,5 @@
     "projects": [
       "<rootDir>/packages/*/jest.config.cjs"
     ]
-  },
-  "turbo": {
-    "baseBranch": "origin/main",
-    "npmClient": "npm",
-    "pipeline": {
-      "build": {
-        "dependsOn": [
-          "^build"
-        ],
-        "outputs": [
-          "dist/**"
-        ]
-      },
-      "tsc": {
-        "outputs": []
-      }
-    }
   }
 }

packages/test-utils/package.json

@@ -33,6 +33,7 @@
     "jspsych": ">=7.0.0"
   },
   "devDependencies": {
-    "@jspsych/config": "^1.1.0"
+    "@jspsych/config": "^1.1.0",
+    "jspsych": "^7.0.0"
   }
 }

turbo.json

@@ -0,0 +1,17 @@
+{
+  "baseBranch": "origin/main",
+  "npmClient": "npm",
+  "pipeline": {
+    "build": {
+      "dependsOn": [
+        "^build"
+      ],
+      "outputs": [
+        "dist/**"
+      ]
+    },
+    "tsc": {
+      "outputs": []
+    }
+  }
+}