Skip to content

Commit 9e2ba51

Browse files
authored
adopt node 20 in generator & extension, prepare 1.11.0 (microsoft#481)
* adopt node 20 in generator & extension, prepare 1.11.0 * generated settings.json refers to output as out instead of dist
1 parent d885e43 commit 9e2ba51

File tree

7 files changed

+55
-43
lines changed

7 files changed

+55
-43
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]
16+
node-version: [18.x, 20.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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,15 @@ extends:
3535
- name: Linux
3636
nodeVersions:
3737
- 18.x
38+
- 20.x
3839
- name: MacOS
3940
nodeVersions:
4041
- 18.x
42+
- 20.x
4143
- name: Windows
4244
nodeVersions:
4345
- 18.x
46+
- 20.x
4447

4548
testSteps:
4649
- script: npm i

generators/app/dependencyVersions/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private": true,
66
"dependencies": {
77
"@types/mocha": "^10.0.6",
8-
"@types/node": "18.x",
8+
"@types/node": "20.x",
99
"@types/assert": "^1.5.10",
1010
"@typescript-eslint/eslint-plugin": "^7.11.0",
1111
"@typescript-eslint/parser": "^7.11.0",
@@ -25,14 +25,14 @@
2525
"ts-loader": "^9.5.1",
2626
"vscode-dts": "^0.3.3",
2727
"vscode-notebook-error-overlay": "^1.0.1",
28-
"webpack": "^5.91.0",
28+
"webpack": "^5.92.0",
2929
"util": "^0.12.5",
3030
"webpack-cli": "^5.1.4",
3131
"webpack-dev-server": "^5.0.4",
3232
"assert": "^2.1.0",
3333
"process": "^0.11.10",
3434
"npm-run-all": "^4.1.5",
35-
"esbuild": "^0.21.4",
35+
"esbuild": "^0.21.5",
3636
"@esbuild-plugins/node-globals-polyfill": "^0.2.3"
3737
}
3838
}

generators/app/templates/ext-command-web/vscode-esbuild/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Place your settings in this file to overwrite default and user settings.
22
{
33
"files.exclude": {
4-
"out": false // set this to true to hide the "out" folder with the compiled JS files
4+
"dist": false // set this to true to hide the "dist" folder with the compiled JS files
55
},
66
"search.exclude": {
7-
"out": true // set this to false to include "out" folder in search results
7+
"dist": true // set this to false to include "dist" folder in search results
88
},
99
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
1010
"typescript.tsc.autoDetect": "off"

generators/app/templates/ext-command-web/vscode-webpack/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Place your settings in this file to overwrite default and user settings.
22
{
33
"files.exclude": {
4-
"out": false // set this to true to hide the "out" folder with the compiled JS files
4+
"dist": false // set this to true to hide the "dist" folder with the compiled JS files
55
},
66
"search.exclude": {
7-
"out": true // set this to false to include "out" folder in search results
7+
"dist": true // set this to false to include "dist" folder in search results
88
},
99
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
1010
"typescript.tsc.autoDetect": "off"

package-lock.json

Lines changed: 40 additions & 31 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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "generator-code",
3-
"version": "1.10.1",
3+
"version": "1.11.0",
44
"description": "Yeoman generator for Visual Studio Code extensions.",
55
"keywords": [
66
"yeoman-generator",
@@ -26,7 +26,7 @@
2626
"url": "https://github.com/Microsoft"
2727
},
2828
"engines": {
29-
"node": ">=16.x"
29+
"node": "^18.17.0 || >=20.5.0"
3030
},
3131
"scripts": {
3232
"test": "mocha",
@@ -44,9 +44,9 @@
4444
},
4545
"devDependencies": {
4646
"@types/mocha": "^10.0.6",
47-
"@types/node": "^16.18.82",
47+
"@types/node": "^18.18.5",
4848
"mocha": "^10.4.0",
49-
"yeoman-environment": "^4.4.0",
49+
"yeoman-environment": "^4.4.1",
5050
"yeoman-test": "^8.3.0"
5151
}
5252
}

0 commit comments

Comments
 (0)