From 319d694683ba85fd98b5df172863e3930be24099 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 20 Apr 2022 10:00:58 +0200 Subject: [PATCH 1/5] fix: use v8-to-istanbul without source-map --- e2e/__tests__/coverageProviderV8.test.ts | 16 ++++++---------- packages/jest-reporters/package.json | 2 +- .../jest-reporters/src/CoverageReporter.ts | 3 +-- yarn.lock | 18 +++++++++--------- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/e2e/__tests__/coverageProviderV8.test.ts b/e2e/__tests__/coverageProviderV8.test.ts index 6071485cc61e..e0aed23d0d10 100644 --- a/e2e/__tests__/coverageProviderV8.test.ts +++ b/e2e/__tests__/coverageProviderV8.test.ts @@ -11,17 +11,13 @@ import runJest from '../runJest'; const DIR = path.resolve(__dirname, '../coverage-provider-v8'); -// https://github.com/nodejs/node/issues/42638 -const nodeOptions = - typeof fetch === 'undefined' ? '' : '--no-experimental-fetch'; - test('prints coverage with missing sourcemaps', () => { const sourcemapDir = path.join(DIR, 'no-sourcemap'); const {stdout, exitCode} = runJest( sourcemapDir, ['--coverage', '--coverage-provider', 'v8'], - {nodeOptions, stripAnsi: true}, + {stripAnsi: true}, ); expect(exitCode).toBe(0); @@ -34,7 +30,7 @@ test('prints coverage with empty sourcemaps', () => { const {stdout, exitCode} = runJest( sourcemapDir, ['--coverage', '--coverage-provider', 'v8'], - {nodeOptions, stripAnsi: true}, + {stripAnsi: true}, ); expect(exitCode).toBe(0); @@ -47,7 +43,7 @@ test('prints correct coverage report, if a CJS module is put under test without const {stdout, exitCode} = runJest( sourcemapDir, ['--coverage', '--coverage-provider', 'v8', '--no-cache'], - {nodeOptions, stripAnsi: true}, + {stripAnsi: true}, ); expect(exitCode).toBe(0); @@ -60,7 +56,7 @@ test('prints correct coverage report, if a TS module is transpiled by Babel to C const {stdout, exitCode} = runJest( sourcemapDir, ['--coverage', '--coverage-provider', 'v8', '--no-cache'], - {nodeOptions, stripAnsi: true}, + {stripAnsi: true}, ); expect(exitCode).toBe(0); @@ -76,7 +72,7 @@ onNodeVersions('>=12.16.0', () => { sourcemapDir, ['--coverage', '--coverage-provider', 'v8', '--no-cache'], { - nodeOptions: `${nodeOptions} --experimental-vm-modules --no-warnings`, + nodeOptions: '--experimental-vm-modules --no-warnings', stripAnsi: true, }, ); @@ -92,7 +88,7 @@ onNodeVersions('>=12.16.0', () => { sourcemapDir, ['--coverage', '--coverage-provider', 'v8', '--no-cache'], { - nodeOptions: `${nodeOptions} --experimental-vm-modules --no-warnings`, + nodeOptions: '--experimental-vm-modules --no-warnings', stripAnsi: true, }, ); diff --git a/packages/jest-reporters/package.json b/packages/jest-reporters/package.json index ed1d2c6b38db..feec4fc73d03 100644 --- a/packages/jest-reporters/package.json +++ b/packages/jest-reporters/package.json @@ -34,7 +34,7 @@ "slash": "^3.0.0", "string-length": "^4.0.1", "terminal-link": "^2.0.0", - "v8-to-istanbul": "^8.1.0" + "v8-to-istanbul": "jridgewell/v8-to-istanbul#trace-mapping" }, "devDependencies": { "@jest/test-utils": "^28.0.0-alpha.9", diff --git a/packages/jest-reporters/src/CoverageReporter.ts b/packages/jest-reporters/src/CoverageReporter.ts index dc4d87daa6c1..15d730a91d95 100644 --- a/packages/jest-reporters/src/CoverageReporter.ts +++ b/packages/jest-reporters/src/CoverageReporter.ts @@ -450,8 +450,7 @@ export default class CoverageReporter extends BaseReporter { originalSource: fileTransform.originalCode, source: fileTransform.code, sourceMap: { - // remove `as any` after https://github.com/istanbuljs/v8-to-istanbul/pull/186 is released - sourcemap: {file: res.url, ...sourcemapContent} as any, + sourcemap: {file: res.url, ...sourcemapContent}, }, } : {source: fs.readFileSync(res.url, 'utf8')}, diff --git a/yarn.lock b/yarn.lock index 266df664152c..e047fd539cc7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2787,7 +2787,7 @@ __metadata: string-length: ^4.0.1 strip-ansi: ^6.0.0 terminal-link: ^2.0.0 - v8-to-istanbul: ^8.1.0 + v8-to-istanbul: "jridgewell/v8-to-istanbul#trace-mapping" peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 peerDependenciesMeta: @@ -2950,13 +2950,13 @@ __metadata: languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.0, @jridgewell/trace-mapping@npm:^0.3.4": - version: 0.3.4 - resolution: "@jridgewell/trace-mapping@npm:0.3.4" +"@jridgewell/trace-mapping@npm:^0.3.0, @jridgewell/trace-mapping@npm:^0.3.4, @jridgewell/trace-mapping@npm:^0.3.7": + version: 0.3.7 + resolution: "@jridgewell/trace-mapping@npm:0.3.7" dependencies: "@jridgewell/resolve-uri": ^3.0.3 "@jridgewell/sourcemap-codec": ^1.4.10 - checksum: ab8bce84bbbc8c34f3ba8325ed926f8f2d3098983c10442a80c55764c4eb6e47d5b92d8ff20a0dd868c3e76a3535651fd8a0138182c290dbfc8396195685c37b + checksum: c08f5344568e1396fc377c95054b126620380a87e8992d77526f73b9627e56930a1a76ee95d31266d388ed052f6f97c64911c2aa49283d37547f51c342dfc9b8 languageName: node linkType: hard @@ -22240,14 +22240,14 @@ __metadata: languageName: node linkType: hard -"v8-to-istanbul@npm:^8.1.0": +"v8-to-istanbul@jridgewell/v8-to-istanbul#trace-mapping": version: 8.1.1 - resolution: "v8-to-istanbul@npm:8.1.1" + resolution: "v8-to-istanbul@https://github.com/jridgewell/v8-to-istanbul.git#commit=c673bff63e9a44da46511d6d485924132f5657ae" dependencies: + "@jridgewell/trace-mapping": ^0.3.7 "@types/istanbul-lib-coverage": ^2.0.1 convert-source-map: ^1.6.0 - source-map: ^0.7.3 - checksum: 54ce92bec2727879626f623d02c8d193f0c7e919941fa373ec135189a8382265117f5316ea317a1e12a5f9c13d84d8449052a731fe3306fa4beaafbfa4cab229 + checksum: a58dadd0390d11864408b6bb4a67674c05c707a40fa2cc941d62d47e235f55abb31e30b8fd354b6d47c77a51cda9bebbc79bfad46ebecdb72b57a2e016211a77 languageName: node linkType: hard From 0d4631ebdb4b5cc9cf9f78f68579cc99d720b5d6 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 20 Apr 2022 14:45:28 +0200 Subject: [PATCH 2/5] use master, not fork --- packages/jest-reporters/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/jest-reporters/package.json b/packages/jest-reporters/package.json index feec4fc73d03..59980a2f93e6 100644 --- a/packages/jest-reporters/package.json +++ b/packages/jest-reporters/package.json @@ -34,7 +34,7 @@ "slash": "^3.0.0", "string-length": "^4.0.1", "terminal-link": "^2.0.0", - "v8-to-istanbul": "jridgewell/v8-to-istanbul#trace-mapping" + "v8-to-istanbul": "istanbuljs/v8-to-istanbul#master" }, "devDependencies": { "@jest/test-utils": "^28.0.0-alpha.9", diff --git a/yarn.lock b/yarn.lock index e047fd539cc7..7e1a51eaeffc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2787,7 +2787,7 @@ __metadata: string-length: ^4.0.1 strip-ansi: ^6.0.0 terminal-link: ^2.0.0 - v8-to-istanbul: "jridgewell/v8-to-istanbul#trace-mapping" + v8-to-istanbul: "istanbuljs/v8-to-istanbul#master" peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 peerDependenciesMeta: @@ -22240,14 +22240,14 @@ __metadata: languageName: node linkType: hard -"v8-to-istanbul@jridgewell/v8-to-istanbul#trace-mapping": +"v8-to-istanbul@istanbuljs/v8-to-istanbul#master": version: 8.1.1 - resolution: "v8-to-istanbul@https://github.com/jridgewell/v8-to-istanbul.git#commit=c673bff63e9a44da46511d6d485924132f5657ae" + resolution: "v8-to-istanbul@https://github.com/istanbuljs/v8-to-istanbul.git#commit=dd37cb950ada91c3177643e1985150f5add29f63" dependencies: "@jridgewell/trace-mapping": ^0.3.7 "@types/istanbul-lib-coverage": ^2.0.1 convert-source-map: ^1.6.0 - checksum: a58dadd0390d11864408b6bb4a67674c05c707a40fa2cc941d62d47e235f55abb31e30b8fd354b6d47c77a51cda9bebbc79bfad46ebecdb72b57a2e016211a77 + checksum: 09dec6f5baac1e28cb9b7653f709ae3dfc3f3e16a56ee4f802cbe63103618442a909f6f63ff2dee3169df50e28d7f6ea8c61769e5e1ca8752e2f159d62288987 languageName: node linkType: hard From 2ac5933e6f5d0f31aa66101979944dbf842b5a88 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 20 Apr 2022 14:50:47 +0200 Subject: [PATCH 3/5] from npm --- packages/jest-reporters/package.json | 4 ++-- packages/jest-source-map/package.json | 2 +- packages/jest-transform/package.json | 2 +- yarn.lock | 18 +++++++++--------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/jest-reporters/package.json b/packages/jest-reporters/package.json index 59980a2f93e6..0af4551a1216 100644 --- a/packages/jest-reporters/package.json +++ b/packages/jest-reporters/package.json @@ -17,7 +17,7 @@ "@jest/test-result": "^28.0.0-alpha.9", "@jest/transform": "^28.0.0-alpha.10", "@jest/types": "^28.0.0-alpha.9", - "@jridgewell/trace-mapping": "^0.3.4", + "@jridgewell/trace-mapping": "^0.3.7", "@types/node": "*", "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", @@ -34,7 +34,7 @@ "slash": "^3.0.0", "string-length": "^4.0.1", "terminal-link": "^2.0.0", - "v8-to-istanbul": "istanbuljs/v8-to-istanbul#master" + "v8-to-istanbul": "^9.0.0" }, "devDependencies": { "@jest/test-utils": "^28.0.0-alpha.9", diff --git a/packages/jest-source-map/package.json b/packages/jest-source-map/package.json index 87d4ad08423b..e310aeaff01c 100644 --- a/packages/jest-source-map/package.json +++ b/packages/jest-source-map/package.json @@ -17,7 +17,7 @@ "./package.json": "./package.json" }, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.4", + "@jridgewell/trace-mapping": "^0.3.7", "callsites": "^3.0.0", "graceful-fs": "^4.2.9" }, diff --git a/packages/jest-transform/package.json b/packages/jest-transform/package.json index 1dcc9333a908..f7ce973efa84 100644 --- a/packages/jest-transform/package.json +++ b/packages/jest-transform/package.json @@ -19,7 +19,7 @@ "dependencies": { "@babel/core": "^7.11.6", "@jest/types": "^28.0.0-alpha.9", - "@jridgewell/trace-mapping": "^0.3.4", + "@jridgewell/trace-mapping": "^0.3.7", "babel-plugin-istanbul": "^6.1.1", "chalk": "^4.0.0", "convert-source-map": "^1.4.0", diff --git a/yarn.lock b/yarn.lock index 7e1a51eaeffc..ab9ccb14f3c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2758,7 +2758,7 @@ __metadata: "@jest/test-utils": ^28.0.0-alpha.9 "@jest/transform": ^28.0.0-alpha.10 "@jest/types": ^28.0.0-alpha.9 - "@jridgewell/trace-mapping": ^0.3.4 + "@jridgewell/trace-mapping": ^0.3.7 "@types/exit": ^0.1.30 "@types/glob": ^7.1.1 "@types/graceful-fs": ^4.1.3 @@ -2787,7 +2787,7 @@ __metadata: string-length: ^4.0.1 strip-ansi: ^6.0.0 terminal-link: ^2.0.0 - v8-to-istanbul: "istanbuljs/v8-to-istanbul#master" + v8-to-istanbul: ^9.0.0 peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 peerDependenciesMeta: @@ -2808,7 +2808,7 @@ __metadata: version: 0.0.0-use.local resolution: "@jest/source-map@workspace:packages/jest-source-map" dependencies: - "@jridgewell/trace-mapping": ^0.3.4 + "@jridgewell/trace-mapping": ^0.3.7 "@types/graceful-fs": ^4.1.3 callsites: ^3.0.0 graceful-fs: ^4.2.9 @@ -2872,7 +2872,7 @@ __metadata: "@babel/core": ^7.11.6 "@jest/test-utils": ^28.0.0-alpha.9 "@jest/types": ^28.0.0-alpha.9 - "@jridgewell/trace-mapping": ^0.3.4 + "@jridgewell/trace-mapping": ^0.3.7 "@types/babel__core": ^7.1.14 "@types/convert-source-map": ^1.5.1 "@types/fast-json-stable-stringify": ^2.0.0 @@ -2950,7 +2950,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.0, @jridgewell/trace-mapping@npm:^0.3.4, @jridgewell/trace-mapping@npm:^0.3.7": +"@jridgewell/trace-mapping@npm:^0.3.0, @jridgewell/trace-mapping@npm:^0.3.7": version: 0.3.7 resolution: "@jridgewell/trace-mapping@npm:0.3.7" dependencies: @@ -22240,14 +22240,14 @@ __metadata: languageName: node linkType: hard -"v8-to-istanbul@istanbuljs/v8-to-istanbul#master": - version: 8.1.1 - resolution: "v8-to-istanbul@https://github.com/istanbuljs/v8-to-istanbul.git#commit=dd37cb950ada91c3177643e1985150f5add29f63" +"v8-to-istanbul@npm:^9.0.0": + version: 9.0.0 + resolution: "v8-to-istanbul@npm:9.0.0" dependencies: "@jridgewell/trace-mapping": ^0.3.7 "@types/istanbul-lib-coverage": ^2.0.1 convert-source-map: ^1.6.0 - checksum: 09dec6f5baac1e28cb9b7653f709ae3dfc3f3e16a56ee4f802cbe63103618442a909f6f63ff2dee3169df50e28d7f6ea8c61769e5e1ca8752e2f159d62288987 + checksum: d8ed2c39ba657dfd851a3c7b3f2b87e5b96c9face806ecfe5b627abe53b0c86f264f51425c591e451405b739e3f8a6728da59670f081790990710e813d8d3440 languageName: node linkType: hard From dc59a95cdead50064d5480cde97caca32e0075c8 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 20 Apr 2022 14:51:42 +0200 Subject: [PATCH 4/5] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e70000d8286f..8d69b328c1e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -89,6 +89,7 @@ - `[jest-mock]` Handle overridden `Function.name` property ([#12674](https://github.com/facebook/jest/pull/12674)) - `[@jest/reporters]` Notifications generated by the `--notify` flag are no longer persistent in GNOME Shell. ([#11733](https://github.com/facebook/jest/pull/11733)) - `[@jest/reporters]` Move missing icon file which is needed for `NotifyReporter` class. ([#12593](https://github.com/facebook/jest/pull/12593)) +- `[@jest/reporters]` Update `v8-to-istanbul` ([#12697](https://github.com/facebook/jest/pull/12697)) - `[jest-resolver]` Call custom resolver with core node.js modules ([#12654](https://github.com/facebook/jest/pull/12654)) - `[jest-worker]` Fix `Farm` execution results memory leak ([#12497](https://github.com/facebook/jest/pull/12497)) From faf390c67d2983a154b4bb9c3e1a52a72a04c5ba Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 20 Apr 2022 15:07:06 +0200 Subject: [PATCH 5/5] destroy does nothing --- packages/jest-reporters/src/CoverageReporter.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/jest-reporters/src/CoverageReporter.ts b/packages/jest-reporters/src/CoverageReporter.ts index d1e65280ef4c..203435f08f23 100644 --- a/packages/jest-reporters/src/CoverageReporter.ts +++ b/packages/jest-reporters/src/CoverageReporter.ts @@ -464,8 +464,6 @@ export default class CoverageReporter extends BaseReporter { const istanbulData = converter.toIstanbul(); - converter.destroy(); - return istanbulData; }), );