@vscode/vsce 2.24.1-0 → 2.24.1-2

package/out/package.js

@@ -1160,12 +1160,21 @@ function getDependenciesOption(options) {
             return undefined;
     }
 }
-function collectFiles(cwd, dependencies, dependencyEntryPoints, ignoreFile) {
+function collectFiles(cwd, dependencies, dependencyEntryPoints, ignoreFile, manifestFileIncludes) {
     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(''))
+            .catch(err => err.code !== 'ENOENT' ?
+            Promise.reject(err) :
+            ignoreFile ?
+                Promise.reject(err) :
+                // No .vscodeignore file exists
+                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 
+                    Promise.resolve(''))
             // Parse raw ignore by splitting output into lines and filtering out empty lines and comments
             .then(rawIgnore => rawIgnore
             .split(/[\n\r]/)
@@ -1233,7 +1242,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).then(fileNames => {
+    return collectFiles(cwd, getDependenciesOption(options), packagedDependencies, ignoreFile, manifest.files).then(fileNames => {
         const files = fileNames.map(f => ({ path: `extension/${f}`, localPath: path.join(cwd, f) }));
         return processFiles(processors, files);
     });
@@ -1347,7 +1356,7 @@ async function listFiles(options = {}) {
     if (options.prepublish) {
         await prepublish(cwd, manifest, options.useYarn);
     }
-    return await collectFiles(cwd, getDependenciesOption(options), options.packagedDependencies, options.ignoreFile);
+    return await collectFiles(cwd, getDependenciesOption(options), options.packagedDependencies, options.ignoreFile, manifest.files);
 }
 exports.listFiles = listFiles;
 /**

package/out/publish.js

@@ -39,6 +39,7 @@ const zip_1 = require("./zip");
 const validation_1 = require("./validation");
 const form_data_1 = __importDefault(require("form-data"));
 const path_1 = require("path");
+const cockatiel_1 = require("cockatiel");
 const tmpName = (0, util_1.promisify)(tmp.tmpName);
 async function publish(options = {}) {
     if (options.packagePath) {
@@ -70,6 +71,7 @@ async function publish(options = {}) {
                     throw new Error(`Cannot use '--pre-release' flag with a package that was not packaged as pre-release. Please package it using the '--pre-release' flag and publish again.`);
                 }
             }
+            validateMarketplaceRequirements(vsix.manifest, options);
             await _publish(packagePath, options.sigzipPath?.[index], vsix.manifest, { ...options, target });
         }
     }
@@ -77,6 +79,8 @@ async function publish(options = {}) {
         const cwd = options.cwd || process.cwd();
         const manifest = await (0, package_1.readManifest)(cwd);
         (0, util_2.patchOptionsWithManifest)(options, manifest);
+        // Validate marketplace requirements before prepublish to avoid unnecessary work
+        validateMarketplaceRequirements(manifest, options);
         await (0, package_1.prepublish)(cwd, manifest, options.useYarn);
         await (0, package_1.versionBump)(options);
         if (options.targets) {
@@ -95,16 +99,6 @@ async function publish(options = {}) {
 }
 exports.publish = publish;
 async function _publish(packagePath, sigzipPath, manifest, options) {
-    (0, validation_1.validatePublisher)(manifest.publisher);
-    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 (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}'`);
-    }
     const pat = options.pat ?? (await (0, store_1.getPublisher)(manifest.publisher)).pat;
     const api = await (0, util_2.getGalleryAPI)(pat);
     const packageStream = fs.createReadStream(packagePath);
@@ -192,7 +186,13 @@ async function _publishSignedPackage(api, packageName, packageStream, sigzipName
     form.append('sigzip', sigzipStream, {
         header: `--${form.getBoundary()}${lineBreak}Content-Disposition: attachment; name=sigzip; filename=${sigzipName}${lineBreak}Content-Type: application/octet-stream${lineBreak}${lineBreak}`
     });
-    return await api.publishExtensionWithPublisherSignature(undefined, form, manifest.publisher, manifest.name, extensionType);
+    const publishWithRetry = (0, cockatiel_1.retry)((0, cockatiel_1.handleWhen)(err => err.message.includes('timeout')), {
+        maxAttempts: 3,
+        backoff: new cockatiel_1.IterableBackoff([5000, 10000, 20000])
+    });
+    return await publishWithRetry.execute(async () => {
+        return await api.publishExtensionWithPublisherSignature(undefined, form, manifest.publisher, manifest.name, extensionType);
+    });
 }
 async function unpublish(options = {}) {
     let publisher, name;
@@ -217,4 +217,16 @@ async function unpublish(options = {}) {
     util_2.log.done(`Deleted extension: ${fullName}!`);
 }
 exports.unpublish = unpublish;
+function validateMarketplaceRequirements(manifest, options) {
+    (0, validation_1.validatePublisher)(manifest.publisher);
+    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 (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}'. Checkout our pre-release versioning recommendation here: https://code.visualstudio.com/api/working-with-extensions/publishing-extension#prerelease-extensions`);
+    }
+}
 //# sourceMappingURL=publish.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vscode/vsce",
-	"version": "2.24.1-0",
+	"version": "2.24.1-2",
 	"description": "VS Code Extensions Manager",
 	"repository": {
 		"type": "git",
@@ -35,12 +35,13 @@
 		"watch:test": "npm run test -- --watch"
 	},
 	"engines": {
-		"node": ">= 14"
+		"node": ">= 16"
 	},
 	"dependencies": {
 		"azure-devops-node-api": "^12.5.0",
 		"chalk": "^2.4.2",
 		"cheerio": "^1.0.0-rc.9",
+		"cockatiel": "^3.1.2",
 		"commander": "^6.2.1",
 		"form-data": "^4.0.0",
 		"glob": "^7.0.6",
@@ -69,7 +70,7 @@
 		"@types/mime": "^1",
 		"@types/minimatch": "^3.0.3",
 		"@types/mocha": "^7.0.2",
-		"@types/node": "^14.17.32",
+		"@types/node": "^16.11.7",
 		"@types/read": "^0.0.28",
 		"@types/semver": "^6.0.0",
 		"@types/tmp": "^0.2.2",