Skip to content

Commit

Permalink
fix(es/module): Fix resolving of .js files (#8480)
Browse files Browse the repository at this point in the history
**Related issue:**

 - vercel/next.js#56144
  • Loading branch information
kdy1 authored Jan 3, 2024
1 parent c9e8376 commit b70e96f
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import styles from "./src/foo.bar.baz";
import styles from "./src/foo.bar.baz.js";
console.log(styles);
8 changes: 7 additions & 1 deletion crates/swc_ecma_transforms_module/src/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,19 @@ where
false
};

let is_resolved_as_js = if let Some(ext) = target_path.extension() {
ext == "js"
} else {
false
};

let is_exact = if let Some(filename) = target_path.file_name() {
filename == orig_filename
} else {
false
};

if !is_resolved_as_index && !is_exact {
if !is_resolved_as_js && !is_resolved_as_index && !is_exact {
target_path.set_file_name(orig_filename);
} else if is_resolved_as_ts && is_exact {
if let Some(ext) = Path::new(orig_filename).extension() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"baseUrl": ".",
"paths": {
"@/*": ["*"]
},
"inputFile": "utils/test.js"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { PrismaClient } from "@/db/client";

class PrismaClientProvider {
prisma;

constructor() {
this.prisma = new PrismaClient({
datasources: {
db: {
url: "",
},
},
});
}
}

export default new PrismaClientProvider();
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

Object.defineProperty(exports, "__esModule", { value: true });
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import PrismaClientProvider from "@/db/PrismaClientProvider";

export default function setupTests() {
const context = {};

beforeEach(() => {
context.prisma = PrismaClientProvider.prisma;
});
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import PrismaClientProvider from "db/PrismaClientProvider";
export default function setupTests() {
const context = {};
beforeEach(()=>{
context.prisma = PrismaClientProvider.prisma;
});
}

0 comments on commit b70e96f

Please sign in to comment.