generator-code 1.5.6 → 1.6.3

package/generators/app/env.js

@@ -3,6 +3,8 @@
  *--------------------------------------------------------*/
 'use strict';
 const request = require('request-light');
+const fs = require('fs');
+const path = require('path');
 
 const fallbackVersion = '^1.54.0';
 let versionPromise = undefined;
@@ -39,33 +41,7 @@ module.exports.getLatestVSCodeVersion = getLatestVSCodeVersion;
 
 module.exports.getDependencyVersions = async function () {
     const vscodeVersion = await getLatestVSCodeVersion();
-    return {
-        "@types/vscode": vscodeVersion,
-        "@types/glob": "^7.1.3",
-        "@types/mocha": "^8.2.2",
-        "@types/node": "14.x",
-        "@typescript-eslint/eslint-plugin": "^4.26.0",
-        "@typescript-eslint/parser": "^4.26.0",
-        "eslint": "^7.27.0",
-        "glob": "^7.1.7",
-        "mocha": "^8.4.0",
-        "typescript": "^4.3.2",
-        "vscode-test": "^1.5.2",
-        "@vscode/test-web": "^0.0.8",
-        "@types/webpack-env": "^1.16.0",
-        "@types/vscode-notebook-renderer": "^1.57.8",
-        "concurrently": "^5.3.0",
-        "css-loader": "^4.2.0",
-        "fork-ts-checker-webpack-plugin": "^5.0.14",
-        "style-loader": "^1.2.1",
-        "ts-loader": "^9.2.2",
-        "vscode-dts": "^0.3.1",
-        "vscode-notebook-error-overlay": "^1.0.1",
-        "webpack": "^5.38.1",
-        "webpack-cli": "^4.7.0",
-        "webpack-dev-server": "^3.11.2",
-        "assert": "^2.0.0",
-        "process": "^0.11.10"
-    }
-}
-
+    const versions = JSON.parse((await fs.promises.readFile(path.join(__dirname, 'package.json'))).toString()).dependencies;
+    versions["@types/vscode"] = vscodeVersion
+    return versions;
+}

package/generators/app/generate-command-ts .js

