feat: support yarn pnp

web-infra-dev · Dec 30, 2024 · d14db9f · d14db9f
1 parent 2f5cf2f
commit d14db9f
Show file tree

Hide file tree

Showing 37 changed files with 21,897 additions and 787 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,8 +6,7 @@
     "**/CVS": true,
     "**/.DS_Store": true,
     "**/*.bk": true,
-    "/target": true,
-    "**/.yarn": true
+    "/target": true
   },
   "[typescript]": {
     "editor.formatOnSave": true

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -63,7 +63,7 @@ quote              = { version = "1.0.38" }
 rayon              = { version = "1.10.0" }
 regex              = { version = "1.11.1" }
 ropey              = "1.6.1"
-rspack_resolver    = { version = "0.3.6", features = ["package_json_raw_json_api"] }
+rspack_resolver    = { features = ["package_json_raw_json_api"], version = "0.4.1" }
 rspack_sources     = { version = "0.4.1" }
 rustc-hash         = { version = "2.1.0" }
 serde              = { version = "1.0.216" }
@@ -101,6 +101,7 @@ swc_html            = { version = "=6.0.0" }
 swc_html_minifier   = { version = "=6.0.0", default-features = false }
 swc_node_comments   = { version = "=5.0.0" }
 
+pnp = { version = "0.9.0" }
 
 rspack_dojang = { version = "0.1.9" }
 

diff --git a/crates/node_binding/binding.d.ts b/crates/node_binding/binding.d.ts
@@ -256,7 +256,7 @@ export declare class JsResolver {
 }
 
 export declare class JsResolverFactory {
-  constructor()
+  constructor(enablePnp: boolean)
   get(type: string, options?: RawResolveOptionsWithDependencyType): JsResolver
 }
 
@@ -1883,6 +1883,7 @@ export interface RawResolveOptions {
   aliasFields?: Array<string>
   restrictions?: Array<string>
   roots?: Array<string>
+  enablePnp?: boolean
 }
 
 export interface RawResolveOptionsWithDependencyType {
@@ -1909,6 +1910,7 @@ export interface RawResolveOptionsWithDependencyType {
   roots?: Array<string>
   dependencyCategory?: string
   resolveToContext?: boolean
+  enablePnp?: boolean
 }
 
 export interface RawResolveTsconfigOptions {

diff --git a/crates/node_binding/src/resolver_factory.rs b/crates/node_binding/src/resolver_factory.rs
@@ -21,8 +21,8 @@ pub struct JsResolverFactory {
 #[napi]
 impl JsResolverFactory {
   #[napi(constructor)]
-  pub fn new() -> napi::Result<Self> {
-    let input_filesystem = Arc::new(NativeFileSystem {});
+  pub fn new(enable_pnp: bool) -> napi::Result<Self> {
+    let input_filesystem = Arc::new(NativeFileSystem::new(enable_pnp));
     Ok(Self {
       resolver_factory: None,
       loader_resolver_factory: None,