diff --git a/.changeset/update-rechoir-v1.md b/.changeset/update-rechoir-v1.md deleted file mode 100644 index efa8ce004c6..00000000000 --- a/.changeset/update-rechoir-v1.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"webpack-cli": patch ---- - -chore: update `rechoir` to v1, which resolves loaders with Node.js's own resolver and drops the `resolve` dependency diff --git a/package-lock.json b/package-lock.json index 87166301e2c..3224d392476 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18073,18 +18073,6 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/rechoir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-1.0.0.tgz", - "integrity": "sha512-vyBa7bWz11iJRwzJR0nGLt6r45bymWfYXAgd1FmP08BNP/DHAVabgpGPyEXQmBtKvhgxi17SQz2szhvkberQsg==", - "license": "MIT", - "engines": { - "node": ">= 22.15.0" - }, - "funding": { - "url": "https://github.com/sponsors/gulpjs" - } - }, "node_modules/reflect-metadata": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz", @@ -21065,7 +21053,7 @@ "envinfo": "^7.21.0", "import-local": "^3.2.0", "interpret": "^3.1.1", - "rechoir": "^1.0.0", + "rechoir": "^0.8.0", "webpack-merge": "^6.0.1" }, "bin": { @@ -21119,6 +21107,18 @@ "engines": { "node": ">=20" } + }, + "packages/webpack-cli/node_modules/rechoir": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", + "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", + "license": "MIT", + "dependencies": { + "resolve": "^1.20.0" + }, + "engines": { + "node": ">= 10.13.0" + } } } } diff --git a/packages/webpack-cli/package.json b/packages/webpack-cli/package.json index 21c7c36f92b..457588ec62a 100644 --- a/packages/webpack-cli/package.json +++ b/packages/webpack-cli/package.json @@ -37,7 +37,7 @@ "envinfo": "^7.21.0", "import-local": "^3.2.0", "interpret": "^3.1.1", - "rechoir": "^1.0.0", + "rechoir": "^0.8.0", "webpack-merge": "^6.0.1" }, "devDependencies": { diff --git a/packages/webpack-cli/src/webpack-cli.ts b/packages/webpack-cli/src/webpack-cli.ts index 367595cafd8..971ce6b18e3 100644 --- a/packages/webpack-cli/src/webpack-cli.ts +++ b/packages/webpack-cli/src/webpack-cli.ts @@ -3102,8 +3102,8 @@ class WebpackCLI { // `tsx` is missing from `interpret`'s loader tables, and it cannot // be added there: its `tsx/cjs` entry point exists only in the - // package's `exports` map, which `rechoir` < 1 could not resolve. - // Register it manually instead, resolved from the + // package's `exports` map, which `rechoir`'s resolver does not + // support. Register it manually instead, resolved from the // configuration file's location so the user's copy is picked up. // Requiring `tsx/cjs` installs its require hook as a side effect. const registerTsxLoader = (): Error | undefined => {