From eafd20d4877497f6c504a37611c2430e38446a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Sat, 3 Apr 2021 08:10:48 -0400 Subject: [PATCH 1/9] fix: add all babel config files to file dependency (#887) --- src/index.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/index.js b/src/index.js index c468f42b..07eec2a1 100644 --- a/src/index.js +++ b/src/index.js @@ -209,10 +209,19 @@ async function loader(source, inputSourceMap, overrides) { result = await transform(source, options); } - // TODO: Babel should really provide the full list of config files that - // were used so that this can also handle files loaded with 'extends'. - if (typeof config.babelrc === "string") { - this.addDependency(config.babelrc); + // Availabe since Babel 7.12 + // https://github.com/babel/babel/pull/11907 + if (config.files) { + config.files.forEach(configFile => this.addDependency(configFile)); + } else { + // .babelrc.json + if (typeof config.babelrc === "string") { + this.addDependency(config.babelrc); + } + // babel.config.js + if (config.config) { + this.addDependency(config.config); + } } if (result) { From f3538d09dcee82847d251266b104b0c8a5eca7bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Tue, 20 Apr 2021 19:46:53 -0400 Subject: [PATCH 2/9] Fix failing main (#903) --- package.json | 2 +- test/sourcemaps.test.js | 12 +- yarn.lock | 333 +++++++++++++++++++--------------------- 3 files changed, 165 insertions(+), 182 deletions(-) diff --git a/package.json b/package.json index c7f0a4e0..2338859e 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "react-intl-webpack-plugin": "^0.3.0", "rimraf": "^3.0.0", "semver": "7.3.2", - "webpack": "^5.4.0" + "webpack": "^5.34.0" }, "scripts": { "clean": "rimraf lib/", diff --git a/test/sourcemaps.test.js b/test/sourcemaps.test.js index cc25ffdc..c927b53c 100644 --- a/test/sourcemaps.test.js +++ b/test/sourcemaps.test.js @@ -117,12 +117,12 @@ test.cb("should output webpack's sourcemap properly when set 'inline'", t => { if (isWebpack5) { t.is( - mapObj.sources[0], + mapObj.sources[3], "webpack://babel-loader/./test/fixtures/basic.js", ); // Ensure that the map contains the original code, not the compiled src. - t.falsy(mapObj.sourcesContent[2].includes("__esModule")); + t.falsy(mapObj.sourcesContent[3].includes("__esModule")); } else { t.is(mapObj.sources[1], "webpack:///./test/fixtures/basic.js"); @@ -232,13 +232,13 @@ test.cb("should disable sourcemap output with 'sourceMaps:false'", t => { if (isWebpack5) { t.is( - mapObj.sources[0], + mapObj.sources[3], "webpack://babel-loader/./test/fixtures/basic.js", ); // Ensure that the code contains Babel's compiled output, because // sourcemaps from Babel are disabled. - t.truthy(mapObj.sourcesContent[2].includes("__esModule")); + t.truthy(mapObj.sourcesContent[3].includes("__esModule")); } else { t.is(mapObj.sources[1], "webpack:///./test/fixtures/basic.js"); @@ -295,13 +295,13 @@ test.cb("should disable sourcemap output with 'sourceMap:false'", t => { if (isWebpack5) { t.is( - mapObj.sources[0], + mapObj.sources[3], "webpack://babel-loader/./test/fixtures/basic.js", ); // Ensure that the code contains Babel's compiled output, because // sourcemaps from Babel are disabled. - t.truthy(mapObj.sourcesContent[2].includes("__esModule")); + t.truthy(mapObj.sourcesContent[3].includes("__esModule")); } else { t.is(mapObj.sources[1], "webpack:///./test/fixtures/basic.js"); diff --git a/yarn.lock b/yarn.lock index b102f644..b10e011e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1444,10 +1444,10 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:*, @types/estree@npm:^0.0.45": - version: 0.0.45 - resolution: "@types/estree@npm:0.0.45" - checksum: 9d339cbcf29a96a32e9d40efc21009c2342e93c4f653294dd1ef081ae474bca9e54707e5d4a1cff90b9e3566e8bdd71ac31e0c3d24bc2ff1d3d5aa75058b3937 +"@types/estree@npm:*, @types/estree@npm:^0.0.47": + version: 0.0.47 + resolution: "@types/estree@npm:0.0.47" + checksum: 28cba548c7b61855f4ff0c20146512e71fb578253e3cb24baf1acf660c626a8a271f99848e8a8c4e0e87f177cfce28e8d1fcecb65a4aad4a92ba48fd73179289 languageName: node linkType: hard @@ -1533,184 +1533,154 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/ast@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/ast@npm:1.9.0" +"@webassemblyjs/ast@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/ast@npm:1.11.0" dependencies: - "@webassemblyjs/helper-module-context": 1.9.0 - "@webassemblyjs/helper-wasm-bytecode": 1.9.0 - "@webassemblyjs/wast-parser": 1.9.0 - checksum: 25d93900cc32c2cfa34860b988a534c6671cf789159cc6b918afdf6099f9f2f70710a947501170d9ba0a24f0503fe3b3b45300ec14ec05c9d833c055795133c4 - languageName: node - linkType: hard - -"@webassemblyjs/floating-point-hex-parser@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.9.0" - checksum: af9e11a688b0748f2e4119379d64a8f990a0edf1fbf80df612d2fdf3874528f4917ba51c735b324266314b6587b229825eb53eacbc9e9d00ce1d21ebd2a7d9dc - languageName: node - linkType: hard - -"@webassemblyjs/helper-api-error@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/helper-api-error@npm:1.9.0" - checksum: ae7b9703ecbd0db50a2e95e23c9a1de2a0ba3d98187f4cd57473df4f2a88f9c3a2e53f98ce3a8ba0d73718a50733843ba0d8f88440d5e4a90704bb831f26a2e0 + "@webassemblyjs/helper-numbers": 1.11.0 + "@webassemblyjs/helper-wasm-bytecode": 1.11.0 + checksum: fc26bf2c831c472535eb45b21931c2118d3037cd132b4837accf41a3a2e3501a5a894389b79fd80106af936c574be164a1af42219e66237de96a617690aecfcf languageName: node linkType: hard -"@webassemblyjs/helper-buffer@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/helper-buffer@npm:1.9.0" - checksum: 94bcf27ccf4e5cfcdb92f89bb1e80a973656cab5d19e67eb61a8b5c9cf4ce060616e3afc3d900f6cffa2fc9746a4ad7be75fa448c06af4d4103e507584149a78 +"@webassemblyjs/floating-point-hex-parser@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.0" + checksum: ae591c9e961f14510ea599c6aa08b9a728cc23e7ba19bd8383bf23b695035c5bbeb5f25dba34ad2fba441eb39beebe0d1aa6e83ead4a19a78120449ab3a56ef0 languageName: node linkType: hard -"@webassemblyjs/helper-code-frame@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/helper-code-frame@npm:1.9.0" - dependencies: - "@webassemblyjs/wast-printer": 1.9.0 - checksum: 008fc534f21b3b054bd0bd863d3afcb30740d9c8cdc5044481747533bd276729ec196392a78c16f5a5ee8a6d067fd5fbaed16142b2b4097b1c5340451b5a5d1d +"@webassemblyjs/helper-api-error@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/helper-api-error@npm:1.11.0" + checksum: 6a2c533780e63d79df33a2f455d0bcfbbbd0543da4f5e845eb6f7f7d68debf124a6e3c5d50888cc2eb4c251d90f77e6203498fff3177e8eb03e5175bae37a956 languageName: node linkType: hard -"@webassemblyjs/helper-fsm@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/helper-fsm@npm:1.9.0" - checksum: 3181e69c16aad1267fd471283b797e86f5e0b26abfddf1d0d2ddef8a758f486cd2482887ec317ecbb5c421aa1d11dea17a06e92c59ea9bd38513204e6c7b8f3d +"@webassemblyjs/helper-buffer@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/helper-buffer@npm:1.11.0" + checksum: 9303e0eaa4a1ab63fa1c8be95b6777499440946c4213846672cca4bb4657674d6c4a05cdfdfc8c0b22e885c830abdbcd9132ca1b869f3f41c244aacec3a4013e languageName: node linkType: hard -"@webassemblyjs/helper-module-context@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/helper-module-context@npm:1.9.0" +"@webassemblyjs/helper-numbers@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/helper-numbers@npm:1.11.0" dependencies: - "@webassemblyjs/ast": 1.9.0 - checksum: 9aa715a8d06a17ea92a6ec44322628f9418aa414b888632b5d8092a5125c2b6dcf2c6b80be2b6ad548201aa38e21d390e13c34f2edf7ba3335442739d88b0aef + "@webassemblyjs/floating-point-hex-parser": 1.11.0 + "@webassemblyjs/helper-api-error": 1.11.0 + "@xtuc/long": 4.2.2 + checksum: 58c29d37f9d6c5eaa1feb6af7ab7282cb35d1c9eaa95406c64942507ac11de1a975082fc825556e73b9ed5cdecb8aa22020559028ae45d5b3d42a7f2a6773881 languageName: node linkType: hard -"@webassemblyjs/helper-wasm-bytecode@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0" - checksum: 27ba07f49514d49ccf62a6e7a460941a6794107c9d7ef9685fda8a7373169d6ebdb676071006ce20581abb9f62562fa447473fb0b031e9ef6b2f62fa819be3f1 +"@webassemblyjs/helper-wasm-bytecode@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.0" + checksum: 5bcd67b430c6b39a25fe8904cc2f832ebfef7e2da17a84326553e2b69dde7aa6bc486380f4fa0d01f17f966fff93ac3b6523ffad79e4b8661eb6ddf7f9182e88 languageName: node linkType: hard -"@webassemblyjs/helper-wasm-section@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/helper-wasm-section@npm:1.9.0" +"@webassemblyjs/helper-wasm-section@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.0" dependencies: - "@webassemblyjs/ast": 1.9.0 - "@webassemblyjs/helper-buffer": 1.9.0 - "@webassemblyjs/helper-wasm-bytecode": 1.9.0 - "@webassemblyjs/wasm-gen": 1.9.0 - checksum: 0e2957efc4001b1e030cf088f41a81b779437bf073272fbb31e3fc36d979dc5dd4137611397a70fa308986597a09cbdcd7806f123a0a809ae1035c40495a59d3 + "@webassemblyjs/ast": 1.11.0 + "@webassemblyjs/helper-buffer": 1.11.0 + "@webassemblyjs/helper-wasm-bytecode": 1.11.0 + "@webassemblyjs/wasm-gen": 1.11.0 + checksum: ad4dd37c2b88ad2f7b53e5e9c04a1ce75eace4fd05b117a5459ebf9b8bd4f417ec6837c8b448481da95cad14d48413b937072146fee79796d1c86ec0cc32339d languageName: node linkType: hard -"@webassemblyjs/ieee754@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/ieee754@npm:1.9.0" +"@webassemblyjs/ieee754@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/ieee754@npm:1.11.0" dependencies: "@xtuc/ieee754": ^1.2.0 - checksum: 1474a87d8686542267b11b8ab0a1a37d3003cd6d4b797b8f96c58e348d483fec4e267ec1e128525e56e9250f90b75a79f1187a6beba2072d568b7a01faf3b8d4 + checksum: 7f282b7ab0754d89ad42f224de34622309e67a4869fc016b51fc8931ce0443a7bab289d5a59c683a9197fdaa60849e26cd68d2b36492af28b9d89139fda3c6c3 languageName: node linkType: hard -"@webassemblyjs/leb128@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/leb128@npm:1.9.0" +"@webassemblyjs/leb128@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/leb128@npm:1.11.0" dependencies: "@xtuc/long": 4.2.2 - checksum: af49765d067ca2db5ec6bda360a235b9063756092a6439b8a296cb1ee0ebff778bcd68f686d3c350d1375a3fdb80fd0a91ea9655da5d1ea10ea5d3eae19c1105 - languageName: node - linkType: hard - -"@webassemblyjs/utf8@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/utf8@npm:1.9.0" - checksum: 172fd362aaf6760b826117177ec171ce63b5fabe172f09343b8cd24852f33475f3a596bc1d02088f64a498556a19f98dce00cafe3da3fb8d77367db5326d2d66 + checksum: d101b817361498a92697ddf9432bcde12bb52924d2494fad8bddd79ce6386f0c81275f014905b0342edd61d3b2a5b97e044b91f023fab9b44b0e00f8f794b888 languageName: node linkType: hard -"@webassemblyjs/wasm-edit@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/wasm-edit@npm:1.9.0" - dependencies: - "@webassemblyjs/ast": 1.9.0 - "@webassemblyjs/helper-buffer": 1.9.0 - "@webassemblyjs/helper-wasm-bytecode": 1.9.0 - "@webassemblyjs/helper-wasm-section": 1.9.0 - "@webassemblyjs/wasm-gen": 1.9.0 - "@webassemblyjs/wasm-opt": 1.9.0 - "@webassemblyjs/wasm-parser": 1.9.0 - "@webassemblyjs/wast-printer": 1.9.0 - checksum: 16016c9ef5b69fed1d6a6f21926e6e4a9add41e316efb23f6aeadc6efe2035cfb528720965883ac7861a5584b679a2697416f19db983c8a0c8bd6c7de7a0c6f1 +"@webassemblyjs/utf8@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/utf8@npm:1.11.0" + checksum: 772caa33fe900043a0dcf1cb4a6cc82a3359460a9de1df7dd9aaf736fcade80e678d939ca8e23063eccd17e44c0184769899874fe8d8f787e56318d462dcb83e languageName: node linkType: hard -"@webassemblyjs/wasm-gen@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/wasm-gen@npm:1.9.0" +"@webassemblyjs/wasm-edit@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/wasm-edit@npm:1.11.0" dependencies: - "@webassemblyjs/ast": 1.9.0 - "@webassemblyjs/helper-wasm-bytecode": 1.9.0 - "@webassemblyjs/ieee754": 1.9.0 - "@webassemblyjs/leb128": 1.9.0 - "@webassemblyjs/utf8": 1.9.0 - checksum: 1afcebfd1272b6f2aac2322b64ced22194d5fe91baf7cbc9fbd4e18a9cf9b1c2d31af5a02a7bf15d5880d598de822accc21d446a94ad0e70d7eb09eeab7de6c6 + "@webassemblyjs/ast": 1.11.0 + "@webassemblyjs/helper-buffer": 1.11.0 + "@webassemblyjs/helper-wasm-bytecode": 1.11.0 + "@webassemblyjs/helper-wasm-section": 1.11.0 + "@webassemblyjs/wasm-gen": 1.11.0 + "@webassemblyjs/wasm-opt": 1.11.0 + "@webassemblyjs/wasm-parser": 1.11.0 + "@webassemblyjs/wast-printer": 1.11.0 + checksum: 3d83a925a54270fbc443a9606375b63469fc938e8af0ddd2516c98c2dd52d3113345a9ce1c8c42b524ee1301c45124685377a6dd764b56628cf5563e484fee0f languageName: node linkType: hard -"@webassemblyjs/wasm-opt@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/wasm-opt@npm:1.9.0" +"@webassemblyjs/wasm-gen@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/wasm-gen@npm:1.11.0" dependencies: - "@webassemblyjs/ast": 1.9.0 - "@webassemblyjs/helper-buffer": 1.9.0 - "@webassemblyjs/wasm-gen": 1.9.0 - "@webassemblyjs/wasm-parser": 1.9.0 - checksum: 2ce89f206e40dbfc44ec4a04669b76d14810db70da2506f90a7d5ff45f8002e34d7eaed447c3423cdad76d60617012d1fd0c055b63a5ed863b0068e5ce3e4032 + "@webassemblyjs/ast": 1.11.0 + "@webassemblyjs/helper-wasm-bytecode": 1.11.0 + "@webassemblyjs/ieee754": 1.11.0 + "@webassemblyjs/leb128": 1.11.0 + "@webassemblyjs/utf8": 1.11.0 + checksum: 3886702e589f8c19a34b7778837e2928da730291d1b19bae4fe2954dd8bf28ae5e1574880346762b788445a096c3b6a94c244d38ef66823a76c8f7a8d989c8e1 languageName: node linkType: hard -"@webassemblyjs/wasm-parser@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/wasm-parser@npm:1.9.0" +"@webassemblyjs/wasm-opt@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/wasm-opt@npm:1.11.0" dependencies: - "@webassemblyjs/ast": 1.9.0 - "@webassemblyjs/helper-api-error": 1.9.0 - "@webassemblyjs/helper-wasm-bytecode": 1.9.0 - "@webassemblyjs/ieee754": 1.9.0 - "@webassemblyjs/leb128": 1.9.0 - "@webassemblyjs/utf8": 1.9.0 - checksum: b8cb346c9b7d1238d24a418bbc676c5adea7561202580527e3f6a8f74e38de8ba60962d5bda56fa7c1d652d28d787234dfae0b4777e2a8bcaf3e0d539ced8acf + "@webassemblyjs/ast": 1.11.0 + "@webassemblyjs/helper-buffer": 1.11.0 + "@webassemblyjs/wasm-gen": 1.11.0 + "@webassemblyjs/wasm-parser": 1.11.0 + checksum: 8e2757994c07c4534f5f747da54919a37777ec0f97bc6a9a53739d87408346fa1464e1932f66d671091c51e3a983977e31be464568ad6e06762ec2c052eeda0c languageName: node linkType: hard -"@webassemblyjs/wast-parser@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/wast-parser@npm:1.9.0" +"@webassemblyjs/wasm-parser@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/wasm-parser@npm:1.11.0" dependencies: - "@webassemblyjs/ast": 1.9.0 - "@webassemblyjs/floating-point-hex-parser": 1.9.0 - "@webassemblyjs/helper-api-error": 1.9.0 - "@webassemblyjs/helper-code-frame": 1.9.0 - "@webassemblyjs/helper-fsm": 1.9.0 - "@xtuc/long": 4.2.2 - checksum: eaa0140a446be6138bbd19ecadf93119381f4cfabe5d7453397f2bd1716e00498666f12944b7da0b472ad1bcc27eca2fd9934785b57cfe97910189f0df59c3f1 + "@webassemblyjs/ast": 1.11.0 + "@webassemblyjs/helper-api-error": 1.11.0 + "@webassemblyjs/helper-wasm-bytecode": 1.11.0 + "@webassemblyjs/ieee754": 1.11.0 + "@webassemblyjs/leb128": 1.11.0 + "@webassemblyjs/utf8": 1.11.0 + checksum: 12bfbb25b96630a1e44570cb71db33c368d0b86ccb56d2f80951217f7e072da894eef4512302e2f4155793acd2cf510d36af2b71aac672e94c64752d96cd3e97 languageName: node linkType: hard -"@webassemblyjs/wast-printer@npm:1.9.0": - version: 1.9.0 - resolution: "@webassemblyjs/wast-printer@npm:1.9.0" +"@webassemblyjs/wast-printer@npm:1.11.0": + version: 1.11.0 + resolution: "@webassemblyjs/wast-printer@npm:1.11.0" dependencies: - "@webassemblyjs/ast": 1.9.0 - "@webassemblyjs/wast-parser": 1.9.0 + "@webassemblyjs/ast": 1.11.0 "@xtuc/long": 4.2.2 - checksum: 9f013b27e28b60cb215011079a15c94d1a7b0784eb3b59ec4936f8c0635ecdb58875c6809485cff814e01df170f02c18676cf782826795dc08553b98e69c1049 + checksum: 06eafb92cb347400f3a025102ad8f605fab706c8a89b4ecabedfe6d06854370e7f38304fd5b345bafa1c9c5de988318eb69b2252e9c67edacea8709d2e966dca languageName: node linkType: hard @@ -2184,7 +2154,7 @@ __metadata: rimraf: ^3.0.0 schema-utils: ^2.6.5 semver: 7.3.2 - webpack: ^5.4.0 + webpack: ^5.34.0 peerDependencies: "@babel/core": ^7.0.0 webpack: ">=2" @@ -2475,9 +2445,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001154": - version: 1.0.30001156 - resolution: "caniuse-lite@npm:1.0.30001156" - checksum: 46d8e675fd49679ab49d49e97b233383c064520b27113a38eb2f5ed054b8c73a613d2a7851a243cce95d8cc83db7a5466ff5efcff10dfb429f0627eb77c77b60 + version: 1.0.30001214 + resolution: "caniuse-lite@npm:1.0.30001214" + checksum: 96c09af8989fe03e6aa0cc0130be3392c4a871093f0ae7190cb1185862a63b54de14483561578564d034cf993c315d4939727badee39ed76144e94ae4ab2a0f7 languageName: node linkType: hard @@ -3276,13 +3246,13 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.3.1": - version: 5.3.1 - resolution: "enhanced-resolve@npm:5.3.1" +"enhanced-resolve@npm:^5.8.0": + version: 5.8.0 + resolution: "enhanced-resolve@npm:5.8.0" dependencies: graceful-fs: ^4.2.4 - tapable: ^2.0.0 - checksum: 1689ec43477bc31b8fd78737ce3f278bebeab0e97426662d966fc722dc5d5dfac8c9279e3467b9918e7e51590e37eb84bc751a67b047e71e8ca34615c729f42e + tapable: ^2.2.0 + checksum: a3e1131c9ba0dd6f8276f068ddac4e6469d824ee8132f748e2734722b9f25360f4cb5a7fbec1cab8cd56815a6762e0bb1b8d088cbdf2a276d30d573ac5528bbb languageName: node linkType: hard @@ -3357,6 +3327,13 @@ __metadata: languageName: node linkType: hard +"es-module-lexer@npm:^0.4.0": + version: 0.4.1 + resolution: "es-module-lexer@npm:0.4.1" + checksum: 0c634ce62d3a77b04aa56b9ca2af2b58ff73a834afc76ac6747b25173e97d9050a28451b6ed39b54b84b8498d887ac8bd5bcf2c9aa9ba948ca0aee0acd613618 + languageName: node + linkType: hard + "es-to-primitive@npm:^1.2.1": version: 1.2.1 resolution: "es-to-primitive@npm:1.2.1" @@ -4982,7 +4959,7 @@ fsevents@~2.1.2: languageName: node linkType: hard -"jest-worker@npm:^26.6.1": +"jest-worker@npm:^26.6.2": version: 26.6.2 resolution: "jest-worker@npm:26.6.2" dependencies: @@ -5250,10 +5227,10 @@ fsevents@~2.1.2: languageName: node linkType: hard -"loader-runner@npm:^4.1.0": - version: 4.1.0 - resolution: "loader-runner@npm:4.1.0" - checksum: 2b964f3484249acc18f1c28e35aee284ed698a73e9f1913bc045761ad0af3a61b403e22ce170e4cc8bdcea87fddb6a34b42e9f88a023758e635d5276c75dd8c4 +"loader-runner@npm:^4.2.0": + version: 4.2.0 + resolution: "loader-runner@npm:4.2.0" + checksum: e8b103ae98d589d9f5444b51053cc8ec48d8d6d9c1d0f845fd6d25ada769c68f22c5031a58ba95faf9a561eb95607a38005ac37339e1e4e37105467193d2b290 languageName: node linkType: hard @@ -5988,12 +5965,12 @@ fsevents@~2.1.2: languageName: node linkType: hard -"p-limit@npm:^3.0.2": - version: 3.0.2 - resolution: "p-limit@npm:3.0.2" +"p-limit@npm:^3.1.0": + version: 3.1.0 + resolution: "p-limit@npm:3.1.0" dependencies: - p-try: ^2.0.0 - checksum: 1eb23d6ea77709212bf8d7a98d36c4e8b5276ec791bf74f460c012fadf4580d136f40efafa25d4892a9327102866eafc79b441eed7be339b0da59da416ced600 + yocto-queue: ^0.1.0 + checksum: 5301db6a34fc1fe3714ae562c100a0567d8c16ce9db800f547bbe75efc045c40cd74c4a4c893279975dcf15afc1217c8d2c93fe957a156a3a43d7cce98eaad2e languageName: node linkType: hard @@ -7399,10 +7376,10 @@ fsevents@~2.1.2: languageName: node linkType: hard -"tapable@npm:^2.0.0": - version: 2.1.1 - resolution: "tapable@npm:2.1.1" - checksum: 02f2c18d9faaeb4b084af4c3cfbdfe87a89032083bc34103f40595e3eb41a8e6c619ba01726622f9d469a47cd6080af2ca975a2e5a94d5e5c2a7302a327c98a3 +"tapable@npm:^2.1.1, tapable@npm:^2.2.0": + version: 2.2.0 + resolution: "tapable@npm:2.2.0" + checksum: f8ed725aedb3d777bf908ff06c02d1a2108667d3e64af87dd45354ac8de67e7e4fe1a567e215057fb1a2a5437b31d80cc5e5ddbb8327f7280afd4494967a9a93 languageName: node linkType: hard @@ -7434,32 +7411,32 @@ fsevents@~2.1.2: languageName: node linkType: hard -"terser-webpack-plugin@npm:^5.0.3": - version: 5.0.3 - resolution: "terser-webpack-plugin@npm:5.0.3" +"terser-webpack-plugin@npm:^5.1.1": + version: 5.1.1 + resolution: "terser-webpack-plugin@npm:5.1.1" dependencies: - jest-worker: ^26.6.1 - p-limit: ^3.0.2 + jest-worker: ^26.6.2 + p-limit: ^3.1.0 schema-utils: ^3.0.0 serialize-javascript: ^5.0.1 source-map: ^0.6.1 - terser: ^5.3.8 + terser: ^5.5.1 peerDependencies: webpack: ^5.1.0 - checksum: e71ae79f550095f1e33330b696f860ed6f704d5ad5c6e06a2a4e4db577c758007874459f8b67a4608285ca7c58c6fc3718482be51762f88fa20dbd6101ce700c + checksum: 8364e53f34764f94aa5c7e74c506d36e130e63cbe91e84cc3f176d712cbc2d3127be8267c88395523e6e39dd45e759704335dc17efab27489a05d9fa148bf05d languageName: node linkType: hard -"terser@npm:^5.3.8": - version: 5.3.8 - resolution: "terser@npm:5.3.8" +"terser@npm:^5.5.1": + version: 5.6.1 + resolution: "terser@npm:5.6.1" dependencies: commander: ^2.20.0 source-map: ~0.7.2 source-map-support: ~0.5.19 bin: terser: bin/terser - checksum: 3fc070378ba9981d8088a4012060f16428a97dc8f98d5a731b2ab51b8c9bc8cb651ca068aef499faad863584ae4d4883872c4f51db053bc2575c2e0bc11ab411 + checksum: 55348dd25452f0a1690040f943a890dc3e33b8711b1c0592ef1114b2eca51d6ec8db8f8f769f1483b088575c07f44b7e92b3dda5f430ff6fa8c2ebd461db26f9 languageName: node linkType: hard @@ -7867,32 +7844,31 @@ typescript@^4.0: languageName: node linkType: hard -"webpack@npm:^5.4.0": - version: 5.4.0 - resolution: "webpack@npm:5.4.0" +"webpack@npm:^5.34.0": + version: 5.34.0 + resolution: "webpack@npm:5.34.0" dependencies: "@types/eslint-scope": ^3.7.0 - "@types/estree": ^0.0.45 - "@webassemblyjs/ast": 1.9.0 - "@webassemblyjs/helper-module-context": 1.9.0 - "@webassemblyjs/wasm-edit": 1.9.0 - "@webassemblyjs/wasm-parser": 1.9.0 + "@types/estree": ^0.0.47 + "@webassemblyjs/ast": 1.11.0 + "@webassemblyjs/wasm-edit": 1.11.0 + "@webassemblyjs/wasm-parser": 1.11.0 acorn: ^8.0.4 browserslist: ^4.14.5 chrome-trace-event: ^1.0.2 - enhanced-resolve: ^5.3.1 + enhanced-resolve: ^5.8.0 + es-module-lexer: ^0.4.0 eslint-scope: ^5.1.1 events: ^3.2.0 glob-to-regexp: ^0.4.1 graceful-fs: ^4.2.4 json-parse-better-errors: ^1.0.2 - loader-runner: ^4.1.0 + loader-runner: ^4.2.0 mime-types: ^2.1.27 neo-async: ^2.6.2 - pkg-dir: ^4.2.0 schema-utils: ^3.0.0 - tapable: ^2.0.0 - terser-webpack-plugin: ^5.0.3 + tapable: ^2.1.1 + terser-webpack-plugin: ^5.1.1 watchpack: ^2.0.0 webpack-sources: ^2.1.1 peerDependenciesMeta: @@ -7900,7 +7876,7 @@ typescript@^4.0: optional: true bin: webpack: bin/webpack.js - checksum: 1da5d7f1f0ec1f8f0a0ef2ef4b374805a9abd9a1a30e8834ab4b2f7793ce43251ea5c50b0132884666bd5189711f2049c66bb06ca6c381bfb022355619dc93bc + checksum: ce93de995d8d348a7a6f97fa2fabfd7d14718bc6163c4b17b758e92aba9fb908fc4e1d7a290c2482a7aa1445d68376bc51c58bc002e5daf4fc122b76dd5d2145 languageName: node linkType: hard @@ -8103,3 +8079,10 @@ typescript@^4.0: checksum: 19e94e62eb653f8310aa4ed6eab797b1756fea90cdacb38dec45afdd21b8607bf38723ee0fae0b967ca3886ad58b8430eb48b716958231f2f1b950c1c7f11034 languageName: node linkType: hard + +"yocto-queue@npm:^0.1.0": + version: 0.1.0 + resolution: "yocto-queue@npm:0.1.0" + checksum: 096c3b40beb2804659539be1605a35c58eb0c85285f94b77b3e924f42ee265c1a40bf9f4153770039517146b469a964d51742395f35ca8135fc9f7e4982b785d + languageName: node + linkType: hard From 7fdf6f4ca85d4f7c25ca7952b6ec51f5cb059762 Mon Sep 17 00:00:00 2001 From: Sebastiaan Nijland <19267753+SebastiaanNijland@users.noreply.github.com> Date: Thu, 3 Jun 2021 13:46:38 +0200 Subject: [PATCH 3/9] chore: update readme example (#907) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e72ac70..f63ea7e0 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ For this, you can either use a combination of `test` and `not`, or [pass a funct { test: /\.m?js$/, exclude: { - test: /node_modules/, // Exclude libraries in node_modules ... + and: [/node_modules/], // Exclude libraries in node_modules ... not: [ // Except for a few of them that needs to be transpiled because they use modern syntax /unfetch/, From 00935251386e97741145598c7287c7ed1f7b559f Mon Sep 17 00:00:00 2001 From: Justin Robb Date: Wed, 20 Oct 2021 15:31:23 -0700 Subject: [PATCH 4/9] Use `md5` has for caching on node v17 (#918) --- src/cache.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/cache.js b/src/cache.js index 7f7721ff..35e78819 100644 --- a/src/cache.js +++ b/src/cache.js @@ -63,7 +63,14 @@ const write = async function (filename, compress, result) { * @return {String} */ const filename = function (source, identifier, options) { - const hash = crypto.createHash("md4"); + // md4 hashing is not supported starting with node v17.0.0 + const majorNodeVersion = parseInt(process.versions.node.split(".")[0], 10); + let hashType = "md4"; + if (majorNodeVersion >= 17) { + hashType = "md5"; + } + + const hash = crypto.createHash(hashType); const contents = JSON.stringify({ source, options, identifier }); From 199c2075f06b5848ad6b58f05aeb0872b6eeb480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Thu, 21 Oct 2021 00:36:00 +0200 Subject: [PATCH 5/9] 8.2.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2338859e..322338ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "babel-loader", - "version": "8.2.2", + "version": "8.2.3", "description": "babel module loader for webpack", "files": [ "lib" From 052c07a0168a24e2bb15fd8890c9e485c5a3fe97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E8=B1=AA?= Date: Thu, 21 Oct 2021 16:51:52 +0800 Subject: [PATCH 6/9] doc(README.md): fix a broken markdown link (#919) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f63ea7e0..33ebb7e6 100644 --- a/README.md +++ b/README.md @@ -252,7 +252,7 @@ You will need to exclude them form `babel-loader`. ### Top level function (IIFE) is still arrow (on Webpack 5) -That function is injected by Webpack itself _after_ running `babel-loader`. By default Webpack asumes that your target environment supports some ES2015 features, but you can overwrite this behavior using the `output.environment` Webpack option ([documentation]((https://webpack.js.org/configuration/output/#outputenvironment)). +That function is injected by Webpack itself _after_ running `babel-loader`. By default Webpack asumes that your target environment supports some ES2015 features, but you can overwrite this behavior using the `output.environment` Webpack option ([documentation](https://webpack.js.org/configuration/output/#outputenvironment)). To avoid the top-level arrow function, you can use `output.environment.arrowFunction`: From 247c94ba90cd7311b17e18dea68349c727c28b6c Mon Sep 17 00:00:00 2001 From: Stian Jensen Date: Tue, 22 Mar 2022 02:03:11 +0100 Subject: [PATCH 7/9] Bump loader-utils to 2.x (#931) https://github.com/webpack/loader-utils/blob/master/CHANGELOG.md New minimum required node version is 8.9.x, which is what babel-loader already requires. --- package.json | 2 +- src/index.js | 2 +- yarn.lock | 23 ++++++----------------- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 322338ee..7a75c8e7 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "find-cache-dir": "^3.3.1", - "loader-utils": "^1.4.0", + "loader-utils": "^2.0.0", "make-dir": "^3.1.0", "schema-utils": "^2.6.5" }, diff --git a/src/index.js b/src/index.js index 07eec2a1..45f518da 100644 --- a/src/index.js +++ b/src/index.js @@ -55,7 +55,7 @@ function makeLoader(callback) { async function loader(source, inputSourceMap, overrides) { const filename = this.resourcePath; - let loaderOptions = loaderUtils.getOptions(this) || {}; + let loaderOptions = loaderUtils.getOptions(this); validateOptions(schema, loaderOptions, { name: "Babel loader", diff --git a/yarn.lock b/yarn.lock index b10e011e..2ca58f1d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2143,7 +2143,7 @@ __metadata: find-cache-dir: ^3.3.1 husky: ^4.3.0 lint-staged: ^10.5.1 - loader-utils: ^1.4.0 + loader-utils: ^2.0.0 make-dir: ^3.1.0 nyc: ^15.1.0 pnp-webpack-plugin: ^1.6.4 @@ -5070,17 +5070,6 @@ fsevents@~2.1.2: languageName: node linkType: hard -"json5@npm:^1.0.1": - version: 1.0.1 - resolution: "json5@npm:1.0.1" - dependencies: - minimist: ^1.2.0 - bin: - json5: lib/cli.js - checksum: df41624f9f40bfacc546f779eef6d161a3312fbb6ec1dbd69f8c4388e9807af653b753371ab19b6d2bab22af2ca7dde62fe03c791596acf76915e1fc4ee6fd88 - languageName: node - linkType: hard - "json5@npm:^2.1.2": version: 2.1.3 resolution: "json5@npm:2.1.3" @@ -5234,14 +5223,14 @@ fsevents@~2.1.2: languageName: node linkType: hard -"loader-utils@npm:^1.4.0": - version: 1.4.0 - resolution: "loader-utils@npm:1.4.0" +"loader-utils@npm:^2.0.0": + version: 2.0.2 + resolution: "loader-utils@npm:2.0.2" dependencies: big.js: ^5.2.2 emojis-list: ^3.0.0 - json5: ^1.0.1 - checksum: 9fd690e57ad78d32ff2942383b4a7a175eba575280ba5aca3b4d03183fec34aa0db314f49bd3301adf7e60b02471644161bf53149e8f2d18fd6a52627e95a927 + json5: ^2.1.2 + checksum: c1df0ff0fb52787011b8d19b1e38ee1b67e31d8b301703e6f791256377ce71a6180f40c34a597dfafe76fe621139fea0ee4669344d98b939d9042ea1c32f1ba9 languageName: node linkType: hard From 4bb9e21a36fa581c045121031717b90b5a77ef16 Mon Sep 17 00:00:00 2001 From: pathmapper Date: Tue, 22 Mar 2022 17:40:21 +0100 Subject: [PATCH 8/9] Use md5 hashing for OpenSSL 3 (#924) --- src/cache.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/cache.js b/src/cache.js index 35e78819..29482924 100644 --- a/src/cache.js +++ b/src/cache.js @@ -19,6 +19,14 @@ const transform = require("./transform"); // Lazily instantiated when needed let defaultCacheDirectory = null; +let hashType = "md4"; +// use md5 hashing if md4 is not available +try { + crypto.createHash(hashType); +} catch (err) { + hashType = "md5"; +} + const readFile = promisify(fs.readFile); const writeFile = promisify(fs.writeFile); const gunzip = promisify(zlib.gunzip); @@ -63,13 +71,6 @@ const write = async function (filename, compress, result) { * @return {String} */ const filename = function (source, identifier, options) { - // md4 hashing is not supported starting with node v17.0.0 - const majorNodeVersion = parseInt(process.versions.node.split(".")[0], 10); - let hashType = "md4"; - if (majorNodeVersion >= 17) { - hashType = "md5"; - } - const hash = crypto.createHash(hashType); const contents = JSON.stringify({ source, options, identifier }); From f7982c1a7ee34f25ce73cc4fd5771fca475b4447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Tue, 22 Mar 2022 17:51:58 +0100 Subject: [PATCH 9/9] 8.2.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a75c8e7..d69155a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "babel-loader", - "version": "8.2.3", + "version": "8.2.4", "description": "babel module loader for webpack", "files": [ "lib"