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.

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

fix(es/module): Fix interop of jsc.paths with symlinks #8757

Merged
merged 4 commits into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import { module } from "@src/config";
import { module } from "@src/conf";
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
const _config = require("../config");
const _conf = require("../conf");
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import { module } from "@src/config";
import { module } from "@src/conf";
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import { module } from "../config";
import { module } from "../conf";
65 changes: 64 additions & 1 deletion crates/swc_cli_impl/tests/issues.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::{
fs::{self, create_dir_all},
fs::{self, create_dir_all, hard_link},
path::Path,
process::{Command, Stdio},
};
Expand Down Expand Up @@ -81,6 +81,69 @@ fn issue_8495_1() -> Result<()> {
Ok(())
}

#[test]
fn issue_8667_1() -> Result<()> {
let output_base = TempDir::new()?;
let bin_dir = output_base.path().join("bazel-out/arch/bin");
let sandbox = output_base.path().join("sandbox/123");

let pwd = Path::new("tests/fixture-manual/8265").canonicalize()?;

create_dir_all(bin_dir.join("src/modules/moduleA"))?;
create_dir_all(bin_dir.join("src/modules/moduleB"))?;
create_dir_all(sandbox.join("src/modules/moduleA"))?;
create_dir_all(sandbox.join("src/modules/moduleB"))?;

// hard links from BINDIR into src
hard_link(pwd.join(".swcrc"), bin_dir.join(".swcrc"))?;
hard_link(pwd.join("src/index.ts"), bin_dir.join("src/index.ts"))?;
hard_link(
pwd.join("src/modules/moduleA/index.ts"),
bin_dir.join("src/modules/moduleA/index.ts"),
)?;
hard_link(
pwd.join("src/modules/moduleB/index.ts"),
bin_dir.join("src/modules/moduleB/index.ts"),
)?;

// soft links from sandbox into bazel-bin
symlink(&bin_dir.join(".swcrc"), &sandbox.join(".swcrc"));
symlink(&bin_dir.join("src/index.ts"), &sandbox.join("src/index.ts"));
symlink(
&bin_dir.join("src/modules/moduleA/index.ts"),
&sandbox.join("src/modules/moduleA/index.ts"),
);
symlink(
&bin_dir.join("src/modules/moduleB/index.ts"),
&sandbox.join("src/modules/moduleB/index.ts"),
);

//
print_ls_alr(&sandbox);

let mut cmd = cli()?;
cmd.current_dir(&sandbox)
.arg("compile")
.arg("--source-maps")
.arg("false")
.arg("--config-file")
.arg(".swcrc")
.arg("--out-file")
.arg(bin_dir.join("src/index.js"))
.arg("src/index.ts");

cmd.assert().success();

let content = fs::read_to_string(bin_dir.join("src/index.js"))?;
assert!(
content.contains("require(\"./modules/moduleA\")"),
"{}",
content
);

Ok(())
}

/// ln -s $a $b
fn symlink(a: &Path, b: &Path) {
#[cfg(unix)]
Expand Down
6 changes: 3 additions & 3 deletions crates/swc_ecma_transforms_module/src/path.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::{
borrow::Cow,
env::current_dir,
fs::read_link,
io::{self},
fs::canonicalize,
io,
path::{Component, Path, PathBuf},
sync::Arc,
};
Expand Down Expand Up @@ -245,7 +245,7 @@ where
//
// https://github.com/swc-project/swc/issues/8265
if let FileName::Real(resolved) = &target.filename {
if let Ok(orig) = read_link(resolved) {
if let Ok(orig) = canonicalize(resolved) {
target.filename = FileName::Real(orig);
}
}
Expand Down
Loading