@vscode/vsce 2.22.1-2 → 2.23.1-0

package/out/npm.js

@@ -30,8 +30,7 @@ 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 find_yarn_workspace_root_1 = __importDefault(require("find-yarn-workspace-root"));
-const package_1 = require("./package");
+const parse_semver_1 = __importDefault(require("parse-semver"));
 const util_1 = require("./util");
 const exists = (file) => fs.promises.stat(file).then(_ => true, _ => false);
 function parseStdout({ stdout }) {
@@ -68,49 +67,29 @@ 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))
-        .map(dir => {
-        return {
-            src: dir,
-            dest: path.relative(cwd, dir)
-        };
-    }));
+        .then(({ stdout }) => stdout.split(/[\r\n]/).filter(dir => path.isAbsolute(dir)));
 }
-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;
-                }
-            }
-        }
-        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);
+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);
         }
-        return result;
-    }));
-    return resolve(root, rootDependencies);
+    }
+    return { name, path: dependencyPath, children };
 }
 function selectYarnDependencies(deps, packagedDependencies) {
     const index = new (class {
@@ -156,38 +135,35 @@ function selectYarnDependencies(deps, packagedDependencies) {
     packagedDependencies.forEach(visit);
     return reached.values;
 }
-async function getYarnProductionDependencies(root, manifest, packagedDependencies) {
+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`');
+    }
     const usingPackagedDependencies = Array.isArray(packagedDependencies);
-    let result = await asYarnDependencies(root, Object.keys(manifest.dependencies || {}));
+    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);
     if (usingPackagedDependencies) {
         result = selectYarnDependencies(result, packagedDependencies);
     }
     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 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 detectYarn(root) {
+async function detectYarn(cwd) {
     for (const name of ['yarn.lock', '.yarnrc', '.yarnrc.yaml', '.pnp.cjs', '.yarn']) {
-        if (await exists(path.join(root, name))) {
+        if (await exists(path.join(cwd, 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).`);
             }
@@ -197,13 +173,12 @@ async function detectYarn(root) {
     return false;
 }
 exports.detectYarn = detectYarn;
-async function getDependencies(cwd, manifest, dependencies, packagedDependencies) {
-    const root = (0, find_yarn_workspace_root_1.default)(cwd) || cwd;
+async function getDependencies(cwd, dependencies, packagedDependencies) {
     if (dependencies === 'none') {
-        return [{ src: root, dest: '' }];
+        return [cwd];
     }
-    else if (dependencies === 'yarn' || (dependencies === undefined && (await detectYarn(root)))) {
-        return await getYarnDependencies(cwd, root, manifest, packagedDependencies);
+    else if (dependencies === 'yarn' || (dependencies === undefined && (await detectYarn(cwd)))) {
+        return await getYarnDependencies(cwd, 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.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;
+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;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const util_1 = require("util");
@@ -971,8 +971,9 @@ function validateManifest(manifest) {
     return manifest;
 }
 exports.validateManifest = validateManifest;
-function readNodeManifest(cwd = process.cwd()) {
+function readManifest(cwd = process.cwd(), nls = true) {
     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}`))
@@ -984,17 +985,11 @@ function readNodeManifest(cwd = process.cwd()) {
             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('{}')))
@@ -1147,12 +1142,9 @@ const defaultIgnore = [
     '**/.vscode-test-web/**',
 ];
 const notIgnored = ['!package.json', '!README.md'];
-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, '/')
-    }))));
+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, '/'))));
     return Promise.all(promises).then(util.flatten);
 }
 function getDependenciesOption(options) {
@@ -1168,17 +1160,9 @@ function getDependenciesOption(options) {
             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));
-        }
+function collectFiles(cwd, dependencies, dependencyEntryPoints, ignoreFile) {
+    return collectAllFiles(cwd, dependencies, dependencyEntryPoints).then(files => {
+        files = files.filter(f => !/\r$/m.test(f));
         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(''))
@@ -1199,8 +1183,8 @@ function collectFiles(cwd, manifest, options) {
             .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.src, i, MinimatchOptions)) ||
-            negate.some(i => (0, minimatch_1.default)(f.src, i.substr(1), MinimatchOptions)))));
+            .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)))));
     });
 }
 function processFiles(processors, files) {
@@ -1246,9 +1230,11 @@ function createDefaultProcessors(manifest, options = {}) {
 exports.createDefaultProcessors = createDefaultProcessors;
 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, manifest, options).then(fileNames => {
-        const files = fileNames.map(f => ({ path: `extension/${f.dest}`, localPath: path.join(cwd, f.src) }));
+    return collectFiles(cwd, getDependenciesOption(options), packagedDependencies, ignoreFile).then(fileNames => {
+        const files = fileNames.map(f => ({ path: `extension/${f}`, localPath: path.join(cwd, f) }));
         return processFiles(processors, files);
     });
 }
@@ -1361,8 +1347,7 @@ async function listFiles(options = {}) {
     if (options.prepublish) {
         await prepublish(cwd, manifest, options.useYarn);
     }
-    const files = await collectFiles(cwd, manifest, options);
-    return files.map(f => f.src);
+    return await collectFiles(cwd, getDependenciesOption(options), options.packagedDependencies, options.ignoreFile);
 }
 exports.listFiles = listFiles;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vscode/vsce",
-	"version": "2.22.1-2",
+	"version": "2.23.1-0",
 	"description": "VS Code Extensions Manager",
 	"repository": {
 		"type": "git",
@@ -42,7 +42,6 @@
 		"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",