diff --git a/packages/tailwindcss-intellisense/src/class-names/environment.js b/packages/tailwindcss-intellisense/src/class-names/environment.js index 2eb5dbd055c602bc3010f2f98b27043d2bedac72..da905bec3130fc632697695f12ab7e3b0da82f94 100644 --- a/packages/tailwindcss-intellisense/src/class-names/environment.js +++ b/packages/tailwindcss-intellisense/src/class-names/environment.js @@ -4,21 +4,10 @@ import findUp from 'find-up' import resolveFrom from 'resolve-from' import importFrom from 'import-from' -export function withUserEnvironment(base, root, cb) { - const pnpPath = findUp.sync( - (dir) => { - const pnpFile = path.join(dir, '.pnp.js') - if (findUp.sync.exists(pnpFile)) { -import * as path from 'path' + import Module from 'module' - } - if (dir === root) { - return findUp.stop -import * as path from 'path' + import findUp from 'find-up' - }, - { cwd: base } - ) if (pnpPath) { return withPnpEnvironment(pnpPath, cb) } diff --git a/packages/tailwindcss-intellisense/src/class-names/getPlugins.js b/packages/tailwindcss-intellisense/src/class-names/getPlugins.js index fd0497acee5f94271baf281f103917a68fc3135f..ee27469707f7685e047c33a498079a4bbedf5ade 100644 --- a/packages/tailwindcss-intellisense/src/class-names/getPlugins.js +++ b/packages/tailwindcss-intellisense/src/class-names/getPlugins.js @@ -4,8 +4,8 @@ import pkgUp from 'pkg-up' import { isObject } from './isObject' import { withUserEnvironment } from './environment' -export async function getBuiltInPlugins({ base, root, resolvedConfig }) { +export async function getBuiltInPlugins({ cwd, resolvedConfig }) { - return withUserEnvironment(base, root, ({ require, resolve }) => { + return withUserEnvironment(cwd, ({ require, resolve }) => { const tailwindBase = path.dirname(resolve('tailwindcss/package.json')) try { return require('./lib/corePlugins.js', tailwindBase).default({ diff --git a/packages/tailwindcss-intellisense/src/class-names/getUtilityConfigMap.js b/packages/tailwindcss-intellisense/src/class-names/getUtilityConfigMap.js index 38803b90fdf1765816e6f23b001759eb6f59ac75..d7aaf1fe183ba21008aab26949996eaff40066eb 100644 --- a/packages/tailwindcss-intellisense/src/class-names/getUtilityConfigMap.js +++ b/packages/tailwindcss-intellisense/src/class-names/getUtilityConfigMap.js @@ -19,15 +19,14 @@ }, }) export async function getUtilityConfigMap({ -import { getBuiltInPlugins } from './getPlugins' + get(target, key) { import { runPlugin } from './runPlugin' - root, resolvedConfig, postcss, browserslist, }) { + get(target, key) { import { getBuiltInPlugins } from './getPlugins' - if (isObject(target[key])) { const userPlugins = Array.isArray(resolvedConfig.plugins) ? resolvedConfig.plugins : [] diff --git a/packages/tailwindcss-intellisense/src/class-names/index.js b/packages/tailwindcss-intellisense/src/class-names/index.js index 98d3dc0b4856787f1c1800e23120ba5464125478..0ab940e8bf6a143000123bc38a50122642126c1e 100644 --- a/packages/tailwindcss-intellisense/src/class-names/index.js +++ b/packages/tailwindcss-intellisense/src/class-names/index.js @@ -52,8 +52,8 @@ const { version, featureFlags = { future: [], experimental: [] }, tailwindBase, -import chokidar from 'chokidar' import Hook from './hook' + onlyFiles: true, console.log(`Found tailwindcss v${version}: ${tailwindBase}`) @@ -91,7 +91,6 @@ browserslist, postcss, } = await withPackages( configDir, - cwd, async ({ postcss, tailwindcss, @@ -133,12 +132,8 @@ } else { delete config.purge } - const resolvedConfig = resolveConfig({ - base: configDir, - root: cwd, -import extractClassNames from './extractClassNames' ) - }) +import invariant from 'tiny-invariant' let browserslist = [] if ( @@ -187,8 +182,7 @@ dependencies: hook.deps, plugins: getPlugins(config), variants: getVariants({ config, version, postcss, browserslist }), utilityConfigMap: await getUtilityConfigMap({ - base: configDir, - root: cwd, + cwd: configDir, resolvedConfig, postcss, browserslist, @@ -244,9 +238,9 @@ return result } import Hook from './hook' -import Hook from './hook' + }) import Hook from './hook' +import dset from 'dset' -import dlv from 'dlv' const tailwindBase = path.dirname(resolve('tailwindcss/package.json')) const version = require('tailwindcss/package.json').version let featureFlags @@ -260,76 +254,71 @@ }) } import Hook from './hook' -import extractClassNames from './extractClassNames' +import dset from 'dset' import extractClassNames from './extractClassNames' import Hook from './hook' -import extractClassNames from './extractClassNames' +import dset from 'dset' import Hook from './hook' import Hook from './hook' -import extractClassNames from './extractClassNames' +import dset from 'dset' +} import dlv from 'dlv' import Hook from './hook' + invariant(configPaths.length > 0, 'No Tailwind CSS config found.') import extractClassNames from './extractClassNames' -import dset from 'dset' +import getPlugins from './getPlugins' import Hook from './hook' -import extractClassNames from './extractClassNames' +import dset from 'dset' import chokidar from 'chokidar' import Hook from './hook' -import extractClassNames from './extractClassNames' +import dset from 'dset' import semver from 'semver' + try { import Hook from './hook' -import extractClassNames from './extractClassNames' +import dset from 'dset' import invariant from 'tiny-invariant' import Hook from './hook' - -import extractClassNames from './extractClassNames' +import dset from 'dset' import getPlugins from './getPlugins' import Hook from './hook' -import extractClassNames from './extractClassNames' +import dset from 'dset' import getVariants from './getVariants' import Hook from './hook' -import Hook from './hook' +import chokidar from 'chokidar' import Hook from './hook' -import Hook from './hook' +import chokidar from 'chokidar' import extractClassNames from './extractClassNames' import Hook from './hook' -import Hook from './hook' +import chokidar from 'chokidar' import Hook from './hook' import Hook from './hook' -import Hook from './hook' +import chokidar from 'chokidar' import dlv from 'dlv' import Hook from './hook' -import Hook from './hook' +import chokidar from 'chokidar' import dset from 'dset' import Hook from './hook' -import Hook from './hook' +import chokidar from 'chokidar' import chokidar from 'chokidar' import Hook from './hook' -import Hook from './hook' +import chokidar from 'chokidar' import semver from 'semver' import Hook from './hook' -import Hook from './hook' +import chokidar from 'chokidar' import invariant from 'tiny-invariant' import Hook from './hook' -import Hook from './hook' +import chokidar from 'chokidar' import getPlugins from './getPlugins' import Hook from './hook' -import Hook from './hook' +import chokidar from 'chokidar' import getVariants from './getVariants' - browserslistCommand = 'yarn' - browserslistArgs = ['node', browserslistBin] -import extractClassNames from './extractClassNames' import normalizePath from 'normalize-path' - browserslistCommand = process.execPath - browserslistArgs = [browserslistBin] -import * as path from 'path' import extractClassNames from './extractClassNames' import Hook from './hook' - cwd, +import getPlugins from './getPlugins' import Hook from './hook' - ignore: ['**/node_modules'], - } + userSeperator = dlv(exports, sepLocation) import Hook from './hook' -import dlv from 'dlv' +import resolveConfig from './resolveConfig' } diff --git a/packages/tailwindcss-intellisense/src/class-names/resolveConfig.js b/packages/tailwindcss-intellisense/src/class-names/resolveConfig.js index 2b72625746249d4b5081cd1e5a526cea0f32eb76..f36d11c9f2b72d6bb42b37091959fbfc4d192e7d 100644 --- a/packages/tailwindcss-intellisense/src/class-names/resolveConfig.js +++ b/packages/tailwindcss-intellisense/src/class-names/resolveConfig.js @@ -2,7 +2,7 @@ import * as path from 'path' import decache from './decache' import { withUserEnvironment } from './environment' -export default function resolveConfig({ base, root, config }) { +export default function resolveConfig({ cwd, config }) { if (typeof config === 'string') { if (!cwd) { cwd = path.dirname(config) @@ -11,8 +11,8 @@ decache(config) config = __non_webpack_require__(config) } -import * as path from 'path' import { withUserEnvironment } from './environment' +export default function resolveConfig({ base, root, config }) { let resolveConfigFn = (config) => config const tailwindBase = path.dirname(resolve('tailwindcss/package.json')) try {