generator-code 1.7.8 → 1.8.0

package/generators/app/dependencyVersions/package.json

@@ -4,30 +4,30 @@
     "version": "0.0.0",
     "private": true,
     "dependencies": {
-        "@types/mocha": "^10.0.1",
-        "@types/node": "16.x",
-        "@typescript-eslint/eslint-plugin": "^6.4.1",
-        "@typescript-eslint/parser": "^6.4.1",
-        "eslint": "^8.47.0",
-        "glob": "^10.3.3",
+        "@types/mocha": "^10.0.3",
+        "@types/node": "18.x",
+        "@typescript-eslint/eslint-plugin": "^6.9.0",
+        "@typescript-eslint/parser": "^6.9.0",
+        "eslint": "^8.52.0",
+        "glob": "^10.3.10",
         "mocha": "^10.2.0",
-        "typescript": "^5.1.6",
-        "@vscode/test-electron": "^2.3.4",
-        "@vscode/test-web": "^0.0.45",
-        "@types/webpack-env": "^1.18.1",
-        "@types/vscode-notebook-renderer": "^1.72.0",
-        "concurrently": "^8.2.1",
+        "typescript": "^5.2.2",
+        "@vscode/test-electron": "^2.3.6",
+        "@vscode/test-web": "^0.0.48",
+        "@types/webpack-env": "^1.18.3",
+        "@types/vscode-notebook-renderer": "^1.72.2",
+        "concurrently": "^8.2.2",
         "css-loader": "^6.8.1",
-        "fork-ts-checker-webpack-plugin": "^8.0.0",
+        "fork-ts-checker-webpack-plugin": "^9.0.0",
         "style-loader": "^3.3.3",
-        "ts-loader": "^9.4.4",
+        "ts-loader": "^9.5.0",
         "vscode-dts": "^0.3.3",
         "vscode-notebook-error-overlay": "^1.0.1",
-        "webpack": "^5.88.2",
+        "webpack": "^5.89.0",
         "util": "^0.12.5",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.1",
-        "assert": "^2.0.0",
+        "assert": "^2.1.0",
         "process": "^0.11.10"
     }
 }

package/generators/app/env.js

@@ -2,14 +2,15 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 'use strict';
-const request = require('request-light');
-const fs = require('fs');
-const path = require('path');
+import request from 'request-light';
+import * as fs from 'fs';
+import * as path from 'path';
+import { fileURLToPath } from 'url';
 
 const fallbackVersion = '^1.54.0';
 let versionPromise = undefined;
 
