Skip to content

Commit 733b6db

Browse files
authored
Merge pull request #5 from devcontainer-config/dev
Update versions
2 parents 37cd9de + f14fefc commit 733b6db

11 files changed

Lines changed: 66 additions & 69 deletions

File tree

.config/eslint/eslint.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { FlatCompat } from "@eslint/eslintrc";
22
import eslint from "@eslint/js";
3+
import vitest from "@vitest/eslint-plugin";
34
import prettier from "eslint-config-prettier";
45
import { gitignore } from "eslint-flat-config-gitignore";
56
import nodePlugin from "eslint-plugin-n";
67
import simpleImportSort from "eslint-plugin-simple-import-sort";
78
import eslintPluginUnicorn from "eslint-plugin-unicorn";
8-
import vitest from "eslint-plugin-vitest";
99
import globals from "globals";
1010
import tsESLint from "typescript-eslint";
1111

.config/eslint/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"extends": "../typescript/tsconfig.node.json",
33
"compilerOptions": {
44
"noEmitOnError": true
5-
}
5+
},
6+
"exclude": []
67
}

.config/typescript/tsconfig.node.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "@tsconfig/node20/tsconfig.json",
2+
"extends": "@tsconfig/node22/tsconfig.json",
33
"compilerOptions": {
44
"resolveJsonModule": true
55
}

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM mcr.microsoft.com/devcontainers/javascript-node:20
1+
FROM mcr.microsoft.com/devcontainers/javascript-node:22
22

33
RUN npm install --global pnpm@latest-9

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
},
4343
"eslint.runtime": "/usr/local/bin/node",
4444
"eslint.workingDirectories": ["/workspaces"],
45-
"eslint.experimental.useFlatConfig": true,
4645
"typescript.preferences.importModuleSpecifier": "non-relative",
4746
"typescript.preferences.includePackageJsonAutoImports": "on",
4847
"typescript.tsdk": "/workspaces/node_modules/typescript/lib",
4948
"[csharp]": {
5049
"editor.defaultFormatter": "csharpier.csharpier-vscode"
51-
}
50+
},
51+
"vitest.rootConfig": "vite.config.ts"
5252
}
5353
}
5454
},

