@m2c2kit/assessment-color-shapes 0.8.4 → 0.8.5

package/dist/index.js

@@ -107,7 +107,7 @@ class ColorShapes extends Game {
       },
       instruction_type: {
         default: "long",
-        description: "Type of intructions to show, 'short' or 'long'.",
+        description: "Type of instructions to show, 'short' or 'long'.",
         type: "string",
         enum: ["short", "long"]
       },
@@ -238,7 +238,7 @@ class ColorShapes extends Game {
     const options = {
       name: "Color Shapes",
       id: "color-shapes",
-      version: "0.8.4",
+      version: "0.8.5",
       shortDescription: "Color Shapes is a visual array change detection task, measuring intra-item feature binding, where participants determine if shapes change color across two sequential presentations of shape stimuli.",
       longDescription: `Color Shapes is a change detection paradigm used to measure visual short-term memory binding (Parra et al., 2009). Participants are asked to memorize the shapes and colors of three different polygons for 3 seconds. The three polygons are then removed from the screen and re-displayed at different locations, either having the same or different colors. Participants are then asked to decide whether the combination of colors and shapes are the "Same" or "Different" between the study and test phases.`,
       showFps: defaultParameters.show_fps.default,
@@ -246,25 +246,30 @@ class ColorShapes extends Game {
       height: 800,
       trialSchema: colorShapesTrialSchema,
       parameters: defaultParameters,
-      fontUrls: ["assets/color-shapes/fonts/roboto/Roboto-Regular.ttf"],
+      fonts: [
+        {
+          fontName: "roboto",
+          url: "fonts/roboto/Roboto-Regular.ttf"
+        }
+      ],
       images: [
         {
           imageName: "instructions-1",
           height: 256,
           width: 256,
-          url: "assets/color-shapes/img/cs-instructions-1.png"
+          url: "images/cs-instructions-1.png"
         },
         {
           imageName: "instructions-2",
           height: 256,
           width: 256,
-          url: "assets/color-shapes/img/cs-instructions-2.png"
+          url: "images/cs-instructions-2.png"
         },
         {
           imageName: "instructions-3",
           height: 330,
           width: 256,
-          url: "assets/color-shapes/img/cs-instructions-3.png"
+          url: "images/cs-instructions-3.png"
         },
         {
           imageName: "circle-x",
@@ -272,7 +277,7 @@ class ColorShapes extends Game {
           width: 32,
           // the svg is from evericons and is licensed under CC0 1.0
           // Universal (Public Domain). see https://www.patreon.com/evericons
-          url: "assets/color-shapes/img/circle-x.svg"
+          url: "images/circle-x.svg"
         }
       ]
     };

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@m2c2kit/assessment-color-shapes",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "scripts": {
     "build": "npm run clean && tsc && rollup -c",
-    "clean": "rimraf build build-nobundler dist .rollup.cache tsconfig.tsbuildinfo",
-    "postinstall": "node post-install.mjs"
+    "clean": "rimraf build build-nobundler dist .rollup.cache tsconfig.tsbuildinfo"
   },
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -16,8 +15,7 @@
   "files": [
     "dist/index.js",
     "dist/index.d.ts",
-    "assets/**",
-    "post-install.mjs"
+    "assets/**"
   ],
   "dependencies": {
     "@m2c2kit/addons": "^0.3.3",
@@ -27,7 +25,7 @@
     "@rollup/plugin-node-resolve": "15.0.2",
     "@rollup/plugin-replace": "5.0.2",
     "rimraf": "5.0.0",
-    "rollup": "3.20.6",
+    "rollup": "3.22.0",
     "rollup-plugin-copy": "3.4.0",
     "rollup-plugin-esbuild": "5.0.0",
     "typescript": "5.0.4"

package/post-install.mjs

@@ -1,72 +0,0 @@
-#!/usr/bin/env node
-import { readFileSync, existsSync } from "fs";
-import { resolve, join, dirname } from "path";
-import { env, exit } from "process";
-import { readdir, readFile, mkdir, writeFile } from "fs/promises";
-
-/**
- * Our current working directory for this postinstall script is the
- * package's root folder in node_modules, e.g., node_modules/{packageName}
- */
-
-/**
- * The folder in which npm command was executed -- this differs from the
- * current working directory.
- */
-const npmCwd = env.INIT_CWD;
-
-/**
- * If the full m2c2kit repo has been cloned and "npm install" is executed,
- * when this package is installed it will run this post-install script.
- * But, we should run this only when the package is being installed in a
- * new m2c2kit project, because it will copy assets to the
- * appropriate location in the project root. The below code will check if
- * npm install is being run on the entire m2c2kit repo, and if so, exit this
- * script before copying any assets.
- * Note: this will cause problems if someone decides to name their m2c2kit
- * project "m2c2kit".
- */
-const { name } = JSON.parse(readFileSync(join(npmCwd, "package.json")));
-if (name === "m2c2kit") {
-  exit(0);
-}
-
-async function copyFolderRecursive(options) {
-  async function getFilePathsRecursive(dir) {
-    const dirents = await readdir(dir, { withFileTypes: true });
-    const files = await Promise.all(
-      dirents.map((dirent) => {
-        const res = resolve(dir, dirent.name);
-        return dirent.isDirectory() ? getFilePathsRecursive(res) : res;
-      })
-    );
-    return Array.prototype.concat(...files);
-  }
-
-  const filePaths = await getFilePathsRecursive(options.sourceFolder);
-
-  filePaths.forEach(async (filePath) => {
-    const destinationFilePath = join(
-      options.destinationFolder,
-      filePath.replace(resolve(options.sourceFolder), options.baseFolder)
-    );
-    if (!options.overwrite && existsSync(destinationFilePath)) {
-      return;
-    }
-
-    const folder = dirname(destinationFilePath);
-    if (!existsSync(folder)) {
-      await mkdir(folder, { recursive: true });
-    }
-
-    const content = await readFile(filePath);
-    await writeFile(destinationFilePath, content);
-  });
-}
-
-copyFolderRecursive({
-  sourceFolder: "assets",
-  destinationFolder: join(npmCwd, "src"),
-  baseFolder: "assets",
-  overwrite: false,
-});