From cb15d2430715c2b43967696e3285c617ea95e088 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 13 Feb 2019 09:05:20 +0100 Subject: [PATCH] import sourcemap type from source-map --- packages/jest-types/package.json | 5 ++++- packages/jest-types/src/Transform.ts | 23 +++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/jest-types/package.json b/packages/jest-types/package.json index 86018bd9b822..572e2b791882 100644 --- a/packages/jest-types/package.json +++ b/packages/jest-types/package.json @@ -11,5 +11,8 @@ }, "license": "MIT", "main": "build/index.js", - "types": "build/index.d.ts" + "types": "build/index.d.ts", + "dependencies": { + "source-map": "^0.6.1" + } } diff --git a/packages/jest-types/src/Transform.ts b/packages/jest-types/src/Transform.ts index 52ce5162fbe2..473434637f90 100644 --- a/packages/jest-types/src/Transform.ts +++ b/packages/jest-types/src/Transform.ts @@ -6,22 +6,21 @@ */ import {Script} from 'vm'; +import {RawSourceMap} from 'source-map'; import {Path, ProjectConfig} from './Config'; +// https://stackoverflow.com/a/48216010/1850276 +type Omit = Pick>; + +// This is fixed in a newer version, but that depends on Node 8 which is a +// breaking change (engine warning when installing) +interface FixedRawSourceMap extends Omit { + version: number; +} + export type TransformedSource = { code: string; - map?: // copied from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/363cdf403a74e0372e87bbcd15eb1668f4c5230b/types/babel__core/index.d.ts#L371-L379 - | { - version: number; - sources: string[]; - names: string[]; - sourceRoot?: string; - sourcesContent?: string[]; - mappings: string; - file: string; - } - | string - | null; + map?: FixedRawSourceMap | string | null; }; export type TransformResult = {