generator-code 1.7.9 → 1.8.1

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.9",
+  "version": "1.8.1",
   "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.2",
+    "@types/mocha": "^10.0.6",
     "@types/node": "^16.x",
-    "@types/yeoman-generator": "^5.2.12",
     "mocha": "^10.2.0",
     "yeoman-environment": "^3.19.3",
-    "yeoman-test": "^7.4.0"
+    "yeoman-test": "^8.2.0"
   }
 }

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

@@ -1,23 +0,0 @@
-const path = require('path');
-
-const { runTests } = require('@vscode/test-electron');
-
-async function main() {
-	try {
-		// The folder containing the Extension Manifest package.json
-		// Passed to `--extensionDevelopmentPath`
-		const extensionDevelopmentPath = path.resolve(__dirname, '../');
-
-		// The path to the extension test script
-		// Passed to --extensionTestsPath
-		const extensionTestsPath = path.resolve(__dirname, './suite/index');
-
-		// Download VS Code, unzip it and run the integration test
-		await runTests({ extensionDevelopmentPath, extensionTestsPath });
-	} catch (err) {
-		console.error('Failed to run tests', err);
-		process.exit(1);
-	}
-}
-
-main();

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

@@ -1,45 +0,0 @@
-const path = require('path');
-const Mocha = require('mocha');
-const glob = require('glob');
-
-function run() {
-	// Create the mocha test
-	const mocha = new Mocha({
-		ui: 'tdd',
-		color: true
-	});
-
-	const testsRoot = path.resolve(__dirname, '..');
-
-	return new Promise((c, e) => {
-		const testFiles = new glob.Glob('**/**.test.js', { cwd: testsRoot });
-		const testFileStream = testFiles.stream();
-
-		testFileStream.on('data', (file) => {
-			// Add files to the test suite
-			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);
-			}
-		});
-	});
-}
-
-module.exports = {
-	run
-};

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

@@ -1,23 +0,0 @@
-import * as path from 'path';
-
-import { runTests } from '@vscode/test-electron';
-
-async function main() {
-	try {
-		// The folder containing the Extension Manifest package.json
-		// Passed to `--extensionDevelopmentPath`
-		const extensionDevelopmentPath = path.resolve(__dirname, '../../');
-
-		// The path to test runner
-		// Passed to --extensionTestsPath
-		const extensionTestsPath = path.resolve(__dirname, './suite/index');
-
-		// Download VS Code, unzip it and run the integration test
-		await runTests({ extensionDevelopmentPath, extensionTestsPath });
-	} catch (err) {
-		console.error('Failed to run tests', err);
-		process.exit(1);
-	}
-}
-
-main();

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

@@ -1,40 +0,0 @@
-import * as path from 'path';
-import * as Mocha from 'mocha';
-import * as glob from 'glob';
-
-export function run(): Promise<void> {
-	// Create the mocha test
-	const mocha = new Mocha({
-		ui: 'tdd',
-		color: true
-	});
-
-	const testsRoot = path.resolve(__dirname, '..');
-
-	return new Promise((c, e) => {
-		const testFiles = new glob.Glob("**/**.test.js", { cwd: testsRoot });
-		const testFileStream = testFiles.stream();
-
-		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);
-			}
-		});
-	});
-}

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

@@ -1,23 +0,0 @@
-import * as path from 'path';
-
-import { runTests } from '@vscode/test-electron';
-
-async function main() {
-  try {
-    // The folder containing the Extension Manifest package.json
-    // Passed to `--extensionDevelopmentPath`
-    const extensionDevelopmentPath = path.resolve(__dirname, '../../');
-
-    // The path to test runner
-    // Passed to --extensionTestsPath
-    const extensionTestsPath = path.resolve(__dirname, './suite/index');
-
-    // Download VS Code, unzip it and run the integration test
-    await runTests({ extensionDevelopmentPath, extensionTestsPath });
-  } catch (err) {
-    console.error('Failed to run tests', err);
-    process.exit(1);
-  }
-}
-
-main();

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

@@ -1,40 +0,0 @@
-import * as path from 'path';
-import * as Mocha from 'mocha';
-import * as glob from 'glob';
-
-export function run(): Promise<void> {
-  // Create the mocha test
-  const mocha = new Mocha({
-    ui: 'tdd',
-    color: true
-  });
-
-  const testsRoot = path.resolve(__dirname, '..');
-
-  return new Promise((c, e) => {
-    const testFiles = new glob.Glob("**/**.test.js", { cwd: testsRoot });
-    const testFileStream = testFiles.stream();
-
-    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);
-      }
-    });
-  });
-}