Skip to content

Commit f2a820b

Browse files
RedCMDRedCMD
authored
Merge branch 'main' into patch-1
2 parents 92d2ce5 + aa12f70 commit f2a820b

File tree

15 files changed

+2516
-1872
lines changed

15 files changed

+2516
-1872
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
node-version: [18.x, 20.x]
16+
node-version: [20.x, 22.x]
1717
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
1818

1919
steps:

‎build/pipeline.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ extends:
3434
testPlatforms:
3535
- name: Linux
3636
nodeVersions:
37-
- 18.x
3837
- 20.x
38+
- 22.x
3939
- name: MacOS
4040
nodeVersions:
41-
- 18.x
4241
- 20.x
42+
- 22.x
4343
- name: Windows
4444
nodeVersions:
45-
- 18.x
4645
- 20.x
46+
- 22.x
4747

4848
testSteps:
4949
- script: npm i

‎generators/app/dependencyVersions/package.json‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,33 @@
55
"private": true,
66
"dependencies": {
77
"@types/mocha": "^10.0.10",
8-
"@types/node": "20.x",
8+
"@types/node": "22.x",
99
"@types/assert": "^1.5.11",
10-
"@typescript-eslint/eslint-plugin": "^8.31.1",
11-
"@typescript-eslint/parser": "^8.31.1",
12-
"eslint": "^9.25.1",
13-
"glob": "^11.0.2",
14-
"mocha": "^11.1.0",
15-
"typescript": "^5.8.3",
16-
"@vscode/test-cli": "^0.0.11",
10+
"typescript-eslint": "^8.48.1",
11+
"eslint": "^9.39.1",
12+
"glob": "^13.0.0",
13+
"mocha": "^11.7.5",
14+
"typescript": "^5.9.3",
15+
"@vscode/test-cli": "^0.0.12",
1716
"@vscode/test-electron": "^2.5.2",
18-
"@vscode/test-web": "^0.0.71",
17+
"@vscode/test-web": "^0.0.77",
1918
"@types/webpack-env": "^1.18.8",
20-
"@types/vscode-notebook-renderer": "^1.72.3",
21-
"concurrently": "^9.1.2",
19+
"@types/vscode-notebook-renderer": "^1.72.4",
20+
"concurrently": "^9.2.1",
2221
"css-loader": "^7.1.2",
2322
"fork-ts-checker-webpack-plugin": "^9.1.0",
2423
"style-loader": "^4.0.0",
25-
"ts-loader": "^9.5.2",
24+
"ts-loader": "^9.5.4",
2625
"vscode-dts": "^0.3.3",
2726
"vscode-notebook-error-overlay": "^1.1.0",
28-
"webpack": "^5.99.7",
27+
"webpack": "^5.103.0",
2928
"util": "^0.12.5",
3029
"webpack-cli": "^6.0.1",
31-
"webpack-dev-server": "^5.2.1",
30+
"webpack-dev-server": "^5.2.2",
3231
"assert": "^2.1.0",
3332
"process": "^0.11.10",
3433
"npm-run-all": "^4.1.5",
35-
"esbuild": "^0.25.3",
34+
"esbuild": "^0.27.1",
3635
"@esbuild-plugins/node-globals-polyfill": "^0.2.3"
3736
}
3837
}

‎generators/app/env.js‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,38 @@ import * as fs from 'fs';
77
import * as path from 'path';
88
import { fileURLToPath } from 'url';
99

10-
const fallbackVersion = '^1.54.0';
10+
const fallbackVersion = '^1.103.0';
1111
let versionPromise = undefined;
1212

