HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-10 11:10:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

This fixes build errors, but warnings are still present. Adds rollup/json plugin back into build chain.

Browse Source
This commit is contained in:
Josh de Leeuw 2024-09-11 13:57:02 -04:00
parent 7ca68ea38d
commit 62d34278a3
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -27,7 +27,7 @@
"devDependencies": { "devDependencies": {
"@changesets/changelog-github": "^0.4.7", "@changesets/changelog-github": "^0.4.7",
"@changesets/cli": "^2.25.2", "@changesets/cli": "^2.25.2",
"@jspsych/config": "^1.3.2", "@jspsych/config": "^3.0.0",
"husky": "^8.0.2", "husky": "^8.0.2",
"import-sort-style-module": "^6.0.0", "import-sort-style-module": "^6.0.0",
"lint-staged": "^13.0.3", "lint-staged": "^13.0.3",

18
packages/config/rollup.js
View File

@ -2,6 +2,7 @@ import { readFileSync } from "node:fs";
import path from "path"; import path from "path";
import commonjs from "@rollup/plugin-commonjs"; import commonjs from "@rollup/plugin-commonjs";
import json from "@rollup/plugin-json";
import resolve from "@rollup/plugin-node-resolve"; import resolve from "@rollup/plugin-node-resolve";
import { defineConfig } from "rollup"; import { defineConfig } from "rollup";
import dts from "rollup-plugin-dts"; import dts from "rollup-plugin-dts";
@ -29,7 +30,7 @@ const makeConfig = ({
outputOptions = {}, outputOptions = {},
globalOptions = {}, globalOptions = {},
iifeOutputOptions = {}, iifeOutputOptions = {},
plugins = [], additionalPlugins = [],
isNodeOnlyBuild = false, isNodeOnlyBuild = false,
}) => { }) => {
const input = "src/index.ts"; const input = "src/index.ts";
@ -43,7 +44,7 @@ const makeConfig = ({
/** @type{import("rollup-plugin-esbuild").Options} */ /** @type{import("rollup-plugin-esbuild").Options} */
const esBuildPluginOptions = { const esBuildPluginOptions = {
loaders: { ".json": "json" }, //loaders: { ".json": "json" },
}; };
/** @type{import("@rollup/plugin-commonjs").RollupCommonJSOptions} */ /** @type{import("@rollup/plugin-commonjs").RollupCommonJSOptions} */
@ -73,8 +74,9 @@ const makeConfig = ({
...globalOptions, ...globalOptions,
input, input,
plugins: [ plugins: [
...plugins, ...additionalPlugins,
externals(), externals(),
json(),
esbuild({ ...esBuildPluginOptions, target: "node18" }), esbuild({ ...esBuildPluginOptions, target: "node18" }),
commonjs(commonjsPluginOptions), commonjs(commonjsPluginOptions),
], ],
@ -99,11 +101,12 @@ const makeConfig = ({
...globalOptions, ...globalOptions,
input, input,
plugins: [ plugins: [
...plugins, ...additionalPlugins,
externals({ deps: false }), externals({ deps: false }),
resolve({ preferBuiltins: false }), resolve({ preferBuiltins: false }),
esbuild({ ...esBuildPluginOptions, target: "esnext" }), json(),
commonjs(commonjsPluginOptions), commonjs(commonjsPluginOptions),
esbuild({ ...esBuildPluginOptions, target: "esnext" }),
], ],
output: { output: {
file: `${destination}.browser.js`, file: `${destination}.browser.js`,
@ -119,9 +122,10 @@ const makeConfig = ({
...globalOptions, ...globalOptions,
input, input,
plugins: [ plugins: [
...plugins, ...additionalPlugins,
externals({ deps: false }), externals({ deps: false }),
resolve({ preferBuiltins: false }), resolve({ preferBuiltins: false }),
json(),
esbuild({ ...esBuildPluginOptions, target: "es2015", minify: true }), esbuild({ ...esBuildPluginOptions, target: "es2015", minify: true }),
commonjs(commonjsPluginOptions), commonjs(commonjsPluginOptions),
], ],
@ -150,7 +154,7 @@ export const makeRollupConfig = (iifeName) =>
outputOptions: { outputOptions: {
exports: "default", exports: "default",
globals: { jspsych: "jsPsychModule" }, globals: { jspsych: "jsPsychModule" },
plugins: [cffToJsonPlugin()], additionalPlugins: [cffToJsonPlugin()],
}, },
globalOptions: { external: ["jspsych"] }, globalOptions: { external: ["jspsych"] },
iifeOutputOptions: { name: iifeName }, iifeOutputOptions: { name: iifeName },