microsoft · aeschli · Oct 27, 2023 · Oct 27, 2023
diff --git a/generators/app/dependencyVersions/package.json b/generators/app/dependencyVersions/package.json
@@ -4,26 +4,26 @@
     "version": "0.0.0",
     "private": true,
     "dependencies": {
-        "@types/mocha": "^10.0.2",
+        "@types/mocha": "^10.0.3",
         "@types/node": "18.x",
-        "@typescript-eslint/eslint-plugin": "^6.7.3",
-        "@typescript-eslint/parser": "^6.7.3",
-        "eslint": "^8.50.0",
+        "@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.2.2",
-        "@vscode/test-electron": "^2.3.4",
-        "@vscode/test-web": "^0.0.47",
-        "@types/webpack-env": "^1.18.2",
-        "@types/vscode-notebook-renderer": "^1.72.1",
-        "concurrently": "^8.2.1",
+        "@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",

diff --git a/generators/app/env.js b/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;
 }
diff --git a/generators/app/generate-colortheme.js b/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) {

diff --git a/generators/app/generate-command-js.js b/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) => {

diff --git a/generators/app/generate-command-ts.js b/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) => {

diff --git a/generators/app/generate-command-web.js b/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) => {

diff --git a/generators/app/generate-extensionpack.js b/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) => {

diff --git a/generators/app/generate-keymap.js b/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) => {