From 29e7b3f20c31a0eee5cd8926934da963eb420f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Tue, 1 Sep 2020 14:53:37 -0400 Subject: [PATCH 1/2] Revert "chore: bump source-map to 0.6.1 (#12014)" This reverts commit d5bcc08bf7134db165af91a88a61c8c6bfe39144. --- packages/babel-cli/package.json | 2 +- packages/babel-core/package.json | 2 +- packages/babel-generator/package.json | 2 +- .../package.json | 2 +- yarn.lock | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/babel-cli/package.json b/packages/babel-cli/package.json index 241bd600620f..77358e5865ad 100644 --- a/packages/babel-cli/package.json +++ b/packages/babel-cli/package.json @@ -30,7 +30,7 @@ "lodash": "^4.17.19", "make-dir": "^2.1.0", "slash": "^2.0.0", - "source-map": "^0.6.1" + "source-map": "^0.5.0" }, "optionalDependencies": { "chokidar": "^2.1.8" diff --git a/packages/babel-core/package.json b/packages/babel-core/package.json index 93fa023b7b36..5aaa8346f158 100644 --- a/packages/babel-core/package.json +++ b/packages/babel-core/package.json @@ -58,7 +58,7 @@ "lodash": "^4.17.19", "resolve": "^1.3.2", "semver": "^5.4.1", - "source-map": "^0.6.1" + "source-map": "^0.5.0" }, "devDependencies": { "@babel/helper-transform-fixture-test-runner": "workspace:^7.11.4" diff --git a/packages/babel-generator/package.json b/packages/babel-generator/package.json index 649af3d731b9..8c3e0181c413 100644 --- a/packages/babel-generator/package.json +++ b/packages/babel-generator/package.json @@ -20,7 +20,7 @@ "dependencies": { "@babel/types": "workspace:^7.11.5", "jsesc": "^2.5.1", - "source-map": "^0.6.1" + "source-map": "^0.5.0" }, "devDependencies": { "@babel/helper-fixtures": "workspace:^7.10.5", diff --git a/packages/babel-helper-transform-fixture-test-runner/package.json b/packages/babel-helper-transform-fixture-test-runner/package.json index 8fee81c6c10a..e78e167f1788 100644 --- a/packages/babel-helper-transform-fixture-test-runner/package.json +++ b/packages/babel-helper-transform-fixture-test-runner/package.json @@ -25,6 +25,6 @@ "lodash": "^4.17.19", "quick-lru": "5.1.0", "resolve": "^1.3.2", - "source-map": "^0.6.1" + "source-map": "^0.5.0" } } diff --git a/yarn.lock b/yarn.lock index b99e00628282..4c3a0d883070 100644 --- a/yarn.lock +++ b/yarn.lock @@ -45,7 +45,7 @@ __metadata: make-dir: ^2.1.0 rimraf: ^3.0.0 slash: ^2.0.0 - source-map: ^0.6.1 + source-map: ^0.5.0 peerDependencies: "@babel/core": ^7.0.0-0 dependenciesMeta: @@ -145,7 +145,7 @@ __metadata: lodash: ^4.17.19 resolve: ^1.3.2 semver: ^5.4.1 - source-map: ^0.6.1 + source-map: ^0.5.0 languageName: unknown linkType: soft @@ -261,7 +261,7 @@ __metadata: "@babel/parser": "workspace:^7.11.5" "@babel/types": "workspace:^7.11.5" jsesc: ^2.5.1 - source-map: ^0.6.1 + source-map: ^0.5.0 languageName: unknown linkType: soft @@ -777,7 +777,7 @@ __metadata: lodash: ^4.17.19 quick-lru: 5.1.0 resolve: ^1.3.2 - source-map: ^0.6.1 + source-map: ^0.5.0 languageName: unknown linkType: soft From f331935c8c565b14fa09a663d15049e9b421b2d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Tue, 1 Sep 2020 15:04:50 -0400 Subject: [PATCH 2/2] test: add regression tests for #12025 --- .../babel/filenames --out-file --source-maps/in-files/script.js | 2 ++ .../filenames --out-file --source-maps/out-files/script3.js | 2 +- .../filenames --out-file --source-maps/out-files/script3.js.map | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps/in-files/script.js b/packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps/in-files/script.js index bf33e97c3d1a..d5521cd5983c 100644 --- a/packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps/in-files/script.js +++ b/packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps/in-files/script.js @@ -1 +1,3 @@ (() => 42) + +// some comments diff --git a/packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps/out-files/script3.js b/packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps/out-files/script3.js index bbbdeb7e0727..72fd2d25163e 100644 --- a/packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps/out-files/script3.js +++ b/packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps/out-files/script3.js @@ -2,7 +2,7 @@ (function () { return 42; -}); +}); // some comments "use strict"; arr.map(function (x) { diff --git a/packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps/out-files/script3.js.map b/packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps/out-files/script3.js.map index ebbc4f5b25fa..b7f8aca1b9bc 100644 --- a/packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps/out-files/script3.js.map +++ b/packages/babel-cli/test/fixtures/babel/filenames --out-file --source-maps/out-files/script3.js.map @@ -1 +1 @@ -{"version":3,"sources":["script.js","script2.js"],"names":[],"mappings":";;AAAA,CAAC;AAAA,SAAM,EAAN;AAAA,CAAD;;;ACAA,GAAG,CAAC,GAAJ,CAAQ,UAAA,CAAC;AAAA,SAAI,CAAC,GAAG,UAAR;AAAA,CAAT","file":"script3.js","sourcesContent":["(() => 42)","arr.map(x => x * MULTIPLIER);"]} +{"version":3,"sources":["script.js","script2.js"],"names":[],"mappings":";;AAAA,CAAC;AAAA,SAAM,EAAN;AAAA,CAAD,E,CAEA;;;ACFA,GAAG,CAAC,GAAJ,CAAQ,UAAA,CAAC;AAAA,SAAI,CAAC,GAAG,UAAR;AAAA,CAAT","file":"script3.js","sourcesContent":["(() => 42)\n\n// some comments","arr.map(x => x * MULTIPLIER);"]}