Revert feat(core): add yarn pnp support (#7639)

web-infra-dev · Jan 24, 2025 · 6a00eef · 6a00eef
1 parent 23f7c8d
commit 6a00eef
Show file tree

Hide file tree

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

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -65,7 +65,7 @@ quote              = { version = "1.0.38" }
 rayon              = { version = "1.10.0" }
 regex              = { version = "1.11.1" }
 ropey              = "1.6.1"
-rspack_resolver    = { features = ["package_json_raw_json_api"], version = "0.5.0" }
+rspack_resolver    = { version = "0.3.6", features = ["package_json_raw_json_api"] }
 rspack_sources     = { version = "0.4.4" }
 rustc-hash         = { version = "2.1.0" }
 serde              = { version = "1.0.217" }
@@ -103,7 +103,6 @@ swc_html            = { version = "=7.0.0" }
 swc_html_minifier   = { version = "=7.0.0", default-features = false }
 swc_node_comments   = { version = "=5.0.0" }
 
-pnp = { version = "0.9.0" }
 
 rspack_dojang = { version = "0.1.10" }
 

diff --git a/crates/node_binding/binding.d.ts b/crates/node_binding/binding.d.ts
@@ -259,7 +259,7 @@ export declare class JsResolver {
 }
 
 export declare class JsResolverFactory {
-  constructor(pnp: boolean)
+  constructor()
   get(type: string, options?: RawResolveOptionsWithDependencyType): JsResolver
 }
 
@@ -1926,7 +1926,6 @@ export interface RawResolveOptions {
   aliasFields?: Array<string>
   restrictions?: Array<string>
   roots?: Array<string>
-  pnp?: boolean
 }
 
 export interface RawResolveOptionsWithDependencyType {
@@ -1953,7 +1952,6 @@ export interface RawResolveOptionsWithDependencyType {
   roots?: Array<string>
   dependencyCategory?: string
   resolveToContext?: boolean
-  pnp?: 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(pnp: bool) -> napi::Result<Self> {
-    let input_filesystem = Arc::new(NativeFileSystem::new(pnp));
+  pub fn new() -> napi::Result<Self> {
+    let input_filesystem = Arc::new(NativeFileSystem {});
     Ok(Self {
       resolver_factory: None,
       loader_resolver_factory: None,