Skip to content

Commit 643dd59

Browse files
authored
Merge pull request #368 from idrawjs/dev-v0.4
chore: bump deps and action scripts
2 parents 58568e7 + 4ab2a64 commit 643dd59

11 files changed

Lines changed: 3397 additions & 2378 deletions

File tree

.github/workflows/coverage.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ jobs:
1515
if: github.repository == 'idrawjs/idraw'
1616
strategy:
1717
matrix:
18-
node-version: [22.x]
18+
node-version: [24.x]
1919
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- name: Use Node.js ${{ matrix.node-version }}
24-
uses: actions/setup-node@v4
24+
uses: actions/setup-node@v5
2525
with:
2626
node-version: ${{ matrix.node-version }}
2727
- run: npm config set registry https://registry.yarnpkg.com/
2828
# - run: npm install
29-
- run: npm install --global pnpm
29+
- run: npm install --global pnpm@10
3030
- run: pnpm i
3131
- run: npm run beforetest
3232
- run: npm run cover

.github/workflows/node.js.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ jobs:
1515
if: github.repository == 'idrawjs/idraw'
1616
strategy:
1717
matrix:
18-
node-version: [22.x]
18+
node-version: [24.x]
1919
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- name: Use Node.js ${{ matrix.node-version }}
24-
uses: actions/setup-node@v4
24+
uses: actions/setup-node@v5
2525
with:
2626
node-version: ${{ matrix.node-version }}
2727
- run: npm config set registry https://registry.yarnpkg.com/
2828
# - run: npm install
29-
- run: npm install --global pnpm
29+
- run: npm install --global pnpm@10
3030
- run: pnpm i
3131
- run: npm run beforetest
3232
- run: npm run test

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
contents: read
1111
id-token: write
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
# Setup .npmrc file to publish to npm
15-
- uses: actions/setup-node@v4
15+
- uses: actions/setup-node@v5
1616
with:
17-
node-version: '22.x'
17+
node-version: '24.x'
1818
registry-url: 'https://registry.npmjs.org'
19-
- run: npm install --global pnpm
19+
- run: npm install --global pnpm@10
2020
- run: pnpm i
2121
- run: npm run test
2222
- run: npm run build