@@ -2,6 +2,7 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
+const chalk = require("chalk");
 const prompts = require("./prompts");
 
 module.exports = {
@@ -28,35 +29,45 @@ module.exports = {
      */
     writing: (generator, extensionConfig) => {
         if (extensionConfig.webpack) {
-            generator.fs.copy(generator.templatePath('vscode-webpack'), generator.destinationPath('.vscode'));
+            generator.fs.copy(generator.templatePath('vscode-webpack/vscode'), generator.destinationPath('.vscode'));
+            generator.fs.copyTpl(generator.templatePath('vscode-webpack/package.json'), generator.destinationPath('package.json'), extensionConfig);
+            generator.fs.copyTpl(generator.templatePath('vscode-webpack/tsconfig.json'), generator.destinationPath('tsconfig.json'), extensionConfig);
+            generator.fs.copyTpl(generator.templatePath('vscode-webpack/vscodeignore'), generator.destinationPath('.vscodeignore'), extensionConfig);
+            generator.fs.copyTpl(generator.templatePath('vscode-webpack/webpack.config.js'), generator.destinationPath('webpack.config.js'), extensionConfig);
+            generator.fs.copyTpl(generator.templatePath('vscode-webpack/vsc-extension-quickstart.md'), generator.destinationPath('vsc-extension-quickstart.md'), extensionConfig);
         } else {
             generator.fs.copy(generator.templatePath('vscode'), generator.destinationPath('.vscode'));
+            generator.fs.copyTpl(generator.templatePath('package.json'), generator.destinationPath('package.json'), extensionConfig);
+            generator.fs.copyTpl(generator.templatePath('tsconfig.json'), generator.destinationPath('tsconfig.json'), extensionConfig);
+            generator.fs.copyTpl(generator.templatePath('vscodeignore'), generator.destinationPath('.vscodeignore'), extensionConfig);
+            generator.fs.copyTpl(generator.templatePath('vsc-extension-quickstart.md'), generator.destinationPath('vsc-extension-quickstart.md'), extensionConfig);
         }
-        generator.fs.copy(generator.templatePath('src/test'), generator.destinationPath('src/test'));
 
-        generator.fs.copyTpl(generator.templatePath('vscodeignore'), generator.destinationPath('.vscodeignore'), extensionConfig);
         if (extensionConfig.gitInit) {
             generator.fs.copy(generator.templatePath('gitignore'), generator.destinationPath('.gitignore'));
         }
         generator.fs.copyTpl(generator.templatePath('README.md'), generator.destinationPath('README.md'), extensionConfig);
         generator.fs.copyTpl(generator.templatePath('CHANGELOG.md'), generator.destinationPath('CHANGELOG.md'), extensionConfig);
-        generator.fs.copyTpl(generator.templatePath('vsc-extension-quickstart.md'), generator.destinationPath('vsc-extension-quickstart.md'), extensionConfig);
-        generator.fs.copyTpl(generator.templatePath('tsconfig.json'), generator.destinationPath('tsconfig.json'), extensionConfig);
-
         generator.fs.copyTpl(generator.templatePath('src/extension.ts'), generator.destinationPath('src/extension.ts'), extensionConfig);
-        generator.fs.copyTpl(generator.templatePath('package.json'), generator.destinationPath('package.json'), extensionConfig);
-
+        generator.fs.copy(generator.templatePath('src/test'), generator.destinationPath('src/test'));
         generator.fs.copy(generator.templatePath('.eslintrc.json'), generator.destinationPath('.eslintrc.json'));
 
         if (extensionConfig.pkgManager === 'yarn') {
             generator.fs.copyTpl(generator.templatePath('.yarnrc'), generator.destinationPath('.yarnrc'), extensionConfig);
         }
 
-        if (extensionConfig.webpack) {
-            generator.fs.copyTpl(generator.templatePath('webpack.config.js'), generator.destinationPath('webpack.config.js'), extensionConfig);
-        }
-
         extensionConfig.installDependencies = true;
         extensionConfig.proposedAPI = extensionConfig.insiders;
+    },
+
+    /**
+     * @param {import('yeoman-generator')} generator
+     * @param {Object} extensionConfig
+     */
+    endMessage: (generator, extensionConfig) => {
+        if (extensionConfig.webpack) {
+            generator.log(chalk.yellow(`To run the extension you need to install the recommended extension 'amodio.tsl-problem-matcher'.`));
+            generator.log('');
+        }
     }
 }

package/generators/app/generate-command-web.js

@@ -2,12 +2,13 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
+const chalk = require("chalk");
 const prompts = require("./prompts");
 
 module.exports = {
     id: 'ext-command-web',
     aliases: ['web', 'command-web'],
-    insidersName: 'New Web Extension (TypeScript)',
+    name: 'New Web Extension (TypeScript)',
     /**
      * @param {import('yeoman-generator')} generator
      * @param {Object} extensionConfig
@@ -39,12 +40,24 @@ module.exports = {
 
         generator.fs.copyTpl(generator.templatePath('src/web/extension.ts'), generator.destinationPath('src/web/extension.ts'), extensionConfig);
 
-        generator.fs.copyTpl(generator.templatePath('build/web-extension.webpack.config.js'), generator.destinationPath('build/web-extension.webpack.config.js'), extensionConfig);
+        generator.fs.copyTpl(generator.templatePath('webpack.config.js'), generator.destinationPath('webpack.config.js'), extensionConfig);
         generator.fs.copyTpl(generator.templatePath('package.json'), generator.destinationPath('package.json'), extensionConfig);
 
         generator.fs.copy(generator.templatePath('.eslintrc.json'), generator.destinationPath('.eslintrc.json'));
 
+        if (extensionConfig.pkgManager === 'yarn') {
+            generator.fs.copyTpl(generator.templatePath('.yarnrc'), generator.destinationPath('.yarnrc'), extensionConfig);
+        }
+
         extensionConfig.installDependencies = true;
         extensionConfig.proposedAPI = false;
+    },
+    /**
+     * @param {import('yeoman-generator')} generator
+     * @param {Object} extensionConfig
+     */
+    endMessage: (generator, extensionConfig) => {
+        generator.log(chalk.yellow(`To run the extension you need to install the recommended extension 'amodio.tsl-problem-matcher'.`));
+        generator.log('');
     }
 }

package/generators/app/index.js

@@ -8,6 +8,7 @@ const yosay = require('yosay');
 
 const path = require('path');
 const env = require('./env');
+const witch = require('which');
 
 const colortheme = require('./generate-colortheme');
 const commandjs = require('./generate-command-js');
@@ -161,7 +162,7 @@ module.exports = class extends Generator {
     }
 
     // End
-    end() {
+    async end() {
         if (this.abort) {
             return;
         }
@@ -195,6 +196,8 @@ module.exports = class extends Generator {
         this.log('Your extension ' + this.extensionConfig.name + ' has been created!');
         this.log('');
 
+        const [codeStableLocation, codeInsidersLocation] = await Promise.all([witch('code').catch(() => undefined), witch('code-insiders').catch(() => undefined)]);
+
         if (!this.extensionConfig.insiders && !this.options['open'] && !this.options['openInInsiders'] && !this.options['quick']) {
             const cdLocation = this.options['destination'] || this.extensionConfig.name;
 
@@ -203,7 +206,11 @@ module.exports = class extends Generator {
             if (cdLocation !== '.') {
                 this.log('     cd ' + cdLocation);
             }
-            this.log('     code-insiders .');
+            if (!this.extensionConfig.insiders) {
+                this.log('     code .');
+            } else {
+                this.log('     code-insiders .');
+            }
             this.log('');
         }
         this.log('Open vsc-extension-quickstart.md inside the new extension for further instructions');
@@ -217,12 +224,43 @@ module.exports = class extends Generator {
         this.log('For more information, also visit http://code.visualstudio.com and follow us @code.');
         this.log('\r\n');
 
-        if (this.options['open']) {
-            this.log(`Opening ${this.destinationPath()} in Visual Studio Code...`);
-            this.spawnCommand('code', [this.destinationPath()]);
-        } else if (this.extensionConfig.insiders || this.options['openInInsiders'] || this.options['quick']) {
-            this.log(`Opening ${this.destinationPath()} with Visual Studio Code Insiders...`);
-            this.spawnCommand('code-insiders', [this.destinationPath()]);
+        if (this.options["open"]) {
+            if (codeStableLocation) {
+                this.log(`Opening ${this.destinationPath()} in Visual Studio Code...`);
+                this.spawnCommand(codeStableLocation, [this.destinationPath()]);
+            } else {
+                this.log(`'code' command not found.`);
+            }
+        } else if (this.options["openInInsiders"]) {
+            if (codeInsidersLocation) {
+                this.log(`Opening ${this.destinationPath()} with Visual Studio Code Insiders...`);
+                this.spawnCommand(codeInsidersLocation, [this.destinationPath()]);
+            } else {
+                this.log(`'code-insiders' command not found.`);
+            }
+        } else if (codeInsidersLocation || codeStableLocation) {
+            if (this.options["quick"]) {
+                this.spawnCommand(codeInsidersLocation || codeStableLocation, [this.destinationPath()]);
+            } else {
+                const choices = [];
+                if (codeInsidersLocation) {
+                    choices.push({ name: "Open with `code-insiders`", value: codeInsidersLocation });
+                }
+                if (codeStableLocation) {
+                    choices.push({ name: "Open with `code`", value: codeStableLocation });
+                }
+                choices.push({ name: "Skip", value: 'skip' });
+
+                const answer = await this.prompt({
+                    type: "list",
+                    name: "openWith",
+                    message: "Do you want to open the new folder with Visual Studio Code?",
+                    choices
+                });
+                if (answer && answer.openWith && answer.openWith !== 'skip') {
+                    this.spawnCommand(answer.openWith, [this.destinationPath()]);
+                }
+            }
         }
     }
 }

package/generators/app/package.json

@@ -0,0 +1,29 @@
+{
+    "dependencies": {
+        "@types/glob": "^7.1.4",
+        "@types/mocha": "^9.0.0",
+        "@types/node": "14.17.27",
+        "@typescript-eslint/eslint-plugin": "^5.1.0",
+        "@typescript-eslint/parser": "^5.1.0",
+        "eslint": "^8.1.0",
+        "glob": "^7.1.7",
+        "mocha": "^9.1.3",
+        "typescript": "^4.4.4",
+        "@vscode/test-electron": "^1.6.2",
+        "@vscode/test-web": "^0.0.13",
+        "@types/webpack-env": "^1.16.2",
+        "@types/vscode-notebook-renderer": "^1.57.8",
+        "concurrently": "^5.3.0",
+        "css-loader": "^4.2.0",
+        "fork-ts-checker-webpack-plugin": "^5.0.14",
+        "style-loader": "^1.2.1",
+        "ts-loader": "^9.2.5",
+        "vscode-dts": "^0.3.1",
+        "vscode-notebook-error-overlay": "^1.0.1",
+        "webpack": "^5.52.1",
+        "webpack-cli": "^4.8.0",
+        "webpack-dev-server": "^3.11.2",
+        "assert": "^2.0.0",
+        "process": "^0.11.10"
+    }
+}

package/generators/app/templates/ext-command-js/jsconfig.json

@@ -1,10 +1,10 @@
 {
 	"compilerOptions": {
 		"module": "commonjs",
-		"target": "es6",
+		"target": "ES2020",
 		"checkJs": <%- JSON.stringify(checkJavaScript) %>,  /* Typecheck .js files. */
 		"lib": [
-			"es6"
+			"ES2020"
 		]
 	},
 	"exclude": [

package/generators/app/templates/ext-command-js/package.json

@@ -34,7 +34,7 @@
         <%- dep("glob") %>,
         <%- dep("mocha") %>,
         <%- dep("typescript") %>,
-        <%- dep("vscode-test") %>
+        <%- dep("@vscode/test-electron") %>
     }
 
 }

package/generators/app/templates/ext-command-js/test/runTest.js

@@ -1,6 +1,6 @@
 const path = require('path');
 
-const { runTests } = require('vscode-test');
+const { runTests } = require('@vscode/test-electron');
 
 async function main() {
 	try {

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

@@ -12,7 +12,7 @@
 	"activationEvents": [
         <%- JSON.stringify(`onCommand:${name}.helloWorld`) %>
 	],
-	"main": <%- JSON.stringify(webpack ? './dist/extension.js' : './out/extension.js') %>,<% if (insiders) { %>
+	"main": "./out/extension.js",<% if (insiders) { %>
 	"enableProposedApi": true,<% } %>
 	"contributes": {
 		"commands": [
@@ -22,18 +22,11 @@
 			}
 		]
 	},
-	"scripts": {<% if (webpack) { %>
-		"vscode:prepublish": "<%= pkgManager %> run package",
-		"compile": "webpack",
-		"watch": "webpack --watch",
-		"package": "webpack --mode production --devtool hidden-source-map",
-		"test-compile": "tsc -p ./",
-		"test-watch": "tsc -watch -p ./",
-		"pretest": "<%= pkgManager %> run test-compile && <%= pkgManager %> run lint",<% } else { %>
+	"scripts": {
 		"vscode:prepublish": "<%= pkgManager %> run compile",
 		"compile": "tsc -p ./",
 		"watch": "tsc -watch -p ./",
-		"pretest": "<%= pkgManager %> run compile && <%= pkgManager %> run lint",<% } %>
+		"pretest": "<%= pkgManager %> run compile && <%= pkgManager %> run lint",
 		"lint": "eslint src --ext ts",
 		"test": "node ./out/test/runTest.js"<% if (insiders) { %>,
 		"update-proposed-api": "vscode-dts dev"<% } %>
@@ -43,16 +36,13 @@
 		<%- dep("@types/glob") %>,
 		<%- dep("@types/mocha") %>,
 		<%- dep("@types/node") %>,
-		<%- dep("eslint") %>,
 		<%- dep("@typescript-eslint/eslint-plugin") %>,
 		<%- dep("@typescript-eslint/parser") %>,
+		<%- dep("eslint") %>,
 		<%- dep("glob") %>,
 		<%- dep("mocha") %>,
 		<%- dep("typescript") %>,
-		<%- dep("vscode-test") %><% if (insiders) { %>,
-		<%- dep("vscode-dts") %><% } if (webpack) { %>,
-		<%- dep("ts-loader") %>,
-		<%- dep("webpack") %>,
-		<%- dep("webpack-cli") %><% } %>
+		<%- dep("@vscode/test-electron") %><% if (insiders) { %>,
+		<%- dep("vscode-dts") %><% } %>
 	}
 }

package/generators/app/templates/ext-command-ts/src/test/runTest.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 
-import { runTests } from 'vscode-test';
+import { runTests } from '@vscode/test-electron';
 
 async function main() {
 	try {

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

@@ -1,10 +1,10 @@
 {
 	"compilerOptions": {
 		"module": "commonjs",
-		"target": "es6",
+		"target": "ES2020",
 		"outDir": "out",
 		"lib": [
-			"es6"
+			"ES2020"
 		],
 		"sourceMap": true,
 		"rootDir": "src",

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

@@ -0,0 +1,54 @@
+{
+  "name": <%- JSON.stringify(name) %>,
+	"displayName": <%- JSON.stringify(displayName) %>,
+	"description": <%- JSON.stringify(description) %>,
+	"version": "0.0.1",
+	"engines": {
+		"vscode": <%- JSON.stringify(vsCodeEngine) %>
+	},
+	"categories": [
+		"Other"
+	],
+	"activationEvents": [
+        <%- JSON.stringify(`onCommand:${name}.helloWorld`) %>
+	],
+	"main": "./dist/extension.js",<% if (insiders) { %>
+	"enableProposedApi": true,<% } %>
+	"contributes": {
+		"commands": [
+			{
+				"command": <%- JSON.stringify(`${name}.helloWorld`) %>,
+				"title": "Hello World"
+			}
+		]
+	},
+	"scripts": {
+		"vscode:prepublish": "<%= pkgManager %> run package",
+		"compile": "webpack",
+		"watch": "webpack --watch",
+		"package": "webpack --mode production --devtool hidden-source-map",
+		"compile-tests": "tsc -p . --outDir out",
+		"watch-tests": "tsc -p -w . --outDir out",
+		"pretest": "<%= pkgManager %> run compile-tests && <%= pkgManager %> run compile && <%= pkgManager %> run lint",
+		"lint": "eslint src --ext ts",
+		"test": "node ./out/test/runTest.js"<% if (insiders) { %>,
+		"update-proposed-api": "vscode-dts dev"<% } %>
+	},
+	"devDependencies": {
+		<%- dep("@types/vscode") %>,
+		<%- dep("@types/glob") %>,
+		<%- dep("@types/mocha") %>,
+		<%- dep("@types/node") %>,
+		<%- dep("@typescript-eslint/eslint-plugin") %>,
+		<%- dep("@typescript-eslint/parser") %>,
+		<%- dep("eslint") %>,
+		<%- dep("glob") %>,
+		<%- dep("mocha") %>,
+		<%- dep("typescript") %>,
+		<%- dep("ts-loader") %>,
+		<%- dep("webpack") %>,
+		<%- dep("webpack-cli") %>,
+		<%- dep("@vscode/test-electron") %><% if (insiders) { %>,
+		<%- dep("vscode-dts") %><% } %>
+	}
+}

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

@@ -0,0 +1,20 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"target": "ES2020",
+		"lib": [
+			"ES2020"
+		],
+		"sourceMap": true,
+		"rootDir": "src",
+		"strict": true   /* enable all strict type-checking options */
+		/* Additional Checks */
+		// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
+		// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
+		// "noUnusedParameters": true,  /* Report errors on unused parameters. */
+	},
+	"exclude": [
+		"node_modules",
+		".vscode-test"
+	]
+}

package/generators/app/templates/ext-command-ts/vscode-webpack/vsc-extension-quickstart.md

@@ -0,0 +1,47 @@
+# Welcome to your VS Code Extension
+
+## What's in the folder
+
+* This folder contains all of the files necessary for your extension.
+* `package.json` - this is the manifest file in which you declare your extension and command.
+  * The sample plugin registers a command and defines its title and command name. With this information VS Code can show the command in the command palette. It doesn’t yet need to load the plugin.
+* `src/extension.ts` - this is the main file where you will provide the implementation of your command.
+  * The file exports one function, `activate`, which is called the very first time your extension is activated (in this case by executing the command). Inside the `activate` function we call `registerCommand`.
+  * We pass the function containing the implementation of the command as the second parameter to `registerCommand`.
+
+## Setup
+
+- install the recommended extensions (amodio.tsl-problem-matcher and dbaeumer.vscode-eslint)
+
+
+## Get up and running straight away
+
+* Press `F5` to open a new window with your extension loaded.
+* Run your command from the command palette by pressing (`Ctrl+Shift+P` or `Cmd+Shift+P` on Mac) and typing `Hello World`.
+* Set breakpoints in your code inside `src/extension.ts` to debug your extension.
+* Find output from your extension in the debug console.
+
+## Make changes
+
+* You can relaunch the extension from the debug toolbar after changing code in `src/extension.ts`.
+* You can also reload (`Ctrl+R` or `Cmd+R` on Mac) the VS Code window with your extension to load your changes.
+
+
+## Explore the API
+
+* You can open the full set of our API when you open the file `node_modules/@types/vscode/index.d.ts`.
+
+## Run tests
+
+* Open the debug viewlet (`Ctrl+Shift+D` or `Cmd+Shift+D` on Mac) and from the launch configuration dropdown pick `Extension Tests`.
+* Press `F5` to run the tests in a new window with your extension loaded.
+* See the output of the test result in the debug console.
+* Make changes to `src/test/suite/extension.test.ts` or create new test files inside the `test/suite` folder.
+  * The provided test runner will only consider files matching the name pattern `**.test.ts`.
+  * You can create folders inside the `test` folder to structure your tests any way you want.
+
+## Go further
+
+ * Reduce the extension size and improve the startup time by [bundling your extension](https://code.visualstudio.com/api/working-with-extensions/bundling-extension).
+ * [Publish your extension](https://code.visualstudio.com/api/working-with-extensions/publishing-extension) on the VSCode extension marketplace.
+ * Automate builds by setting up [Continuous Integration](https://code.visualstudio.com/api/working-with-extensions/continuous-integration).

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

@@ -0,0 +1,5 @@
+{
+  // See http://go.microsoft.com/fwlink/?LinkId=827846
+  // for the documentation about the extensions.json format
+  "recommendations": ["dbaeumer.vscode-eslint", "amodio.tsl-problem-matcher"]
+}

package/generators/app/templates/ext-command-ts/vscode-webpack/{launch.json → vscode/launch.json}

@@ -26,9 +26,10 @@
 				"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
 			],
 			"outFiles": [
-				"${workspaceFolder}/out/test/**/*.js"
+				"${workspaceFolder}/out/**/*.js",
+				"${workspaceFolder}/dist/**/*.js"
 			],
-			"preLaunchTask": "npm: test-watch"
+			"preLaunchTask": "tasks: watch-tests"
 		}
 	]
 }

package/generators/app/templates/ext-command-ts/vscode-webpack/{tasks.json → vscode/tasks.json}

@@ -7,12 +7,13 @@
 			"type": "npm",
 			"script": "watch",
 			"problemMatcher": [
-                "$ts-webpack-watch",
-                "$tslint-webpack-watch"
+				"$ts-webpack-watch",
+				"$tslint-webpack-watch"
 			],
 			"isBackground": true,
 			"presentation": {
-				"reveal": "never"
+				"reveal": "never",
+				"group": "watchers"
 			},
 			"group": {
 				"kind": "build",
@@ -21,13 +22,22 @@
 		},
 		{
 			"type": "npm",
-			"script": "test-watch",
+			"script": "watch-tests",
 			"problemMatcher": "$tsc-watch",
 			"isBackground": true,
 			"presentation": {
-				"reveal": "never"
+				"reveal": "never",
+				"group": "watchers"
 			},
 			"group": "build"
+		},
+		{
+			"label": "tasks: watch-tests",
+			"dependsOn": [
+				"npm: watch",
+				"npm: watch-tests"
+			],
+			"problemMatcher": []
 		}
 	]
 }

package/generators/app/templates/ext-command-ts/vscode-webpack/vscodeignore

@@ -0,0 +1,13 @@
+.vscode/**
+.vscode-test/**
+out/**
+node_modules/**
+src/**
+.gitignore
+.yarnrc
+webpack.config.js
+vsc-extension-quickstart.md
+**/tsconfig.json
+**/.eslintrc.json
+**/*.map
+**/*.ts

package/generators/app/templates/ext-command-ts/{webpack.config.js → vscode-webpack/webpack.config.js}

@@ -4,8 +4,11 @@
 
 const path = require('path');
 
-/**@type {import('webpack').Configuration}*/
-const config = {
+//@ts-check
+/** @typedef {import('webpack').Configuration} WebpackConfig **/
+
+/** @type WebpackConfig */
+const extensionConfig = {
   target: 'node', // vscode extensions run in a Node.js-context 📖 -> https://webpack.js.org/configuration/node/
 	mode: 'none', // this leaves the source code as close as possible to the original (when packaging we set this to 'production')
 
@@ -16,10 +19,9 @@ const config = {
     filename: 'extension.js',
     libraryTarget: 'commonjs2'
   },
-  devtool: 'nosources-source-map',
   externals: {
     vscode: 'commonjs vscode' // the vscode-module is created on-the-fly and must be excluded. Add other modules that cannot be webpack'ed, 📖 -> https://webpack.js.org/configuration/externals/
-    // modules added here also need to be added in the .vsceignore file
+    // modules added here also need to be added in the .vscodeignore file
   },
   resolve: {
     // support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader
@@ -37,6 +39,10 @@ const config = {
         ]
       }
     ]
-  }
+  },
+  devtool: 'nosources-source-map',
+  infrastructureLogging: {
+    level: "log", // enables logging required for problem matchers
+  },
 };
-module.exports = config;
+module.exports = [ extensionConfig ];

package/generators/app/templates/ext-command-ts/vscodeignore

@@ -1,7 +1,5 @@
 .vscode/**
 .vscode-test/**
-<% if (webpack) { %>out/**<% } else { %>out/test/**<% } %>
-<% if (webpack) { %>node_modules/**<% } %>
 src/**
 .gitignore
 .yarnrc

package/generators/app/templates/ext-command-web/.yarnrc

@@ -0,0 +1 @@
+--ignore-engines true

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

@@ -27,10 +27,11 @@
 		"test": "vscode-test-web --browserType=chromium --extensionDevelopmentPath=. --extensionTestsPath=dist/web/test/suite/index.js",
 		"pretest": "<%= pkgManager %> run compile-web",
 		"vscode:prepublish": "<%= pkgManager %> run package-web",
-		"compile-web": "webpack --config ./build/web-extension.webpack.config.js",
-		"watch-web": "webpack --watch --config ./build/web-extension.webpack.config.js",
-		"package-web": "webpack --mode production --devtool hidden-source-map --config ./build/web-extension.webpack.config.js",
-		"lint": "eslint src --ext ts"
+		"compile-web": "webpack",
+		"watch-web": "webpack --watch",
+		"package-web": "webpack --mode production --devtool hidden-source-map",
+		"lint": "eslint src --ext ts",
+		"run-in-browser": "vscode-test-web --browserType=chromium --extensionDevelopmentPath=. ."
 	},
 	"devDependencies": {
 		<%- dep("@types/vscode") %>,

package/generators/app/templates/ext-command-web/vsc-extension-quickstart.md

@@ -3,16 +3,19 @@
 ## What's in the folder
 
 * This folder contains all of the files necessary for your web extension.
-* `package.json` - this is the manifest file in which you declare your extension and command.
-* `src/web/extension.ts` - this is the main file for the browser
-* `build/web-extension.webpack.config.js` - the webpack config file for the web main
+* `package.json` * this is the manifest file in which you declare your extension and command.
+* `src/web/extension.ts` * this is the main file for the browser
+* `webpack.config.js` * the webpack config file for the web main
+
+## Setup
+
+* install the recommended extensions (amodio.tsl-problem-matcher and dbaeumer.vscode-eslint)
 
 ## Get up and running the Web Extension
 
-* ⚠️ configure in vscode: `"extensions.webWorker": true`
 * `npm install`
 * place breakpoints in `src/web/extension.ts`
-* debug via F5 (Run Extension)
+* debug via F5 (Run Web Extension)
 * execute extension code via `F1 > Hello world`
 
 ## Make changes
@@ -20,7 +23,6 @@
 * You can relaunch the extension from the debug toolbar after changing code in `src/web/extension.ts`.
 * You can also reload (`Ctrl+R` or `Cmd+R` on Mac) the VS Code window with your extension to load your changes.
 
-
 ## Explore the API
 
 * You can open the full set of our API when you open the file `node_modules/@types/vscode/index.d.ts`.
@@ -30,11 +32,12 @@
 * Open the debug viewlet (`Ctrl+Shift+D` or `Cmd+Shift+D` on Mac) and from the launch configuration dropdown pick `Extension Tests`.
 * Press `F5` to run the tests in a new window with your extension loaded.
 * See the output of the test result in the debug console.
-* Make changes to `src/test/suite/extension.test.ts` or create new test files inside the `test/suite` folder.
+* Make changes to `src/web/test/suite/extension.test.ts` or create new test files inside the `test/suite` folder.
   * The provided test runner will only consider files matching the name pattern `**.test.ts`.
   * You can create folders inside the `test` folder to structure your tests any way you want.
 
 ## Go further
 
- * [Publish your extension](https://code.visualstudio.com/api/working-with-extensions/publishing-extension) on the VSCode extension marketplace.
- * Automate builds by setting up [Continuous Integration](https://code.visualstudio.com/api/working-with-extensions/continuous-integration).
+* Check out the [Web Extension Guide](https://code.visualstudio.com/api/extension-guides/web-extensions)
+* [Publish your extension](https://code.visualstudio.com/api/working-with-extensions/publishing-extension) on the VSCode extension marketplace.
+* Automate builds by setting up [Continuous Integration](https://code.visualstudio.com/api/working-with-extensions/continuous-integration).

package/generators/app/templates/ext-command-web/vscode/extensions.json

@@ -1,8 +1,5 @@
 {
-	// See http://go.microsoft.com/fwlink/?LinkId=827846
-	// for the documentation about the extensions.json format
-	"recommendations": [
-		"dbaeumer.vscode-eslint",
-		"eamodio.tsl-problem-matcher"
-	]
+  // See http://go.microsoft.com/fwlink/?LinkId=827846
+  // for the documentation about the extensions.json format
+  "recommendations": ["dbaeumer.vscode-eslint", "amodio.tsl-problem-matcher"]
 }

package/generators/app/templates/ext-command-web/vscode/launch.json

@@ -6,7 +6,7 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"name": "Run Web Extension in VS Code",
+			"name": "Run Web Extension ",
 			"type": "pwa-extensionHost",
 			"debugWebWorkerHost": true,
 			"request": "launch",
@@ -20,7 +20,7 @@
 			"preLaunchTask": "npm: watch-web"
 		},
 		{
-			"name": "Extension Tests in VS Code",
+			"name": "Extension Tests",
 			"type": "extensionHost",
 			"debugWebWorkerHost": true,
 			"request": "launch",

package/generators/app/templates/ext-command-web/vscodeignore

@@ -3,9 +3,10 @@
 src/**
 out/**
 node_modules/**
-build/**
 .gitignore
 vsc-extension-quickstart.md
+webpack.config.js
+.yarnrc
 **/tsconfig.json
 **/.eslintrc.json
 **/*.map

package/generators/app/templates/ext-command-web/{build/web-extension.webpack.config.js → webpack.config.js}

@@ -12,14 +12,20 @@
 const path = require('path');
 const webpack = require('webpack');
 
-module.exports = /** @type WebpackConfig */ {
-	context: path.dirname(__dirname),
+/** @type WebpackConfig */
+const webExtensionConfig = {
 	mode: 'none', // this leaves the source code as close as possible to the original (when packaging we set this to 'production')
 	target: 'webworker', // extensions run in a webworker context
 	entry: {
 		'extension': './src/web/extension.ts',
 		'test/suite/index': './src/web/test/suite/index.ts'
 	},
+	output: {
+		filename: '[name].js',
+		path: path.join(__dirname, './dist/web'),
+		libraryTarget: 'commonjs',
+		devtoolModuleFilenameTemplate: '../../[resource-path]'
+	},
 	resolve: {
 		mainFields: ['browser', 'module', 'main'], // look for `browser` entry point in imported node modules
 		extensions: ['.ts', '.js'], // support ts-files and js-files
@@ -53,10 +59,10 @@ module.exports = /** @type WebpackConfig */ {
 	performance: {
 		hints: false
 	},
-	output: {
-		filename: '[name].js',
-		path: path.join(__dirname, '../dist/web'),
-		libraryTarget: 'commonjs'
+	devtool: 'nosources-source-map', // create a source map that points to the original source file
+	infrastructureLogging: {
+		level: "log", // enables logging required for problem matchers
 	},
-	devtool: 'nosources-source-map' // create a source map that points to the original source file
-};
+};
+
+module.exports = [ webExtensionConfig ];

package/generators/app/templates/ext-notebook-renderer/package.json

@@ -6,6 +6,9 @@
   "engines": {
     "vscode": <%- JSON.stringify(vsCodeEngine) %>
   },
+  "keywords": [
+    "notebookRenderer"
+  ],
   "categories": [
     "Other"
   ],
@@ -48,7 +51,7 @@
     <%- dep("ts-loader") %>,
     <%- dep("typescript") %>,
     <%- dep("vscode-notebook-error-overlay") %>,
-    <%- dep("vscode-test") %>,
+    <%- dep("@vscode/test-electron") %>,
     <%- dep("webpack") %>,
     <%- dep("webpack-cli") %>
   }

package/generators/app/templates/ext-notebook-renderer/src/test/runTest.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 
-import { runTests } from 'vscode-test';
+import { runTests } from '@vscode/test-electron';
 
 async function main() {
   try {

package/generators/app/templates/ext-notebook-renderer/vscode/extensions.json

@@ -1,8 +1,5 @@
 {
   // See http://go.microsoft.com/fwlink/?LinkId=827846
   // for the documentation about the extensions.json format
-  "recommendations": [
-    "dbaeumer.vscode-eslint",
-    "eamodio.tsl-problem-matcher"
-  ]
+  "recommendations": ["dbaeumer.vscode-eslint", "amodio.tsl-problem-matcher"]
 }

package/generators/app/templates/ext-notebook-renderer/webpack.config.js

@@ -66,6 +66,9 @@ const makeConfig = (argv, { entry, out, target, library = 'commonjs' }) => ({
             scriptUrl: 'import.meta.url',
         }),
     ],
+    infrastructureLogging: {
+        level: "log", // enables logging required for problem matchers
+    },
 });
 
 module.exports = (env, argv) => [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-code",
-  "version": "1.5.6",
+  "version": "1.6.3",
   "description": "Yeoman generator for Visual Studio Code Extensions",
   "keywords": [
     "yeoman-generator",
@@ -38,15 +38,16 @@
     "fast-plist": "^0.1.2",
     "request-light": "^0.5.4",
     "sanitize-filename": "^1.6.3",
+    "which": "^2.0.2",
     "yeoman-generator": "^5.4.2",
     "yosay": "^2.0.2"
   },
   "devDependencies": {
     "@types/mocha": "^9.0.0",
-    "@types/node": "^15.12.0",
-    "@types/yeoman-generator": "^5.2.2",
-    "@types/yeoman-test": "^4.0.2",
-    "mocha": "^9.1.0",
+    "@types/node": "^16.11.6",
+    "@types/yeoman-generator": "^5.2.7",
+    "@types/yeoman-test": "^4.0.3",
+    "mocha": "^9.1.3",
     "yeoman-test": "^6.2.0",
     "yeoman-environment": "^3.6.0"
   }

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

@@ -1,8 +0,0 @@
-{
-	// See http://go.microsoft.com/fwlink/?LinkId=827846
-	// for the documentation about the extensions.json format
-	"recommendations": [
-		"dbaeumer.vscode-eslint",
-		"eamodio.tsl-problem-matcher"
-	]
-}