Merge branch 'master' into pr/396

Author: joaomoreno

.vscode/tasks.json

@@ -1,25 +1,23 @@
 {
-	// See https://go.microsoft.com/fwlink/?LinkId=733558
+	// See https://go.microsoft.com/fwlink/?LinkId=733558 
 	// for the documentation about the tasks.json format
 	"version": "2.0.0",
 	"tasks": [
 		{
-			"label": "compile",
+			"type": "npm",
+			"script": "watch",
+			"problemMatcher": [
+				"$tsc-watch"
+			],
 			"group": {
 				"kind": "build",
 				"isDefault": true
 			},
-			"command": "npm",
-			"presentation": {
-				"reveal": "silent"
-			},
-			"args": [
-				"run",
-				"compile",
-				"--loglevel",
-				"silent"
-			],
-			"problemMatcher": [],
+			"isBackground": true
+		},
+		{
+			"type": "npm",
+			"script": "test"
 		}
 	]
 }

README.md

@@ -8,6 +8,12 @@
 
 - [Node.js](https://nodejs.org/en/) at least `8.x.x`
 
+## Usage
+
+`vsce` is meant to be mainly used as a command line tool. It can also be used a library since it exposes a small [API](https://github.com/microsoft/vscode-vsce/blob/master/src/api.ts).
+
+> **Warning:** When using vsce as a library be sure to sanitize any user input used in API calls, as a security measurement.
+
 ## Development
 
 First clone this repository, then:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vsce",
-  "version": "1.68.0",
+  "version": "1.76.1",
   "description": "VSCode Extension Manager",
   "repository": {
     "type": "git",
@@ -40,10 +40,10 @@
     "cheerio": "^1.0.0-rc.1",
     "commander": "^2.8.1",
     "denodeify": "^1.2.1",
-    "didyoumean": "^1.2.1",
     "glob": "^7.0.6",
-    "lodash": "^4.17.10",
-    "markdown-it": "^8.3.1",
+    "leven": "^3.1.0",
+    "lodash": "^4.17.15",
+    "markdown-it": "^10.0.0",
     "mime": "^1.3.4",
     "minimatch": "^3.0.3",
     "osenv": "^0.1.3",
@@ -59,22 +59,27 @@
   "devDependencies": {
     "@types/cheerio": "^0.22.1",
     "@types/denodeify": "^1.2.31",
-    "@types/didyoumean": "^1.2.0",
     "@types/glob": "^7.1.1",
     "@types/lodash": "^4.14.123",
     "@types/markdown-it": "0.0.2",
     "@types/mime": "^1",
     "@types/minimatch": "^3.0.3",
-    "@types/mocha": "^5.2.6",
+    "@types/mocha": "^7.0.2",
     "@types/node": "^8",
     "@types/read": "^0.0.28",
     "@types/semver": "^6.0.0",
     "@types/tmp": "^0.1.0",
     "@types/xml2js": "^0.4.4",
-    "concurrently": "^4.1.0",
-    "mocha": "^5.2.0",
+    "concurrently": "^5.1.0",
+    "mocha": "^7.1.1",
     "source-map-support": "^0.4.2",
     "typescript": "^3.4.3",
     "xml2js": "^0.4.12"
+  },
+  "mocha": {
+    "require": [
+      "source-map-support/register"
+    ],
+    "spec": "out/test"
   }
 }

src/api.ts

@@ -90,6 +90,13 @@ export interface IListFilesOptions {
 	 * no dependencies will be included.
 	 */
 	packagedDependencies?: string[];
+
+	/**
+	 * The location of an alternative .vscodeignore file to be used.
+	 * The `.vscodeignore` file located at the root of the project will be taken
+	 * instead, if none is specified.
+	 */
+	ignoreFile?: string;
 }
 
 export interface IPublishVSIXOptions {
@@ -135,7 +142,7 @@ export function publish(options: IPublishOptions = {}): Promise<any> {
  * Lists the files included in the extension's package.
  */
 export function listFiles(options: IListFilesOptions = {}): Promise<string[]> {
-	return _listFiles(options.cwd, options.packageManager === PackageManager.Yarn, options.packagedDependencies);
+	return _listFiles(options.cwd, options.packageManager === PackageManager.Yarn, options.packagedDependencies, options.ignoreFile);
 }
 
 /**

src/main.ts

@@ -1,18 +1,18 @@
 import * as program from 'commander';
-import * as didYouMean from 'didyoumean';
+import * as leven from 'leven';
 
 import { packageCommand, ls } from './package';
 import { publish, unpublish } from './publish';
 import { show } from './show';
 import { search } from './search';
 import { listPublishers, createPublisher, deletePublisher, loginPublisher, logoutPublisher } from './store';
 import { getLatestVersion } from './npm';
-import { CancellationToken, isCancelledError, log } from './util';
+import { CancellationToken, log } from './util';
 import * as semver from 'semver';
 import { isatty } from 'tty';
 const pkg = require('../package.json');
 
-function fatal<T>(message: any, ...args: any[]): void {
+function fatal(message: any, ...args: any[]): void {
 	if (message instanceof Error) {
 		message = message.message;
 
@@ -63,7 +63,8 @@ module.exports = function (argv: string[]): void {
 		.description('Lists all the files that will be published')
 		.option('--yarn', 'Use yarn instead of npm')
 		.option('--packagedDependencies <path>', 'Select packages that should be published only (includes dependencies)', (val, all) => all ? all.concat(val) : [val], undefined)
-		.action(({ yarn, packagedDependencies }) => main(ls(undefined, yarn, packagedDependencies)));
+		.option('--ignoreFile [path]', 'Indicate alternative .vscodeignore')
+		.action(({ yarn, packagedDependencies, ignoreFile }) => main(ls(undefined, yarn, packagedDependencies, ignoreFile)));
 
 	program
 		.command('package')
@@ -72,25 +73,29 @@ module.exports = function (argv: string[]): void {
 		.option('--baseContentUrl [url]', 'Prepend all relative links in README.md with this url.')
 		.option('--baseImagesUrl [url]', 'Prepend all relative image links in README.md with this url.')
 		.option('--yarn', 'Use yarn instead of npm')
-		.action(({ out, baseContentUrl, baseImagesUrl, yarn }) => main(packageCommand({ packagePath: out, baseContentUrl, baseImagesUrl, useYarn: yarn })));
+		.option('--ignoreFile [path]', 'Indicate alternative .vscodeignore')
+		.option('--noGitHubIssueLinking', 'Prevent automatic expansion of GitHub-style issue syntax into links')
+		.action(({ out, baseContentUrl, baseImagesUrl, yarn, ignoreFile, noGitHubIssueLinking }) => main(packageCommand({ packagePath: out, baseContentUrl, baseImagesUrl, useYarn: yarn, ignoreFile, expandGitHubIssueLinks: noGitHubIssueLinking })));
 
 	program
 		.command('publish [<version>]')
 		.description('Publishes an extension')
-		.option('-p, --pat <token>', 'Personal Access Token')
+		.option('-p, --pat <token>', 'Personal Access Token', process.env['VSCE_PAT'])
 		.option('-m, --message <commit message>', 'Commit message used when calling `npm version`.')
 		.option('--packagePath [path]', 'Publish the VSIX package located at the specified path.')
 		.option('--baseContentUrl [url]', 'Prepend all relative links in README.md with this url.')
 		.option('--baseImagesUrl [url]', 'Prepend all relative image links in README.md with this url.')
 		.option('--yarn', 'Use yarn instead of npm while packing extension files')
 		.option('--noVerify')
-		.action((version, { pat, message, packagePath, baseContentUrl, baseImagesUrl, yarn, noVerify }) => main(publish({ pat, commitMessage: message, version, packagePath, baseContentUrl, baseImagesUrl, useYarn: yarn, noVerify })));
+		.option('--ignoreFile [path]', 'Indicate alternative .vscodeignore')
+		.action((version, { pat, message, packagePath, baseContentUrl, baseImagesUrl, yarn, noVerify, ignoreFile }) => main(publish({ pat, commitMessage: message, version, packagePath, baseContentUrl, baseImagesUrl, useYarn: yarn, noVerify, ignoreFile })));
 
 	program
 		.command('unpublish [<extensionid>]')
 		.description('Unpublishes an extension. Example extension id: microsoft.csharp.')
 		.option('-p, --pat <token>', 'Personal Access Token')
-		.action((id, { pat }) => main(unpublish({ id, pat })));
+		.option('-f, --force', 'Forces Unpublished Extension')
+		.action((id, { pat, force }) => main(unpublish({ id, pat, force })));
 
 	program
 		.command('ls-publishers')
@@ -133,7 +138,8 @@ module.exports = function (argv: string[]): void {
 		.command('*', '', { noHelp: true })
 		.action((cmd: string) => {
 			program.help(help => {
-				const suggestion = didYouMean(cmd, program.commands.map(c => c._name));
+				const availableCommands = program.commands.map(c => c._name);
+				const suggestion = availableCommands.find(c => leven(c, cmd) < c.length * 0.4);
 
 				help = `${help}
 Unknown command '${cmd}'`;

src/manifest.ts

@@ -42,6 +42,7 @@ export interface Manifest {
 	_testing?: string;
 	enableProposedApi?: boolean;
 	qna?: 'marketplace' | string | false;
+	extensionKind?: string[];
 
 	// optional (npm)
 	author?: string | Person;

src/npm.ts

@@ -3,7 +3,7 @@ import * as fs from 'fs';
 import * as cp from 'child_process';
 import * as parseSemver from 'parse-semver';
 import * as _ from 'lodash';
-import { CancellationToken, log } from './util';
+import { CancellationToken } from './util';
 
 interface IOptions {
 	cwd?: string;
@@ -54,7 +54,7 @@ function checkNPM(cancellationToken?: CancellationToken): Promise<void> {
 
 function getNpmDependencies(cwd: string): Promise<string[]> {
 	return checkNPM()
-		.then(() => exec('npm list --production --parseable --depth=99999', { cwd, maxBuffer: 5000 * 1024 }))
+		.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)));