@vscode/vsce 2.21.1 → 2.22.1-0

package/README.md

@@ -1,19 +1,21 @@
-# vsce
+# @vscode/vsce
 
 > _The Visual Studio Code Extension Manager_
 
 [![Build Status](https://dev.azure.com/monacotools/Monaco/_apis/build/status/npm/microsoft.vscode-vsce?repoName=microsoft%2Fvscode-vsce&branchName=main)](https://dev.azure.com/monacotools/Monaco/_build/latest?definitionId=446&repoName=microsoft%2Fvscode-vsce&branchName=main)
 [![Version](https://img.shields.io/npm/v/@vscode/vsce.svg)](https://npmjs.org/package/@vscode/vsce)
 
-## Requirements
+This tool assists in packaging and publishing Visual Studio Code extensions.
 
-- [Node.js](https://nodejs.org/en/) at least `14.x.x`
+Read the [**Documentation**](https://code.visualstudio.com/api/working-with-extensions/publishing-extension) on the VS Code website.
 
-Or simply [Docker](#usage-via-docker).
+## Requirements
+
+[Node.js](https://nodejs.org/en/) at least `18.x.x`.
 
 ### Linux
 
-In order to save credentials safely, this project uses [keytar](https://www.npmjs.com/package/keytar) which uses `libsecret`, which you may need to install before publishing extensions. Setting the `VSCE_STORE=file` environment variable will revert back to the file credential store. Using the `VSCE_PAT` environment variable will also avoid using keytar.
+In order to save credentials safely, this project uses [`keytar`](https://www.npmjs.com/package/keytar) which uses `libsecret`, which you may need to install before publishing extensions. Setting the `VSCE_STORE=file` environment variable will revert back to the file credential store. Using the `VSCE_PAT` environment variable will also avoid using `keytar`.
 
 Depending on your distribution, you will need to run the following command:
 
@@ -24,46 +26,23 @@ Depending on your distribution, you will need to run the following command:
 
 ## Usage
 
-Install vsce globally:
-
-```console
-npm install --global @vscode/vsce
-```
-
-Verify the installation:
-
 ```console
-vsce --version
+$ npx @vscode/vsce --version
 ```
 
-`vsce` is meant to be mainly used as a command line tool. It can also be used a library since it exposes a small [API](https://github.com/microsoft/vscode-vsce/blob/main/src/api.ts). When using vsce as a library be sure to sanitize any user input used in API calls, as a security measurement.
-
-## Usage via Docker
+`@vscode/vsce` is meant to be mainly used as a command-line tool. It can also be used as a library since it exposes a small [API](https://github.com/microsoft/vscode-vsce/blob/main/src/api.ts). When using `@vscode/vsce` as a library, be sure to sanitize any user input used in API calls to prevent security issues.
 
-You can also build a container for running vsce:
-
-```console
-$ DOCKER_BUILDKIT=1 docker build --tag vsce "https://github.com/microsoft/vscode-vsce.git#main"
-```
+Supported package managers:
 
-Validate the container:
-
-```console
-docker run --rm -it vsce --version
-```
-
-Publish your local extension:
-
-```console
-docker run --rm -it -v "$(pwd)":/workspace vsce publish
-```
+- `npm >=6`
+- `yarn >=1 <2`
 
 ## Configuration
 
 You can configure the behavior of `vsce` by using CLI flags (run `vsce --help` to list them all). Example:
 
 ```console
-vsce publish --baseImagesUrl https://my.custom/base/images/url
+$ npx @vscode/vsce publish --baseImagesUrl https://my.custom/base/images/url
 ```
 
 Or you can also set them in the `package.json`, so that you avoid having to retype the common options again. Example:
@@ -72,7 +51,7 @@ Or you can also set them in the `package.json`, so that you avoid having to rety
 // package.json
 {
   "vsce": {
-    "baseImagesUrl": "https://my.custom/base/images/url"
+    "baseImagesUrl": "https://my.custom/base/images/url",
     "dependencies": true,
     "yarn": false
   }
@@ -85,25 +64,19 @@ First clone this repository, then:
 
 ```console
 $ npm install
-
 $ npm run watch:build # or `watch:test` to also build tests
 ```
 
 Once the watcher is up and running, you can run out of sources with:
 
 ```console
-node vsce
+$ node vsce
 ```
 
 Tests can be executed with:
 
-```npm
+```console
 $ npm test
 ```
 
 > **Note:** [Yarn](https://www.npmjs.com/package/yarn) is required to run the tests.
-## About
-
-This tool assists in packaging and publishing Visual Studio Code extensions.
-
-Read the [**Documentation**](https://code.visualstudio.com/api/working-with-extensions/publishing-extension) on the VS Code website.

package/dist/vsce.d.ts

@@ -63,6 +63,15 @@ export declare interface IPackageOptions {
      * https://code.visualstudio.com/api/working-with-extensions/publishing-extension#platformspecific-extensions
      */
     readonly target?: string;
+    /**
+     * Ignore all files inside folders named as other targets. Only relevant when
+     * `target` is set. For example, if `target` is `linux-x64` and there are
+     * folders named `win32-x64`, `darwin-arm64` or `web`, the files inside
+     * those folders will be ignored.
+     *
+     * @default false
+     */
+    readonly ignoreOtherTargetFolders?: boolean;
     readonly commitMessage?: string;
     readonly gitTagVersion?: boolean;
     readonly updatePackageJson?: boolean;
@@ -72,6 +81,8 @@ export declare interface IPackageOptions {
      * Defaults to `process.cwd()`.
      */
     readonly cwd?: string;
+    readonly readmePath?: string;
+    readonly changelogPath?: string;
     /**
      * GitHub branch used to publish the package. Used to automatically infer
      * the base content and images URI.
@@ -117,6 +128,7 @@ export declare interface IPublishOptions {
     readonly packagePath?: string[];
     readonly version?: string;
     readonly targets?: string[];
+    readonly ignoreOtherTargetFolders?: boolean;
     readonly commitMessage?: string;
     readonly gitTagVersion?: boolean;
     readonly updatePackageJson?: boolean;
@@ -126,6 +138,8 @@ export declare interface IPublishOptions {
      * Defaults to `process.cwd()`.
      */
     readonly cwd?: string;
+    readonly readmePath?: string;
+    readonly changelogPath?: string;
     readonly githubBranch?: string;
     readonly gitlabBranch?: string;
     /**
@@ -148,7 +162,10 @@ export declare interface IPublishOptions {
      * Defaults to the stored one.
      */
     readonly pat?: string;
+    readonly allowProposedApi?: boolean;
     readonly noVerify?: boolean;
+    readonly allowProposedApis?: string[];
+    readonly allowAllProposedApis?: boolean;
     readonly dependencies?: boolean;
     readonly preRelease?: boolean;
     readonly allowStarActivation?: boolean;

package/out/main.js

@@ -76,9 +76,9 @@ module.exports = function (argv) {
     commander_1.default.version(pkg.version).usage('<command>');
     commander_1.default
         .command('ls')
-        .description('Lists all the files that will be published')
+        .description('Lists all the files that will be published/packaged')
         .option('--yarn', 'Use yarn instead of npm (default inferred from presence of yarn.lock or .yarnrc)')
-        .option('--no-yarn', 'Use npm instead of yarn (default inferred from lack of yarn.lock or .yarnrc)')
+        .option('--no-yarn', 'Use npm instead of yarn (default inferred from absence of yarn.lock or .yarnrc)')
         .option('--packagedDependencies <path>', 'Select packages that should be published only (includes dependencies)', (val, all) => (all ? all.concat(val) : [val]), undefined)
         .option('--ignoreFile <path>', 'Indicate alternative .vscodeignore')
         // default must remain undefined for dependencies or we will fail to load defaults from package.json
@@ -91,30 +91,36 @@ module.exports = function (argv) {
         .description('Packages an extension')
         .option('-o, --out <path>', 'Output .vsix extension file to <path> location (defaults to <name>-<version>.vsix)')
         .option('-t, --target <target>', `Target architecture. Valid targets: ${ValidTargets}`)
+        .option('--ignore-other-target-folders', `Ignore other target folders. Valid only when --target <target> is provided.`)
+        .option('--readme-path <path>', 'Path to README file (defaults to README.md)')
+        .option('--changelog-path <path>', 'Path to CHANGELOG file (defaults to CHANGELOG.md)')
         .option('-m, --message <commit message>', 'Commit message used when calling `npm version`.')
         .option('--no-git-tag-version', 'Do not create a version commit and tag when calling `npm version`. Valid only when [version] is provided.')
         .option('--no-update-package-json', 'Do not update `package.json`. Valid only when [version] is provided.')
         .option('--githubBranch <branch>', 'The GitHub branch used to infer relative links in README.md. Can be overridden by --baseContentUrl and --baseImagesUrl.')
         .option('--gitlabBranch <branch>', 'The GitLab branch used to infer relative links in README.md. Can be overridden by --baseContentUrl and --baseImagesUrl.')
         .option('--no-rewrite-relative-links', 'Skip rewriting relative links.')
-        .option('--baseContentUrl <url>', 'Prepend all relative links in README.md with this url.')
-        .option('--baseImagesUrl <url>', 'Prepend all relative image links in README.md with this url.')
+        .option('--baseContentUrl <url>', 'Prepend all relative links in README.md with the specified URL.')
+        .option('--baseImagesUrl <url>', 'Prepend all relative image links in README.md with the specified URL.')
         .option('--yarn', 'Use yarn instead of npm (default inferred from presence of yarn.lock or .yarnrc)')
-        .option('--no-yarn', 'Use npm instead of yarn (default inferred from lack of yarn.lock or .yarnrc)')
+        .option('--no-yarn', 'Use npm instead of yarn (default inferred from absence of yarn.lock or .yarnrc)')
         .option('--ignoreFile <path>', 'Indicate alternative .vscodeignore')
         .option('--no-gitHubIssueLinking', 'Disable automatic expansion of GitHub-style issue syntax into links')
         .option('--no-gitLabIssueLinking', 'Disable automatic expansion of GitLab-style issue syntax into links')
         // default must remain undefined for dependencies or we will fail to load defaults from package.json
         .option('--dependencies', 'Enable dependency detection via npm or yarn', undefined)
-        .option('--no-dependencies', 'Disable dependency detection via npm or yarn')
+        .option('--no-dependencies', 'Disable dependency detection via npm or yarn', undefined)
         .option('--pre-release', 'Mark this package as a pre-release')
         .option('--allow-star-activation', 'Allow using * in activation events')
         .option('--allow-missing-repository', 'Allow missing a repository URL in package.json')
         .option('--skip-license', 'Allow packaging without license file')
-        .action((version, { out, target, message, gitTagVersion, updatePackageJson, githubBranch, gitlabBranch, rewriteRelativeLinks, baseContentUrl, baseImagesUrl, yarn, ignoreFile, gitHubIssueLinking, gitLabIssueLinking, dependencies, preRelease, allowStarActivation, allowMissingRepository, skipLicense, }) => main((0, package_1.packageCommand)({
+        .action((version, { out, target, ignoreOtherTargetFolders, readmePath, changelogPath, message, gitTagVersion, updatePackageJson, githubBranch, gitlabBranch, rewriteRelativeLinks, baseContentUrl, baseImagesUrl, yarn, ignoreFile, gitHubIssueLinking, gitLabIssueLinking, dependencies, preRelease, allowStarActivation, allowMissingRepository, skipLicense, }) => main((0, package_1.packageCommand)({
         packagePath: out,
         version,
         target,
+        ignoreOtherTargetFolders,
+        readmePath,
+        changelogPath,
         commitMessage: message,
         gitTagVersion,
         updatePackageJson,
@@ -138,17 +144,22 @@ module.exports = function (argv) {
         .description('Publishes an extension')
         .option('-p, --pat <token>', 'Personal Access Token (defaults to VSCE_PAT environment variable)', process.env['VSCE_PAT'])
         .option('-t, --target <targets...>', `Target architectures. Valid targets: ${ValidTargets}`)
+        .option('--ignore-other-target-folders', `Ignore other target folders. Valid only when --target <target> is provided.`)
+        .option('--readme-path <path>', 'Path to README file (defaults to README.md)')
+        .option('--changelog-path <path>', 'Path to CHANGELOG file (defaults to CHANGELOG.md)')
         .option('-m, --message <commit message>', 'Commit message used when calling `npm version`.')
         .option('--no-git-tag-version', 'Do not create a version commit and tag when calling `npm version`. Valid only when [version] is provided.')
         .option('--no-update-package-json', 'Do not update `package.json`. Valid only when [version] is provided.')
         .option('-i, --packagePath <paths...>', 'Publish the provided VSIX packages.')
         .option('--githubBranch <branch>', 'The GitHub branch used to infer relative links in README.md. Can be overridden by --baseContentUrl and --baseImagesUrl.')
         .option('--gitlabBranch <branch>', 'The GitLab branch used to infer relative links in README.md. Can be overridden by --baseContentUrl and --baseImagesUrl.')
-        .option('--baseContentUrl <url>', 'Prepend all relative links in README.md with this url.')
-        .option('--baseImagesUrl <url>', 'Prepend all relative image links in README.md with this url.')
+        .option('--baseContentUrl <url>', 'Prepend all relative links in README.md with the specified URL.')
+        .option('--baseImagesUrl <url>', 'Prepend all relative image links in README.md with the specified URL.')
         .option('--yarn', 'Use yarn instead of npm (default inferred from presence of yarn.lock or .yarnrc)')
-        .option('--no-yarn', 'Use npm instead of yarn (default inferred from lack of yarn.lock or .yarnrc)')
-        .option('--noVerify')
+        .option('--no-yarn', 'Use npm instead of yarn (default inferred from absence of yarn.lock or .yarnrc)')
+        .option('--noVerify', 'Allow all proposed APIs (deprecated: use --allow-all-proposed-apis instead)')
+        .option('--allow-proposed-apis <apis...>', 'Allow specific proposed APIs')
+        .option('--allow-all-proposed-apis', 'Allow all proposed APIs')
         .option('--ignoreFile <path>', 'Indicate alternative .vscodeignore')
         // default must remain undefined for dependencies or we will fail to load defaults from package.json
         .option('--dependencies', 'Enable dependency detection via npm or yarn', undefined)
@@ -158,10 +169,13 @@ module.exports = function (argv) {
         .option('--allow-missing-repository', 'Allow missing a repository URL in package.json')
         .option('--skip-duplicate', 'Fail silently if version already exists on the marketplace')
         .option('--skip-license', 'Allow publishing without license file')
-        .action((version, { pat, target, message, gitTagVersion, updatePackageJson, packagePath, githubBranch, gitlabBranch, baseContentUrl, baseImagesUrl, yarn, noVerify, ignoreFile, dependencies, preRelease, allowStarActivation, allowMissingRepository, skipDuplicate, skipLicense, }) => main((0, publish_1.publish)({
+        .action((version, { pat, target, ignoreOtherTargetFolders, readmePath, changelogPath, message, gitTagVersion, updatePackageJson, packagePath, githubBranch, gitlabBranch, baseContentUrl, baseImagesUrl, yarn, noVerify, allowProposedApis, allowAllProposedApis, ignoreFile, dependencies, preRelease, allowStarActivation, allowMissingRepository, skipDuplicate, skipLicense, }) => main((0, publish_1.publish)({
         pat,
         version,
         targets: target,
+        ignoreOtherTargetFolders,
+        readmePath,
+        changelogPath,
         commitMessage: message,
         gitTagVersion,
         updatePackageJson,
@@ -172,6 +186,8 @@ module.exports = function (argv) {
         baseImagesUrl,
         useYarn: yarn,
         noVerify,
+        allowProposedApis,
+        allowAllProposedApis,
         ignoreFile,
         dependencies,
         preRelease,
@@ -182,42 +198,42 @@ module.exports = function (argv) {
     })));
     commander_1.default
         .command('unpublish [extensionid]')
-        .description('Unpublishes an extension. Example extension id: microsoft.csharp.')
+        .description('Unpublishes an extension. Example extension id: ms-vscode.live-server.')
         .option('-p, --pat <token>', 'Personal Access Token')
-        .option('-f, --force', 'Forces Unpublished Extension')
+        .option('-f, --force', 'Skip confirmation prompt when unpublishing an extension')
         .action((id, { pat, force }) => main((0, publish_1.unpublish)({ id, pat, force })));
     commander_1.default
         .command('ls-publishers')
-        .description('List all known publishers')
+        .description('Lists all known publishers')
         .action(() => main((0, store_1.listPublishers)()));
     commander_1.default
         .command('delete-publisher <publisher>')
-        .description('Deletes a publisher')
+        .description('Deletes a publisher from marketplace')
         .action(publisher => main((0, store_1.deletePublisher)(publisher)));
     commander_1.default
         .command('login <publisher>')
-        .description('Add a publisher to the known publishers list')
+        .description('Adds a publisher to the list of known publishers')
         .action(name => main((0, store_1.loginPublisher)(name)));
     commander_1.default
         .command('logout <publisher>')
-        .description('Remove a publisher from the known publishers list')
+        .description('Removes a publisher from the list of known publishers')
         .action(name => main((0, store_1.logoutPublisher)(name)));
     commander_1.default
         .command('verify-pat [publisher]')
+        .description('Verifies if the Personal Access Token has publish rights for the publisher')
         .option('-p, --pat <token>', 'Personal Access Token (defaults to VSCE_PAT environment variable)', process.env['VSCE_PAT'])
-        .description('Verify if the Personal Access Token has publish rights for the publisher.')
         .action((name, { pat }) => main((0, store_1.verifyPat)(pat, name)));
     commander_1.default
         .command('show <extensionid>')
-        .option('--json', 'Output data in json format', false)
-        .description('Show extension metadata')
+        .description(`Shows an extension's metadata`)
+        .option('--json', 'Outputs data in json format', false)
         .action((extensionid, { json }) => main((0, show_1.show)(extensionid, json)));
     commander_1.default
         .command('search <text>')
-        .option('--json', 'Output result in json format', false)
-        .option('--stats', 'Shows the extension rating and download counts', false)
+        .description('Searches extension gallery')
+        .option('--json', 'Output results in json format', false)
+        .option('--stats', 'Shows extensions rating and download count', false)
         .option('-p, --pagesize [value]', 'Number of results to return', '100')
-        .description('search extension gallery')
         .action((text, { json, pagesize, stats }) => main((0, search_1.search)(text, json, parseInt(pagesize), stats)));
     commander_1.default.on('command:*', ([cmd]) => {
         if (cmd === 'create-publisher') {
@@ -227,8 +243,7 @@ module.exports = function (argv) {
         commander_1.default.outputHelp(help => {
             const availableCommands = commander_1.default.commands.map(c => c._name);
             const suggestion = availableCommands.find(c => (0, leven_1.default)(c, cmd) < c.length * 0.4);
-            help = `${help}
-Unknown command '${cmd}'`;
+            help = `${help}\n Unknown command '${cmd}'`;
             return suggestion ? `${help}, did you mean '${suggestion}'?\n` : `${help}.\n`;
         });
         process.exit(1);

package/out/npm.js

@@ -30,7 +30,8 @@ exports.getLatestVersion = exports.getDependencies = exports.detectYarn = void 0
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const cp = __importStar(require("child_process"));
-const parse_semver_1 = __importDefault(require("parse-semver"));
+const find_yarn_workspace_root_1 = __importDefault(require("find-yarn-workspace-root"));
+const package_1 = require("./package");
 const util_1 = require("./util");
 const exists = (file) => fs.promises.stat(file).then(_ => true, _ => false);
 function parseStdout({ stdout }) {
@@ -67,29 +68,49 @@ async function checkNPM(cancellationToken) {
 function getNpmDependencies(cwd) {
     return checkNPM()
         .then(() => exec('npm list --production --parseable --depth=99999 --loglevel=error', { cwd, maxBuffer: 5000 * 1024 }))
-        .then(({ stdout }) => stdout.split(/[\r\n]/).filter(dir => path.isAbsolute(dir)));
+        .then(({ stdout }) => stdout.split(/[\r\n]/).filter(dir => path.isAbsolute(dir))
+        .map(dir => {
+        return {
+            src: dir,
+            dest: path.relative(cwd, dir)
+        };
+    }));
 }
-function asYarnDependency(prefix, tree, prune) {
-    if (prune && /@[\^~]/.test(tree.name)) {
-        return null;
-    }
-    let name;
-    try {
-        const parseResult = (0, parse_semver_1.default)(tree.name);
-        name = parseResult.name;
-    }
-    catch (err) {
-        name = tree.name.replace(/^([^@+])@.*$/, '$1');
-    }
-    const dependencyPath = path.join(prefix, name);
-    const children = [];
-    for (const child of tree.children || []) {
-        const dep = asYarnDependency(path.join(prefix, name, 'node_modules'), child, prune);
-        if (dep) {
-            children.push(dep);
+async function asYarnDependencies(root, rootDependencies) {
+    const resolve = async (prefix, dependencies, collected = new Map()) => await Promise.all(dependencies
+        .map(async (name) => {
+        let newPrefix = prefix, depPath = null, depManifest = null;
+        while (!depManifest && root.length <= newPrefix.length) {
+            depPath = path.join(newPrefix, 'node_modules', name);
+            try {
+                depManifest = await (0, package_1.readNodeManifest)(depPath);
+            }
+            catch (err) {
+                newPrefix = path.join(newPrefix, '..');
+                if (newPrefix.length < root.length) {
+                    throw err;
+                }
+            }
         }
-    }
-    return { name, path: dependencyPath, children };
+        if (!depPath || !depManifest) {
+            throw new Error(`Error finding dependencies`);
+        }
+        const result = {
+            name,
+            path: {
+                src: depPath,
+                dest: path.relative(root, depPath),
+            },
+            children: [],
+        };
+        const shouldResolveChildren = !collected.has(depPath);
+        collected.set(depPath, result);
+        if (shouldResolveChildren) {
+            result.children = await resolve(depPath, Object.keys(depManifest.dependencies || {}), collected);
+        }
+        return result;
+    }));
+    return resolve(root, rootDependencies);
 }
 function selectYarnDependencies(deps, packagedDependencies) {
     const index = new (class {
@@ -135,35 +156,38 @@ function selectYarnDependencies(deps, packagedDependencies) {
     packagedDependencies.forEach(visit);
     return reached.values;
 }
-async function getYarnProductionDependencies(cwd, packagedDependencies) {
-    const raw = await new Promise((c, e) => cp.exec('yarn list --prod --json', { cwd, encoding: 'utf8', env: { ...process.env }, maxBuffer: 5000 * 1024 }, (err, stdout) => (err ? e(err) : c(stdout))));
-    const match = /^{"type":"tree".*$/m.exec(raw);
-    if (!match || match.length !== 1) {
-        throw new Error('Could not parse result of `yarn list --json`');
-    }
+async function getYarnProductionDependencies(root, manifest, packagedDependencies) {
     const usingPackagedDependencies = Array.isArray(packagedDependencies);
-    const trees = JSON.parse(match[0]).data.trees;
-    let result = trees
-        .map(tree => asYarnDependency(path.join(cwd, 'node_modules'), tree, !usingPackagedDependencies))
-        .filter(util_1.nonnull);
+    let result = await asYarnDependencies(root, Object.keys(manifest.dependencies || {}));
     if (usingPackagedDependencies) {
         result = selectYarnDependencies(result, packagedDependencies);
     }
     return result;
 }
-async function getYarnDependencies(cwd, packagedDependencies) {
-    const result = new Set([cwd]);
-    const deps = await getYarnProductionDependencies(cwd, packagedDependencies);
-    const flatten = (dep) => {
-        result.add(dep.path);
-        dep.children.forEach(flatten);
-    };
-    deps.forEach(flatten);
-    return [...result];
+async function getYarnDependencies(cwd, root, manifest, packagedDependencies) {
+    const result = [{
+            src: cwd,
+            dest: ''
+        }];
+    if (await exists(path.join(root, 'yarn.lock'))) {
+        const deps = await getYarnProductionDependencies(root, manifest, packagedDependencies);
+        const flatten = (dep) => {
+            result.push(dep.path);
+            dep.children.forEach(flatten);
+        };
+        deps.forEach(flatten);
+    }
+    const dedup = new Map();
+    for (const item of result) {
+        if (!dedup.has(item.src)) {
+            dedup.set(item.src, item);
+        }
+    }
+    return [...dedup.values()];
 }
-async function detectYarn(cwd) {
+async function detectYarn(root) {
     for (const name of ['yarn.lock', '.yarnrc', '.yarnrc.yaml', '.pnp.cjs', '.yarn']) {
-        if (await exists(path.join(cwd, name))) {
+        if (await exists(path.join(root, name))) {
             if (!process.env['VSCE_TESTS']) {
                 util_1.log.info(`Detected presence of ${name}. Using 'yarn' instead of 'npm' (to override this pass '--no-yarn' on the command line).`);
             }
@@ -173,12 +197,13 @@ async function detectYarn(cwd) {
     return false;
 }
 exports.detectYarn = detectYarn;
-async function getDependencies(cwd, dependencies, packagedDependencies) {
+async function getDependencies(cwd, manifest, dependencies, packagedDependencies) {
+    const root = (0, find_yarn_workspace_root_1.default)(cwd) || cwd;
     if (dependencies === 'none') {
-        return [cwd];
+        return [{ src: root, dest: '' }];
     }
-    else if (dependencies === 'yarn' || (dependencies === undefined && (await detectYarn(cwd)))) {
-        return await getYarnDependencies(cwd, packagedDependencies);
+    else if (dependencies === 'yarn' || (dependencies === undefined && (await detectYarn(root)))) {
+        return await getYarnDependencies(cwd, root, manifest, packagedDependencies);
     }
     else {
         return await getNpmDependencies(cwd);

package/out/package.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ls = exports.listFiles = exports.packageCommand = exports.pack = exports.prepublish = exports.collect = exports.createDefaultProcessors = exports.processFiles = exports.toContentTypes = exports.toVsixManifest = exports.readManifest = exports.validateManifest = exports.ValidationProcessor = exports.NLSProcessor = exports.isWebKind = exports.LicenseProcessor = exports.ChangelogProcessor = exports.ReadmeProcessor = exports.MarkdownProcessor = exports.TagsProcessor = exports.ManifestProcessor = exports.Targets = exports.versionBump = exports.BaseProcessor = exports.read = void 0;
+exports.ls = exports.listFiles = exports.packageCommand = exports.pack = exports.prepublish = exports.collect = exports.createDefaultProcessors = exports.processFiles = exports.toContentTypes = exports.toVsixManifest = exports.readManifest = exports.readNodeManifest = exports.validateManifest = exports.ValidationProcessor = exports.NLSProcessor = exports.isWebKind = exports.LicenseProcessor = exports.ChangelogProcessor = exports.ReadmeProcessor = exports.MarkdownProcessor = exports.TagsProcessor = exports.ManifestProcessor = exports.Targets = exports.versionBump = exports.BaseProcessor = exports.read = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const util_1 = require("util");
@@ -246,7 +246,6 @@ async function versionBump(options) {
 exports.versionBump = versionBump;
 exports.Targets = new Set([
     'win32-x64',
-    'win32-ia32',
     'win32-arm64',
     'linux-x64',
     'linux-arm64',
@@ -365,13 +364,13 @@ class ManifestProcessor extends BaseProcessor {
             throw new Error("It's not allowed to use the 'vscode-samples' publisher. Learn more at: https://code.visualstudio.com/api/working-with-extensions/publishing-extension.");
         }
         if (!this.options.allowMissingRepository && !this.manifest.repository) {
-            util.log.warn(`A 'repository' field is missing from the 'package.json' manifest file.`);
+            util.log.warn(`A 'repository' field is missing from the 'package.json' manifest file.\nUse --allow-missing-repository to bypass.`);
             if (!/^y$/i.test(await util.read('Do you want to continue? [y/N] '))) {
                 throw new Error('Aborted');
             }
         }
         if (!this.options.allowStarActivation && this.manifest.activationEvents?.some(e => e === '*')) {
-            util.log.warn(`Using '*' activation is usually a bad idea as it impacts performance.\nMore info: https://code.visualstudio.com/api/references/activation-events#Start-up`);
+            util.log.warn(`Using '*' activation is usually a bad idea as it impacts performance.\nMore info: https://code.visualstudio.com/api/references/activation-events#Start-up\nUse --allow-star-activation to bypass.`);
             if (!/^y$/i.test(await util.read('Do you want to continue? [y/N] '))) {
                 throw new Error('Aborted');
             }
@@ -474,11 +473,11 @@ TagsProcessor.Keywords = {
     rust: ['rust'],
 };
 class MarkdownProcessor extends BaseProcessor {
-    constructor(manifest, name, regexp, assetType, options = {}) {
+    constructor(manifest, name, filePath, assetType, options = {}) {
         super(manifest);
         this.name = name;
-        this.regexp = regexp;
         this.assetType = assetType;
+        this.regexp = new RegExp(`^extension/${filePath}$`, 'i');
         const guess = this.guessBaseUrls(options.githubBranch || options.gitlabBranch);
         this.baseContentUrl = options.baseContentUrl || (guess && guess.content);
         this.baseImagesUrl = options.baseImagesUrl || options.baseContentUrl || (guess && guess.images);
@@ -522,7 +521,7 @@ class MarkdownProcessor extends BaseProcessor {
             // Replace Markdown links with urls
             contents = contents.replace(markdownPathRegex, urlReplace);
             // Replace <img> links with urls
-            contents = contents.replace(/<img.+?src=["']([/.\w\s#-]+)['"].*?>/g, (all, link) => {
+            contents = contents.replace(/<(?:img|video)[^>]+src=["']([/.\w\s#-]+)['"][^>]*>/gm, (all, link) => {
                 const isLinkRelative = !/^\w+:\/\//.test(link) && link[0] !== '#';
                 if (!this.baseImagesUrl && isLinkRelative) {
                     throw new Error(`Couldn't detect the repository where this extension is published. The image will be broken in ${this.name}. GitHub/GitLab repositories will be automatically detected. Otherwise, please provide the repository URL in package.json or use the --baseContentUrl and --baseImagesUrl options.`);
@@ -572,7 +571,13 @@ class MarkdownProcessor extends BaseProcessor {
                     throw new Error(`Images in ${this.name} must have a source.`);
                 }
                 const src = decodeURI(rawSrc);
-                const srcUrl = new url.URL(src);
+                let srcUrl;
+                try {
+                    srcUrl = new url.URL(src);
+                }
+                catch (err) {
+                    throw new Error(`Invalid image source in ${this.name}: ${src}`);
+                }
                 if (/^data:$/i.test(srcUrl.protocol) && /^image$/i.test(srcUrl.host) && /\/svg/i.test(srcUrl.pathname)) {
                     throw new Error(`SVG data URLs are not allowed in ${this.name}: ${src}`);
                 }
@@ -632,13 +637,13 @@ class MarkdownProcessor extends BaseProcessor {
 exports.MarkdownProcessor = MarkdownProcessor;
 class ReadmeProcessor extends MarkdownProcessor {
     constructor(manifest, options = {}) {
-        super(manifest, 'README.md', /^extension\/readme.md$/i, 'Microsoft.VisualStudio.Services.Content.Details', options);
+        super(manifest, 'README.md', options.readmePath ?? 'readme.md', 'Microsoft.VisualStudio.Services.Content.Details', options);
     }
 }
 exports.ReadmeProcessor = ReadmeProcessor;
 class ChangelogProcessor extends MarkdownProcessor {
     constructor(manifest, options = {}) {
-        super(manifest, 'CHANGELOG.md', /^extension\/changelog.md$/i, 'Microsoft.VisualStudio.Services.Content.Changelog', options);
+        super(manifest, 'CHANGELOG.md', options.changelogPath ?? 'changelog.md', 'Microsoft.VisualStudio.Services.Content.Changelog', options);
     }
 }
 exports.ChangelogProcessor = ChangelogProcessor;
@@ -919,7 +924,13 @@ function validateManifest(manifest) {
     }
     (manifest.badges ?? []).forEach(badge => {
         const decodedUrl = decodeURI(badge.url);
-        const srcUrl = new url.URL(decodedUrl);
+        let srcUrl;
+        try {
+            srcUrl = new url.URL(decodedUrl);
+        }
+        catch (err) {
+            throw new Error(`Badge URL is invalid: ${badge.url}`);
+        }
         if (!/^https:$/i.test(srcUrl.protocol)) {
             throw new Error(`Badge URLs must come from an HTTPS source: ${badge.url}`);
         }
@@ -960,9 +971,8 @@ function validateManifest(manifest) {
     return manifest;
 }
 exports.validateManifest = validateManifest;
-function readManifest(cwd = process.cwd(), nls = true) {
+function readNodeManifest(cwd = process.cwd()) {
     const manifestPath = path.join(cwd, 'package.json');
-    const manifestNLSPath = path.join(cwd, 'package.nls.json');
     const manifest = fs.promises
         .readFile(manifestPath, 'utf8')
         .catch(() => Promise.reject(`Extension manifest not found: ${manifestPath}`))
@@ -974,11 +984,17 @@ function readManifest(cwd = process.cwd(), nls = true) {
             console.error(`Error parsing 'package.json' manifest file: not a valid JSON file.`);
             throw e;
         }
-    })
+    });
+    return manifest;
+}
+exports.readNodeManifest = readNodeManifest;
+function readManifest(cwd = process.cwd(), nls = true) {
+    const manifest = readNodeManifest(cwd)
         .then(validateManifest);
     if (!nls) {
         return manifest;
     }
+    const manifestNLSPath = path.join(cwd, 'package.nls.json');
     const manifestNLS = fs.promises
         .readFile(manifestNLSPath, 'utf8')
         .catch(err => (err.code !== 'ENOENT' ? Promise.reject(err) : Promise.resolve('{}')))
@@ -1131,14 +1147,38 @@ const defaultIgnore = [
     '**/.vscode-test-web/**',
 ];
 const notIgnored = ['!package.json', '!README.md'];
-async function collectAllFiles(cwd, dependencies, dependencyEntryPoints) {
-    const deps = await (0, npm_1.getDependencies)(cwd, dependencies, dependencyEntryPoints);
-    const promises = deps.map(dep => (0, util_1.promisify)(glob_1.default)('**', { cwd: dep, nodir: true, dot: true, ignore: 'node_modules/**' }).then(files => files.map(f => path.relative(cwd, path.join(dep, f))).map(f => f.replace(/\\/g, '/'))));
+async function collectAllFiles(cwd, manifest, dependencies, dependencyEntryPoints) {
+    const deps = await (0, npm_1.getDependencies)(cwd, manifest, dependencies, dependencyEntryPoints);
+    const promises = deps.map(dep => (0, util_1.promisify)(glob_1.default)('**', { cwd: dep.src, nodir: true, dot: true, ignore: 'node_modules/**' }).then(files => files.map(f => ({
+        src: path.relative(cwd, path.join(dep.src, f)).replace(/\\/g, '/'),
+        dest: path.join(dep.dest, f).replace(/\\/g, '/')
+    }))));
     return Promise.all(promises).then(util.flatten);
 }
-function collectFiles(cwd, dependencies, dependencyEntryPoints, ignoreFile) {
-    return collectAllFiles(cwd, dependencies, dependencyEntryPoints).then(files => {
-        files = files.filter(f => !/\r$/m.test(f));
+function getDependenciesOption(options) {
+    if (options.dependencies === false) {
+        return 'none';
+    }
+    switch (options.useYarn) {
+        case true:
+            return 'yarn';
+        case false:
+            return 'npm';
+        default:
+            return undefined;
+    }
+}
+function collectFiles(cwd, manifest, options) {
+    const packagedDependencies = options.dependencyEntryPoints || undefined;
+    const ignoreFile = options.ignoreFile || undefined;
+    const target = options.target || undefined;
+    return collectAllFiles(cwd, manifest, getDependenciesOption(options), packagedDependencies).then(files => {
+        files = files.filter(f => !/\r$/m.test(f.src));
+        // Filter data from other platforms
+        if (target && options.ignoreOtherTargetFolders) {
+            const regex = new RegExp(`(^|/)(${Array.from(exports.Targets, v => v).filter(v => v !== target).join('|')})/`);
+            files = files.filter(f => !regex.test(f.src));
+        }
         return (fs.promises
             .readFile(ignoreFile ? ignoreFile : path.join(cwd, '.vscodeignore'), 'utf8')
             .catch(err => err.code !== 'ENOENT' ? Promise.reject(err) : ignoreFile ? Promise.reject(err) : Promise.resolve(''))
@@ -1159,8 +1199,8 @@ function collectFiles(cwd, dependencies, dependencyEntryPoints, ignoreFile) {
             .then(ignore => ignore.reduce((r, e) => (!/^\s*!/.test(e) ? [[...r[0], e], r[1]] : [r[0], [...r[1], e]]), [[], []]))
             .then(r => ({ ignore: r[0], negate: r[1] }))
             // Filter out files
-            .then(({ ignore, negate }) => files.filter(f => !ignore.some(i => (0, minimatch_1.default)(f, i, MinimatchOptions)) ||
-            negate.some(i => (0, minimatch_1.default)(f, i.substr(1), MinimatchOptions)))));
+            .then(({ ignore, negate }) => files.filter(f => !ignore.some(i => (0, minimatch_1.default)(f.src, i, MinimatchOptions)) ||
+            negate.some(i => (0, minimatch_1.default)(f.src, i.substr(1), MinimatchOptions)))));
     });
 }
 function processFiles(processors, files) {
@@ -1204,26 +1244,11 @@ function createDefaultProcessors(manifest, options = {}) {
     ];
 }
 exports.createDefaultProcessors = createDefaultProcessors;
-function getDependenciesOption(options) {
-    if (options.dependencies === false) {
-        return 'none';
-    }
-    switch (options.useYarn) {
-        case true:
-            return 'yarn';
-        case false:
-            return 'npm';
-        default:
-            return undefined;
-    }
-}
 function collect(manifest, options = {}) {
     const cwd = options.cwd || process.cwd();
-    const packagedDependencies = options.dependencyEntryPoints || undefined;
-    const ignoreFile = options.ignoreFile || undefined;
     const processors = createDefaultProcessors(manifest, options);
-    return collectFiles(cwd, getDependenciesOption(options), packagedDependencies, ignoreFile).then(fileNames => {
-        const files = fileNames.map(f => ({ path: `extension/${f}`, localPath: path.join(cwd, f) }));
+    return collectFiles(cwd, manifest, options).then(fileNames => {
+        const files = fileNames.map(f => ({ path: `extension/${f.dest}`, localPath: path.join(cwd, f.src) }));
         return processFiles(processors, files);
     });
 }
@@ -1298,7 +1323,7 @@ async function pack(options = {}) {
     if (files.length > 5000 || jsFiles.length > 100) {
         console.log(`This extension consists of ${files.length} files, out of which ${jsFiles.length} are JavaScript files. For performance reasons, you should bundle your extension: https://aka.ms/vscode-bundle-extension . You should also exclude unnecessary files by adding them to your .vscodeignore: https://aka.ms/vscode-vscodeignore`);
     }
-    if (options.version) {
+    if (options.version && !(options.updatePackageJson ?? true)) {
         manifest.version = options.version;
     }
     const packagePath = await getPackagePath(cwd, manifest, options);
@@ -1336,7 +1361,8 @@ async function listFiles(options = {}) {
     if (options.prepublish) {
         await prepublish(cwd, manifest, options.useYarn);
     }
-    return await collectFiles(cwd, getDependenciesOption(options), options.packagedDependencies, options.ignoreFile);
+    const files = await collectFiles(cwd, manifest, options);
+    return files.map(f => f.src);
 }
 exports.listFiles = listFiles;
 /**

package/out/publish.js

@@ -90,11 +90,11 @@ async function publish(options = {}) {
 exports.publish = publish;
 async function _publish(packagePath, manifest, options) {
     (0, validation_1.validatePublisher)(manifest.publisher);
-    if (!options.noVerify && manifest.enableProposedApi) {
-        throw new Error("Extensions using proposed API (enableProposedApi: true) can't be published to the Marketplace");
+    if (manifest.enableProposedApi && !options.allowAllProposedApis && !options.noVerify) {
+        throw new Error("Extensions using proposed API (enableProposedApi: true) can't be published to the Marketplace. Use --allow-all-proposed-apis to bypass.");
     }
-    if (!options.noVerify && manifest.enabledApiProposals) {
-        throw new Error("Extensions using proposed API (enabledApiProposals: [...]) can't be published to the Marketplace");
+    if (manifest.enabledApiProposals && !options.allowAllProposedApis && !options.noVerify && manifest.enabledApiProposals?.some(p => !options.allowProposedApis?.includes(p))) {
+        throw new Error(`Extensions using unallowed proposed API (enabledApiProposals: [${manifest.enabledApiProposals}], allowed: [${options.allowProposedApis ?? []}]) can't be published to the Marketplace. Use --allow-proposed-apis <APIS...> or --allow-all-proposed-apis to bypass.`);
     }
     if (semver.prerelease(manifest.version)) {
         throw new Error(`The VS Marketplace doesn't support prerelease versions: '${manifest.version}'`);

package/out/show.js

@@ -12,6 +12,7 @@ function show(extensionId, json = false) {
         GalleryInterfaces_1.ExtensionQueryFlags.IncludeMetadata,
         GalleryInterfaces_1.ExtensionQueryFlags.IncludeStatistics,
         GalleryInterfaces_1.ExtensionQueryFlags.IncludeVersions,
+        GalleryInterfaces_1.ExtensionQueryFlags.IncludeVersionProperties,
     ];
     return (0, util_1.getPublicGalleryAPI)()
         .getExtension(extensionId, flags)
@@ -30,13 +31,59 @@ function show(extensionId, json = false) {
     });
 }
 exports.show = show;
+function round(num) {
+    return Math.round(num * 100) / 100;
+}
+function unit(value, statisticName) {
+    switch (statisticName) {
+        case 'install':
+            return `${value} installs`;
+        case 'updateCount':
+            return `${value} updates`;
+        case 'averagerating':
+        case 'weightedRating':
+            return `${value} stars`;
+        case 'ratingcount':
+            return `${value} ratings`;
+        case 'downloadCount':
+            return `${value} downloads`;
+        default:
+            return `${value}`;
+    }
+}
+function getVersionTable(versions) {
+    if (!versions.length) {
+        return [];
+    }
+    const set = new Set();
+    const result = versions
+        .filter(({ version }) => !set.has(version) && set.add(version))
+        .slice(0, limitVersions)
+        .map(({ version, lastUpdated, properties }) => [version, (0, viewutils_1.formatDate)(lastUpdated), properties?.some(p => p.key === 'Microsoft.VisualStudio.Code.PreRelease')]);
+    // Only show pre-release column if there are any pre-releases
+    if (result.every(v => !v[2])) {
+        for (const version of result) {
+            version.pop();
+        }
+        result.unshift(['Version', 'Last Updated']);
+    }
+    else {
+        for (const version of result) {
+            version[2] = version[2] ? `✔️` : '';
+        }
+        result.unshift(['Version', 'Last Updated', 'Pre-release']);
+    }
+    return result;
+}
 function showOverview({ displayName = 'unknown', extensionName = 'unknown', shortDescription = '', versions = [], publisher: { displayName: publisherDisplayName, publisherName }, categories = [], tags = [], statistics = [], publishedDate, lastUpdated, }) {
     const [{ version = 'unknown' } = {}] = versions;
-    // Create formatted table list of versions
-    const versionList = (versions.slice(0, limitVersions).map(({ version, lastUpdated }) => [version, (0, viewutils_1.formatDate)(lastUpdated)]));
+    const versionTable = getVersionTable(versions);
+    const latestVersionTargets = versions
+        .filter(v => v.version === version)
+        .filter(v => v.targetPlatform)
+        .map(v => v.targetPlatform);
     const { install: installs = 0, averagerating = 0, ratingcount = 0 } = statistics.reduce((map, { statisticName, value }) => ({ ...map, [statisticName]: value }), {});
-    // Render
-    console.log([
+    const rows = [
         `${displayName}`,
         `${publisherDisplayName} | ${viewutils_1.icons.download} ` +
             `${Number(installs).toLocaleString()} installs |` +
@@ -44,28 +91,27 @@ function showOverview({ displayName = 'unknown', extensionName = 'unknown', shor
         '',
         `${shortDescription}`,
         '',
-        'Recent versions:',
-        ...(versionList.length ? (0, viewutils_1.tableView)(versionList).map(viewutils_1.indentRow) : ['no versions found']),
+        ...(versionTable.length ? (0, viewutils_1.tableView)(versionTable).map(viewutils_1.indentRow) : ['no versions found']),
         '',
         'Categories:',
         `  ${categories.join(', ')}`,
         '',
         'Tags:',
-        `  ${tags.filter(tag => !isExtensionTag.test(tag)).join(', ')}`,
-        '',
-        'More info:',
-        ...(0, viewutils_1.tableView)([
-            ['Unique identifier:', `${publisherName}.${extensionName}`],
-            ['Version:', version],
-            ['Last updated:', (0, viewutils_1.formatDateTime)(lastUpdated)],
-            ['Publisher:', publisherDisplayName],
-            ['Published at:', (0, viewutils_1.formatDate)(publishedDate)],
-        ]).map(viewutils_1.indentRow),
-        '',
-        'Statistics:',
-        ...(0, viewutils_1.tableView)(statistics.map(({ statisticName, value }) => [statisticName, Number(value).toFixed(2)])).map(viewutils_1.indentRow),
-    ]
-        .map(line => (0, viewutils_1.wordWrap)(line))
-        .join('\n'));
+        `  ${tags.filter(tag => !isExtensionTag.test(tag)).join(', ')}`
+    ];
+    if (latestVersionTargets.length) {
+        rows.push('', 'Targets:', `  ${latestVersionTargets.join(', ')}`);
+    }
+    rows.push('', 'More info:', ...(0, viewutils_1.tableView)([
+        ['Unique identifier:', `${publisherName}.${extensionName}`],
+        ['Version:', version],
+        ['Last updated:', (0, viewutils_1.formatDateTime)(lastUpdated)],
+        ['Publisher:', publisherDisplayName],
+        ['Published at:', (0, viewutils_1.formatDate)(publishedDate)],
+    ]).map(viewutils_1.indentRow), '', 'Statistics:', ...(0, viewutils_1.tableView)(statistics
+        .filter(({ statisticName }) => !/^trending/.test(statisticName))
+        .map(({ statisticName, value }) => [statisticName, unit(round(value), statisticName)])).map(viewutils_1.indentRow));
+    // Render
+    console.log(rows.map(line => (0, viewutils_1.wordWrap)(line)).join('\n'));
 }
 //# sourceMappingURL=show.js.map

package/out/validation.js

@@ -112,7 +112,7 @@ function validateVSCodeTypesCompatibility(engineVersion, typeVersion) {
             return 0;
         }
     });
-    const error = new Error(`@types/vscode ${typeVersion} greater than engines.vscode ${engineVersion}. Consider upgrade engines.vscode or use an older @types/vscode version`);
+    const error = new Error(`@types/vscode ${typeVersion} greater than engines.vscode ${engineVersion}. Either upgrade engines.vscode or use an older @types/vscode version`);
     if (typeMajor > engineMajor) {
         throw error;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vscode/vsce",
-	"version": "2.21.1",
+	"version": "2.22.1-0",
 	"description": "VS Code Extensions Manager",
 	"repository": {
 		"type": "git",
@@ -42,6 +42,7 @@
 		"chalk": "^2.4.2",
 		"cheerio": "^1.0.0-rc.9",
 		"commander": "^6.2.1",
+		"find-yarn-workspace-root": "^2.0.0",
 		"glob": "^7.0.6",
 		"hosted-git-info": "^4.0.2",
 		"jsonc-parser": "^3.2.0",