Move from source-map to source-map-sync

babel · Feb 14, 2021 · 4e888d5 · 4e888d5
1 parent 759a82a
commit 4e888d5
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 24 deletions.
diff --git a/packages/babel-cli/package.json b/packages/babel-cli/package.json
@@ -31,7 +31,7 @@
     "lodash": "^4.17.19",
     "make-dir": "^2.1.0",
     "slash": "condition:BABEL_8_BREAKING ? ^3.0.0 : ^2.0.0",
-    "source-map": "^0.5.0"
+    "source-map-sync": "^0.8.0-beta.1"
   },
   "optionalDependencies": {
     "@nicolo-ribaudo/chokidar-2": "condition:BABEL_8_BREAKING ? : 2.1.8-no-fsevents",

diff --git a/packages/babel-cli/src/babel/file.js b/packages/babel-cli/src/babel/file.js
@@ -1,7 +1,7 @@
 // @flow
 
 import convertSourceMap from "convert-source-map";
-import sourceMap from "source-map";
+import sourceMap from "source-map-sync";
 import slash from "slash";
 import path from "path";
 import fs from "fs";
@@ -65,6 +65,7 @@ export default async function ({
           }
         });
 
+        consumer.destroy();
         offset = code.split("\n").length - 1;
       }
     }

diff --git a/packages/babel-core/package.json b/packages/babel-core/package.json
@@ -59,7 +59,7 @@
     "json5": "^2.1.2",
     "lodash": "^4.17.19",
     "semver": "^5.4.1",
