@vscode/vsce 3.9.3-7 → 3.9.3-8

package/out/package.js

@@ -65,7 +65,7 @@ const cp = __importStar(require("child_process"));
 const yazl = __importStar(require("yazl"));
 const nls_1 = require("./nls");
 const util = __importStar(require("./util"));
-const glob_1 = require("glob");
+const tinyglobby_1 = require("tinyglobby");
 const minimatch_1 = require("minimatch");
 const parse5_1 = require("parse5");
 const marked_1 = require("marked");
@@ -1285,9 +1285,46 @@ const defaultIgnore = [
     '**/.vscode-test/**',
     '**/.vscode-test-web/**',
 ];
+/**
+ * `tinyglobby` skips symbolic links altogether when `followSymbolicLinks` is disabled, while
+ * vsce treats them as regular files instead (see the `--follow-symlinks` option). Presenting
+ * symbolic links to the crawler as regular files keeps them in the result without recursing
+ * into symlinked directories.
+ */
+const symlinksAsFilesFileSystem = {
+    readdir: (dir, options, callback) => fs.readdir(dir, options, (err, entries) => callback(err, err ? entries : entries.map(asFile))),
+    readdirSync: (dir, options) => fs.readdirSync(dir, options).map(asFile),
+};
+function asFile(entry) {
+    if (!entry.isSymbolicLink()) {
+        return entry;
+    }
+    return Object.create(entry, {
+        isFile: { value: () => true },
+        isDirectory: { value: () => false },
+        isSymbolicLink: { value: () => false },
+    });
+}
+/**
+ * `glob` matched patterns case-insensitively on Windows and macOS and case-sensitively
+ * everywhere else, based on `process.platform` rather than on the actual filesystem.
+ * `tinyglobby` always matches case-sensitively, so this keeps the previous behaviour, which
+ * matters for the `node_modules` folder being ignored regardless of how it is cased on disk.
+ * Keep this keyed off the platform: probing the filesystem instead would change what is
+ * packaged on case-sensitive macOS volumes and case-insensitive Linux mounts.
+ */
+const caseSensitiveMatch = process.platform !== 'win32' && process.platform !== 'darwin';
 async function collectAllFiles(cwd, dependencies, dependencyEntryPoints, followSymlinks = true) {
     const deps = await (0, npm_1.getDependencies)(cwd, dependencies, dependencyEntryPoints);
-    const promises = deps.map(dep => (0, glob_1.glob)('**', { cwd: dep, nodir: true, follow: followSymlinks, dot: true, ignore: 'node_modules/**' }).then(files => files.map(f => path.relative(cwd, path.join(dep, f))).map(f => f.replace(/\\/g, '/'))));
+    const promises = deps.map(dep => (0, tinyglobby_1.glob)('**', {
+        cwd: dep,
+        onlyFiles: true,
+        followSymbolicLinks: followSymlinks,
+        fs: followSymlinks ? undefined : symlinksAsFilesFileSystem,
+        caseSensitiveMatch,
+        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) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vscode/vsce",
-	"version": "3.9.3-7",
+	"version": "3.9.3-8",
 	"description": "VS Code Extensions Manager",
 	"repository": {
 		"type": "git",
@@ -50,7 +50,6 @@
 		"cockatiel": "^3.1.2",
 		"commander": "^12.1.0",
 		"form-data": "^4.0.0",
-		"glob": "^13.0.6",
 		"hosted-git-info": "^4.0.2",
 		"jsonc-parser": "^3.2.0",
 		"leven": "^3.1.0",
@@ -61,6 +60,7 @@
 		"parse5": "^8.0.1",
 		"read": "^1.0.7",
 		"semver": "^7.5.2",
+		"tinyglobby": "^0.2.17",
 		"typed-rest-client": "^1.8.4",
 		"url-join": "^4.0.1",
 		"xml2js": "^0.5.0",
@@ -73,6 +73,7 @@
 		"@types/mime": "^1",
 		"@types/mocha": "^7.0.2",
 		"@types/node": "^22.0.0",
+		"@types/picomatch": "^4.0.3",
 		"@types/read": "^0.0.28",
 		"@types/semver": "^6.0.0",
 		"@types/url-join": "^4.0.1",