merge main and fix rollup conflict (remove iife only and add record a…

…s external dependency)
lookit · Sep 3, 2024 · 224c9df · 224c9df
2 parents ade4e1d + 96beb6b
commit 224c9df
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 31 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/data/package.json b/packages/data/package.json
@@ -31,6 +31,6 @@
     "rollup-plugin-dotenv": "^0.5.1"
   },
   "peerDependencies": {
-    "jspsych": "^7.3.4"
+    "jspsych": "^8.0.2"
   }
 }
diff --git a/packages/data/src/types.ts b/packages/data/src/types.ts
@@ -1,4 +1,4 @@
-import { DataCollection } from "jspsych/dist/modules/data/DataCollection";
+import { DataCollection } from "jspsych";
 
 export type ApiPromise = Promise<Data<Attributes> | Data<Attributes>[]>;
 

diff --git a/packages/lookit-initjspsych/package.json b/packages/lookit-initjspsych/package.json
@@ -32,7 +32,7 @@
     "@jspsych/config": "^2.0.0"
   },
   "peerDependencies": {
-    "jspsych": "^7.3.4"
+    "jspsych": "^8.0.2"
   },
   "optionalDependencies": {
     "@rollup/rollup-linux-arm64-gnu": "^4.14.1",

diff --git a/packages/lookit-initjspsych/src/types.ts b/packages/lookit-initjspsych/src/types.ts
@@ -1,4 +1,4 @@
-import { DataCollection } from "jspsych/dist/modules/data/DataCollection";
+import { DataCollection } from "jspsych";
 
 export type UserFunc = (data: DataCollection) => void;
 

diff --git a/packages/lookit-initjspsych/src/utils.spec.ts b/packages/lookit-initjspsych/src/utils.spec.ts
@@ -1,4 +1,4 @@
-import { DataCollection } from "jspsych/dist/modules/data/DataCollection";
+import { DataCollection } from "jspsych";
 
 import { Child, PastSession, Study } from "@lookit/data/dist/types";
 import { on_data_update, on_finish } from "./utils";

diff --git a/packages/lookit-initjspsych/src/utils.ts b/packages/lookit-initjspsych/src/utils.ts
@@ -1,6 +1,6 @@
 import Api from "@lookit/data";
 import { LookitWindow } from "@lookit/data/dist/types";
-import { DataCollection } from "jspsych/dist/modules/data/DataCollection";
+import { DataCollection } from "jspsych";
 import { UserFunc } from "./types";
 
 declare let window: LookitWindow;

diff --git a/packages/record/package.json b/packages/record/package.json
@@ -35,6 +35,6 @@
     "rollup-plugin-dotenv": "^0.5.1"
   },
   "peerDependencies": {
-    "jspsych": "^7.3.4"
+    "jspsych": "^8.0.2"
   }
 }
diff --git a/packages/surveys/package.json b/packages/surveys/package.json
@@ -36,6 +36,6 @@
     "@types/dompurify": "^3.0.5"
   },
   "peerDependencies": {
-    "jspsych": "^7.3.4"
+    "jspsych": "^8.0.2"
   }
 }
diff --git a/rollup.mjs b/rollup.mjs
@@ -9,22 +9,19 @@ export function makeRollupConfig(iifeName) {
   return jsPsychMakeRollupConfig(iifeName).map((config) => {
     return {
       ...config,
-      // Add data package as external dependency
+      // Add data and record packages as external dependencys
       external: [...config.external, dataPackageName, recordPackageName],
-      output: config.output
-        // Only build iife bundles
-        .filter((output) => output.format === "iife")
-        .map((output) => {
-          return {
-            ...output,
-            globals: {
-              ...output.globals,
-              // Explicitly state data's iife name
-              [dataPackageName]: dataPackageIifeName,
-              [recordPackageName]: recordPackageIifeName,
-            },
-          };
-        }),
+      output: config.output.map((output) => {
+        return {
+          ...output,
+          globals: {
+            ...output.globals,
+            // Explicitly state iife names
+            [dataPackageName]: dataPackageIifeName,
+            [recordPackageName]: recordPackageIifeName,
+          },
+        };
+      }),
     };
   });
 }