.vscode/settings.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
{
22
"editor.formatOnSave": true,
33
"eslint.format.enable": true,
4+
"eslint.useFlatConfig": true,
5+
"eslint.lintTask.enable": true,
6+
"eslint.lintTask.options": "--config eslint.config.js .",
7+
"eslint.validate": [
8+
"javascript",
9+
"javascriptreact",
10+
"typescript",
11+
"typescriptreact",
12+
"html"
13+
],
14+
"editor.codeActionsOnSave": {
15+
"source.fixAll.eslint": "explicit"
16+
},
417
"prettier.configPath": ".prettierrc.json",
518
"[typescript]": {
619
"editor.defaultFormatter": "esbenp.prettier-vscode"

eslint.config.mjs

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import globals from 'globals';
2+
import pluginJs from '@eslint/js';
3+
import tsESLint from 'typescript-eslint';
4+
import eslintPluginReact from 'eslint-plugin-react';
5+
import eslintPluginNode from 'eslint-plugin-n';
6+
import typescriptEslint from '@typescript-eslint/eslint-plugin';
7+
import tsParser from '@typescript-eslint/parser';
8+
9+
/** @type {import('eslint').Linter.Config[]} */
10+
export default [
11+
pluginJs.configs.recommended,
12+
...tsESLint.configs.recommended,
13+
eslintPluginReact.configs.flat.recommended,
14+
{
15+
...eslintPluginNode.configs['flat/recommended-script'],
16+
files: ['scripts/**/*.ts', 'babel.config.js', 'jest.*.js', 'jest.*.*.js'],
17+
rules: {
18+
// 'no-console': 'error'
19+
}
20+
},
21+
{
22+
// files: ['src/**/*.{js,mjs,cjs,ts,jsx,tsx}'],
23+
files: ['packages/*/src/**/*.ts'],
24+
languageOptions: {
25+
globals: globals.browser,
26+
parser: tsParser,
27+
ecmaVersion: 'latest',
28+
sourceType: 'module',
29+
parserOptions: {}
30+
},
31+
plugins: {
32+
'@typescript-eslint': typescriptEslint
33+
},
34+
ignores: ['node_modules'],
35+
rules: {
36+
semi: 'error',
37+
'no-console': 'error',
38+
'comma-dangle': ['always-multiline'],
39+
'@typescript-eslint/rule-name': 0,
40+
'@typescript-eslint/no-explicit-any': 0,
41+
'@typescript-eslint/explicit-module-boundary-types': 0,
42+
'@typescript-eslint/no-unnecessary-type-constraint': 0
43+
}
44+
}
45+
];

package.json

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,47 +30,56 @@
3030
"upgrade:version": "npm run version:reset && pnpm i"
3131
},
3232
"devDependencies": {
33-
"@babel/core": "^7.27.1",
34-
"@babel/preset-env": "^7.27.2",
33+
"@babel/core": "^7.28.4",
34+
"@babel/preset-env": "^7.28.3",
3535
"@babel/preset-typescript": "^7.27.1",
36+
"@eslint/js": "^9.35.0",
3637
"@rollup/plugin-json": "^6.1.0",
3738
"@types/glob": "^8.1.0",
38-
"@types/jest": "^29.5.14",
39+
"@types/jest": "^30.0.0",
3940
"@types/koa-compose": "^3.2.8",
40-
"@types/node": "^22.15.17",
41+
"@types/node": "^24.3.1",
4142
"@types/serve-handler": "^6.1.4",
42-
"@typescript-eslint/eslint-plugin": "^8.32.0",
43-
"@typescript-eslint/parser": "^8.32.0",
44-
"@vitejs/plugin-react": "^4.4.1",
45-
"babel-jest": "^29.7.0",
46-
"chalk": "^5.4.1",
47-
"dotenv": "^16.5.0",
43+
"@typescript-eslint/eslint-plugin": "^8.42.0",
44+
"@typescript-eslint/parser": "^8.42.0",
45+
"@vitejs/plugin-react": "^5.0.2",
46+
"babel-jest": "^30.1.2",
47+
"chalk": "^5.6.0",
48+
"dotenv": "^17.2.2",
4849
"enquirer": "^2.4.1",
49-
"esbuild": "^0.25.4",
50-
"eslint": "^9.26.0",
51-
"execa": "^9.5.3",
52-
"fs-extra": "^11.3.0",
53-
"glob": "^11.0.2",
50+
"esbuild": "^0.25.9",
51+
"eslint": "^9.35.0",
52+
"eslint-plugin-n": "^17.21.3",
53+
"eslint-plugin-react": "^7.37.5",
54+
"execa": "^9.6.0",
55+
"fs-extra": "^11.3.1",
56+
"glob": "^11.0.3",
57+
"globals": "^16.3.0",
5458
"http-server": "^14.1.1",
5559
"husky": "^9.1.7",
56-
"jest": "^29.7.0",
60+
"jest": "^30.1.3",
5761
"jest-canvas-mock": "^2.5.2",
58-
"jest-environment-jsdom": "^29.7.0",
62+
"jest-environment-jsdom": "^30.1.2",
5963
"jimp": "^1.6.0",
6064
"koa-compose": "^4.1.0",
61-
"less": "^4.3.0",
65+
"less": "^4.4.1",
6266
"pixelmatch": "^7.1.0",
6367
"pngjs": "^7.0.0",
64-
"puppeteer": "^24.8.2",
65-
"rollup": "^4.40.2",
66-
"rollup-plugin-dts": "^6.2.1",
68+
"puppeteer": "^24.19.0",
69+
"rollup": "^4.50.0",
70+
"rollup-plugin-dts": "^6.2.3",
6771
"rollup-plugin-esbuild": "^6.2.1",
6872
"serve-handler": "^6.1.6",
69-
"terser": "^5.39.0",
70-
"ts-morph": "^25.0.1",
73+
"terser": "^5.44.0",
74+
"ts-morph": "^26.0.0",
7175
"ts-node": "^10.9.2",
7276
"tslib": "^2.8.1",
73-
"typescript": "^5.8.3",
74-
"vite": "^6.3.5"
77+
"typescript": "^5.9.2",
78+
"typescript-eslint": "^8.42.0",
79+
"vite": "^7.1.4"
80+
},
81+
"engines": {
82+
"pnpm": ">=10",
83+
"node": ">=24"
7584
}
7685
}

packages/util/__tests__/lib/__snapshots__/context.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`@idraw/board: src/lib/context Context 1`] = `
44
[
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`@idraw/util: lib/file downloadImageFromCanvas 1`] = `<canvas />`;

0 commit comments

Comments
 (0)