Setup PnP runtime API when available

A call to `setup()` is required for resolution to function at all

Author: thecrypticace

packages/tailwindcss-language-server/src/resolver/index.ts

@@ -43,15 +43,6 @@ export interface ResolverOptions {
 }
 
 export interface Resolver {
-  /**
-   * Sets up the PnP API if it is available such that globals like `require`
-   * have been monkey-patched to use PnP resolution.
-   *
-   * This function does nothing if PnP resolution is not enabled or if the PnP
-   * API is not available.
-   */
-  setupPnP(): Promise<void>
-
   /**
    * Resolves a JavaScript module to a file path.
    *
@@ -98,6 +89,11 @@ export interface Resolver {
    */
   child(opts: Partial<ResolverOptions>): Promise<Resolver>
 
+  /**
+   * Whether or not the PnP API is being used by the resolver
+   */
+  hasPnP(): Promise<boolean>
+
   /**
    * Refresh information the resolver may have cached
    *
@@ -107,17 +103,18 @@ export interface Resolver {
 }
 
 export async function createResolver(opts: ResolverOptions): Promise<Resolver> {
-  let fileSystem = opts.fileSystem ? opts.fileSystem : new CachedInputFileSystem(fs, 4000)
-
   let pnpApi: PnpApi | null = null
 
   // Load PnP API if requested
+  // This MUST be done before `CachedInputFileSystem` is created
   if (typeof opts.pnp === 'object') {
     pnpApi = opts.pnp
   } else if (opts.pnp) {
     pnpApi = await loadPnPApi(opts.root)
   }
 
+  let fileSystem = opts.fileSystem ? opts.fileSystem : new CachedInputFileSystem(fs, 4000)
+
   let tsconfig: TSConfigApi | null = null
 
   // Load TSConfig path mappings
@@ -217,10 +214,6 @@ export async function createResolver(opts: ResolverOptions): Promise<Resolver> {
     return (await tsconfig?.substituteId(id, base)) ?? id
   }
 
-  async function setupPnP() {
-    pnpApi?.setup()
-  }
-
   async function aliases(base: string) {
     if (!tsconfig) return {}
 
@@ -231,12 +224,16 @@ export async function createResolver(opts: ResolverOptions): Promise<Resolver> {
     await tsconfig?.refresh()
   }
 
+  async function hasPnP() {
+    return !!pnpApi
+  }
+
   return {
-    setupPnP,
     resolveJsId,
     resolveCssId,
     substituteId,
     refresh,
+    hasPnP,
 
     aliases,
 

packages/tailwindcss-language-server/src/resolver/pnp.ts

@@ -3,7 +3,6 @@ import * as path from 'node:path'
 import { pathToFileURL } from '../utils'
 
 export interface PnpApi {
-  setup(): void
   resolveToUnqualified: (arg0: string, arg1: string, arg2: object) => null | string
 }
 
@@ -29,6 +28,7 @@ export async function loadPnPApi(root: string): Promise<PnpApi | null> {
   let pnpUrl = pathToFileURL(pnpPath).href
   let mod = await import(pnpUrl)
   let api = mod.default
+  api.setup()
   cache.set(root, api)
   return api
 }