diff --git a/package-lock.json b/package-lock.json index 5ca211532..77c919e80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2553,40 +2553,6 @@ "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", "dev": true }, - "fileset": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz", - "integrity": "sha1-WI74lzxmI7KnbfRlEFaWuWqsgGc=", - "dev": true, - "requires": { - "glob": "5.x", - "minimatch": "2.x" - }, - "dependencies": { - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "minimatch": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", - "dev": true, - "requires": { - "brace-expansion": "^1.0.0" - } - } - } - }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -5310,151 +5276,6 @@ } } }, - "istanbul-combine": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/istanbul-combine/-/istanbul-combine-0.3.0.tgz", - "integrity": "sha1-VrLV5joiBZi23ErIrVcucV6ZV3M=", - "dev": true, - "requires": { - "glob": "^5.0.3", - "istanbul": "0.3.x", - "minimist": "^1.1.1", - "q": "^1.2.0" - }, - "dependencies": { - "escodegen": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.7.1.tgz", - "integrity": "sha1-MOz89mypjcZ80v0WKr626vqM5vw=", - "dev": true, - "requires": { - "esprima": "^1.2.2", - "estraverse": "^1.9.1", - "esutils": "^2.0.2", - "optionator": "^0.5.0", - "source-map": "~0.2.0" - }, - "dependencies": { - "esprima": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz", - "integrity": "sha1-CZNQL+r2aBODJXVvMPmlH+7sEek=", - "dev": true - } - } - }, - "esprima": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.5.0.tgz", - "integrity": "sha1-84ekb9NEwbGjm6+MIL+0O20AWMw=", - "dev": true - }, - "fast-levenshtein": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz", - "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=", - "dev": true - }, - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "istanbul": { - "version": "0.3.22", - "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.22.tgz", - "integrity": "sha1-PhZNhQIf4ZyYXR8OfvDD4i0BLrY=", - "dev": true, - "requires": { - "abbrev": "1.0.x", - "async": "1.x", - "escodegen": "1.7.x", - "esprima": "2.5.x", - "fileset": "0.2.x", - "handlebars": "^4.0.1", - "js-yaml": "3.x", - "mkdirp": "0.5.x", - "nopt": "3.x", - "once": "1.x", - "resolve": "1.1.x", - "supports-color": "^3.1.0", - "which": "^1.1.1", - "wordwrap": "^1.0.0" - } - }, - "levn": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz", - "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.0", - "type-check": "~0.3.1" - } - }, - "optionator": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz", - "integrity": "sha1-t1qJlaLUF98ltuTjhi9QqohlE2g=", - "dev": true, - "requires": { - "deep-is": "~0.1.2", - "fast-levenshtein": "~1.0.0", - "levn": "~0.2.5", - "prelude-ls": "~1.1.1", - "type-check": "~0.3.1", - "wordwrap": "~0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true - } - } - }, - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - }, - "source-map": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", - "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", - "dev": true, - "optional": true, - "requires": { - "amdefine": ">=0.0.4" - } - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "^1.0.0" - } - } - } - }, "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", diff --git a/package.json b/package.json index edb658a43..247a2abca 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,6 @@ "gulp-mocha": "5.0.0", "gulp-tslint": "8.1.3", "istanbul": "0.4.5", - "istanbul-combine": "0.3.0", "ltcdr": "2.2.1", "minimist": "1.2.0", "mocha": "5.0.4", diff --git a/tasks/coverageTasks.ts b/tasks/coverageTasks.ts index eaf367832..6590b05fe 100644 --- a/tasks/coverageTasks.ts +++ b/tasks/coverageTasks.ts @@ -9,7 +9,7 @@ import * as gulp from 'gulp'; import * as path from 'path'; import * as del from 'del'; import spawnNode from './spawnNode'; -import { coverageRootPath, nycOutputPath, nycPath, codeExtensionSourcesPath, integrationTestCoverageRootPath, integrationTestNycOutputPath, istanbulCombinePath, codecovPath, unitTestCoverageRootPath } from './projectPaths'; +import { coverageRootPath, nycOutputPath, nycPath, codeExtensionSourcesPath, integrationTestCoverageRootPath, integrationTestNycOutputPath, istanbulPath, codecovPath, unitTestCoverageRootPath } from './projectPaths'; gulp.task("cov:instrument", async () => { del(coverageRootPath); @@ -29,12 +29,13 @@ gulp.task("cov:instrument", async () => { gulp.task("cov:merge", async () => { return spawnNode([ - istanbulCombinePath, - '-d', + istanbulPath, + 'report', + '--dir', integrationTestCoverageRootPath, - '-r', - 'lcovonly', - `${integrationTestNycOutputPath}/*.json` + '--include', + `${integrationTestNycOutputPath}/*.json`, + 'lcovonly' ], { cwd: codeExtensionSourcesPath }); @@ -42,12 +43,13 @@ gulp.task("cov:merge", async () => { gulp.task("cov:merge-html", async () => { return spawnNode([ - istanbulCombinePath, - '-d', + istanbulPath, + 'report', + '--dir', integrationTestCoverageRootPath, - '-r', - 'html', - `${integrationTestNycOutputPath}/*.json` + '--include', + `${integrationTestNycOutputPath}/*.json`, + 'html' ], { cwd: codeExtensionSourcesPath }); diff --git a/tasks/projectPaths.ts b/tasks/projectPaths.ts index 16c16891a..959741f61 100644 --- a/tasks/projectPaths.ts +++ b/tasks/projectPaths.ts @@ -18,7 +18,7 @@ export const nodeModulesPath = path.join(rootPath, 'node_modules'); export const vscePath = path.join(nodeModulesPath, 'vsce', 'out', 'vsce'); export const nycPath = path.join(nodeModulesPath, 'nyc', 'bin', 'nyc.js'); export const mochaPath = path.join(nodeModulesPath, 'mocha', 'bin', 'mocha'); -export const istanbulCombinePath = path.join(nodeModulesPath, 'istanbul-combine', 'cli.js'); +export const istanbulPath = path.join(nodeModulesPath, 'istanbul', 'lib', 'cli.js'); export const codecovPath = path.join(nodeModulesPath, 'codecov', 'bin', 'codecov'); export const vscodeTestHostPath = path.join(nodeModulesPath, 'vscode', 'bin', 'test');