From a6fcbd9bd287e14b94a38a16d43da7d12105959e Mon Sep 17 00:00:00 2001 From: Brad Cornes Date: Thu, 25 May 2023 10:32:48 +0100 Subject: [PATCH] Fix initialisation when using `tailwindcss@^0` --- packages/tailwindcss-language-server/src/server.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts index d981fddb..c4a844d6 100644 --- a/packages/tailwindcss-language-server/src/server.ts +++ b/packages/tailwindcss-language-server/src/server.ts @@ -668,7 +668,7 @@ async function createProjectService( './lib/util/mergeConfigWithDefaults.js' )) const defaultConfig = require(resolveFrom(tailwindDir, './defaultConfig.js')) - resolveConfigFn = (config) => resolveConfig(config, defaultConfig()) + resolveConfigFn = (config) => resolveConfig.default(config, defaultConfig()) } catch (_) { throw Error('Failed to load resolveConfig function.') } @@ -1029,7 +1029,10 @@ async function createProjectService( try { state.config = resolveConfig.module(originalConfig) - state.separator = state.config.separator + state.separator = dlv(state.config, sepLocation) + if (typeof state.separator !== 'string') { + state.separator = ':' + } state.blocklist = Array.isArray(state.config.blocklist) ? state.config.blocklist : [] delete state.config.blocklist