Skip to content

Commit 313231c

Browse files
authored
Merge pull request #3488 from jspsych/remove-canvas-dependency-from-config
Replace `canvas` dependency in`@jspsych/config` with `jest-canvas-mock`
2 parents 6e74767 + 4a796c7 commit 313231c

File tree

9 files changed

+2132
-4509
lines changed

9 files changed

+2132
-4509
lines changed

.changeset/little-roses-kick.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@jspsych/config": patch
3+
---
4+
5+
Replaces the dependency on `canvas` in `@jspsych/config` with `jest-canvas-mock`.

package-lock.json

Lines changed: 2115 additions & 4501 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,17 @@
2727
"devDependencies": {
2828
"@changesets/changelog-github": "^0.4.7",
2929
"@changesets/cli": "^2.25.2",
30-
"@jspsych/config": "^3.0.0",
30+
"@jspsych/config": "^3.2.1",
3131
"husky": "^8.0.3",
3232
"import-sort-style-module": "^6.0.0",
3333
"lint-staged": "^13.0.3",
3434
"prettier": "^2.7.1",
3535
"prettier-plugin-import-sort": "^0.0.7",
3636
"turbo": "^1.6.3"
3737
},
38+
"overrides": {
39+
"typescript": "^5.0.0"
40+
},
3841
"prettier": {
3942
"printWidth": 100
4043
},

packages/config/jest.cjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module.exports.makePackageConfig = (dirname) => {
1818
displayName: {
1919
name: packageBaseName,
2020
color: packageBaseName === "jspsych" ? "white" : "cyanBright",
21-
}
21+
},
22+
setupFiles: [require.resolve("jest-canvas-mock")],
2223
};
2324
};

packages/config/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
"@types/node": "^22.10.10",
5353
"alias-hq": "6.2.4",
5454
"app-root-path": "^3.1.0",
55-
"canvas": "^2.11.2",
5655
"esbuild": "0.23.1",
5756
"glob": "7.2.3",
5857
"gulp": "5.0.0",
@@ -62,6 +61,7 @@
6261
"gulp-replace": "1.1.4",
6362
"gulp-zip": "6.0.0",
6463
"jest": "29.7.0",
64+
"jest-canvas-mock": "2.5.0",
6565
"jest-environment-jsdom": "29.7.0",
6666
"merge-stream": "2.0.0",
6767
"rollup": "4.21.2",
@@ -71,6 +71,6 @@
7171
"rollup-plugin-node-externals": "7.1.3",
7272
"sucrase": "3.34.0",
7373
"tslib": "2.6.2",
74-
"typescript": "^5.2.2"
74+
"typescript": "^5.7.0"
7575
}
7676
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
},
3939
"devDependencies": {
4040
"@jspsych/config": "^3.2.0",
41-
"@jspsych/test-utils": "^1.2.0"
41+
"@jspsych/test-utils": "^1.2.0"
4242
}
4343
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
},
3939
"devDependencies": {
4040
"@jspsych/config": "^3.2.0",
41-
"@jspsych/test-utils": "^1.2.0"
41+
"@jspsych/test-utils": "^1.2.0"
4242
}
4343
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
},
3939
"devDependencies": {
4040
"@jspsych/config": "^3.2.0",
41-
"@jspsych/test-utils": "^1.2.0"
41+
"@jspsych/test-utils": "^1.2.0"
4242
}
4343
}

packages/plugin-sketchpad/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
},
3939
"devDependencies": {
4040
"@jspsych/config": "^3.2.0",
41-
"@jspsych/test-utils": "^1.2.0"
41+
"@jspsych/test-utils": "^1.2.0"
4242
}
4343
}

0 commit comments

Comments
 (0)