package.json

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,48 +12,45 @@
1212
"test": "vite-node scripts/test.ts",
1313
"watch": "vite-node scripts/watch.ts"
1414
},
15-
"resolutions": {
16-
"eslint>file-entry-cache": "^8.0.0"
17-
},
1815
"dependencies": {
1916
"@commander-js/extra-typings": "^12.1.0",
20-
"@eslint/eslintrc": "^3.1.0",
21-
"@eslint/js": "^9.3.0",
17+
"@eslint/eslintrc": "^3.2.0",
18+
"@eslint/js": "^9.16.0",
2219
"@prettier/plugin-xml": "^3.4.1",
23-
"@tsconfig/node20": "^20.1.4",
20+
"@tsconfig/node22": "^22.0.0",
21+
"@vitest/eslint-plugin": "^1.1.16",
2422
"commander": "~12.1.0",
25-
"cspell": "^8.8.3",
26-
"eslint": "^8.57.0",
23+
"cspell": "^8.16.1",
24+
"eslint": "^9.16.0",
2725
"eslint-config-prettier": "^9.1.0",
2826
"eslint-flat-config-gitignore": "^2.0.0",
29-
"eslint-plugin-import": "^2.29.1",
30-
"eslint-plugin-n": "^17.7.0",
31-
"eslint-plugin-simple-import-sort": "^12.1.0",
32-
"eslint-plugin-unicorn": "^53.0.0",
33-
"eslint-plugin-vitest": "^0.5.4",
34-
"execa": "^9.1.0",
35-
"glob": "^10.4.1",
36-
"globals": "^15.3.0",
37-
"isomorphic-git": "^1.25.10",
38-
"prettier": "^3.2.5",
39-
"prettier-plugin-ini": "^1.2.0",
40-
"prettier-plugin-packagejson": "^2.5.0",
41-
"semver": "^7.6.2",
42-
"syncpack": "^12.3.2",
43-
"type-fest": "^4.18.2",
44-
"typescript": "^5.4.5",
45-
"typescript-eslint": "^7.10.0",
46-
"vite": "^5.2.11",
47-
"vite-node": "^1.6.0",
48-
"vite-tsconfig-paths": "^4.3.2",
49-
"vitest": "^1.6.0"
27+
"eslint-plugin-import": "^2.31.0",
28+
"eslint-plugin-n": "^17.15.0",
29+
"eslint-plugin-simple-import-sort": "^12.1.1",
30+
"eslint-plugin-unicorn": "^56.0.1",
31+
"execa": "^9.5.2",
32+
"glob": "^11.0.0",
33+
"globals": "^15.13.0",
34+
"isomorphic-git": "1.27.1",
35+
"prettier": "^3.4.2",
36+
"prettier-plugin-ini": "^1.3.0",
37+
"prettier-plugin-packagejson": "^2.5.6",
38+
"semver": "^7.6.3",
39+
"syncpack": "^13.0.0",
40+
"type-fest": "^4.30.1",
41+
"typescript": "~5.6.3",
42+
"typescript-eslint": "^8.18.0",
43+
"vite": "^6.0.3",
44+
"vite-node": "^2.1.8",
45+
"vite-tsconfig-paths": "^5.1.4",
46+
"vitest": "^2.1.8"
5047
},
5148
"devDependencies": {
52-
"@types/eslint": "^8.56.10",
49+
"@types/eslint": "^9.6.1",
5350
"@types/eslint-config-prettier": "^6.11.3",
54-
"@types/eslint__eslintrc": "^2.1.1",
51+
"@types/eslint__eslintrc": "^2.1.2",
5552
"@types/eslint__js": "^8.42.3",
56-
"@types/node": "^20.12.12",
53+
"@types/node": "^22.10.2",
5754
"@types/semver": "^7.5.8"
5855
},
5956
"engines": {

setup/configs/typescript/workspace.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export const createTypeScriptWorkspaceConfigs = async (
6060
dependencies: {
6161
...dependencies,
6262
...commanderVersion,
63-
eslint: "^8.57.0", // Wait until typescript-eslint updates peer dependencies to ESLint 9
63+
typescript: "~5.6.3", // TypeScript 5.7 breaks json import for --module=node16, wait for https://github.com/microsoft/TypeScript/issues/60705
6464
},
6565
devDependencies: {
6666
...devDependencies,

setup/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@
1616
"@commander-js/extra-typings": "^12.1.0",
1717
"@prettier/plugin-xml": "^3.4.1",
1818
"commander": "~12.1.0",
19-
"cspell-lib": "^8.8.3",
19+
"cspell-lib": "^8.16.1",
2020
"dedent": "^1.5.3",
2121
"default-composer": "^0.6.0",
22-
"fast-xml-parser": "^4.4.0",
23-
"jsonc-parser": "^3.2.1",
22+
"fast-xml-parser": "^4.5.0",
23+
"jsonc-parser": "^3.3.1",
2424
"lodash-es": "^4.17.21",
2525
"node-fetch": "^3.3.2",
2626
"oci-registry-client": "^0.2.0",
27-
"pacote": "^18.0.6",
28-
"prettier": "^3.2.5",
29-
"prettier-plugin-ini": "^1.2.0",
30-
"prettier-plugin-packagejson": "^2.5.0",
31-
"semver": "^7.6.2",
32-
"type-fest": "^4.18.2",
33-
"write-file-atomic": "^5.0.1"
27+
"pacote": "^21.0.0",
28+
"prettier": "^3.4.2",
29+
"prettier-plugin-ini": "^1.3.0",
30+
"prettier-plugin-packagejson": "^2.5.6",
31+
"semver": "^7.6.3",
32+
"type-fest": "^4.30.1",
33+
"write-file-atomic": "^6.0.0"
3434
},
3535
"devDependencies": {
3636
"@types/lodash-es": "^4.17.12",
37-
"@types/node": "^20.12.12",
37+
"@types/node": "^22.10.2",
3838
"@types/pacote": "^11.1.8",
3939
"@types/semver": "^7.5.8",
4040
"@types/write-file-atomic": "^4.0.3"

setup/templates/typescript/.config/typescript/tsconfig.node.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "@tsconfig/node20/tsconfig.json",
2+
"extends": "@tsconfig/node22/tsconfig.json",
33
"compilerOptions": {
44
"resolveJsonModule": true
55
}

setup/templates/typescript/.devcontainer/devcontainer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
},
1010
"eslint.runtime": "/usr/local/bin/node",
1111
"eslint.workingDirectories": ["/workspaces"],
12-
"eslint.experimental.useFlatConfig": true,
1312
"typescript.preferences.importModuleSpecifier": "non-relative",
1413
"typescript.preferences.includePackageJsonAutoImports": "on",
1514
"typescript.tsdk": "/workspaces/node_modules/typescript/lib"

0 commit comments

Comments
 (0)