-    "source-map": "^0.5.0"
+    "source-map-sync": "^0.8.0-beta.1"
   },
   "devDependencies": {
     "@babel/helper-transform-fixture-test-runner": "workspace:*"

diff --git a/packages/babel-core/src/transformation/file/merge-map.js b/packages/babel-core/src/transformation/file/merge-map.js
@@ -1,7 +1,7 @@
 // @flow
 
 import typeof { SourceMap } from "convert-source-map";
-import sourceMap from "source-map";
+import sourceMap from "source-map-sync";
 
 export default function mergeSourceMap(
   inputMap: SourceMap,
@@ -261,6 +261,8 @@ function buildMappingData(map: SourceMap): ResolvedMappings {
     sourceMap.SourceMapConsumer.ORIGINAL_ORDER,
   );
 
+  consumer.destroy();
+
   return {
     file: map.file,
     sourceRoot: map.sourceRoot,

diff --git a/packages/babel-core/test/api.js b/packages/babel-core/test/api.js
@@ -1,5 +1,5 @@
 import * as babel from "../lib/index";
-import sourceMap from "source-map";
+import sourceMap from "source-map-sync";
 import path from "path";
 import Plugin from "../lib/config/plugin";
 import generator from "@babel/generator";
@@ -541,6 +541,8 @@ describe("api", function () {
       line: 1,
       column: 6,
     });
+
+    consumer.destroy();
   });
 
   it("default source map filename", function () {

diff --git a/packages/babel-generator/package.json b/packages/babel-generator/package.json
@@ -21,13 +21,12 @@
   "dependencies": {
     "@babel/types": "workspace:^7.12.13",
     "jsesc": "condition: BABEL_8_BREAKING ? ^3.0.2 : ^2.5.1",
-    "source-map": "^0.5.0"
+    "source-map-sync": "^0.8.0-beta.1"
   },
   "devDependencies": {
     "@babel/helper-fixtures": "workspace:*",
     "@babel/parser": "workspace:*",
     "@types/jsesc": "^2.5.0",
-    "@types/lodash": "^4.14.150",
-    "@types/source-map": "^0.5.0"
+    "@types/lodash": "^4.14.150"
   }
 }
diff --git a/packages/babel-generator/src/source-map.ts b/packages/babel-generator/src/source-map.ts
@@ -1,4 +1,4 @@
-import sourceMap from "source-map";
+import sourceMap from "source-map-sync";
 
 /**
  * Build a sourcemap.

diff --git a/packages/babel-generator/test/index.js b/packages/babel-generator/test/index.js
@@ -5,7 +5,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 sourcemap from "source-map-sync";
 
 describe("generation", function () {
   it("completeness", function () {
@@ -297,6 +297,8 @@ describe("generation", function () {
       column: 0,
       line: 2,
     });
+
+    consumer.destroy();
   });
 
   it("newline in string literal", () => {
@@ -318,6 +320,8 @@ describe("generation", function () {
       column: 0,
       line: 2,
     });
+
+    consumer.destroy();
   });
 
   it("lazy source map generation", function () {

diff --git a/packages/babel-helper-transform-fixture-test-runner/package.json b/packages/babel-helper-transform-fixture-test-runner/package.json
@@ -24,6 +24,6 @@
     "lodash": "^4.17.19",
     "quick-lru": "5.1.0",
     "regenerator-runtime": "^0.13.7",
-    "source-map": "^0.5.0"
+    "source-map-sync": "^0.8.0-beta.1"
   }
 }
diff --git a/packages/babel-helper-transform-fixture-test-runner/src/index.js b/packages/babel-helper-transform-fixture-test-runner/src/index.js
@@ -5,7 +5,7 @@ import {
   default as getFixtures,
   resolveOptionPluginOrPreset,
 } from "@babel/helper-fixtures";
-import sourceMap from "source-map";
+import sourceMap from "source-map-sync";
 import { codeFrameColumns } from "@babel/code-frame";
 import * as helpers from "./helpers";
 import merge from "lodash/merge";
@@ -297,6 +297,8 @@ function run(task) {
       const expected = consumer.originalPositionFor(mapping.generated);
       expect({ line: expected.line, column: expected.column }).toEqual(actual);
     });
+
+    consumer.destroy();
   }
 
   if (execCode && resultExec) {

diff --git a/yarn.lock b/yarn.lock
@@ -49,7 +49,7 @@ __metadata:
     make-dir: ^2.1.0
     rimraf: ^3.0.0
     slash: "condition:BABEL_8_BREAKING ? ^3.0.0 : ^2.0.0"
-    source-map: ^0.5.0
+    source-map-sync: ^0.8.0-beta.1
   peerDependencies:
     "@babel/core": ^7.0.0-0
   dependenciesMeta:
@@ -145,7 +145,7 @@ __metadata:
     json5: ^2.1.2
     lodash: ^4.17.19
     semver: ^5.4.1
-    source-map: ^0.5.0
+    source-map-sync: ^0.8.0-beta.1
   languageName: unknown
   linkType: soft
 
@@ -255,9 +255,8 @@ __metadata:
     "@babel/types": "workspace:^7.12.13"
     "@types/jsesc": ^2.5.0
     "@types/lodash": ^4.14.150
-    "@types/source-map": ^0.5.0
     jsesc: "condition: BABEL_8_BREAKING ? ^3.0.2 : ^2.5.1"
-    source-map: ^0.5.0
+    source-map-sync: ^0.8.0-beta.1
   languageName: unknown
   linkType: soft
 
@@ -770,7 +769,7 @@ __metadata:
     lodash: ^4.17.19
     quick-lru: 5.1.0
     regenerator-runtime: ^0.13.7
-    source-map: ^0.5.0
+    source-map-sync: ^0.8.0-beta.1
   languageName: unknown
   linkType: soft
 
@@ -3976,13 +3975,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/source-map@npm:^0.5.0":
-  version: 0.5.2
-  resolution: "@types/source-map@npm:0.5.2"
-  checksum: 228e1ef7c7f9c126cf38afdef2c3ccfb1224523c3692da6148abb9bb81095269645495773e94477e8512e1f652419b471cc8c30997f6bd222185e931f6d97acc
-  languageName: node
-  linkType: hard
-
 "@types/stack-utils@npm:^2.0.0":
   version: 2.0.0
   resolution: "@types/stack-utils@npm:2.0.0"
@@ -12123,6 +12115,15 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"source-map-sync@npm:^0.8.0-beta.1":
+  version: 0.8.0-beta.1
+  resolution: "source-map-sync@npm:0.8.0-beta.1"
+  dependencies:
+    whatwg-url: ^7.0.0
+  checksum: a45bf3b3075404b80794a890f43addd75d0eb1d7c2694f6d9c60284e5942945d051e66b13de6a7f13be5e99ca8b0b775ec334aff347a8a02cd21afc8b08268c2
+  languageName: node
+  linkType: hard
+
 "source-map-url@npm:^0.4.0":
   version: 0.4.0
   resolution: "source-map-url@npm:0.4.0"
@@ -12821,6 +12822,15 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"tr46@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "tr46@npm:1.0.1"
+  dependencies:
+    punycode: ^2.1.0
+  checksum: 66e2e4d6799d3c2fcc56ad6084e8ab7b3e744f138babc86100e5e2bfaf011231d00d229cfccfaf338da953b96c3ea9128d182274915c1516c5189ee75b7c0ad9
+  languageName: node
+  linkType: hard
+
 "tr46@npm:^2.0.2":
   version: 2.0.2
   resolution: "tr46@npm:2.0.2"
@@ -13347,6 +13357,13 @@ typescript@^4.1.3:
   languageName: node
   linkType: hard
 
+"webidl-conversions@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "webidl-conversions@npm:4.0.2"
+  checksum: 75c2ada4262cda41410ec898178f4f2a31419a905415a98a0bd1b93441ce4a2b942bae2d0ac6d637b749b9d3b309be5a49dbc3b06aae9d9e65280554268a2c94
+  languageName: node
+  linkType: hard
+
 "webidl-conversions@npm:^5.0.0":
   version: 5.0.0
   resolution: "webidl-conversions@npm:5.0.0"
@@ -13377,6 +13394,17 @@ typescript@^4.1.3:
   languageName: node
   linkType: hard
 
+"whatwg-url@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "whatwg-url@npm:7.1.0"
+  dependencies:
+    lodash.sortby: ^4.7.0
+    tr46: ^1.0.1
+    webidl-conversions: ^4.0.2
+  checksum: ccbf75d3dfa6d97a7705acc250a43041dfcfa0c9695a5148cac844c39a29657d7c07b3c4533ebabb2401fedcd5eb98626256add2760403b0889c9983ea1a76aa
+  languageName: node
+  linkType: hard
+
 "whatwg-url@npm:^8.0.0":
   version: 8.4.0
   resolution: "whatwg-url@npm:8.4.0"