@jspsych/config 1.3.3 → 2.0.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @jspsych/config
 
+## 2.0.1
+
+### Patch Changes
+
+- [#3287](https://github.com/jspsych/jsPsych/pull/3287) [`54e04dc9`](https://github.com/jspsych/jsPsych/commit/54e04dc93f54a7a019db1fee4961dcc5e02b6fc0) Thanks [@becky-gilbert](https://github.com/becky-gilbert)! - Adds the survey.css file to the dist archive (#3131).
+
+## 2.0.0
+
+### Major Changes
+
+- [#3122](https://github.com/jspsych/jsPsych/pull/3122) [`715a9d13`](https://github.com/jspsych/jsPsych/commit/715a9d130ec1d4772ce0b61956d8c19be5348fca) Thanks [@bjoluc](https://github.com/bjoluc)! - Upgrade build tools to their latest versions. This doesn't introduce breaking changes to the artifacts built using `@jspsych/config`, but it requires some minor changes to projects using `@jspsych/config`:
+
+  - The minimum required Node.js version is now 18.0.0
+  - Jest has been upgraded from v28 to v29 and ts-jest has been replaced with the more performant Sucrase Jest plugin to avoid significant memory leaks. As a consequence, Jest does no longer type-check code. If you are facing any issues, please check Jest's [upgrade guide](https://jestjs.io/docs/upgrading-to-jest29) for instructions on updating your tests.
+  - TypeScript has been upgraded from version 4 to version 5. This is very unlikely to break anything in your code though.
+
+### Patch Changes
+
+- [#3122](https://github.com/jspsych/jsPsych/pull/3122) [`535e5d90`](https://github.com/jspsych/jsPsych/commit/535e5d903c4a5d6c71f3eecb73bc62b51e044a1f) Thanks [@bjoluc](https://github.com/bjoluc)! - Remove erroneous browser builds from the rollup configuration returned by `makeNodeRollupConfig()`
+
+- [#3184](https://github.com/jspsych/jsPsych/pull/3184) [`9acfa29c`](https://github.com/jspsych/jsPsych/commit/9acfa29c8db1d7a8816c53ac49651f15493f2cf4) Thanks [@bjoluc](https://github.com/bjoluc)! - Point to source maps via canonical unpkg URLs in NPM-published browser builds. This prevents 404 errors when using redirecting CDN URLs (as described in #3043).
+
 ## 1.3.3
 
 ### Patch Changes

package/gulp.js

@@ -82,6 +82,9 @@ export const createCoreDistArchive = () =>
     // jspsych.css
     src("packages/jspsych/css/jspsych.css").pipe(rename("/dist/jspsych.css")),
 
+    // survey.css
+    src("packages/survey/css/survey.css").pipe(rename("/dist/survey.css")),
+
     // Examples
     src("examples/**/*", { base: "." })
       // Rewrite script source paths

package/jest.cjs

@@ -1,21 +1,13 @@
-const ts = require("typescript");
-const { pathsToModuleNameMapper } = require("ts-jest");
+const hq = require("alias-hq");
 
 /** @type { (dirname: string) => import('@jest/types').Config.InitialOptions } */
 module.exports.makePackageConfig = (dirname) => {
   const packageJson = require(dirname + "/package.json");
   const packageBaseName = packageJson.name.replace("@jspsych/", "");
 
-  // based on https://github.com/formium/tsdx/blob/462af2d002987f985695b98400e0344b8f2754b7/src/createRollupConfig.ts#L51-L57
-  const tsCompilerOptions = ts.parseJsonConfigFileContent(
-    ts.readConfigFile(dirname + "/tsconfig.json", ts.sys.readFile).config,
-    ts.sys,
-    dirname
-  ).options;
-
   return {
-    preset: "ts-jest",
-    moduleNameMapper: pathsToModuleNameMapper(tsCompilerOptions.paths, { prefix: "<rootDir>/" }),
+    transform: { "\\.(js|jsx|ts|tsx)$": "@sucrase/jest-plugin" },
+    moduleNameMapper: hq.load(dirname + "/tsconfig.json").get("jest"),
     testEnvironment: "jsdom",
     testEnvironmentOptions: {
       fetchExternalResources: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jspsych/config",
-  "version": "1.3.3",
+  "version": "2.0.1",
   "description": "Shared (build) configuration for jsPsych packages",
   "type": "module",
   "exports": {
@@ -25,7 +25,7 @@
     "./tsconfig.contrib.json": "./tsconfig.contrib.json"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=18.0.0"
   },
   "repository": {
     "type": "git",
@@ -39,33 +39,35 @@
   },
   "homepage": "https://www.jspsych.org/latest/developers/configuration",
   "dependencies": {
-    "@babel/cli": "7.17.10",
-    "@babel/core": "7.17.10",
-    "@babel/preset-env": "7.17.10",
-    "@rollup/plugin-babel": "5.3.1",
-    "@rollup/plugin-commonjs": "22.0.0",
-    "@rollup/plugin-json": "4.1.0",
-    "@rollup/plugin-node-resolve": "13.3.0",
-    "@rollup/plugin-replace": "4.0.0",
-    "@types/gulp": "4.0.9",
-    "@types/jest": "27.5.1",
+    "@babel/cli": "7.23.0",
+    "@babel/core": "7.23.3",
+    "@babel/preset-env": "7.23.3",
+    "@rollup/plugin-babel": "6.0.4",
+    "@rollup/plugin-commonjs": "25.0.7",
+    "@rollup/plugin-json": "6.0.1",
+    "@rollup/plugin-node-resolve": "15.2.3",
+    "@rollup/plugin-replace": "5.0.5",
+    "@rollup/plugin-terser": "0.4.4",
+    "@sucrase/jest-plugin": "3.0.0",
+    "@types/gulp": "4.0.17",
+    "@types/jest": "29.5.8",
+    "alias-hq": "6.2.3",
     "babel-preset-minify": "0.5.2",
-    "canvas": "2.11.2",
+    "canvas": "^2.11.2",
     "gulp": "4.0.2",
     "gulp-cli": "2.3.0",
     "gulp-file": "^0.4.0",
     "gulp-rename": "2.0.0",
-    "gulp-replace": "1.1.3",
-    "gulp-zip": "5.1.0",
-    "jest": "28.1.0",
-    "jest-environment-jsdom": "28.1.0",
+    "gulp-replace": "1.1.4",
+    "gulp-zip": "6.0.0",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
     "merge-stream": "2.0.0",
-    "regenerator-runtime": "0.13.9",
-    "rollup": "2.73.0",
-    "rollup-plugin-terser": "7.0.2",
-    "rollup-plugin-typescript2": "0.31.2",
-    "ts-jest": "28.0.2",
-    "tslib": "2.4.0",
-    "typescript": "^4.6.4"
+    "regenerator-runtime": "0.14.0",
+    "rollup": "4.3.0",
+    "rollup-plugin-typescript2": "0.36.0",
+    "sucrase": "3.34.0",
+    "tslib": "2.6.2",
+    "typescript": "^5.2.2"
   }
 }

package/rollup.js

@@ -1,14 +1,21 @@
+import { readFileSync } from "node:fs";
+
 import { DEFAULT_EXTENSIONS as babelDefaultExtensions } from "@babel/core";
 import { babel } from "@rollup/plugin-babel";
 import commonjs from "@rollup/plugin-commonjs";
 import json from "@rollup/plugin-json";
 import resolve from "@rollup/plugin-node-resolve";
 import replace from "@rollup/plugin-replace";
+import terser from "@rollup/plugin-terser";
 import { defineConfig } from "rollup";
-import { terser } from "rollup-plugin-terser";
 import typescript from "rollup-plugin-typescript2";
 import ts from "typescript";
 
+const getPackageInfo = () => {
+  const { name, version } = JSON.parse(readFileSync("./package.json"));
+  return { name, version };
+};
+
 const makeConfig = ({
   outputOptions = {},
   globalOptions = {},
@@ -16,7 +23,8 @@ const makeConfig = ({
   isNodeOnlyBuild = false,
 }) => {
   const source = "src/index";
-  const destination = "dist/index";
+  const destinationDirectory = "dist";
+  const destination = `${destinationDirectory}/index`;
 
   outputOptions = {
     sourcemap: true,
@@ -62,11 +70,20 @@ const makeConfig = ({
     },
   ];
 
+  let sourcemapBaseUrl;
   if (!isNodeOnlyBuild) {
+    // In builds that are published to NPM (potentially every CI build), point to sourcemaps via the
+    // package's canonical unpkg URL
+    if (process.env.CI) {
+      const { name, version } = getPackageInfo();
+      sourcemapBaseUrl = `https://unpkg.com/${name}@${version}/${destinationDirectory}/`;
+    }
+
     output.push({
       // Build file to be used for tinkering in modern browsers
       file: `${destination}.browser.js`,
       format: "iife",
+      sourcemapBaseUrl,
       ...outputOptions,
       ...iifeOutputOptions,
     });
@@ -103,6 +120,7 @@ const makeConfig = ({
           file: `${destination}.browser.min.js`,
           format: "iife",
           plugins: [terser()],
+          sourcemapBaseUrl,
           ...outputOptions,
           ...iifeOutputOptions,
         },
@@ -148,5 +166,5 @@ export const makeCoreRollupConfig = () =>
 export const makeNodeRollupConfig = () =>
   makeConfig({
     globalOptions: { external: ["jspsych"] },
-    nodeOnly: true,
+    isNodeOnlyBuild: true,
   });