@vscode/vsce 3.1.1 → 3.1.2-1

package/dist/vsce.d.ts

@@ -72,6 +72,10 @@ export declare interface IPackageOptions {
      * @default false
      */
     readonly ignoreOtherTargetFolders?: boolean;
+    /**
+     * Recurse into symlinked directories instead of treating them as files.
+     */
+    readonly followSymlinks?: boolean;
     readonly commitMessage?: string;
     readonly gitTagVersion?: boolean;
     readonly updatePackageJson?: boolean;
@@ -158,6 +162,10 @@ export declare interface IPublishOptions {
     readonly useYarn?: boolean;
     readonly dependencyEntryPoints?: string[];
     readonly ignoreFile?: string;
+    /**
+     * Recurse into symlinked directories instead of treating them as files
+     */
+    readonly followSymlinks?: boolean;
     /**
      * The Personal Access Token to use.
      *

package/out/main.js

@@ -86,7 +86,8 @@ module.exports = function (argv) {
         .option('--dependencies', 'Enable dependency detection via npm or yarn', undefined)
         .option('--no-dependencies', 'Disable dependency detection via npm or yarn', undefined)
         .option('--readme-path <path>', 'Path to README file (defaults to README.md)')
-        .action(({ tree, yarn, packagedDependencies, ignoreFile, dependencies, readmePath }) => main((0, package_1.ls)({ tree, useYarn: yarn, packagedDependencies, ignoreFile, dependencies, readmePath })));
+        .option('--follow-symlinks', 'Recurse into symlinked directories instead of treating them as files')
+        .action(({ tree, yarn, packagedDependencies, ignoreFile, dependencies, readmePath, followSymlinks }) => main((0, package_1.ls)({ tree, useYarn: yarn, packagedDependencies, ignoreFile, dependencies, readmePath, followSymlinks })));
     commander_1.default
         .command('package [version]')
         .alias('pack')
@@ -118,7 +119,8 @@ module.exports = function (argv) {
         .option('--allow-unused-files-pattern', 'Allow include patterns for the files field in package.json that does not match any file')
         .option('--skip-license', 'Allow packaging without license file')
         .option('--sign-tool <path>', 'Path to the VSIX signing tool. Will be invoked with two arguments: `SIGNTOOL <path/to/extension.signature.manifest> <path/to/extension.signature.p7s>`.')
-        .action((version, { out, target, ignoreOtherTargetFolders, readmePath, changelogPath, message, gitTagVersion, updatePackageJson, githubBranch, gitlabBranch, rewriteRelativeLinks, baseContentUrl, baseImagesUrl, yarn, ignoreFile, gitHubIssueLinking, gitLabIssueLinking, dependencies, preRelease, allowStarActivation, allowMissingRepository, allowUnusedFilesPattern, skipLicense, signTool, }) => main((0, package_1.packageCommand)({
+        .option('--follow-symlinks', 'Recurse into symlinked directories instead of treating them as files')
+        .action((version, { out, target, ignoreOtherTargetFolders, readmePath, changelogPath, message, gitTagVersion, updatePackageJson, githubBranch, gitlabBranch, rewriteRelativeLinks, baseContentUrl, baseImagesUrl, yarn, ignoreFile, gitHubIssueLinking, gitLabIssueLinking, dependencies, preRelease, allowStarActivation, allowMissingRepository, allowUnusedFilesPattern, skipLicense, signTool, followSymlinks, }) => main((0, package_1.packageCommand)({
         packagePath: out,
         version,
         target,
@@ -144,6 +146,7 @@ module.exports = function (argv) {
         allowUnusedFilesPattern,
         skipLicense,
         signTool,
+        followSymlinks,
     })));
     commander_1.default
         .command('publish [version]')
@@ -181,7 +184,8 @@ module.exports = function (argv) {
         .option('--allow-unused-files-pattern', 'Allow include patterns for the files field in package.json that does not match any file')
         .option('--skip-duplicate', 'Fail silently if version already exists on the marketplace')
         .option('--skip-license', 'Allow publishing without license file')
-        .action((version, { pat, azureCredential, target, ignoreOtherTargetFolders, readmePath, changelogPath, message, gitTagVersion, updatePackageJson, packagePath, manifestPath, signaturePath, sigzipPath, githubBranch, gitlabBranch, baseContentUrl, baseImagesUrl, yarn, noVerify, allowProposedApis, allowAllProposedApis, ignoreFile, dependencies, preRelease, allowStarActivation, allowMissingRepository, allowUnusedFilesPattern, skipDuplicate, skipLicense, signTool, }) => main((0, publish_1.publish)({
+        .option('--follow-symlinks', 'Recurse into symlinked directories instead of treating them as files')
+        .action((version, { pat, azureCredential, target, ignoreOtherTargetFolders, readmePath, changelogPath, message, gitTagVersion, updatePackageJson, packagePath, manifestPath, signaturePath, sigzipPath, githubBranch, gitlabBranch, baseContentUrl, baseImagesUrl, yarn, noVerify, allowProposedApis, allowAllProposedApis, ignoreFile, dependencies, preRelease, allowStarActivation, allowMissingRepository, allowUnusedFilesPattern, skipDuplicate, skipLicense, signTool, followSymlinks, }) => main((0, publish_1.publish)({
         pat,
         azureCredential,
         version,
@@ -212,7 +216,8 @@ module.exports = function (argv) {
         allowUnusedFilesPattern,
         skipDuplicate,
         skipLicense,
-        signTool
+        signTool,
+        followSymlinks
     })));
     commander_1.default
         .command('unpublish [extensionid]')

package/out/package.js

@@ -521,6 +521,9 @@ class MarkdownProcessor extends BaseProcessor {
         if (!this.regexp.test(filePath)) {
             return Promise.resolve(file);
         }
+        return await this.processFile(file, filePath);
+    }
+    async processFile(file, filePath) {
         this.filesProcessed++;
         this.assets.push({ type: this.assetType, path: filePath });
         let contents = await read(file);
@@ -668,6 +671,10 @@ class ReadmeProcessor extends MarkdownProcessor {
     constructor(manifest, options = {}) {
         super(manifest, 'README.md', options.readmePath ?? 'readme.md', 'Microsoft.VisualStudio.Services.Content.Details', options);
     }
+    async processFile(file) {
+        file.path = 'extension/readme.md';
+        return await super.processFile(file, file.path);
+    }
     async onEnd() {
         if (this.options.readmePath && this.filesProcessed === 0) {
             util.log.error(`The provided readme file (${this.options.readmePath}) could not be found.`);
@@ -680,6 +687,10 @@ class ChangelogProcessor extends MarkdownProcessor {
     constructor(manifest, options = {}) {
         super(manifest, 'CHANGELOG.md', options.changelogPath ?? 'changelog.md', 'Microsoft.VisualStudio.Services.Content.Changelog', options);
     }
+    async processFile(file) {
+        file.path = 'extension/changelog.md';
+        return await super.processFile(file, file.path);
+    }
     async onEnd() {
         if (this.options.changelogPath && this.filesProcessed === 0) {
             util.log.error(`The provided changelog file (${this.options.changelogPath}) could not be found.`);
@@ -1192,9 +1203,9 @@ const defaultIgnore = [
     '**/.vscode-test/**',
     '**/.vscode-test-web/**',
 ];
-async function collectAllFiles(cwd, dependencies, dependencyEntryPoints) {
+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, 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, 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, '/'))));
     return Promise.all(promises).then(util.flatten);
 }
 function getDependenciesOption(options) {
@@ -1210,10 +1221,10 @@ function getDependenciesOption(options) {
             return undefined;
     }
 }
-function collectFiles(cwd, dependencies, dependencyEntryPoints, ignoreFile, manifestFileIncludes, readmePath) {
+function collectFiles(cwd, dependencies, dependencyEntryPoints, ignoreFile, manifestFileIncludes, readmePath, followSymlinks = false) {
     readmePath = readmePath ?? 'README.md';
     const notIgnored = ['!package.json', `!${readmePath}`];
-    return collectAllFiles(cwd, dependencies, dependencyEntryPoints).then(files => {
+    return collectAllFiles(cwd, dependencies, dependencyEntryPoints, followSymlinks).then(files => {
         files = files.filter(f => !/\r$/m.test(f));
         return (fs.promises
             .readFile(ignoreFile ? ignoreFile : path.join(cwd, '.vscodeignore'), 'utf8')
@@ -1225,7 +1236,7 @@ function collectFiles(cwd, dependencies, dependencyEntryPoints, ignoreFile, mani
                 manifestFileIncludes ?
                     // include all files in manifestFileIncludes and ignore the rest
                     Promise.resolve(manifestFileIncludes.map(file => `!${file}`).concat(['**']).join('\n\r')) :
-                    // "files" property not used in package.json 
+                    // "files" property not used in package.json
                     Promise.resolve(''))
             // Parse raw ignore by splitting output into lines and filtering out empty lines and comments
             .then(rawIgnore => rawIgnore
@@ -1294,7 +1305,7 @@ function collect(manifest, options = {}) {
     const packagedDependencies = options.dependencyEntryPoints || undefined;
     const ignoreFile = options.ignoreFile || undefined;
     const processors = createDefaultProcessors(manifest, options);
-    return collectFiles(cwd, getDependenciesOption(options), packagedDependencies, ignoreFile, manifest.files, options.readmePath).then(fileNames => {
+    return collectFiles(cwd, getDependenciesOption(options), packagedDependencies, ignoreFile, manifest.files, options.readmePath, options.followSymlinks).then(fileNames => {
         const files = fileNames.map(f => ({ path: util.filePathToVsixPath(f), localPath: path.join(cwd, f) }));
         return processFiles(processors, files);
     });
@@ -1440,7 +1451,7 @@ async function listFiles(options = {}) {
     if (options.prepublish) {
         await prepublish(cwd, manifest, options.useYarn);
     }
-    return await collectFiles(cwd, getDependenciesOption(options), options.packagedDependencies, options.ignoreFile, manifest.files, options.readmePath);
+    return await collectFiles(cwd, getDependenciesOption(options), options.packagedDependencies, options.ignoreFile, manifest.files, options.readmePath, options.followSymlinks);
 }
 exports.listFiles = listFiles;
 /**
@@ -1490,7 +1501,7 @@ async function printAndValidatePackagedFiles(files, cwd, manifest, options) {
         util.log.error(message);
         process.exit(1);
     }
-    // Throw an error if the extension uses the files property in package.json and 
+    // Throw an error if the extension uses the files property in package.json and
     // the package does not include at least one file for each include pattern
     else if (manifest.files !== undefined && manifest.files.length > 0 && !options.allowUnusedFilesPattern) {
         const localPaths = files.filter(f => !isInMemoryFile(f)).map(f => util.normalize(f.localPath));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vscode/vsce",
-	"version": "3.1.1",
+	"version": "3.1.2-1",
 	"description": "VS Code Extensions Manager",
 	"repository": {
 		"type": "git",