wip

Author: thecrypticace

packages/tailwindcss-language-server/src/oxide-session.ts

@@ -1,6 +1,7 @@
 import * as rpc from 'vscode-jsonrpc/node'
 import * as proc from 'node:child_process'
 import * as path from 'node:path'
+import * as fs from 'node:fs/promises'
 import { type ScanOptions, type ScanResult } from './oxide'
 
 /**
@@ -32,7 +33,32 @@ export class OxideSession {
 
     // TODO: Can we find a way to not require a build first?
     // let module = path.resolve(path.dirname(__filename), './oxide-helper.ts')
-    let module = path.resolve(path.dirname(__filename), '../bin/oxide-helper.js')
+
+    let modulePaths = [
+      // Separate Language Server package
+      '../bin/oxide-helper.js',
+
+      // Bundled with the VSCode extension
+      '../dist/oxide-helper.js',
+    ]
+
+    let module: string | null = null
+
+    for (let relativePath of modulePaths) {
+      let filepath = path.resolve(path.dirname(__filename), relativePath)
+
+      if (
+        await fs.access(filepath).then(
+          () => true,
+          () => false,
+        )
+      ) {
+        module = filepath
+        break
+      }
+    }
+
+    if (!module) throw new Error('unable to load')
 
     let helper = proc.fork(module)
     let connection = rpc.createMessageConnection(

packages/vscode-tailwindcss/package.json

@@ -362,7 +362,7 @@
     }
   },
   "scripts": {
-    "_esbuild": "node ../../esbuild.mjs src/extension.ts src/server.ts src/cssServer.ts --outdir=dist",
+    "_esbuild": "node ../../esbuild.mjs src/extension.ts src/server.ts src/cssServer.ts src/oxide-helper.ts --outdir=dist",
     "dev": "concurrently --raw --kill-others \"pnpm run watch\" \"pnpm run check --watch\"",
     "watch": "pnpm run clean && pnpm run _esbuild --watch",
     "build": "pnpm run check && pnpm run clean && pnpm run _esbuild --minify && move-file dist/server.js dist/tailwindServer.js && move-file dist/cssServer.js dist/tailwindModeServer.js",

packages/vscode-tailwindcss/src/oxide-helper.ts

@@ -0,0 +1 @@
+import '@tailwindcss/language-server/src/oxide-helper'