@vscode/vsce 2.16.0 → 2.18.0

package/README.md

@@ -95,6 +95,13 @@ Once the watcher is up and running, you can run out of sources with:
 node vsce
 ```
 
+Tests can be executed with:
+
+```npm
+$ 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.

package/out/api.js

@@ -34,7 +34,11 @@ exports.publish = publish;
  * @public
  */
 function listFiles(options = {}) {
-    return (0, package_1.listFiles)(options);
+    return (0, package_1.listFiles)({
+        ...options,
+        useYarn: options.packageManager === PackageManager.Yarn,
+        dependencies: options.packageManager !== PackageManager.None,
+    });
 }
 exports.listFiles = listFiles;
 /**

package/out/package.js

@@ -46,6 +46,7 @@ const validation_1 = require("./validation");
 const npm_1 = require("./npm");
 const GitHost = __importStar(require("hosted-git-info"));
 const parse_semver_1 = __importDefault(require("parse-semver"));
+const jsonc = __importStar(require("jsonc-parser"));
 const MinimatchOptions = { dot: true };
 function isInMemoryFile(file) {
     return !!file.contents;
@@ -693,7 +694,7 @@ class LaunchEntryPointProcessor extends BaseProcessor {
         }
     }
     appendJSExt(filePath) {
-        if (filePath.endsWith('.js')) {
+        if (filePath.endsWith('.js') || filePath.endsWith('.cjs')) {
             return filePath;
         }
         return filePath + '.js';
@@ -713,7 +714,7 @@ class IconProcessor extends BaseProcessor {
     constructor(manifest) {
         super(manifest);
         this.didFindIcon = false;
-        this.icon = manifest.icon && `extension/${manifest.icon}`;
+        this.icon = manifest.icon && path.posix.normalize(`extension/${manifest.icon}`);
         delete this.vsix.icon;
     }
     onFile(file) {
@@ -876,12 +877,29 @@ function validateManifest(manifest) {
     if (!manifest.engines['vscode']) {
         throw new Error('Manifest missing field: engines.vscode');
     }
-    (0, validation_1.validateEngineCompatibility)(manifest.engines['vscode']);
+    const engineVersion = manifest.engines['vscode'];
+    (0, validation_1.validateEngineCompatibility)(engineVersion);
     const hasActivationEvents = !!manifest.activationEvents;
+    const hasImplicitLanguageActivationEvents = manifest.contributes?.languages;
+    const hasOtherImplicitActivationEvents = manifest.contributes?.commands ||
+        manifest.contributes?.authentication ||
+        manifest.contributes?.customEditors ||
+        manifest.contributes?.views;
+    const hasImplicitActivationEvents = hasImplicitLanguageActivationEvents || hasOtherImplicitActivationEvents;
     const hasMain = !!manifest.main;
     const hasBrowser = !!manifest.browser;
-    if (hasActivationEvents) {
-        if (!hasMain && !hasBrowser) {
+    let parsedEngineVersion;
+    try {
+        const engineSemver = (0, parse_semver_1.default)(`vscode@${engineVersion}`);
+        parsedEngineVersion = engineSemver.version;
+    }
+    catch (err) {
+        throw new Error('Failed to parse semver of engines.vscode');
+    }
+    if (hasActivationEvents ||
+        ((engineVersion === '*' || semver.satisfies(parsedEngineVersion, '>=1.74', { includePrerelease: true })) &&
+            hasImplicitActivationEvents)) {
+        if (!hasMain && !hasBrowser && (hasActivationEvents || !hasImplicitLanguageActivationEvents)) {
             throw new Error("Manifest needs either a 'main' or 'browser' property, given it has a 'activationEvents' property.");
         }
     }
@@ -951,7 +969,8 @@ function readManifest(cwd = process.cwd(), nls = true) {
             return Promise.resolve(JSON.parse(manifestStr));
         }
         catch (e) {
-            return Promise.reject(`Error parsing 'package.json' manifest file: not a valid JSON file.`);
+            console.error(`Error parsing 'package.json' manifest file: not a valid JSON file.`);
+            throw e;
         }
     })
         .then(validateManifest);
@@ -963,10 +982,11 @@ function readManifest(cwd = process.cwd(), nls = true) {
         .catch(err => (err.code !== 'ENOENT' ? Promise.reject(err) : Promise.resolve('{}')))
         .then(raw => {
         try {
-            return Promise.resolve(JSON.parse(raw));
+            return Promise.resolve(jsonc.parse(raw));
         }
         catch (e) {
-            return Promise.reject(`Error parsing JSON manifest translations file: ${manifestNLSPath}`);
+            console.error(`Error parsing JSON manifest translations file: ${manifestNLSPath}`);
+            throw e;
         }
     });
     return Promise.all([manifest, manifestNLS]).then(([manifest, translations]) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vscode/vsce",
-	"version": "2.16.0",
+	"version": "2.18.0",
 	"description": "VSCode Extension Manager",
 	"repository": {
 		"type": "git",
@@ -32,8 +32,7 @@
 		"build": "npm run compile && npm run api",
 		"watch:build": "npm run compile -- --watch",
 		"test": "mocha",
-		"watch:test": "npm run test -- --watch",
-		"prepare": "husky install"
+		"watch:test": "npm run test -- --watch"
 	},
 	"engines": {
 		"node": ">= 14"
@@ -45,6 +44,7 @@
 		"commander": "^6.1.0",
 		"glob": "^7.0.6",
 		"hosted-git-info": "^4.0.2",
+		"jsonc-parser": "^3.2.0",
 		"leven": "^3.1.0",
 		"markdown-it": "^12.3.2",
 		"mime": "^1.3.4",
@@ -76,10 +76,7 @@
 		"@types/xml2js": "^0.4.4",
 		"@types/yauzl": "^2.9.2",
 		"@types/yazl": "^2.4.2",
-		"husky": "^7.0.4",
 		"mocha": "^9.2.0",
-		"prettier": "2.1.2",
-		"pretty-quick": "^3.0.2",
 		"source-map-support": "^0.4.2",
 		"ts-node": "^10.9.1",
 		"typescript": "^4.3.2"
@@ -93,11 +90,5 @@
 		],
 		"watch-files": "src/**",
 		"spec": "src/test/**/*.ts"
-	},
-	"prettier": {
-		"useTabs": true,
-		"printWidth": 120,
-		"singleQuote": true,
-		"arrowParens": "avoid"
 	}
 }