-function getLatestVSCodeVersion() {
+export function getLatestVSCodeVersion() {
     if (!versionPromise) {
         versionPromise = request.xhr({ url: 'https://update.code.visualstudio.com/api/releases/stable', headers: { "X-API-Version": "2" } }).then(res => {
             if (res.status === 200) {
@@ -37,11 +38,11 @@ function getLatestVSCodeVersion() {
     }
     return versionPromise;
 };
-module.exports.getLatestVSCodeVersion = getLatestVSCodeVersion;
 
-module.exports.getDependencyVersions = async function () {
+export async function getDependencyVersions() {
     const vscodeVersion = await getLatestVSCodeVersion();
-    const versions = JSON.parse((await fs.promises.readFile(path.join(__dirname, 'dependencyVersions', 'package.json'))).toString()).dependencies;
+    const currentFileName = fileURLToPath(import.meta.url);
+    const versions = JSON.parse((await fs.promises.readFile(path.join(currentFileName, '..', 'dependencyVersions', 'package.json'))).toString()).dependencies;
     versions["@types/vscode"] = vscodeVersion
     return versions;
 }

package/generators/app/generate-colortheme.js

@@ -1,21 +1,20 @@
 /*---------------------------------------------------------
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
+import Generator from 'yeoman-generator';
+import * as prompts from './prompts.js';
+import * as validator from './validator.js';
+import * as path from 'path';
+import * as fs from 'fs';
+import * as plistParser from 'fast-plist';
+import request from 'request-light';
 
-const prompts = require("./prompts");
-const validator = require('./validator');
-const sanitize = require("sanitize-filename");
-const path = require('path');
-const fs = require('fs');
-const plistParser = require('fast-plist');
-const request = require('request-light');
-
-module.exports = {
+export default {
     id: 'ext-colortheme',
     aliases: ['colortheme'],
     name: 'New Color Theme',
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     prompting: async (generator, extensionConfig) => {
@@ -63,14 +62,14 @@ module.exports = {
         await prompts.askForGit(generator, extensionConfig);
     },
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     writing: (generator, extensionConfig) => {
         if (extensionConfig.tmThemeFileName) {
             generator.fs.copyTpl(generator.templatePath('themes/theme.tmTheme'), generator.destinationPath('themes', extensionConfig.tmThemeFileName), extensionConfig);
         }
-        extensionConfig.themeFileName = sanitize(extensionConfig.themeName + '-color-theme.json');
+        extensionConfig.themeFileName = validator.sanitizeFilename(extensionConfig.themeName + '-color-theme.json');
         if (extensionConfig.themeContent) {
             extensionConfig.themeContent.name = extensionConfig.themeName;
             generator.fs.copyTpl(generator.templatePath('themes/color-theme.json'), generator.destinationPath('themes', extensionConfig.themeFileName), extensionConfig);
@@ -92,7 +91,7 @@ module.exports = {
 }
 
 /**
- * @param {import('yeoman-generator')} generator
+ * @param {Generator} generator
  * @param {Object} extensionConfig
  */
 async function askForThemeInfo(generator, extensionConfig) {

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

@@ -1,15 +1,15 @@
 /*---------------------------------------------------------
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
+import Generator from 'yeoman-generator';
+import * as prompts from './prompts.js';
 
-const prompts = require("./prompts");
-
-module.exports = {
+export default {
     id: 'ext-command-js',
     aliases: ['js', 'command-js'],
     name: 'New Extension (JavaScript)',
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     prompting: async (generator, extensionConfig) => {
@@ -32,7 +32,7 @@ module.exports = {
     },
 
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     writing: (generator, extensionConfig) => {

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

@@ -1,17 +1,19 @@
 /*---------------------------------------------------------
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
+import Generator from 'yeoman-generator';
+import { Chalk } from 'chalk';
+import * as prompts from './prompts.js';
 
-const chalk = require("chalk");
-const prompts = require("./prompts");
+const chalk = new Chalk();
 
-module.exports = {
+export default {
     id: 'ext-command-ts',
     aliases: ['ts', 'command-ts'],
     name: 'New Extension (TypeScript)',
     insidersName: 'New Extension with Proposed API (TypeScript)',
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     prompting: async (generator, extensionConfig) => {
@@ -24,7 +26,7 @@ module.exports = {
         await prompts.askForPackageManager(generator, extensionConfig);
     },
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     writing: (generator, extensionConfig) => {
@@ -63,7 +65,7 @@ module.exports = {
     },
 
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     endMessage: (generator, extensionConfig) => {

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

@@ -1,16 +1,18 @@
 /*---------------------------------------------------------
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
+import Generator from 'yeoman-generator';
+import { Chalk } from 'chalk';
+import * as prompts from './prompts.js';
 
-const chalk = require("chalk");
-const prompts = require("./prompts");
+const chalk = new Chalk();
 
-module.exports = {
+export default {
     id: 'ext-command-web',
     aliases: ['web', 'command-web'],
     name: 'New Web Extension (TypeScript)',
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     prompting: async (generator, extensionConfig) => {
@@ -22,7 +24,7 @@ module.exports = {
         await prompts.askForPackageManager(generator, extensionConfig);
     },
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     writing: (generator, extensionConfig) => {
@@ -55,7 +57,7 @@ module.exports = {
         extensionConfig.proposedAPI = false;
     },
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     endMessage: (generator, extensionConfig) => {

package/generators/app/generate-extensionpack.js

@@ -1,16 +1,16 @@
 /*---------------------------------------------------------
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
+import Generator from 'yeoman-generator';
+import * as prompts from './prompts.js';
+import * as childProcess from 'child_process';
 
-const prompts = require("./prompts");
-let childProcess = require('child_process');
-
-module.exports = {
+export default {
     id: 'ext-extensionpack',
     aliases: ['extensionpack'],
     name: 'New Extension Pack',
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     prompting: async (generator, extensionConfig) => {
@@ -24,7 +24,7 @@ module.exports = {
         await prompts.askForGit(generator, extensionConfig);
     },
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     writing: (generator, extensionConfig) => {

package/generators/app/generate-keymap.js

@@ -1,15 +1,15 @@
 /*---------------------------------------------------------
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
+import Generator from 'yeoman-generator';
+import * as prompts from './prompts.js';
 
-const prompts = require("./prompts");
-
-module.exports = {
+export default {
     id: 'ext-keymap',
     aliases: ['keymap'],
     name: 'New Keymap',
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     prompting: async (generator, extensionConfig) => {
@@ -20,7 +20,7 @@ module.exports = {
         await prompts.askForGit(generator, extensionConfig);
     },
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     writing: (generator, extensionConfig) => {

package/generators/app/generate-language.js

@@ -1,20 +1,20 @@
 /*---------------------------------------------------------
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
-
-const prompts = require("./prompts");
-const sanitize = require("sanitize-filename");
-const path = require('path');
-const fs = require('fs');
-const plistParser = require('fast-plist');
-const request = require('request-light');
-
-module.exports = {
+import Generator from 'yeoman-generator';
+import * as prompts from './prompts.js';
+import * as path from 'path';
+import * as fs from 'fs';
+import * as plistParser from 'fast-plist';
+import request from 'request-light';
+import * as validator from './validator.js';
+
+export default {
     id: 'ext-language',
     aliases: ['language'],
     name: 'New Language Support',
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     prompting: async (generator, extensionConfig) => {
@@ -33,16 +33,16 @@ module.exports = {
 
     },
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     writing: (generator, extensionConfig) => {
         if (!extensionConfig.languageContent) {
-            extensionConfig.languageFileName = sanitize(extensionConfig.languageId + '.tmLanguage.json');
+            extensionConfig.languageFileName = validator.sanitizeFilename(extensionConfig.languageId + '.tmLanguage.json');
 
             generator.fs.copyTpl(generator.templatePath('syntaxes/new.tmLanguage.json'), generator.destinationPath('syntaxes', extensionConfig.languageFileName), extensionConfig);
         } else {
-            generator.fs.copyTpl(generator.templatePath('syntaxes/language.tmLanguage'), generator.destinationPath('syntaxes', sanitize(extensionConfig.languageFileName)), extensionConfig);
+            generator.fs.copyTpl(generator.templatePath('syntaxes/language.tmLanguage'), generator.destinationPath('syntaxes', validator.sanitizeFilename(extensionConfig.languageFileName)), extensionConfig);
         }
 
         generator.fs.copy(generator.templatePath('vscode'), generator.destinationPath('.vscode'));
@@ -59,7 +59,7 @@ module.exports = {
     }
 }
 /**
- * @param {import('yeoman-generator')} generator
+ * @param {Generator} generator
  * @param {Object} extensionConfig
  */
 function askForLanguageInfo(generator, extensionConfig) {
@@ -76,7 +76,7 @@ function askForLanguageInfo(generator, extensionConfig) {
 }
 
 /**
- * @param {import('yeoman-generator')} generator
+ * @param {Generator} generator
  * @param {Object} extensionConfig
  */
 function askForLanguageId(generator, extensionConfig) {
@@ -92,7 +92,7 @@ function askForLanguageId(generator, extensionConfig) {
 }
 
 /**
- * @param {import('yeoman-generator')} generator
+ * @param {Generator} generator
  * @param {Object} extensionConfig
  */
 function askForLanguageName(generator, extensionConfig) {
@@ -108,7 +108,7 @@ function askForLanguageName(generator, extensionConfig) {
 }
 
 /**
- * @param {import('yeoman-generator')} generator
+ * @param {Generator} generator
  * @param {Object} extensionConfig
  */
 function askForLanguageExtensions(generator, extensionConfig) {
@@ -124,7 +124,7 @@ function askForLanguageExtensions(generator, extensionConfig) {
 }
 
 /**
- * @param {import('yeoman-generator')} generator
+ * @param {Generator} generator
  * @param {Object} extensionConfig
  */
 function askForLanguageScopeName(generator, extensionConfig) {
@@ -154,10 +154,13 @@ function convertGrammar(location, extensionConfig) {
         // load from url
         return request.xhr({ url: location }).then(r => {
             if (r.status == 200) {
-                var contentDisposition = r.headers && r.headers['content-disposition'];
-                var fileName = '';
+                let contentDisposition = r.headers && r.headers['content-disposition'];
+                if (Array.isArray(contentDisposition)) {
+                    contentDisposition = contentDisposition[0];
+                }
+                let fileName = '';
                 if (contentDisposition) {
-                    var fileNameMatch = contentDisposition.match(/filename="([^"]*)/);
+                    const fileNameMatch = contentDisposition.match(/filename="([^"]*)/);
                     if (fileNameMatch) {
                         fileName = fileNameMatch[1];
                     }
@@ -170,7 +173,7 @@ function convertGrammar(location, extensionConfig) {
 
     } else {
         // load from disk
-        var body = null;
+        let body = null;
         // trim the spaces of the location path
         location = location.trim()
         try {
@@ -187,7 +190,7 @@ function convertGrammar(location, extensionConfig) {
 }
 
 function processContent(extensionConfig, fileName, body) {
-    var languageInfo;
+    let languageInfo;
     if (path.extname(fileName) === '.json') {
         try {
             languageInfo = JSON.parse(body);
@@ -212,19 +215,19 @@ function processContent(extensionConfig, fileName, body) {
     extensionConfig.languageName = languageInfo.name || '';
 
     // evaluate language id
-    var languageId = '';
-    var languageScopeName;
+    let languageId = '';
+    let languageScopeName;
 
     if (languageInfo.scopeName) {
         languageScopeName = languageInfo.scopeName;
 
-        var lastIndexOfDot = languageInfo.scopeName.lastIndexOf('.');
+        const lastIndexOfDot = languageInfo.scopeName.lastIndexOf('.');
         if (lastIndexOfDot) {
             languageId = languageInfo.scopeName.substring(lastIndexOfDot + 1);
         }
     }
     if (!languageId && fileName) {
-        var lastIndexOfDot2 = fileName.lastIndexOf('.');
+        const lastIndexOfDot2 = fileName.lastIndexOf('.');
         if (lastIndexOfDot2 && fileName.substring(lastIndexOfDot2 + 1) == 'tmLanguage') {
             languageId = fileName.substring(0, lastIndexOfDot2);
         }

package/generators/app/generate-localization.js

@@ -1,16 +1,18 @@
 /*---------------------------------------------------------
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
+import Generator from 'yeoman-generator';
+import * as prompts from './prompts.js';
+import { Chalk } from 'chalk';
 
-const prompts = require("./prompts");
-const chalk = require("chalk");
+const chalk = new Chalk();
 
-module.exports = {
+export default {
     id: 'ext-localization',
     aliases: ['localization'],
     name: 'New Language Pack (Localization)',
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     prompting: async (generator, extensionConfig) => {
@@ -26,7 +28,7 @@ module.exports = {
         await prompts.askForPackageManager(generator, extensionConfig);
     },
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     writing: (generator, extensionConfig) => {
@@ -54,7 +56,7 @@ module.exports = {
 }
 
 /**
- * @param {import('yeoman-generator')} generator
+ * @param {Generator} generator
  * @param {Object} extensionConfig
  */
 function askForLanguageId(generator, extensionConfig) {
@@ -74,7 +76,7 @@ function askForLanguageId(generator, extensionConfig) {
 }
 
 /**
- * @param {import('yeoman-generator')} generator
+ * @param {Generator} generator
  * @param {Object} extensionConfig
  */
 function askForLanguageName(generator, extensionConfig) {
@@ -97,7 +99,7 @@ function askForLanguageName(generator, extensionConfig) {
 }
 
 /**
- * @param {import('yeoman-generator')} generator
+ * @param {Generator} generator
  * @param {Object} extensionConfig
  */
 function askForLocalizedLanguageName(generator, extensionConfig) {

package/generators/app/generate-notebook-renderer.js

@@ -1,15 +1,15 @@
 /*---------------------------------------------------------
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
+import Generator from 'yeoman-generator';
+import * as prompts from './prompts.js';
 
-const prompts = require("./prompts");
-
-module.exports = {
+export default {
     id: 'ext-notebook-renderer',
     aliases: ['notebook'],
     name: 'New Notebook Renderer (TypeScript)',
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     prompting: async (generator, extensionConfig) => {
@@ -24,7 +24,7 @@ module.exports = {
 
     },
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     writing: (generator, extensionConfig) => {
@@ -60,7 +60,7 @@ module.exports = {
 }
 
 /**
- * @param {import('yeoman-generator')} generator
+ * @param {Generator} generator
  * @param {Object} extensionConfig
  */
 async function askForNotebookRendererInfo(generator, extensionConfig) {

package/generators/app/generate-snippets.js

@@ -1,18 +1,18 @@
 /*---------------------------------------------------------
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
+import Generator from 'yeoman-generator';
+import * as prompts from "./prompts.js";
+import * as path from 'path';
+import * as fs from 'fs';
+import * as plistParser from 'fast-plist';
 
-const prompts = require("./prompts");
-const path = require('path');
-const fs = require('fs');
-const plistParser = require('fast-plist');
-
-module.exports = {
+export default {
     id: 'ext-snippets',
     aliases: ['snippets'],
     name: 'New Code Snippets',
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     prompting: async (generator, extensionConfig) => {
@@ -27,7 +27,7 @@ module.exports = {
 
     },
     /**
-     * @param {import('yeoman-generator')} generator
+     * @param {Generator} generator
      * @param {Object} extensionConfig
      */
     writing: (generator, extensionConfig) => {
@@ -45,7 +45,7 @@ module.exports = {
     }
 }
 /**
- * @param {import('yeoman-generator')} generator
+ * @param {Generator} generator
  * @param {Object} extensionConfig
  */
 function askForSnippetsInfo(generator, extensionConfig) {
@@ -90,7 +90,7 @@ function askForSnippetsInfo(generator, extensionConfig) {
 }
 
 /**
- * @param {import('yeoman-generator')} generator
+ * @param {Generator} generator
  * @param {Object} extensionConfig
  */
 function askForSnippetLanguage(generator, extensionConfig) {

package/generators/app/index.js

@@ -3,30 +3,29 @@
  *--------------------------------------------------------*/
 'use strict';
 
-const Generator = require('yeoman-generator');
-const yosay = require('yosay');
-
-const path = require('path');
-const env = require('./env');
-const which = require('which');
-
-const colortheme = require('./generate-colortheme');
-const commandjs = require('./generate-command-js');
-const commandts = require('./generate-command-ts');
-const commandweb = require('./generate-command-web');
-const extensionpack = require('./generate-extensionpack');
-const keymap = require('./generate-keymap');
-const language = require('./generate-language');
-const localization = require('./generate-localization');
-const notebook = require('./generate-notebook-renderer');
-const snippets = require('./generate-snippets');
+import Generator from 'yeoman-generator';
+import yosay from 'yosay';
+import { fileURLToPath } from 'url';
+import * as path from 'path';
+import * as env from './env.js';
+import which from 'which';
+import colortheme from './generate-colortheme.js';
+import commandjs from './generate-command-js.js';
+import commandts from './generate-command-ts.js';
+import commandweb from './generate-command-web.js';
+import extensionpack from './generate-extensionpack.js';
+import keymap from './generate-keymap.js';
+import language from './generate-language.js';
+import localization from './generate-localization.js';
+import notebook from './generate-notebook-renderer.js';
+import snippets from './generate-snippets.js';
 
 const extensionGenerators = [
     commandts, commandjs, colortheme, language, snippets, keymap, extensionpack, localization,
     commandweb, notebook
 ]
 
-module.exports = class extends Generator {
+export default class extends Generator {
 
     constructor(args, opts) {
         super(args, opts);
@@ -126,6 +125,7 @@ module.exports = class extends Generator {
         try {
             await this.extensionGenerator.prompting(this, this.extensionConfig);
         } catch (e) {
+            console.log(e);
             this.abort = true;
         }
 
@@ -143,7 +143,8 @@ module.exports = class extends Generator {
         this.log();
         this.log(`Writing in ${this.destinationPath()}...`);
 
-        this.sourceRoot(path.join(__dirname, './templates/' + this.extensionConfig.type));
+        const currentFilename = fileURLToPath(import.meta.url);
+        this.sourceRoot(path.join(currentFilename, '../templates/' + this.extensionConfig.type));
 
         return this.extensionGenerator.writing(this, this.extensionConfig);
     }
@@ -151,12 +152,15 @@ module.exports = class extends Generator {
     // Installation
     install() {
         if (this.abort) {
+            // @ts-ignore
             this.env.options.skipInstall = true;
             return;
         }
         if (this.extensionConfig.installDependencies) {
+            // @ts-ignore
             this.env.options.nodePackageManager = this.extensionConfig.pkgManager;
         } else {
+            // @ts-ignore
             this.env.options.skipInstall = true;
         }
     }
@@ -185,7 +189,7 @@ module.exports = class extends Generator {
 
         // Git init
         if (this.extensionConfig.gitInit) {
-            this.spawnCommand('git', ['init', '--quiet', '--initial-branch=main']);
+            this.spawnCommand('git', ['init', '--quiet']);
         }
 
         if (this.extensionConfig.proposedAPI) {

package/generators/app/prompts.js

@@ -3,14 +3,16 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-const validator = require('./validator');
-const path = require('path');
+import Generator from 'yeoman-generator';
+
+import * as validator from './validator.js';
+import * as path from 'path';
 
 /**
-* @param {import('yeoman-generator')} generator
+* @param {Generator} generator
 * @param {Object} extensionConfig
 */
-exports.askForExtensionDisplayName = (generator, extensionConfig) => {
+export function askForExtensionDisplayName(generator, extensionConfig) {
     let extensionDisplayName = generator.options['extensionDisplayName'];
     if (extensionDisplayName) {
         extensionConfig.displayName = extensionDisplayName;
@@ -35,10 +37,10 @@ exports.askForExtensionDisplayName = (generator, extensionConfig) => {
 
 /**
  * Ask for extension id ("name" in package.json)
-* @param {import('yeoman-generator')} generator
+* @param {Generator} generator
 * @param {Object} extensionConfig
 */
-exports.askForExtensionId = (generator, extensionConfig) => {
+export function askForExtensionId(generator, extensionConfig) {
     let extensionName = generator.options['extensionId'];
     if (extensionName) {
         extensionConfig.name = extensionName;
@@ -66,10 +68,10 @@ exports.askForExtensionId = (generator, extensionConfig) => {
 
 /**
  * Ask for extension description
-* @param {import('yeoman-generator')} generator
+* @param {Generator} generator
 * @param {Object} extensionConfig
 */
-exports.askForExtensionDescription = (generator, extensionConfig) => {
+export function askForExtensionDescription(generator, extensionConfig) {
     let extensionDescription = generator.options['extensionDescription'];
     if (extensionDescription) {
         extensionConfig.description = extensionDescription;
@@ -91,10 +93,10 @@ exports.askForExtensionDescription = (generator, extensionConfig) => {
 }
 
 /**
-* @param {import('yeoman-generator')} generator
+* @param {Generator} generator
 * @param {Object} extensionConfig
 */
-exports.askForGit = (generator, extensionConfig) => {
+export function askForGit(generator, extensionConfig) {
     let gitInit = generator.options['gitInit'];
     if (typeof gitInit === 'boolean') {
         extensionConfig.gitInit = Boolean(gitInit);
@@ -116,10 +118,10 @@ exports.askForGit = (generator, extensionConfig) => {
 }
 
 /**
-* @param {import('yeoman-generator')} generator
+* @param {Generator} generator
 * @param {Object} extensionConfig
 */
-exports.askForPackageManager = (generator, extensionConfig) => {
+export function askForPackageManager(generator, extensionConfig) {
     let pkgManager = generator.options['pkgManager'];
     if (pkgManager === 'npm' || pkgManager === 'yarn' || pkgManager === 'pnpm') {
         extensionConfig.pkgManager = pkgManager;
@@ -156,10 +158,10 @@ exports.askForPackageManager = (generator, extensionConfig) => {
 }
 
 /**
-* @param {import('yeoman-generator')} generator
+* @param {Generator} generator
 * @param {Object} extensionConfig
 */
-exports.askForWebpack = (generator, extensionConfig) => {
+export function askForWebpack(generator, extensionConfig) {
     let webpack = generator.options['webpack'];
     if (typeof webpack === 'boolean') {
         extensionConfig.webpack = Boolean(webpack);

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

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

package/generators/app/templates/ext-command-js/test/suite/index.js

@@ -2,7 +2,7 @@ const path = require('path');
 const Mocha = require('mocha');
 const glob = require('glob');
 
-function run() {
+async function run() {
 	// Create the mocha test
 	const mocha = new Mocha({
 		ui: 'tdd',
@@ -10,34 +10,25 @@ function run() {
 	});
 
 	const testsRoot = path.resolve(__dirname, '..');
+	const files = await glob('**/**.test.js', { cwd: testsRoot });
 
-	return new Promise((c, e) => {
-		const testFiles = new glob.Glob('**/**.test.js', { cwd: testsRoot });
-		const testFileStream = testFiles.stream();
+	// Add files to the test suite
+	files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
 
-		testFileStream.on('data', (file) => {
-			// Add files to the test suite
-			mocha.addFile(path.resolve(testsRoot, file));
+	try {
+		return new Promise((c, e) => {
+			// Run the mocha test
+			mocha.run(failures => {
+				if (failures > 0) {
+					e(new Error(`${failures} tests failed.`));
+				} else {
+					c();
+				}
+			});
 		});
-		testFileStream.on('error', (err) => {
-			e(err);
-		});
-		testFileStream.on('end', () => {
-			try {
-				// Run the mocha test
-				mocha.run(failures => {
-					if (failures > 0) {
-						e(new Error(`${failures} tests failed.`));
-					} else {
-						c();
-					}
-				});
-			} catch (err) {
-				console.error(err);
-				e(err);
-			}
-		});
-	});
+	} catch (err) {
+		console.error(err);
+	}
 }
 
 module.exports = {

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

@@ -9,7 +9,13 @@
         "@typescript-eslint"
     ],
     "rules": {
-        "@typescript-eslint/naming-convention": "warn",
+        "@typescript-eslint/naming-convention": [
+            "warn",
+            {
+                "selector": "import",
+                "format": [ "camelCase", "PascalCase" ]
+            }
+        ],
         "@typescript-eslint/semi": "warn",
         "curly": "warn",
         "eqeqeq": "warn",
@@ -21,4 +27,4 @@
         "dist",
         "**/*.d.ts"
     ]
-}
+}

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

@@ -1,8 +1,8 @@
 import * as path from 'path';
-import * as Mocha from 'mocha';
-import * as glob from 'glob';
+import Mocha from 'mocha';
+import { glob } from 'glob';
 
-export function run(): Promise<void> {
+export async function run(): Promise<void> {
 	// Create the mocha test
 	const mocha = new Mocha({
 		ui: 'tdd',
@@ -10,31 +10,23 @@ export function run(): Promise<void> {
 	});
 
 	const testsRoot = path.resolve(__dirname, '..');
+	const files = await glob('**/**.test.js', { cwd: testsRoot });
 
-	return new Promise((c, e) => {
-		const testFiles = new glob.Glob("**/**.test.js", { cwd: testsRoot });
-		const testFileStream = testFiles.stream();
+	// Add files to the test suite
+	files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
 
-		testFileStream.on("data", (file) => {
-			mocha.addFile(path.resolve(testsRoot, file));
+	try {
+		return new Promise<void>((c, e) => {
+			// Run the mocha test
+			mocha.run(failures => {
+				if (failures > 0) {
+					e(new Error(`${failures} tests failed.`));
+				} else {
+					c();
+				}
+			});
 		});
-		testFileStream.on("error", (err) => {
-			e(err);
-		});
-		testFileStream.on("end", () => {
-			try {
-				// Run the mocha test
-				mocha.run(failures => {
-					if (failures > 0) {
-						e(new Error(`${failures} tests failed.`));
-					} else {
-						c();
-					}
-				});
-			} catch (err) {
-				console.error(err);
-				e(err);
-			}
-		});
-	});
+	} catch (err) {
+		console.error(err);
+	}
 }

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

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

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

@@ -1,9 +1,9 @@
 {
 	"compilerOptions": {
-		"module": "commonjs",
-		"target": "ES2020",
+		"module": "Node16",
+		"target": "ES2022",
 		"lib": [
-			"ES2020"
+			"ES2022"
 		],
 		"sourceMap": true,
 		"rootDir": "src",

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

@@ -1,6 +1,6 @@
 {
 	"compilerOptions": {
-		"module": "commonjs",
+		"module": "Node16",
 		"target": "ES2020",
 		"outDir": "dist",
 		"lib": [

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

@@ -1,40 +1,32 @@
 import * as path from 'path';
-import * as Mocha from 'mocha';
-import * as glob from 'glob';
+import Mocha from 'mocha';
+import { glob } from 'glob';
 
-export function run(): Promise<void> {
-  // Create the mocha test
-  const mocha = new Mocha({
-    ui: 'tdd',
-    color: true
-  });
+export async function run(): Promise<void> {
+	// Create the mocha test
+	const mocha = new Mocha({
+		ui: 'tdd',
+		color: true
+	});
 
-  const testsRoot = path.resolve(__dirname, '..');
+	const testsRoot = path.resolve(__dirname, '..');
+	const files = await glob('**/**.test.js', { cwd: testsRoot });
 
-  return new Promise((c, e) => {
-    const testFiles = new glob.Glob("**/**.test.js", { cwd: testsRoot });
-    const testFileStream = testFiles.stream();
+	// Add files to the test suite
+	files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
 
-    testFileStream.on("data", (file) => {
-      mocha.addFile(path.resolve(testsRoot, file));
-    });
-    testFileStream.on("error", (err) => {
-      e(err);
-    });
-    testFileStream.on("end", () => {
-      try {
-        // Run the mocha test
-        mocha.run(failures => {
-          if (failures > 0) {
-            e(new Error(`${failures} tests failed.`));
-          } else {
-            c();
-          }
-        });
-      } catch (err) {
-        console.error(err);
-        e(err);
-      }
-    });
-  });
+	try {
+		return new Promise<void>((c, e) => {
+			// Run the mocha test
+			mocha.run(failures => {
+				if (failures > 0) {
+					e(new Error(`${failures} tests failed.`));
+				} else {
+					c();
+				}
+			});
+		});
+	} catch (err) {
+		console.error(err);
+	}
 }

package/generators/app/templates/ext-notebook-renderer/src/tsconfig-base.json

@@ -1,12 +1,11 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
-    "target": "ES2019",
+    "module": "Node16",
+    "target": "ES2022",
     "lib": [
-      "ES2019"
+      "ES2022"
     ],
     "types": ["node"],
-    "moduleResolution": "node",
     "sourceMap": true,
     "strict": true   /* enable all strict type-checking options */
     /* Additional Checks */

package/generators/app/validator.js

@@ -3,7 +3,10 @@
  *--------------------------------------------------------*/
 var nameRegex = /^[a-z0-9][a-z0-9\-]*$/i;
 
-module.exports.validatePublisher = function(publisher) {
+/**
+ * @param {string} publisher
+ */
+export function validatePublisher(publisher) {
     if (!publisher) {
         return "Missing publisher name";
     }
@@ -15,7 +18,10 @@ module.exports.validatePublisher = function(publisher) {
     return true;
 }
 
-module.exports.validateExtensionId = function(id) {
+/**
+ * @param {string} id
+ */
+export function validateExtensionId(id) {
     if (!id) {
         return "Missing extension identifier";
     }
@@ -27,6 +33,27 @@ module.exports.validateExtensionId = function(id) {
     return true;
 }
 
-module.exports.validateNonEmpty = function(name) {
+/**
+ * @param {string | any[]} name
+ */
+export function validateNonEmpty(name) {
     return name && name.length > 0;
-}
+}
+
+const illegalRe = /[\/\?<>\\:\*\|"]/g;
+const controlRe = /[\x00-\x1f\x80-\x9f]/g;
+const reservedRe = /^\.+$/;
+const windowsReservedRe = /^(con|prn|aux|nul|com[0-9]|lpt[0-9])(\..*)?$/i;
+const windowsTrailingRe = /[\. ]+$/;
+
+/**
+ * @param {string} input
+ */
+export function sanitizeFilename(input) {
+    return input
+        .replace(illegalRe, '')
+        .replace(controlRe, '')
+        .replace(reservedRe, '')
+        .replace(windowsReservedRe, '')
+        .replace(windowsTrailingRe, '');
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-code",
-  "version": "1.7.8",
+  "version": "1.8.0",
   "description": "Yeoman generator for Visual Studio Code extensions.",
   "keywords": [
     "yeoman-generator",
@@ -10,6 +10,7 @@
     "vs code",
     "extensions"
   ],
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/Microsoft/vscode-generator-code.git"
@@ -25,7 +26,7 @@
     "url": "https://github.com/Microsoft"
   },
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=16.x"
   },
   "scripts": {
     "test": "mocha",
@@ -34,20 +35,18 @@
     "postversion": "git push && git push --tags"
   },
   "dependencies": {
-    "chalk": "^4.1.2",
+    "chalk": "^5.3.0",
     "fast-plist": "^0.1.3",
     "request-light": "^0.7.0",
-    "sanitize-filename": "^1.6.3",
-    "which": "^3.0.1",
-    "yeoman-generator": "^5.9.0",
-    "yosay": "^2.0.2"
+    "which": "^4.0.0",
+    "yeoman-generator": "^6.0.1",
+    "yosay": "^3.0.0"
   },
   "devDependencies": {
-    "@types/mocha": "^10.0.1",
+    "@types/mocha": "^10.0.3",
     "@types/node": "^16.x",
-    "@types/yeoman-generator": "^5.2.11",
     "mocha": "^10.2.0",
     "yeoman-environment": "^3.19.3",
-    "yeoman-test": "^7.4.0"
+    "yeoman-test": "^8.2.0"
   }
 }