Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(deps): upgrade rspack_resolver 0.3.5 to fix extensionAlias edge cases #8188

Merged
merged 3 commits into from
Oct 22, 2024
Merged

fix(deps): upgrade rspack_resolver 0.3.5 to fix extensionAlias edge cases #8188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8de324e
chore(deps): update rspack_resolver 0.3.5
SoonIter Oct 22, 2024
87d502b
chore: upgrade the renovate
SoonIter Oct 22, 2024
67044eb
chore: update the test case
SoonIter Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
"styled_components",
"owo-colors",
"miette",
"rkyv"
"rkyv",
"rspack_resolver"
]
},
{
Expand Down Expand Up @@ -96,6 +97,15 @@
],
"enabled": false
},
{
"groupName": "ignore crate rspack_resolver",
"matchManagers": [
"cargo"
],
"matchPackageNames": [
"rspack_resolver"
],
},
{
"groupName": "ignored indexmap",
"matchManagers": [
Expand Down
5 changes: 3 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ quote = { version = "1.0.35" }
rayon = { version = "1.10.0" }
regex = { version = "1.10.4" }
ropey = "1.6.1"
rspack_resolver = { version = "0.3.3", features = ["package_json_raw_json_api"] }
rspack_resolver = { version = "0.3.5", features = ["package_json_raw_json_api"] }
rspack_sources = { version = "=0.3.3" }
rustc-hash = { version = "1.1.0" }
serde = { version = "1.0.197" }
Expand Down
3 changes: 3 additions & 0 deletions packages/rspack-test-tools/tests/configCases/resolve/extension-alias/errors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = [
/Cannot resolve 'm1\.mjs'/
]
8 changes: 8 additions & 0 deletions packages/rspack-test-tools/tests/configCases/resolve/extension-alias/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,11 @@ import value from "./src/index.mjs";
it("extension-alias should work", () => {
expect(value).toBe("in ts");
});

it("extension-alias should report meaningful error message", () => {
try {
require("./src/m1.mjs")
} catch (e) {
expect(e.message).toContain("Cannot resolve 'm1.mjs' for extension aliases 'm1.mts'");
}
});
1 change: 1 addition & 0 deletions packages/rspack-test-tools/tests/configCases/resolve/extension-alias/src/m1.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = "in m1 mjs"
3 changes: 3 additions & 0 deletions packages/rspack-test-tools/tests/configCases/resolve/matched-alias-not-found/errors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = [
/Cannot find module 'm1'/
]
2 changes: 1 addition & 1 deletion packages/rspack-test-tools/tests/configCases/resolve/matched-alias-not-found/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ it("should error when alias not match", () => {
try {
require("m1")
} catch (e) {
expect(e.message).toContain("Cannot find module 'm1'");
expect(e.message).toContain("Cannot find module 'm1' for matched aliased key 'm1'");
}
})
3 changes: 0 additions & 3 deletions packages/rspack-test-tools/tests/configCases/resolve/matched-alias-not-found/warnings.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/rspack-test-tools/tests/treeShakingCases/cjs-tree-shaking-basic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "example-basic",
"name": "example-cjs-tree-shaking-basic",
"version": "1.0.0",
"description": "",
"main": "index.js",
Expand Down
2 changes: 1 addition & 1 deletion .../rspack-test-tools/tests/treeShakingCases/reexport-all-as-multi-level-nested/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "example-basic",
"name": "example-reexport-all-as-multi-level-nested",
"version": "1.0.0",
"description": "",
"main": "index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/rspack-test-tools/tests/treeShakingCases/reexport-all-as/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "example-basic",
"name": "example-reexport-all-as",
"version": "1.0.0",
"description": "",
"main": "index.js",
Expand Down
Loading