diff --git a/packages/babel-core/package.json b/packages/babel-core/package.json index b70f7ffc7597..066f6b9e3f0b 100644 --- a/packages/babel-core/package.json +++ b/packages/babel-core/package.json @@ -67,12 +67,12 @@ "devDependencies": { "@babel/helper-transform-fixture-test-runner": "workspace:^", "@babel/plugin-transform-modules-commonjs": "workspace:^", + "@jridgewell/trace-mapping": "^0.3.2", "@types/convert-source-map": "^1.5.1", "@types/debug": "^4.1.0", "@types/resolve": "^1.3.2", "@types/semver": "^5.4.0", - "@types/source-map": "^0.5.0", - "source-map": "0.6.1" + "@types/source-map": "^0.5.0" }, "conditions": { "BABEL_8_BREAKING": [ diff --git a/packages/babel-core/test/api.js b/packages/babel-core/test/api.js index 1b21b376d88e..d1da2a93052b 100644 --- a/packages/babel-core/test/api.js +++ b/packages/babel-core/test/api.js @@ -1,5 +1,5 @@ import babel from "../lib/index.js"; -import sourceMap from "source-map"; +import { TraceMap, originalPositionFor } from "@jridgewell/trace-mapping"; import path from "path"; import generator from "@babel/generator"; import { fileURLToPath } from "url"; @@ -532,10 +532,10 @@ describe("api", function () { ].join("\n"), ).toBe(result.code); - const consumer = new sourceMap.SourceMapConsumer(result.map); + const consumer = new TraceMap(result.map); expect( - consumer.originalPositionFor({ + originalPositionFor(consumer, { line: 7, column: 4, }), diff --git a/packages/babel-generator/package.json b/packages/babel-generator/package.json index 67d38aac439f..02e3a93a618b 100644 --- a/packages/babel-generator/package.json +++ b/packages/babel-generator/package.json @@ -26,6 +26,7 @@ "devDependencies": { "@babel/helper-fixtures": "workspace:^", "@babel/parser": "workspace:^", + "@jridgewell/trace-mapping": "^0.3.2", "@types/jsesc": "^2.5.0", "@types/source-map": "^0.5.0", "charcodes": "^0.2.0" diff --git a/packages/babel-generator/test/index.js b/packages/babel-generator/test/index.js index c7cdd19235ba..1708f951eee8 100644 --- a/packages/babel-generator/test/index.js +++ b/packages/babel-generator/test/index.js @@ -3,7 +3,7 @@ import * as t from "@babel/types"; import fs from "fs"; import path from "path"; import fixtures from "@babel/helper-fixtures"; -import sourcemap from "source-map"; +import { TraceMap, originalPositionFor } from "@jridgewell/trace-mapping"; import { fileURLToPath } from "url"; import _Printer from "../lib/printer.js"; @@ -295,8 +295,8 @@ describe("generation", function () { code, ); - const consumer = new sourcemap.SourceMapConsumer(generated.map); - const loc = consumer.originalPositionFor({ line: 2, column: 1 }); + const consumer = new TraceMap(generated.map); + const loc = originalPositionFor(consumer, { line: 2, column: 1 }); expect(loc).toMatchObject({ column: 0, line: 2, @@ -316,8 +316,8 @@ describe("generation", function () { code, ); - const consumer = new sourcemap.SourceMapConsumer(generated.map); - const loc = consumer.originalPositionFor({ line: 2, column: 1 }); + const consumer = new TraceMap(generated.map); + const loc = originalPositionFor(consumer, { line: 2, column: 1 }); expect(loc).toMatchObject({ column: 0, line: 2,