diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 89cba480..d50004cb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - node-version: [18.x] + node-version: [18.x, 20.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: diff --git a/build/pipeline.yml b/build/pipeline.yml index e0471997..cc34faac 100644 --- a/build/pipeline.yml +++ b/build/pipeline.yml @@ -35,12 +35,15 @@ extends: - name: Linux nodeVersions: - 18.x + - 20.x - name: MacOS nodeVersions: - 18.x + - 20.x - name: Windows nodeVersions: - 18.x + - 20.x testSteps: - script: npm i diff --git a/generators/app/dependencyVersions/package.json b/generators/app/dependencyVersions/package.json index 5307923c..24b3c084 100644 --- a/generators/app/dependencyVersions/package.json +++ b/generators/app/dependencyVersions/package.json @@ -5,7 +5,7 @@ "private": true, "dependencies": { "@types/mocha": "^10.0.6", - "@types/node": "18.x", + "@types/node": "20.x", "@types/assert": "^1.5.10", "@typescript-eslint/eslint-plugin": "^7.11.0", "@typescript-eslint/parser": "^7.11.0", @@ -25,14 +25,14 @@ "ts-loader": "^9.5.1", "vscode-dts": "^0.3.3", "vscode-notebook-error-overlay": "^1.0.1", - "webpack": "^5.91.0", + "webpack": "^5.92.0", "util": "^0.12.5", "webpack-cli": "^5.1.4", "webpack-dev-server": "^5.0.4", "assert": "^2.1.0", "process": "^0.11.10", "npm-run-all": "^4.1.5", - "esbuild": "^0.21.4", + "esbuild": "^0.21.5", "@esbuild-plugins/node-globals-polyfill": "^0.2.3" } } diff --git a/generators/app/templates/ext-command-web/vscode-esbuild/settings.json b/generators/app/templates/ext-command-web/vscode-esbuild/settings.json index d6c6bf38..943fae73 100644 --- a/generators/app/templates/ext-command-web/vscode-esbuild/settings.json +++ b/generators/app/templates/ext-command-web/vscode-esbuild/settings.json @@ -1,10 +1,10 @@ // Place your settings in this file to overwrite default and user settings. { "files.exclude": { - "out": false // set this to true to hide the "out" folder with the compiled JS files + "dist": false // set this to true to hide the "dist" folder with the compiled JS files }, "search.exclude": { - "out": true // set this to false to include "out" folder in search results + "dist": true // set this to false to include "dist" folder in search results }, // Turn off tsc task auto detection since we have the necessary tasks as npm scripts "typescript.tsc.autoDetect": "off" diff --git a/generators/app/templates/ext-command-web/vscode-webpack/settings.json b/generators/app/templates/ext-command-web/vscode-webpack/settings.json index d6c6bf38..943fae73 100644 --- a/generators/app/templates/ext-command-web/vscode-webpack/settings.json +++ b/generators/app/templates/ext-command-web/vscode-webpack/settings.json @@ -1,10 +1,10 @@ // Place your settings in this file to overwrite default and user settings. { "files.exclude": { - "out": false // set this to true to hide the "out" folder with the compiled JS files + "dist": false // set this to true to hide the "dist" folder with the compiled JS files }, "search.exclude": { - "out": true // set this to false to include "out" folder in search results + "dist": true // set this to false to include "dist" folder in search results }, // Turn off tsc task auto detection since we have the necessary tasks as npm scripts "typescript.tsc.autoDetect": "off" diff --git a/package-lock.json b/package-lock.json index 83d15b5c..46409189 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "generator-code", - "version": "1.10.1", + "version": "1.11.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "generator-code", - "version": "1.10.1", + "version": "1.11.0", "license": "MIT", "dependencies": { "chalk": "^5.3.0", @@ -18,13 +18,13 @@ }, "devDependencies": { "@types/mocha": "^10.0.6", - "@types/node": "^16.18.82", + "@types/node": "^18.18.5", "mocha": "^10.4.0", - "yeoman-environment": "^4.4.0", + "yeoman-environment": "^4.4.1", "yeoman-test": "^8.3.0" }, "engines": { - "node": ">=16.x" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@babel/code-frame": { @@ -1033,9 +1033,12 @@ "dev": true }, "node_modules/@types/node": { - "version": "16.18.82", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.82.tgz", - "integrity": "sha512-pcDZtkx9z8XYV+ius2P3Ot2VVrcYOfXffBQUBuiszrlUzKSmoDYqo+mV+IoL8iIiIjjtOMvNSmH1hwJ+Q+f96Q==" + "version": "18.19.34", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.34.tgz", + "integrity": "sha512-eXF4pfBNV5DAMKGbI02NnDtWrQ40hAN558/2vvS4gMpMIxaf6JmD7YjnZbq0Q9TDSSkKBamime8ewRoomHdt4g==", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/normalize-package-data": { "version": "2.4.4", @@ -1418,6 +1421,12 @@ "mem-fs": "^4.0.0" } }, + "node_modules/@yeoman/conflicter/node_modules/@types/node": { + "version": "16.18.98", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.98.tgz", + "integrity": "sha512-fpiC20NvLpTLAzo3oVBKIqBGR6Fx/8oAK/SSf7G+fydnXMY1x4x9RZ6sBXhqKlCU21g2QapUsbLlhv3+a7wS+Q==", + "devOptional": true + }, "node_modules/@yeoman/conflicter/node_modules/diff": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", @@ -1455,9 +1464,9 @@ } }, "node_modules/@yeoman/conflicter/node_modules/mem-fs-editor/node_modules/@types/node": { - "version": "18.19.33", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.33.tgz", - "integrity": "sha512-NR9+KrpSajr2qBVp/Yt5TU/rp+b5Mayi3+OlMlcg2cVCfRmcG5PWZ7S4+MG9PZ5gWBoc9Pd0BKSRViuBCRPu0A==", + "version": "18.19.34", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.34.tgz", + "integrity": "sha512-eXF4pfBNV5DAMKGbI02NnDtWrQ40hAN558/2vvS4gMpMIxaf6JmD7YjnZbq0Q9TDSSkKBamime8ewRoomHdt4g==", "devOptional": true, "dependencies": { "undici-types": "~5.26.4" @@ -1500,6 +1509,12 @@ "node": "^16.13.0 || >=18.12.0" } }, + "node_modules/@yeoman/transform/node_modules/@types/node": { + "version": "16.18.98", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.98.tgz", + "integrity": "sha512-fpiC20NvLpTLAzo3oVBKIqBGR6Fx/8oAK/SSf7G+fydnXMY1x4x9RZ6sBXhqKlCU21g2QapUsbLlhv3+a7wS+Q==", + "devOptional": true + }, "node_modules/@yeoman/transform/node_modules/minimatch": { "version": "9.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", @@ -1546,6 +1561,11 @@ } } }, + "node_modules/@yeoman/types/node_modules/@types/node": { + "version": "16.18.98", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.98.tgz", + "integrity": "sha512-fpiC20NvLpTLAzo3oVBKIqBGR6Fx/8oAK/SSf7G+fydnXMY1x4x9RZ6sBXhqKlCU21g2QapUsbLlhv3+a7wS+Q==" + }, "node_modules/abbrev": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", @@ -4433,6 +4453,12 @@ "node": ">=16.13.0" } }, + "node_modules/p-transform/node_modules/@types/node": { + "version": "16.18.98", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.98.tgz", + "integrity": "sha512-fpiC20NvLpTLAzo3oVBKIqBGR6Fx/8oAK/SSf7G+fydnXMY1x4x9RZ6sBXhqKlCU21g2QapUsbLlhv3+a7wS+Q==", + "devOptional": true + }, "node_modules/package-json": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.1.tgz", @@ -6095,9 +6121,9 @@ } }, "node_modules/yeoman-environment": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-4.4.0.tgz", - "integrity": "sha512-X53IlyzOI4gX1vEGlxW1Q9lJ73sJq4o13gLeDw5IzDMBVn0xnmsmxphs+dWDzSmipirmZQaWKQhBH/rEAXTCLA==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-4.4.1.tgz", + "integrity": "sha512-x1TXPM6msNm9+zWLUuegfBf2AOwilTIUMAKHmhJvm9zidiDDrkp8cIuK32CvADuMxgbrGrvwHejDWnPScasnkw==", "devOptional": true, "dependencies": { "@yeoman/adapter": "^1.4.0", @@ -6133,15 +6159,6 @@ "mem-fs": "^4.0.0" } }, - "node_modules/yeoman-environment/node_modules/@types/node": { - "version": "18.19.33", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.33.tgz", - "integrity": "sha512-NR9+KrpSajr2qBVp/Yt5TU/rp+b5Mayi3+OlMlcg2cVCfRmcG5PWZ7S4+MG9PZ5gWBoc9Pd0BKSRViuBCRPu0A==", - "devOptional": true, - "dependencies": { - "undici-types": "~5.26.4" - } - }, "node_modules/yeoman-environment/node_modules/globby": { "version": "14.0.1", "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.1.tgz", @@ -6341,14 +6358,6 @@ } } }, - "node_modules/yeoman-generator/node_modules/@types/node": { - "version": "18.19.33", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.33.tgz", - "integrity": "sha512-NR9+KrpSajr2qBVp/Yt5TU/rp+b5Mayi3+OlMlcg2cVCfRmcG5PWZ7S4+MG9PZ5gWBoc9Pd0BKSRViuBCRPu0A==", - "dependencies": { - "undici-types": "~5.26.4" - } - }, "node_modules/yeoman-generator/node_modules/mem-fs-editor": { "version": "11.0.1", "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-11.0.1.tgz", diff --git a/package.json b/package.json index 79d0c628..f8d2827e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "generator-code", - "version": "1.10.1", + "version": "1.11.0", "description": "Yeoman generator for Visual Studio Code extensions.", "keywords": [ "yeoman-generator", @@ -26,7 +26,7 @@ "url": "https://github.com/Microsoft" }, "engines": { - "node": ">=16.x" + "node": "^18.17.0 || >=20.5.0" }, "scripts": { "test": "mocha", @@ -44,9 +44,9 @@ }, "devDependencies": { "@types/mocha": "^10.0.6", - "@types/node": "^16.18.82", + "@types/node": "^18.18.5", "mocha": "^10.4.0", - "yeoman-environment": "^4.4.0", + "yeoman-environment": "^4.4.1", "yeoman-test": "^8.3.0" } }