feat(plugin): change nodeModulesDir filed to actual absolute path t…

…o node_modules
TomokiMiyauci · Jun 5, 2024 · ac97ee6 · ac97ee6
1 parent 835e691
commit ac97ee6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/docs/dependence.md b/docs/dependence.md
@@ -19,7 +19,6 @@ The following flags are required to run this plugin:
 
 The following fields may be referenced in the build options:
 
-- [`absWorkingDir`](https://esbuild.github.io/api/#working-directory)
 - [`platform`](https://esbuild.github.io/api/#platform)
 - [`conditions`](https://esbuild.github.io/api/#conditions)
 - [`mainFields`](https://esbuild.github.io/api/#main-fields)

diff --git a/src/option.ts b/src/option.ts
@@ -94,7 +94,6 @@ export function resolvePlatform(platForm: Platform): string | null {
 
 export type DependentBuildOptions = Pick<
   BuildOptions,
-  | "absWorkingDir"
   | "platform"
   | "mainFields"
   | "resolveExtensions"

diff --git a/src/plugin.ts b/src/plugin.ts
@@ -15,10 +15,8 @@ import { resolveReferrer } from "./referrer.ts";
 import { existDir, existFile, readFile, realURL } from "./io.ts";
 
 export interface Options {
-  /**
-   * @default false
-   */
-  nodeModulesDir?: boolean;
+  /** Path to `node_modules` dir. */
+  nodeModulesDir?: string;
 
   /**
    * @default new DenoDir().root
@@ -31,7 +29,7 @@ export function denoSpecifierPlugin(options: Options = {}): Plugin {
     name: "deno-specifier",
     setup(build) {
       const DENO_DIR = options.denoDir ?? new DenoDir().root;
-      const infoOptions = options.nodeModulesDir
+      const infoOptions = typeof options.nodeModulesDir === "string"
         ? {
           json: true,
           noConfig: true,
@@ -61,17 +59,7 @@ export function denoSpecifierPlugin(options: Options = {}): Plugin {
       }
 
       const strategy = options.nodeModulesDir
-        ? (() => {
-          const root = build.initialOptions.absWorkingDir;
-
-          if (!root) {
-            throw new Error(
-              `'absWorkingDir' is required when nodeModulesDir is 'true'`,
-            );
-          }
-
-          return new LocalStrategy(root);
-        })()
+        ? new LocalStrategy(options.nodeModulesDir)
         : new GlobalStrategy(DENO_DIR);
 
       const resolveOptions = {

diff --git a/src/strategy.ts b/src/strategy.ts
@@ -1,5 +1,6 @@
 import { join } from "@std/url/join";
 import { toFileUrl } from "@std/path/to-file-url";
+import { dirname } from "@std/path/dirname";
 import { getParents } from "./npm/cjs/utils.ts";
 import { IO } from "./types.ts";
 import { createNpmRegistryURL } from "./utils.ts";
@@ -27,7 +28,8 @@ export class LocalStrategy implements Strategy {
 
   resolveSymbolic = true;
   constructor(nodeModulesDir: string) {
-    this.#root = toFileUrl(nodeModulesDir);
+    const rootDir = dirname(nodeModulesDir);
+    this.#root = toFileUrl(rootDir);
   }
 
   async getPackageURL(args: PackageArgs): Promise<URL | null> {