generator-code 1.7.9 → 1.8.1

package/generators/app/dependencyVersions/package.json

@@ -4,26 +4,28 @@
     "version": "0.0.0",
     "private": true,
     "dependencies": {
-        "@types/mocha": "^10.0.2",
+        "@types/mocha": "^10.0.6",
         "@types/node": "18.x",
-        "@typescript-eslint/eslint-plugin": "^6.7.3",
-        "@typescript-eslint/parser": "^6.7.3",
-        "eslint": "^8.50.0",
-        "glob": "^10.3.3",
+        "@types/assert": "^1.5.10",
+        "@typescript-eslint/eslint-plugin": "^6.13.1",
+        "@typescript-eslint/parser": "^6.13.1",
+        "eslint": "^8.54.0",
+        "glob": "^10.3.10",
         "mocha": "^10.2.0",
-        "typescript": "^5.2.2",
-        "@vscode/test-electron": "^2.3.4",
-        "@vscode/test-web": "^0.0.46",
-        "@types/webpack-env": "^1.18.2",
-        "@types/vscode-notebook-renderer": "^1.72.1",
-        "concurrently": "^8.2.1",
+        "typescript": "^5.3.2",
+        "@vscode/test-cli": "^0.0.4",
+        "@vscode/test-electron": "^2.3.8",
+        "@vscode/test-web": "^0.0.49",
+        "@types/webpack-env": "^1.18.4",
+        "@types/vscode-notebook-renderer": "^1.72.3",
+        "concurrently": "^8.2.2",
         "css-loader": "^6.8.1",
-        "fork-ts-checker-webpack-plugin": "^8.0.0",
+        "fork-ts-checker-webpack-plugin": "^9.0.2",
         "style-loader": "^3.3.3",
-        "ts-loader": "^9.4.4",
+        "ts-loader": "^9.5.1",
         "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",

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) => {
@@ -52,6 +52,7 @@ module.exports = {
 
         generator.fs.copyTpl(generator.templatePath('extension.js'), generator.destinationPath('extension.js'), extensionConfig);
         generator.fs.copyTpl(generator.templatePath('package.json'), generator.destinationPath('package.json'), extensionConfig);
+        generator.fs.copy(generator.templatePath('.vscode-test.mjs'), generator.destinationPath('.vscode-test.mjs'));
         generator.fs.copyTpl(generator.templatePath('.eslintrc.json'), generator.destinationPath('.eslintrc.json'), extensionConfig);
 
         if (extensionConfig.pkgManager === 'yarn') {

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) => {
@@ -50,6 +52,7 @@ module.exports = {
         generator.fs.copyTpl(generator.templatePath('CHANGELOG.md'), generator.destinationPath('CHANGELOG.md'), extensionConfig);
         generator.fs.copyTpl(generator.templatePath('src/extension.ts'), generator.destinationPath('src/extension.ts'), extensionConfig);
         generator.fs.copy(generator.templatePath('src/test'), generator.destinationPath('src/test'));
+        generator.fs.copy(generator.templatePath('.vscode-test.mjs'), generator.destinationPath('.vscode-test.mjs'));
         generator.fs.copy(generator.templatePath('.eslintrc.json'), generator.destinationPath('.eslintrc.json'));
 
         if (extensionConfig.pkgManager === 'yarn') {
@@ -63,7 +66,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) => {
@@ -35,6 +35,7 @@ module.exports = {
         generator.fs.copy(generator.templatePath('.vscodeignore'), generator.destinationPath('.vscodeignore'));
         generator.fs.copy(generator.templatePath('webpack.config.js'), generator.destinationPath('webpack.config.js'));
         generator.fs.copy(generator.templatePath('.eslintrc.json'), generator.destinationPath('.eslintrc.json'));
+        generator.fs.copy(generator.templatePath('.vscode-test.mjs'), generator.destinationPath('.vscode-test.mjs'));
 
         generator.fs.copyTpl(generator.templatePath('package.json'), generator.destinationPath('package.json'), extensionConfig);
         generator.fs.copyTpl(generator.templatePath('README.md'), generator.destinationPath('README.md'), extensionConfig);
@@ -60,7 +61,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) {