@vscode/vsce 3.9.3-10 → 3.9.3-11

package/out/package.js

@@ -70,10 +70,10 @@ const minimatch_1 = require("minimatch");
 const parse5_1 = require("parse5");
 const marked_1 = require("marked");
 const url = __importStar(require("url"));
+const util_2 = require("util");
 const mime_1 = __importDefault(require("mime"));
 const semver = __importStar(require("semver"));
 const url_join_1 = __importDefault(require("url-join"));
-const chalk_1 = __importDefault(require("chalk"));
 const validation_1 = require("./validation");
 const npm_1 = require("./npm");
 const GitHost = __importStar(require("hosted-git-info"));
@@ -1566,7 +1566,7 @@ async function packageCommand(options = {}) {
     }
     const stats = await fs.promises.stat(packagePath);
     const packageSize = util.bytesToString(stats.size);
-    util.log.done(`Packaged: ${packagePath} ` + chalk_1.default.bold(`(${files.length} files, ${packageSize})`));
+    util.log.done(`Packaged: ${packagePath} ` + (0, util_2.styleText)('bold', `(${files.length} files, ${packageSize})`));
 }
 /**
  * Lists the files included in the extension's package.
@@ -1602,26 +1602,26 @@ async function printAndValidatePackagedFiles(files, cwd, manifest, options) {
     const jsFiles = files.filter(f => /\.js$/i.test(f.path));
     if (files.length > 5000 || jsFiles.length > 100) {
         let message = '';
-        message += `This extension consists of ${chalk_1.default.bold(String(files.length))} files, out of which ${chalk_1.default.bold(String(jsFiles.length))} are JavaScript files. `;
-        message += `For performance reasons, you should bundle your extension: ${chalk_1.default.underline('https://aka.ms/vscode-bundle-extension')}. `;
-        message += `You should also exclude unnecessary files by adding them to your .vscodeignore: ${chalk_1.default.underline('https://aka.ms/vscode-vscodeignore')}.\n`;
+        message += `This extension consists of ${(0, util_2.styleText)('bold', String(files.length))} files, out of which ${(0, util_2.styleText)('bold', String(jsFiles.length))} are JavaScript files. `;
+        message += `For performance reasons, you should bundle your extension: ${(0, util_2.styleText)('underline', 'https://aka.ms/vscode-bundle-extension')}. `;
+        message += `You should also exclude unnecessary files by adding them to your .vscodeignore: ${(0, util_2.styleText)('underline', 'https://aka.ms/vscode-vscodeignore')}.\n`;
         util.log.warn(message);
     }
     // Warn if the extension does not have a .vscodeignore file or a files property in package.json
     const hasIgnoreFile = fs.existsSync(options.ignoreFile ?? path.join(cwd, '.vscodeignore'));
     if (!hasIgnoreFile && !manifest.files) {
         let message = '';
-        message += `Neither a ${chalk_1.default.bold('.vscodeignore')} file nor a ${chalk_1.default.bold('"files"')} property in package.json was found. `;
+        message += `Neither a ${(0, util_2.styleText)('bold', '.vscodeignore')} file nor a ${(0, util_2.styleText)('bold', '"files"')} property in package.json was found. `;
         message += `To ensure only necessary files are included in your extension, `;
-        message += `add a .vscodeignore file or specify the "files" property in package.json. More info: ${chalk_1.default.underline('https://aka.ms/vscode-vscodeignore')}\n`;
+        message += `add a .vscodeignore file or specify the "files" property in package.json. More info: ${(0, util_2.styleText)('underline', 'https://aka.ms/vscode-vscodeignore')}\n`;
         util.log.warn(message);
     }
     // Throw an error if the extension uses both a .vscodeignore file and the files property in package.json
     else if (hasIgnoreFile && manifest.files !== undefined && manifest.files.length > 0) {
         let message = '';
-        message += `Both a ${chalk_1.default.bold('.vscodeignore')} file and a ${chalk_1.default.bold('"files"')} property in package.json were found. `;
+        message += `Both a ${(0, util_2.styleText)('bold', '.vscodeignore')} file and a ${(0, util_2.styleText)('bold', '"files"')} property in package.json were found. `;
         message += `VSCE does not support combining both strategies. `;
-        message += `Either remove the ${chalk_1.default.bold('.vscodeignore')} file or the ${chalk_1.default.bold('"files"')} property in package.json.`;
+        message += `Either remove the ${(0, util_2.styleText)('bold', '.vscodeignore')} file or the ${(0, util_2.styleText)('bold', '"files"')} property in package.json.`;
         util.log.error(message);
         process.exit(1);
     }
@@ -1646,11 +1646,11 @@ async function printAndValidatePackagedFiles(files, cwd, manifest, options) {
         });
         if (unusedIncludePatterns.length > 0) {
             let message = '';
-            message += `The following include patterns in the ${chalk_1.default.bold('"files"')} property in package.json do not match any files packaged in the extension:\n`;
+            message += `The following include patterns in the ${(0, util_2.styleText)('bold', '"files"')} property in package.json do not match any files packaged in the extension:\n`;
             message += unusedIncludePatterns.map(p => `  - ${p.relative}`).join('\n');
             message += '\nRemove any include pattern which is not needed.\n';
-            message += `\n=> Run ${chalk_1.default.bold('vsce ls --tree')} to see all included files.\n`;
-            message += `=> Use ${chalk_1.default.bold('--allow-unused-files-pattern')} to skip this check`;
+            message += `\n=> Run ${(0, util_2.styleText)('bold', 'vsce ls --tree')} to see all included files.\n`;
+            message += `=> Use ${(0, util_2.styleText)('bold', '--allow-unused-files-pattern')} to skip this check`;
             util.log.error(message);
             process.exit(1);
         }
@@ -1664,11 +1664,11 @@ async function printAndValidatePackagedFiles(files, cwd, manifest, options) {
     })), 35 // Print up to 35 files/folders
     );
     let message = '';
-    message += chalk_1.default.bold.blue(`Files included in the VSIX:\n`);
+    message += (0, util_2.styleText)(['bold', 'blue'], `Files included in the VSIX:\n`);
     message += printableFileStructure.join('\n');
     // If not all files have been printed, mention how all files can be printed
     if (files.length + 1 > printableFileStructure.length) {
-        message += `\n\n=> Run ${chalk_1.default.bold('vsce ls --tree')} to see all included files.`;
+        message += `\n\n=> Run ${(0, util_2.styleText)('bold', 'vsce ls --tree')} to see all included files.`;
     }
     message += '\n';
     util.log.info(message);
@@ -1703,33 +1703,33 @@ async function scanFilesForSecrets(files, fileExclusion, options) {
     if (noneDotEnvSecretsFound.length > 0) {
         const uniqueSecretIds = new Set(noneDotEnvSecretsFound.map(result => result.ruleId));
         const secretsFoundRuleNames = Array.from(uniqueSecretIds).map(secretLint_1.getRuleNameFromRuleId);
-        let errorMessage = `${chalk_1.default.bold('Potential security issue detected:')}`;
+        let errorMessage = `${(0, util_2.styleText)('bold', 'Potential security issue detected:')}`;
         errorMessage += ` Your extension package contains sensitive information that should not be published.`;
         errorMessage += ` Please remove these secrets before packaging.`;
         errorMessage += `\n` + noneDotEnvSecretsFound.map(secretLint_1.prettyPrintLintResult).join('\n');
         let hintMessage = `\nIn case of false positives, you can allow specific types of secrets with `;
         hintMessage += secretsFoundRuleNames.map(name => `--allow-package-secrets ${name}`).join(' ');
         hintMessage += ` or use --allow-package-all-secrets to skip this check entirely (not recommended).`;
-        util.log.error(errorMessage + chalk_1.default.italic(hintMessage));
+        util.log.error(errorMessage + (0, util_2.styleText)('italic', hintMessage));
         process.exit(1);
     }
     // .env file found
     const allRuleIds = new Set(secretsFound.map(result => result.ruleId).filter(Boolean));
     if (!options.allowPackageEnvFile && allRuleIds.has('@secretlint/secretlint-rule-no-dotenv')) {
-        let errorMessage = `${chalk_1.default.bold.red('.env')} files should not be packaged.`;
+        let errorMessage = `${(0, util_2.styleText)(['bold', 'red'], '.env')} files should not be packaged.`;
         switch (fileExclusion) {
             case FileExclusionType.None:
-                errorMessage += ` Ignore the file in your ${chalk_1.default.bold('.vscodeignore')} or exclude it from the package.json ${chalk_1.default.bold('files')} property.`;
+                errorMessage += ` Ignore the file in your ${(0, util_2.styleText)('bold', '.vscodeignore')} or exclude it from the package.json ${(0, util_2.styleText)('bold', 'files')} property.`;
                 break;
             case FileExclusionType.VSCodeIgnore:
-                errorMessage += ` Ignore the file in your ${chalk_1.default.bold('.vscodeignore')}.`;
+                errorMessage += ` Ignore the file in your ${(0, util_2.styleText)('bold', '.vscodeignore')}.`;
                 break;
             case FileExclusionType.PackageFiles:
-                errorMessage += ` Do not include the file in your package.json ${chalk_1.default.bold('files')} property.`;
+                errorMessage += ` Do not include the file in your package.json ${(0, util_2.styleText)('bold', 'files')} property.`;
                 break;
         }
         const hintMessage = `\nTo ignore this check, you can use --allow-package-env-file (not recommended).`;
-        util.log.error(errorMessage + chalk_1.default.italic(hintMessage));
+        util.log.error(errorMessage + (0, util_2.styleText)('italic', hintMessage));
         process.exit(1);
     }
 }

package/out/secretLint.js

@@ -32,19 +32,16 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lintFiles = lintFiles;
 exports.lintText = lintText;
 exports.getRuleNameFromRuleId = getRuleNameFromRuleId;
 exports.prettyPrintLintResult = prettyPrintLintResult;
-const chalk_1 = __importDefault(require("chalk"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
+const util_1 = require("util");
 const url_1 = require("url");
-const util_1 = require("./util");
+const util_2 = require("./util");
 const secretsScanningRules = [
     {
         id: "@secretlint/secretlint-rule-preset-recommend",
@@ -133,7 +130,7 @@ async function lintFiles(filePaths, scanSecrets, scanDotEnv) {
         }));
     }
     catch (error) {
-        util_1.log.error('Error occurred while scanning secrets (files):', error);
+        util_2.log.error('Error occurred while scanning secrets (files):', error);
         process.exit(1);
     }
     return parseResult(results);
@@ -159,7 +156,7 @@ async function lintText(content, fileName, scanSecrets, scanDotEnv) {
         });
     }
     catch (error) {
-        util_1.log.error('Error occurred while scanning secrets (content):', error);
+        util_2.log.error('Error occurred while scanning secrets (content):', error);
         process.exit(1);
     }
     return parseResult([result]);
@@ -194,10 +191,9 @@ function getRuleNameFromRuleId(ruleId) {
 }
 function prettyPrintLintResult(result) {
     const text = result.message;
-    const titleColor = result.level === "error" ? chalk_1.default.bold.red : chalk_1.default.bold.yellow;
     const title = text.length > 54 ? text.slice(0, 50) + '...' : text;
     const ruleName = getRuleNameFromRuleId(result.ruleId);
-    let output = `\t${titleColor(title)} [${ruleName}]\n`;
+    let output = `\t${(0, util_1.styleText)(['bold', result.level === "error" ? 'red' : 'yellow'], title)} [${ruleName}]\n`;
     output += `\t${prettyPrintLocation(result)}\n`;
     return output;
 }

package/out/util.js

@@ -60,7 +60,6 @@ const fs = __importStar(require("fs"));
 const read_1 = __importDefault(require("read"));
 const WebApi_1 = require("azure-devops-node-api/WebApi");
 const GalleryApi_1 = require("azure-devops-node-api/GalleryApi");
-const chalk_1 = __importDefault(require("chalk"));
 const publicgalleryapi_1 = require("./publicgalleryapi");
 const os_1 = require("os");
 const __read = (0, util_1.promisify)(read_1.default);
@@ -155,10 +154,10 @@ var LogMessageType;
     LogMessageType[LogMessageType["ERROR"] = 3] = "ERROR";
 })(LogMessageType || (LogMessageType = {}));
 const LogPrefix = {
-    [LogMessageType.DONE]: chalk_1.default.bgGreen.black(' DONE '),
-    [LogMessageType.INFO]: chalk_1.default.bgBlueBright.black(' INFO '),
-    [LogMessageType.WARNING]: chalk_1.default.bgYellow.black(' WARNING '),
-    [LogMessageType.ERROR]: chalk_1.default.bgRed.black(' ERROR '),
+    [LogMessageType.DONE]: (0, util_1.styleText)(['bgGreen', 'black'], ' DONE '),
+    [LogMessageType.INFO]: (0, util_1.styleText)(['bgBlueBright', 'black'], ' INFO '),
+    [LogMessageType.WARNING]: (0, util_1.styleText)(['bgYellow', 'black'], ' WARNING '),
+    [LogMessageType.ERROR]: (0, util_1.styleText)(['bgRed', 'black'], ' ERROR '),
 };
 function _log(type, msg, ...args) {
     args = [LogPrefix[type], msg, ...args];
@@ -303,11 +302,11 @@ async function generateFileStructureTree(rootFolder, filePaths, printLinesLimit
         });
     });
     let output = [];
-    output.push(chalk_1.default.bold(rootFolder));
+    output.push((0, util_1.styleText)('bold', rootFolder));
     output.push(...createTreeOutput(folderTree, maxDepth, totalFileSizes));
     for (const [size, filePath] of fileSizes) {
         if (size > FILE_SIZE_WARNING_THRESHOLD * totalFileSizes) {
-            output.push(`\nThe file ${filePath} is ${chalk_1.default.red('large')} (${bytesToString(size)})`);
+            output.push(`\nThe file ${filePath} is ${(0, util_1.styleText)('red', 'large')} (${bytesToString(size)})`);
             break;
         }
     }
@@ -316,20 +315,20 @@ async function generateFileStructureTree(rootFolder, filePaths, printLinesLimit
 function createTreeOutput(fileSystem, maxDepth, totalFileSizes) {
     const getColorFromSize = (size) => {
         if (size > FILE_SIZE_WARNING_THRESHOLD * totalFileSizes) {
-            return chalk_1.default.red;
+            return 'red';
         }
         else if (size > FILE_SIZE_LARGE_THRESHOLD * totalFileSizes) {
-            return chalk_1.default.yellow;
+            return 'yellow';
         }
         else {
-            return chalk_1.default.grey;
+            return 'gray';
         }
     };
     const createFileOutput = (prefix, fileName, fileSize) => {
         let fileSizeColored = '';
         if (fileSize > 0) {
             const fileSizeString = `[${bytesToString(fileSize)}]`;
-            fileSizeColored = getColorFromSize(fileSize)(fileSizeString);
+            fileSizeColored = (0, util_1.styleText)(getColorFromSize(fileSize), fileSizeString);
         }
         return `${prefix}${fileName} ${fileSizeColored}`;
     };
@@ -337,14 +336,14 @@ function createTreeOutput(fileSystem, maxDepth, totalFileSizes) {
         if (depth < maxDepth) {
             // Max depth is not reached, print only the folder
             // as children will be printed
-            return prefix + chalk_1.default.bold(`${folderName}/`);
+            return prefix + (0, util_1.styleText)('bold', `${folderName}/`);
         }
         // Max depth is reached, print the folder name and additional metadata
         // as children will not be printed
         const folderSizeString = bytesToString(folderSize);
-        const folder = chalk_1.default.bold(`${folderName}/`);
-        const numFilesString = chalk_1.default.green(`(${filesCount} ${filesCount === 1 ? 'file' : 'files'})`);
-        const folderSizeColored = getColorFromSize(folderSize)(`[${folderSizeString}]`);
+        const folder = (0, util_1.styleText)('bold', `${folderName}/`);
+        const numFilesString = (0, util_1.styleText)('green', `(${filesCount} ${filesCount === 1 ? 'file' : 'files'})`);
+        const folderSizeColored = (0, util_1.styleText)(getColorFromSize(folderSize), `[${folderSizeString}]`);
         return `${prefix}${folder} ${numFilesString} ${folderSizeColored}`;
     };
     const createTreeLayerOutput = (tree, depth, prefix, path) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vscode/vsce",
-	"version": "3.9.3-10",
+	"version": "3.9.3-11",
 	"description": "VS Code Extensions Manager",
 	"repository": {
 		"type": "git",
@@ -48,7 +48,6 @@
 		"@secretlint/types": "^10.1.2",
 		"@vscode/vsce-sign": "^2.0.0",
 		"azure-devops-node-api": "^12.5.0",
-		"chalk": "^4.1.2",
 		"cockatiel": "^3.1.2",
 		"commander": "^12.1.0",
 		"form-data": "^4.0.0",