Merge branch 'modularization' into modularization-new-docs

packages/config/gulp.js

@@ -1,3 +1,5 @@
+import { sep as pathSeparator } from "path";
+
 import gulp from "gulp";
 import rename from "gulp-rename";
 import replace from "gulp-replace";
@@ -13,7 +15,7 @@ export const createCoreDistArchive = () =>
       // Rename dist files
       .pipe(
         rename((path) => {
-          const packageName = path.dirname.split("/")[0];
+          const packageName = path.dirname.split(pathSeparator)[0];
 
           path.dirname = "/dist";
           path.basename = packageName;

packages/config/rollup.js

@@ -7,7 +7,12 @@ import { terser } from "rollup-plugin-terser";
 import typescript from "rollup-plugin-typescript2";
 import ts from "typescript";
 
-const makeConfig = (outputOptions, globalOptions = {}, iifeOutputOptions = {}) => {
+const makeConfig = ({
+  outputOptions = {},
+  globalOptions = {},
+  iifeOutputOptions = {},
+  nodeOnly = false,
+}) => {
   const source = "src/index";
   const destination = "dist/index";
 
@@ -39,11 +44,8 @@ const makeConfig = (outputOptions, globalOptions = {}, iifeOutputOptions = {}) =
     ...globalOptions,
   });
 
-  return defineConfig([
+  /** @type {import("rollup").OutputOptions} */
-    {
+  const output = [
-      // Non-babel builds
-      ...commonConfig,
-      output: [
     {
       // Build file to be used as an ES import
       file: `${destination}.js`,
@@ -56,17 +58,24 @@ const makeConfig = (outputOptions, globalOptions = {}, iifeOutputOptions = {}) =
       format: "cjs",
       ...outputOptions,
     },
-        {
+  ];
+
+  if (!nodeOnly) {
+    output.push({
       // Build file to be used for tinkering in modern browsers
       file: `${destination}.browser.js`,
       format: "iife",
       ...outputOptions,
       ...iifeOutputOptions,
-        },
+    });
-      ],
+  }
-    },
+
-    {
+  // Non-babel builds
+  const config = defineConfig([{ ...commonConfig, output }]);
+
+  if (!nodeOnly) {
     // Babel build
+    config.push({
       ...commonConfig,
       plugins: commonConfig.plugins.concat(
         babel({
@@ -84,8 +93,10 @@ const makeConfig = (outputOptions, globalOptions = {}, iifeOutputOptions = {}) =
           ...iifeOutputOptions,
         },
       ],
-    },
+    });
-  ]);
+  }
+
+  return config;
 };
 
 /**
@@ -96,24 +107,32 @@ const makeConfig = (outputOptions, globalOptions = {}, iifeOutputOptions = {}) =
  * global scope in browser builds
  */
 export const makeRollupConfig = (iifeName) =>
-  makeConfig(
+  makeConfig({
-    {
+    outputOptions: {
       exports: "default",
       globals: { jspsych: "jsPsychModule" },
     },
-    { external: ["jspsych"] },
+    globalOptions: { external: ["jspsych"] },
-    { name: iifeName }
+    iifeOutputOptions: { name: iifeName },
-  );
+  });
 
 /**
  * Returns the rollup configuration for the core `jspsych` package.
  */
 export const makeCoreRollupConfig = () =>
-  makeConfig(
+  makeConfig({
-    {
+    outputOptions: {
       exports: "named",
       name: "jsPsychModule",
     },
-    {},
+    iifeOutputOptions: { footer: "var initJsPsych = jsPsychModule.initJsPsych;" },
-    { footer: "var initJsPsych = jsPsychModule.initJsPsych;" }
+  });
-  );
+
+/**
+ * Returns the rollup configuration for Node.js-only packages
+ */
+export const makeNodeRollupConfig = () =>
+  makeConfig({
+    globalOptions: { external: ["jspsych"] },
+    nodeOnly: true,
+  });

packages/config/tsconfig.contrib.json

@@ -1,9 +1,9 @@
 {
-  // ts-config for the jspsych-dist monorepo
+  // tsconfig for the jspsych-contrib monorepo
   "extends": "@jspsych/config/tsconfig.json",
   "compilerOptions": {
-    // map jspsych-contrib package imports directly to their source files
     "paths": {
+      // map jspsych-contrib package imports directly to their source files
       "@jspsych-contrib/*": ["../*/src"]
     }
   }

packages/config/tsconfig.core.json

@@ -4,7 +4,6 @@
   "compilerOptions": {
     // map package imports directly to their source files
     "paths": {
-      "jspsych/tests": ["../jspsych/tests"],
       "jspsych": ["../jspsych/src"],
       "@jspsych/*": ["../*/src"]
     },

packages/config/tsconfig.json

@@ -1,6 +1,6 @@
 {
   // shared base tsconfig for all jsPsych packages
-  // based on https://github.com/formium/tsdx/blob/462af2d002987f985695b98400e0344b8f2754b7/templates/basic/tsconfig.json<<<<
+  // based on https://github.com/formium/tsdx/blob/462af2d002987f985695b98400e0344b8f2754b7/templates/basic/tsconfig.json
   // see https://www.typescriptlang.org/tsconfig to better understand tsconfigs
   "compilerOptions": {
     "target": "ES6",
@@ -27,10 +27,7 @@
     "skipLibCheck": true,
     // error out if import and file system have a casing mismatch. Recommended by TS
     "forceConsistentCasingInFileNames": true,
-    // do note emit build output when running `tsc`
+    // do not emit build output when running `tsc`
-    "noEmit": true,
+    "noEmit": true
-    // allow resolving json modules in tests (needed for transitive imports of jspsych in tests;
-    // the jspsych package itself uses https://stackoverflow.com/a/61426303 instead)
-    "resolveJsonModule": true
   }
 }

packages/extension-webgazer/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/jspsych/package.json

@@ -44,6 +44,7 @@
     "auto-bind": "^4.0.0"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/jspsych/tests/core/case-sensitive-responses.test.ts

@@ -1,6 +1,5 @@
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
-
+import { pressKey, startTimeline } from "@jspsych/test-utils";
-import { pressKey, startTimeline } from "../utils";
 
 describe("case_sensitive_responses parameter", () => {
   test("has a default value of false", async () => {

packages/jspsych/tests/core/css-classes-parameter.test.ts

@@ -1,7 +1,7 @@
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import { initJsPsych } from "../../src";
-import { pressKey, startTimeline } from "../utils";
 
 describe("The css_classes parameter for trials", () => {
   test("Adds a single CSS class to the root jsPsych element", async () => {

packages/jspsych/tests/core/default-iti.test.ts

@@ -1,7 +1,6 @@
 import { jest } from "@jest/globals";
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
-
+import { pressKey, startTimeline } from "@jspsych/test-utils";
-import { pressKey, startTimeline } from "../utils";
 
 jest.useFakeTimers();
 

packages/jspsych/tests/core/default-parameters.test.ts

@@ -1,6 +1,5 @@
 import surveyText from "@jspsych/plugin-survey-text";
-
+import { startTimeline } from "@jspsych/test-utils";
-import { startTimeline } from "../utils";
 
 describe("nested defaults", () => {
   test("work in basic situation", async () => {

packages/jspsych/tests/core/endexperiment.test.ts

@@ -1,7 +1,7 @@
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
+import { flushPromises, pressKey, startTimeline } from "@jspsych/test-utils";
 
 import { initJsPsych } from "../../src";
-import { flushPromises, pressKey, startTimeline } from "../utils";
 
 test("works on basic timeline", async () => {
   const jsPsych = initJsPsych();

packages/jspsych/tests/core/events.test.ts

@@ -1,8 +1,8 @@
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
 import htmlSliderResponse from "@jspsych/plugin-html-slider-response";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import { initJsPsych } from "../../src";
-import { pressKey, startTimeline } from "../utils";
 
 jest.useFakeTimers();
 

packages/jspsych/tests/core/functions-as-parameters.test.ts

@@ -2,9 +2,9 @@ import cloze from "@jspsych/plugin-cloze";
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
 import surveyMultiChoice from "@jspsych/plugin-survey-multi-choice";
 import surveyText from "@jspsych/plugin-survey-text";
+import { clickTarget, pressKey, startTimeline } from "@jspsych/test-utils";
 
 import { JsPsych, JsPsychPlugin, ParameterType, TrialType } from "../../src";
-import { clickTarget, pressKey, startTimeline } from "../utils";
 
 describe("standard use of function as parameter", () => {
   test("function value is used as parameter", async () => {

packages/jspsych/tests/core/min-rt.test.ts

@@ -1,6 +1,5 @@
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
-
+import { pressKey, startTimeline } from "@jspsych/test-utils";
-import { pressKey, startTimeline } from "../utils";
 
 jest.useFakeTimers("modern");
 

packages/jspsych/tests/core/progressbar.test.ts

@@ -1,7 +1,7 @@
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import { initJsPsych } from "../../src";
-import { pressKey, startTimeline } from "../utils";
 
 describe("automatic progress bar", () => {
   test("progress bar does not display by default", async () => {

packages/jspsych/tests/core/run.test.ts

@@ -1,6 +1,5 @@
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
-
+import { flushPromises, startTimeline } from "@jspsych/test-utils";
-import { flushPromises, startTimeline } from "../utils";
 
 describe("jsPsych.run()", () => {
   beforeEach(() => {

packages/jspsych/tests/core/timeline-variables.test.ts

@@ -1,9 +1,9 @@
 import callFunction from "@jspsych/plugin-call-function";
 import htmlButtonResponse from "@jspsych/plugin-html-button-response";
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import { initJsPsych } from "../../src";
-import { pressKey, startTimeline } from "../utils";
 
 describe("randomize order", () => {});
 

packages/jspsych/tests/core/timelines.test.ts

@@ -1,7 +1,7 @@
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import { initJsPsych } from "../../src";
-import { pressKey, startTimeline } from "../utils";
 
 describe("loop function", () => {
   test("repeats a timeline when returns true", async () => {

packages/jspsych/tests/data/data-csv-conversion.test.ts

@@ -1,8 +1,7 @@
 import sameDifferentHtml from "@jspsych/plugin-same-different-html";
 import surveyMultiSelect from "@jspsych/plugin-survey-multi-select";
 import surveyText from "@jspsych/plugin-survey-text";
-
+import { clickTarget, pressKey, startTimeline } from "@jspsych/test-utils";
-import { clickTarget, pressKey, startTimeline } from "../utils";
 
 jest.useFakeTimers();
 

packages/jspsych/tests/data/data-json-conversion.test.ts

@@ -2,8 +2,7 @@ import instructions from "@jspsych/plugin-instructions";
 import sameDifferentHtml from "@jspsych/plugin-same-different-html";
 import surveyMultiSelect from "@jspsych/plugin-survey-multi-select";
 import surveyText from "@jspsych/plugin-survey-text";
-
+import { clickTarget, pressKey, startTimeline } from "@jspsych/test-utils";
-import { clickTarget, pressKey, startTimeline } from "../utils";
 
 jest.useFakeTimers();
 

packages/jspsych/tests/data/datamodule.test.ts

@@ -1,7 +1,7 @@
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import { initJsPsych } from "../../src";
-import { pressKey, startTimeline } from "../utils";
 
 describe("Basic data recording", () => {
   test("should be able to get rt after running experiment", async () => {

packages/jspsych/tests/data/dataparameter.test.ts

@@ -1,7 +1,7 @@
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import { initJsPsych } from "../../src";
-import { pressKey, startTimeline } from "../utils";
 
 describe("The data parameter", () => {
   test("should record data to a trial", async () => {

packages/jspsych/tests/data/interactions.test.ts

@@ -1,7 +1,7 @@
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import { initJsPsych } from "../../src";
-import { pressKey, startTimeline } from "../utils";
 
 describe("Data recording", () => {
   test("record focus events", async () => {

packages/jspsych/tests/data/trialparameters.test.ts

@@ -1,8 +1,7 @@
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
 import reconstruction from "@jspsych/plugin-reconstruction";
 import surveyText from "@jspsych/plugin-survey-text";
-
+import { clickTarget, pressKey, startTimeline } from "@jspsych/test-utils";
-import { clickTarget, pressKey, startTimeline } from "../utils";
 
 describe("Trial parameters in the data", () => {
   test("Can be added by specifying the parameter with a value of true in save_trial_parameters", async () => {

packages/jspsych/tests/extensions/extensions.test.ts

@@ -1,12 +1,11 @@
 import htmlKeyboardResponse from "@jspsych/plugin-html-keyboard-response";
+import { pressKey } from "@jspsych/test-utils";
 
-import { JsPsych, initJsPsych } from "../../src";
+import { initJsPsych } from "../../src";
-import { pressKey } from "../utils";
 import testExtension from "./test-extension";
 
 jest.useFakeTimers();
 
-// https://github.com/jspsych/jsPsych/projects/6#card-64825201
 describe("jsPsych.extensions", () => {
   test("initialize is called at start of experiment", async () => {
     const jsPsych = initJsPsych({

packages/jspsych/tests/extensions/test-extension.ts

@@ -1,4 +1,4 @@
-import { JsPsych, JsPsychExtension } from "jspsych";
+import { JsPsych, JsPsychExtension } from "../../src";
 
 class TestExtension implements JsPsychExtension {
   static info = {

packages/jspsych/tests/pluginAPI/pluginapi.test.ts

@@ -1,6 +1,7 @@
+import { keyDown, keyUp, pressKey } from "@jspsych/test-utils";
+
 import { KeyboardListenerAPI } from "../../src/modules/plugin-api/KeyboardListenerAPI";
 import { TimeoutAPI } from "../../src/modules/plugin-api/TimeoutAPI";
-import { keyDown, keyUp, pressKey } from "../utils";
 
 jest.useFakeTimers();
 

packages/jspsych/tsconfig.json

@@ -4,5 +4,5 @@
     "baseUrl": ".",
     "resolveJsonModule": false // using https://stackoverflow.com/a/61426303 instead
   },
-  "include": ["src", "test", "global.d.ts"]
+  "include": ["src", "tests", "global.d.ts"]
 }

packages/plugin-animation/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-animation/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { startTimeline } from "jspsych/tests/utils";
+import { startTimeline } from "@jspsych/test-utils";
 
 import animation from ".";
 

packages/plugin-audio-button-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-audio-button-response/src/index.spec.ts

@@ -1,5 +1,5 @@
+import { clickTarget, startTimeline } from "@jspsych/test-utils";
 import { initJsPsych } from "jspsych";
-import { clickTarget, startTimeline } from "jspsych/tests/utils";
 
 import audioButtonResponse from ".";
 

packages/plugin-audio-keyboard-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-audio-slider-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-call-function/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-call-function/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { startTimeline } from "jspsych/tests/utils";
+import { startTimeline } from "@jspsych/test-utils";
 
 import callFunction from ".";
 

packages/plugin-canvas-button-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-canvas-keyboard-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-canvas-slider-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-categorize-animation/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-categorize-animation/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { pressKey, startTimeline } from "jspsych/tests/utils";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import categorizeAnimation from ".";
 

packages/plugin-categorize-html/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-categorize-image/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-cloze/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-cloze/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { clickTarget, startTimeline } from "jspsych/tests/utils";
+import { clickTarget, startTimeline } from "@jspsych/test-utils";
 
 import cloze from ".";
 

packages/plugin-external-html/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-free-sort/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-free-sort/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { startTimeline } from "jspsych/tests/utils";
+import { startTimeline } from "@jspsych/test-utils";
 
 import freeSort from ".";
 

packages/plugin-fullscreen/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-fullscreen/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { startTimeline } from "jspsych/tests/utils";
+import { startTimeline } from "@jspsych/test-utils";
 
 import fullscreen from ".";
 

packages/plugin-html-button-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-html-button-response/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { clickTarget, startTimeline } from "jspsych/tests/utils";
+import { clickTarget, startTimeline } from "@jspsych/test-utils";
 
 import htmlButtonResponse from ".";
 

packages/plugin-html-keyboard-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-html-keyboard-response/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { pressKey, startTimeline } from "jspsych/tests/utils";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import htmlKeyboardResponse from ".";
 

packages/plugin-html-slider-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-html-slider-response/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { clickTarget, startTimeline } from "jspsych/tests/utils";
+import { clickTarget, startTimeline } from "@jspsych/test-utils";
 
 import htmlSliderResponse from ".";
 

packages/plugin-iat-html/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-iat-html/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { pressKey, startTimeline } from "jspsych/tests/utils";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import iatHtml from ".";
 

packages/plugin-iat-image/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-iat-image/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { pressKey, startTimeline } from "jspsych/tests/utils";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import iatImage from ".";
 

packages/plugin-image-button-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-image-button-response/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { clickTarget, startTimeline } from "jspsych/tests/utils";
+import { clickTarget, startTimeline } from "@jspsych/test-utils";
 
 import imageButtonResponse from ".";
 

packages/plugin-image-keyboard-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-image-keyboard-response/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { pressKey, startTimeline } from "jspsych/tests/utils";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import imageKeyboardResponse from ".";
 

packages/plugin-image-slider-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-image-slider-response/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { clickTarget, startTimeline } from "jspsych/tests/utils";
+import { clickTarget, startTimeline } from "@jspsych/test-utils";
 
 import imageSliderResponse from ".";
 

packages/plugin-instructions/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-instructions/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { pressKey, startTimeline } from "jspsych/tests/utils";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import instructions from ".";
 

packages/plugin-maxdiff/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-maxdiff/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { clickTarget, startTimeline } from "jspsych/tests/utils";
+import { clickTarget, startTimeline } from "@jspsych/test-utils";
 
 import maxdiff from ".";
 

packages/plugin-preload/src/index.spec.ts

@@ -1,8 +1,8 @@
 import audioKeyboardResponse from "@jspsych/plugin-audio-keyboard-response";
 import imageKeyboardResponse from "@jspsych/plugin-image-keyboard-response";
 import videoKeyboardResponse from "@jspsych/plugin-video-keyboard-response";
+import { startTimeline } from "@jspsych/test-utils";
 import { JsPsych, initJsPsych } from "jspsych";
-import { startTimeline } from "jspsych/tests/utils";
 
 import preloadPlugin from ".";
 

packages/plugin-rdk/jest.config.cjs

@@ -1 +0,0 @@
-module.exports = require("@jspsych/config/jest").makePackageConfig(__dirname);

packages/plugin-rdk/rollup.config.mjs

@@ -1,3 +0,0 @@
-import { makeRollupConfig } from "@jspsych/config/rollup";
-
-export default makeRollupConfig("jsPsychRdk");

packages/plugin-rdk/src/index.spec.ts

@@ -1,44 +0,0 @@
-import { pressKey, startTimeline } from "jspsych/tests/utils";
-
-import rdk from ".";
-
-describe("rdk plugin", () => {
-  test("choices and frame data are stored as arrays", async () => {
-    const { getData } = await startTimeline([
-      {
-        type: rdk,
-        number_of_dots: 200,
-        RDK_type: 3,
-        choices: ["a", "l"],
-        correct_choice: "l",
-        coherent_direction: 0,
-      },
-    ]);
-
-    pressKey("l");
-    const data = getData().values()[0];
-    expect(data.choices).toStrictEqual(["a", "l"]);
-    expect(Array.isArray(data.frame_rate_array)).toBe(true);
-  });
-
-  test("responses are scored correctly", async () => {
-    const trial = {
-      type: rdk,
-      number_of_dots: 200,
-      RDK_type: 3,
-      choices: ["a", "l"],
-      correct_choice: "l",
-      coherent_direction: 0,
-    };
-
-    const { getData } = await startTimeline([trial, trial]);
-
-    pressKey("l");
-    pressKey("a");
-
-    expect(getData().values()).toEqual([
-      expect.objectContaining({ response: "l", correct: true }),
-      expect.objectContaining({ response: "a", correct: false }),
-    ]);
-  });
-});

packages/plugin-reconstruction/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-reconstruction/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { clickTarget, pressKey, startTimeline } from "jspsych/tests/utils";
+import { clickTarget, pressKey, startTimeline } from "@jspsych/test-utils";
 
 import reconstruction from ".";
 

packages/plugin-resize/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-same-different-html/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-same-different-image/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-serial-reaction-time-mouse/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-serial-reaction-time-mouse/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { mouseDownMouseUpTarget, startTimeline } from "jspsych/tests/utils";
+import { mouseDownMouseUpTarget, startTimeline } from "@jspsych/test-utils";
 
 import serialReactionTimeMouse from ".";
 

packages/plugin-serial-reaction-time/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-serial-reaction-time/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { pressKey, startTimeline } from "jspsych/tests/utils";
+import { pressKey, startTimeline } from "@jspsych/test-utils";
 
 import serialReactionTime from ".";
 

packages/plugin-survey-html-form/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-survey-html-form/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { clickTarget, startTimeline } from "jspsych/tests/utils";
+import { clickTarget, startTimeline } from "@jspsych/test-utils";
 
 import surveyHtmlForm from ".";
 

packages/plugin-survey-likert/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-survey-likert/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { clickTarget, startTimeline } from "jspsych/tests/utils";
+import { clickTarget, startTimeline } from "@jspsych/test-utils";
 
 import surveyLikert from ".";
 

packages/plugin-survey-multi-choice/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-survey-multi-choice/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { clickTarget, startTimeline } from "jspsych/tests/utils";
+import { clickTarget, startTimeline } from "@jspsych/test-utils";
 
 import surveyMultiChoice from ".";
 

packages/plugin-survey-multi-select/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-survey-multi-select/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { clickTarget, startTimeline } from "jspsych/tests/utils";
+import { clickTarget, startTimeline } from "@jspsych/test-utils";
 
 import surveyMultiSelect from ".";
 

packages/plugin-survey-text/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-survey-text/src/index.spec.ts

@@ -1,4 +1,4 @@
-import { clickTarget, startTimeline } from "jspsych/tests/utils";
+import { clickTarget, startTimeline } from "@jspsych/test-utils";
 
 import surveyText from ".";
 

packages/plugin-template/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-video-button-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-video-keyboard-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }

packages/plugin-video-slider-response/package.json

@@ -36,6 +36,7 @@
     "jspsych": ">=7"
   },
   "devDependencies": {
-    "@jspsych/config": "^0.1.0"
+    "@jspsych/config": "^0.1.0",
+    "@jspsych/test-utils": "^0.1.0"
   }
 }