Skip to content

Commit

Permalink
Fix project loading on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
thecrypticace committed Mar 12, 2024
1 parent 4b46fc5 commit 8285ebc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions packages/tailwindcss-language-server/src/project-locator.ts
Expand Up @@ -15,6 +15,7 @@ import { CacheMap } from './cache-map'
import { getPackageRoot } from './util/get-package-root'
import resolveFrom from './util/resolveFrom'
import { Feature, supportedFeatures } from './features'
import { pathToFileURL } from 'node:url'

export interface ProjectConfig {
/** The folder that contains the project */
Expand Down Expand Up @@ -406,6 +407,7 @@ async function* contentSelectorsFromCssConfig(entry: ConfigEntry): AsyncIterable
async function* detectContentFiles(base: string): AsyncIterable<string> {
try {
let oxidePath = resolveFrom(path.dirname(base), '@tailwindcss/oxide')
oxidePath = pathToFileURL(oxidePath).href

// This isn't a v4 project
const oxide = await import(oxidePath)
Expand Down
4 changes: 3 additions & 1 deletion packages/tailwindcss-language-server/src/projects.ts
Expand Up @@ -79,6 +79,7 @@ import { loadDesignSystem } from './util/v4'
import { readCssFile } from './util/css'
import type { AstNode } from 'tailwindcss-language-service/src/util/v4'
import * as postcss8 from 'postcss'
import { pathToFileURL } from 'url'

const colorNames = Object.keys(namedColors)

Expand Down Expand Up @@ -419,14 +420,15 @@ export async function createProjectService(
let applyComplexClasses: any

try {
const tailwindcssPath = resolveFrom(configDir, 'tailwindcss')
let tailwindcssPath = resolveFrom(configDir, 'tailwindcss')
const tailwindcssPkgPath = resolveFrom(configDir, 'tailwindcss/package.json')
const tailwindDir = path.dirname(tailwindcssPkgPath)
tailwindcssVersion = require(tailwindcssPkgPath).version

let features = supportedFeatures(tailwindcssVersion)
log(`supported features: ${JSON.stringify(features)}`)

tailwindcssPath = pathToFileURL(tailwindcssPath).href
tailwindcss = await import(tailwindcssPath)
tailwindcss = tailwindcss.default ?? tailwindcss
log(`Loaded tailwindcss v${tailwindcssVersion}: ${tailwindDir}`)
Expand Down

0 comments on commit 8285ebc

Please sign in to comment.