diff --git a/package-lock.json b/package-lock.json index de80c07f..cc3c8a43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3569,6 +3569,27 @@ } } }, + "node_modules/@rollup/plugin-replace": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-6.0.1.tgz", + "integrity": "sha512-2sPh9b73dj5IxuMmDAsQWVFT7mR+yoHweBaXG2W/R8vQ+IWZlnaI7BR7J6EguVQUp1hd8Z7XuozpDjEKQAAC2Q==", + "license": "MIT", + "dependencies": { + "@rollup/pluginutils": "^5.0.1", + "magic-string": "^0.30.3" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, "node_modules/@rollup/pluginutils": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.2.tgz", @@ -6733,6 +6754,24 @@ "@esbuild/win32-x64": "0.23.1" } }, + "node_modules/esbuild-plugin-replace": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/esbuild-plugin-replace/-/esbuild-plugin-replace-1.4.0.tgz", + "integrity": "sha512-lP3ZAyzyRa5JXoOd59lJbRKNObtK8pJ/RO7o6vdjwLi71GfbL32NR22ZuS7/cLZkr10/L1lutoLma8E4DLngYg==", + "license": "MIT", + "dependencies": { + "magic-string": "^0.25.7" + } + }, + "node_modules/esbuild-plugin-replace/node_modules/magic-string": { + "version": "0.25.9", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", + "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", + "license": "MIT", + "dependencies": { + "sourcemap-codec": "^1.4.8" + } + }, "node_modules/escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", @@ -13803,6 +13842,41 @@ "rollup": "^3.0.0 || ^4.0.0" } }, + "node_modules/rollup-plugin-replace": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz", + "integrity": "sha512-/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA==", + "deprecated": "This module has moved and is now available at @rollup/plugin-replace. Please update your dependencies. This version is no longer maintained.", + "license": "MIT", + "dependencies": { + "magic-string": "^0.25.2", + "rollup-pluginutils": "^2.6.0" + } + }, + "node_modules/rollup-plugin-replace/node_modules/magic-string": { + "version": "0.25.9", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", + "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", + "license": "MIT", + "dependencies": { + "sourcemap-codec": "^1.4.8" + } + }, + "node_modules/rollup-pluginutils": { + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz", + "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==", + "license": "MIT", + "dependencies": { + "estree-walker": "^0.6.1" + } + }, + "node_modules/rollup-pluginutils/node_modules/estree-walker": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz", + "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==", + "license": "MIT" + }, "node_modules/rollup/node_modules/@types/estree": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", @@ -14360,6 +14434,13 @@ "source-map": "^0.6.0" } }, + "node_modules/sourcemap-codec": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", + "deprecated": "Please use @jridgewell/sourcemap-codec instead", + "license": "MIT" + }, "node_modules/sparkles": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-2.1.0.tgz", @@ -16852,12 +16933,14 @@ "@rollup/plugin-commonjs": "26.0.1", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "15.2.3", + "@rollup/plugin-replace": "^6.0.1", "@sucrase/jest-plugin": "3.0.0", "@types/gulp": "4.0.17", "@types/jest": "29.5.8", "alias-hq": "6.2.4", "canvas": "^2.11.2", "esbuild": "0.23.1", + "esbuild-plugin-replace": "^1.4.0", "gulp": "5.0.0", "gulp-cli": "3.0.0", "gulp-file": "0.4.0", @@ -16872,6 +16955,7 @@ "rollup-plugin-dts": "6.1.1", "rollup-plugin-esbuild": "6.1.1", "rollup-plugin-node-externals": "7.1.3", + "rollup-plugin-replace": "^2.2.0", "sucrase": "3.34.0", "tslib": "2.6.2", "typescript": "^5.2.2" diff --git a/packages/config/package.json b/packages/config/package.json index 8f87df3b..84e7eac0 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -36,14 +36,15 @@ "homepage": "https://www.jspsych.org/latest/developers/configuration", "dependencies": { "@rollup/plugin-commonjs": "26.0.1", - "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "15.2.3", + "@rollup/plugin-replace": "^6.0.1", "@sucrase/jest-plugin": "3.0.0", "@types/gulp": "4.0.17", "@types/jest": "29.5.8", "alias-hq": "6.2.4", "canvas": "^2.11.2", "esbuild": "0.23.1", + "esbuild-plugin-replace": "^1.4.0", "gulp": "5.0.0", "gulp-cli": "3.0.0", "gulp-file": "0.4.0", @@ -53,14 +54,15 @@ "jest": "29.7.0", "jest-environment-jsdom": "29.7.0", "merge-stream": "2.0.0", + "npm-link": "^0.0.4", "rollup": "4.21.2", "rollup-plugin-dts": "6.1.1", "rollup-plugin-esbuild": "6.1.1", "rollup-plugin-node-externals": "7.1.3", + "rollup-plugin-replace": "^2.2.0", "sucrase": "3.34.0", "tslib": "2.6.2", - "typescript": "^5.2.2", - "npm-link": "^0.0.4" + "typescript": "^5.2.2" }, "overrides": { "alias-hq": { diff --git a/packages/config/rollup.js b/packages/config/rollup.js index 0cc74a26..5f775166 100644 --- a/packages/config/rollup.js +++ b/packages/config/rollup.js @@ -3,6 +3,7 @@ import path from "path"; import commonjs from "@rollup/plugin-commonjs"; import resolve from "@rollup/plugin-node-resolve"; +import replace from "@rollup/plugin-replace"; import { defineConfig } from "rollup"; import dts from "rollup-plugin-dts"; import esbuild from "rollup-plugin-esbuild"; @@ -41,18 +42,17 @@ const makeConfig = ({ }; const citationData = generateCitation(); + console.log(JSON.stringify(citationData.apa)); /** @type{import("rollup-plugin-esbuild").Options} */ const esBuildPluginOptions = { - define: { - __APACITATION__: JSON.stringify(citationData.apa), - __BIBTEXCITATION__: JSON.stringify(citationData.bibtex), - }, + // define: { + // __APACITATION_: JSON.stringify(citationData.apa), + // __BIBTEXCITATION__: JSON.stringify(citationData.bibtex), + // }, loaders: { ".json": "json" }, }; - console.log("esBuildPluginOptions", esBuildPluginOptions); - /** @type{import("@rollup/plugin-commonjs").RollupCommonJSOptions} */ const commonjsPluginOptions = { extensions: [".js", ".json"], @@ -81,6 +81,12 @@ const makeConfig = ({ input, plugins: [ externals(), + replace({ + values: { + __APACITATION__: citationData.apa, + __BIBTEXCITATION__: citationData.bibtex, + }, + }), esbuild({ ...esBuildPluginOptions, target: "node18" }), commonjs(commonjsPluginOptions), ], @@ -106,6 +112,12 @@ const makeConfig = ({ input, plugins: [ externals({ deps: false }), + replace({ + values: { + __APACITATION__: citationData.apa, + __BIBTEXCITATION__: citationData.bibtex, + }, + }), resolve({ preferBuiltins: false }), esbuild({ ...esBuildPluginOptions, target: "esnext" }), commonjs(commonjsPluginOptions), @@ -125,6 +137,12 @@ const makeConfig = ({ input, plugins: [ externals({ deps: false }), + replace({ + values: { + __APACITATION__: citationData.apa, + __BIBTEXCITATION__: citationData.bibtex, + }, + }), resolve({ preferBuiltins: false }), esbuild({ ...esBuildPluginOptions, target: "es2015", minify: true }), commonjs(commonjsPluginOptions), diff --git a/packages/plugin-html-keyboard-response/src/index.ts b/packages/plugin-html-keyboard-response/src/index.ts index d35da352..36ffc67c 100644 --- a/packages/plugin-html-keyboard-response/src/index.ts +++ b/packages/plugin-html-keyboard-response/src/index.ts @@ -2,9 +2,6 @@ import { JsPsych, JsPsychPlugin, ParameterType, TrialType } from "jspsych"; import { version } from "../package.json"; -declare const __APACITATION__: string; -declare const __BIBTEXCITATION__: string; - const info = { name: "html-keyboard-response", version: version, @@ -84,8 +81,8 @@ const info = { }, }, citation: { - apa: __APACITATION__, - bibtex: __BIBTEXCITATION__, + apa: "__APACITATION__", + bibtex: "__BIBTEXCITATION__", }, };