1313
export function getLatestVSCodeVersion() {
1414
if (!versionPromise) {
15-
versionPromise = request.xhr({ url: 'https://update.code.visualstudio.com/api/releases/stable', headers: { "X-API-Version": "2" } }).then(res => {
16-
if (res.status === 200) {
17-
try {
18-
var tagsAndCommits = JSON.parse(res.responseText);
19-
if (Array.isArray(tagsAndCommits) && tagsAndCommits.length > 0) {
20-
var segments = tagsAndCommits[0].version.split('.');
21-
if (segments.length === 3) {
22-
return '^' + segments[0] + '.' + segments[1] + '.0';
15+
// Fetch the latest published @types/vscode version from the npm registry
16+
// and return a caret-pinned range (e.g. ^1.93.0).
17+
versionPromise = request
18+
.xhr({ url: 'https://registry.npmjs.org/@types/vscode/latest', headers: { 'Accept': 'application/json' } })
19+
.then(
20+
res => {
21+
if (res.status === 200) {
22+
try {
23+
const meta = JSON.parse(res.responseText);
24+
if (meta && typeof meta.version === 'string' && meta.version) {
25+
return '^' + meta.version;
26+
}
27+
} catch (e) {
28+
console.log('Problem parsing @types/vscode metadata: ' + res.responseText, e);
2329
}
30+
} else {
31+
console.warn('Unable to evaluate the latest @types/vscode version: Status code: ' + res.status + ', ' + res.responseText);
2432
}
25-
} catch (e) {
26-
console.log('Problem parsing version: ' + res.responseText, e);
33+
console.warn('Falling back to: ' + fallbackVersion);
34+
return fallbackVersion;
35+
},
36+
err => {
37+
console.warn('Unable to evaluate the latest @types/vscode version: Error: ', err);
38+
console.warn('Falling back to: ' + fallbackVersion);
39+
return fallbackVersion;
2740
}
28-
} else {
29-
console.warn('Unable to evaluate the latest vscode version: Status code: ' + res.status + ', ' + res.responseText);
30-
}
31-
console.warn('Falling back to: ' + fallbackVersion);
32-
return fallbackVersion;
33-
}, err => {
34-
console.warn('Unable to evaluate the latest vscode version: Error: ', err);
35-
console.warn('Falling back to: ' + fallbackVersion);
36-
return fallbackVersion;
37-
});
41+
);
3842
}
3943
return versionPromise;
4044
};

‎generators/app/templates/ext-command-ts/eslint.config.mjs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
import typescriptEslint from "@typescript-eslint/eslint-plugin";
2-
import tsParser from "@typescript-eslint/parser";
1+
import typescriptEslint from "typescript-eslint";
32

43
export default [{
54
files: ["**/*.ts"],
65
}, {
76
plugins: {
8-
"@typescript-eslint": typescriptEslint,
7+
"@typescript-eslint": typescriptEslint.plugin,
98
},
109

1110
languageOptions: {
12-
parser: tsParser,
11+
parser: typescriptEslint.parser,
1312
ecmaVersion: 2022,
1413
sourceType: "module",
1514
},

‎generators/app/templates/ext-command-ts/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
<%- dep("@types/vscode") %>,
3434
<%- dep("@types/mocha") %>,
3535
<%- dep("@types/node") %>,
36-
<%- dep("@typescript-eslint/eslint-plugin") %>,
37-
<%- dep("@typescript-eslint/parser") %>,
36+
<%- dep("typescript-eslint") %>,
3837
<%- dep("eslint") %>,
3938
<%- dep("typescript") %>,
4039
<%- dep("@vscode/test-cli") %>,

‎generators/app/templates/ext-command-ts/vscode-esbuild/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
<%- dep("@types/vscode") %>,
4040
<%- dep("@types/mocha") %>,
4141
<%- dep("@types/node") %>,
42-
<%- dep("@typescript-eslint/eslint-plugin") %>,
43-
<%- dep("@typescript-eslint/parser") %>,
42+
<%- dep("typescript-eslint") %>,
4443
<%- dep("eslint") %>,
4544
<%- dep("esbuild") %>,
4645
<%- dep("npm-run-all") %>,

‎generators/app/templates/ext-command-ts/vscode-webpack/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
<%- dep("@types/vscode") %>,
3737
<%- dep("@types/mocha") %>,
3838
<%- dep("@types/node") %>,
39-
<%- dep("@typescript-eslint/eslint-plugin") %>,
40-
<%- dep("@typescript-eslint/parser") %>,
39+
<%- dep("typescript-eslint") %>,
4140
<%- dep("eslint") %>,
4241
<%- dep("typescript") %>,
4342
<%- dep("ts-loader") %>,

‎generators/app/templates/ext-command-web/esbuild-package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
<%- dep("@types/mocha") %>,
3838
<%- dep("@types/assert") %>,
3939
<%- dep("eslint") %>,
40-
<%- dep("@typescript-eslint/eslint-plugin") %>,
41-
<%- dep("@typescript-eslint/parser") %>,
40+
<%- dep("typescript-eslint") %>,
4241
<%- dep("mocha") %>,
4342
<%- dep("typescript") %>,
4443
<%- dep("@vscode/test-web") %>,

‎generators/app/templates/ext-command-web/eslint.config.mjs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
import typescriptEslint from "@typescript-eslint/eslint-plugin";
2-
import tsParser from "@typescript-eslint/parser";
1+
import typescriptEslint from "typescript-eslint";
32

43
export default [{
54
files: ["**/*.ts"],
65
}, {
76
plugins: {
8-
"@typescript-eslint": typescriptEslint,
7+
"@typescript-eslint": typescriptEslint.plugin,
98
},
109

1110
languageOptions: {
12-
parser: tsParser,
11+
parser: typescriptEslint.parser,
1312
ecmaVersion: 2022,
1413
sourceType: "module",
1514
},

0 commit comments

Comments
 (0)