Skip to content

Commit

Permalink
fix(es/module): Respect module.resolveFully in more cases (#8820)
Browse files Browse the repository at this point in the history
**Related issue:**

 - Closes #8742
  • Loading branch information
kdy1 committed Apr 8, 2024
1 parent b511cea commit e1f7704
Show file tree
Hide file tree
Showing 14 changed files with 38 additions and 1 deletion.
9 changes: 9 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8742/input/.swcrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"module": {
"type": "es6",
"resolveFully": true
},
"jsc": {
"baseUrl": "."
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { }
9 changes: 9 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8742/input/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// ======
// SOURCE
// ======
export { teamsDarkTheme, teamsHighContrastTheme, teamsLightTheme, webDarkTheme, webLightTheme } from './themes'; // 🚨 invalid directory path - wont work within browser
export { createDarkTheme, createHighContrastTheme, createLightTheme, createTeamsDarkTheme } from './utils'; // 🚨 invalid directory path - wont work within browser

export { themeToTokensObject } from './themeToTokensObject';
export { tokens } from './tokens';
export { typographyStyles } from './global'; // 🚨 invalid directory path - wont work within browser
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { }
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { }
1 change: 1 addition & 0 deletions crates/swc/tests/fixture/issues-8xxx/8742/input/tokens.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { }
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { }
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { };
8 changes: 8 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8742/output/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// ======
// SOURCE
// ======
export { teamsDarkTheme, teamsHighContrastTheme, teamsLightTheme, webDarkTheme, webLightTheme } from "./themes/index.js"; // 🚨 invalid directory path - wont work within browser
export { createDarkTheme, createHighContrastTheme, createLightTheme, createTeamsDarkTheme } from "./utils/index.js"; // 🚨 invalid directory path - wont work within browser
export { themeToTokensObject } from "./themeToTokensObject.js";
export { tokens } from "./tokens.js";
export { typographyStyles } from "./global/index.js"; // 🚨 invalid directory path - wont work within browser
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { };
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { };
1 change: 1 addition & 0 deletions crates/swc/tests/fixture/issues-8xxx/8742/output/tokens.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { };
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { };
3 changes: 2 additions & 1 deletion crates/swc_ecma_transforms_module/src/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@ where
false
};

if orig_filename == "index" {
if self.config.resolve_fully && is_resolved_as_js {
} else if orig_filename == "index" {
// Import: `./foo/index`
// Resolved: `./foo/index.js`

Expand Down

0 comments on commit e1f7704

Please sign in to comment.