From c9a2effc6d04b6d9359218e91b02b03b4a8903cc Mon Sep 17 00:00:00 2001 From: Erlend Seppola Date: Fri, 26 Jul 2024 18:22:24 +0200 Subject: [PATCH 01/10] fix: add mts and cts files to CONFIG_GLOB --- packages/tailwindcss-language-server/src/lib/constants.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/tailwindcss-language-server/src/lib/constants.ts b/packages/tailwindcss-language-server/src/lib/constants.ts index 4f9462c6..a953f697 100644 --- a/packages/tailwindcss-language-server/src/lib/constants.ts +++ b/packages/tailwindcss-language-server/src/lib/constants.ts @@ -1,4 +1,4 @@ export const CONFIG_GLOB = - '{tailwind,tailwind.config,tailwind.*.config,tailwind.config.*}.{js,cjs,ts,mjs}' -export const PACKAGE_LOCK_GLOB = '{package-lock.json,yarn.lock,pnpm-lock.yaml}' -export const CSS_GLOB = '*.{css,scss,sass,less,pcss}' + "{tailwind,tailwind.config,tailwind.*.config,tailwind.config.*}.{js,cjs,ts,mjs,mts,cts}"; +export const PACKAGE_LOCK_GLOB = "{package-lock.json,yarn.lock,pnpm-lock.yaml}"; +export const CSS_GLOB = "*.{css,scss,sass,less,pcss}"; From 91a6ea48e4f041262537d166aed3d946a22fbd6e Mon Sep 17 00:00:00 2001 From: Erlend Seppola Date: Fri, 26 Jul 2024 18:23:56 +0200 Subject: [PATCH 02/10] chore: keep formatting as it was --- packages/tailwindcss-language-server/src/lib/constants.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/tailwindcss-language-server/src/lib/constants.ts b/packages/tailwindcss-language-server/src/lib/constants.ts index a953f697..29d0e641 100644 --- a/packages/tailwindcss-language-server/src/lib/constants.ts +++ b/packages/tailwindcss-language-server/src/lib/constants.ts @@ -1,4 +1,4 @@ export const CONFIG_GLOB = - "{tailwind,tailwind.config,tailwind.*.config,tailwind.config.*}.{js,cjs,ts,mjs,mts,cts}"; -export const PACKAGE_LOCK_GLOB = "{package-lock.json,yarn.lock,pnpm-lock.yaml}"; -export const CSS_GLOB = "*.{css,scss,sass,less,pcss}"; + '{tailwind,tailwind.config,tailwind.*.config,tailwind.config.*}.{js,cjs,ts,mjs,mts,cts}' +export const PACKAGE_LOCK_GLOB = '{package-lock.json,yarn.lock,pnpm-lock.yaml}' +export const CSS_GLOB = '*.{css,scss,sass,less,pcss}' From ae427c15850f7dedf9a0e2ed116b34de4e5e05aa Mon Sep 17 00:00:00 2001 From: Erlend Seppola Date: Fri, 26 Jul 2024 18:35:26 +0200 Subject: [PATCH 03/10] chore: bump vscode-tailwindcss version --- packages/vscode-tailwindcss/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vscode-tailwindcss/package.json b/packages/vscode-tailwindcss/package.json index 1099ce1b..bf8541c8 100644 --- a/packages/vscode-tailwindcss/package.json +++ b/packages/vscode-tailwindcss/package.json @@ -4,7 +4,7 @@ "description": "Intelligent Tailwind CSS tooling for VS Code", "author": "Brad Cornes ", "license": "MIT", - "version": "0.12.5", + "version": "0.12.6", "homepage": "https://github.com/tailwindlabs/tailwindcss-intellisense", "bugs": { "url": "https://github.com/tailwindlabs/tailwindcss-intellisense/issues", @@ -366,4 +366,4 @@ "typescript": "5.3.3", "vscode-languageclient": "8.0.2" } -} +} \ No newline at end of file From 75a1e724ba720aa9cbe817990a9756d62cf53c44 Mon Sep 17 00:00:00 2001 From: Erlend Seppola Date: Fri, 26 Jul 2024 18:35:48 +0200 Subject: [PATCH 04/10] chore: update change.log and readme --- packages/vscode-tailwindcss/CHANGELOG.md | 4 ++++ packages/vscode-tailwindcss/README.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/vscode-tailwindcss/CHANGELOG.md b/packages/vscode-tailwindcss/CHANGELOG.md index f64fc958..86b31379 100644 --- a/packages/vscode-tailwindcss/CHANGELOG.md +++ b/packages/vscode-tailwindcss/CHANGELOG.md @@ -4,6 +4,10 @@ - Nothing yet! +## 0.12.6 + +- Add support for .cts and .mts config files ([#1025](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1025)) + ## 0.12.5 - Use paths relative to opened folder when searching for projects ([#1013](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1013)) diff --git a/packages/vscode-tailwindcss/README.md b/packages/vscode-tailwindcss/README.md index 61c9d1b1..9aa9902c 100644 --- a/packages/vscode-tailwindcss/README.md +++ b/packages/vscode-tailwindcss/README.md @@ -6,7 +6,7 @@ Tailwind CSS IntelliSense enhances the Tailwind development experience by provid **[Install via the Visual Studio Code Marketplace →](https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss)** -In order for the extension to activate you must have [`tailwindcss` installed](https://tailwindcss.com/docs/installation) and a [Tailwind config file](https://tailwindcss.com/docs/installation#create-your-configuration-file) named `tailwind.config.{js,cjs,mjs,ts}` in your workspace. +In order for the extension to activate you must have [`tailwindcss` installed](https://tailwindcss.com/docs/installation) and a [Tailwind config file](https://tailwindcss.com/docs/installation#create-your-configuration-file) named `tailwind.config.{js,cjs,mjs,ts,cts,mts}` in your workspace. ## Features From 06f33ed4538d42ac6c9dc57b948d0bd33d22d9a9 Mon Sep 17 00:00:00 2001 From: Erlend Seppola Date: Fri, 26 Jul 2024 18:43:20 +0200 Subject: [PATCH 05/10] chore: Add .mts and .cts in config file description --- packages/vscode-tailwindcss/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vscode-tailwindcss/README.md b/packages/vscode-tailwindcss/README.md index 9aa9902c..ac38d6ad 100644 --- a/packages/vscode-tailwindcss/README.md +++ b/packages/vscode-tailwindcss/README.md @@ -164,7 +164,7 @@ Enable the Node.js inspector agent for the language server and listen on the spe **Default: `null`** -By default the extension will automatically use the first `tailwind.config.{js,cjs,mjs,ts}` file that it can find to provide Tailwind CSS IntelliSense. Use this setting to manually specify the config file(s) yourself instead. +By default the extension will automatically use the first `tailwind.config.{js,cjs,mjs,ts,cts,mts}` file that it can find to provide Tailwind CSS IntelliSense. Use this setting to manually specify the config file(s) yourself instead. If your project contains a single Tailwind config file you can specify a string value: @@ -185,7 +185,7 @@ For projects with multiple config files use an object where each key is a config If you’re having issues getting the IntelliSense features to activate, there are a few things you can check: -- Ensure that you have a Tailwind config file in your workspace and that this is named `tailwind.config.{js,cjs,mjs,ts}`. Check out the Tailwind documentation for details on [creating a config file](https://tailwindcss.com/docs/installation#create-your-configuration-file). +- Ensure that you have a Tailwind config file in your workspace and that this is named `tailwind.config.{js,cjs,mjs,ts,cts,mts}`. Check out the Tailwind documentation for details on [creating a config file](https://tailwindcss.com/docs/installation#create-your-configuration-file). - Ensure that the `tailwindcss` module is installed in your workspace, via `npm`, `yarn`, or `pnpm`. - Make sure your VS Code settings aren’t causing your Tailwind config file to be hidden/ignored, for example via the `files.exclude` or `files.watcherExclude` settings. - Take a look at the language server output by running the `Tailwind CSS: Show Output` command from the command palette. This may show errors that are preventing the extension from activating. From a691ad631ad5935a674bd5888517ee133334f61a Mon Sep 17 00:00:00 2001 From: Erlend Seppola Date: Fri, 26 Jul 2024 19:11:08 +0200 Subject: [PATCH 06/10] Add test to find .mts and .cts config files --- .../src/project-locator.test.ts | 10 ++++++++++ .../tests/fixtures/v3/cts-config/tailwind.config.cts | 7 +++++++ .../tests/fixtures/v3/mts-config/tailwind.config.mts | 7 +++++++ 3 files changed, 24 insertions(+) create mode 100644 packages/tailwindcss-language-server/tests/fixtures/v3/cts-config/tailwind.config.cts create mode 100644 packages/tailwindcss-language-server/tests/fixtures/v3/mts-config/tailwind.config.mts diff --git a/packages/tailwindcss-language-server/src/project-locator.test.ts b/packages/tailwindcss-language-server/src/project-locator.test.ts index 34bb73ec..18019a5b 100644 --- a/packages/tailwindcss-language-server/src/project-locator.test.ts +++ b/packages/tailwindcss-language-server/src/project-locator.test.ts @@ -86,6 +86,16 @@ testFixture('v3/ts-config', [ { config: 'tailwind.config.ts' }, ]) +testFixture('v3/cts-config', [ + // + { config: 'tailwind.config.cts' }, +]) + +testFixture('v3/mts-config', [ + // + { config: 'tailwind.config.mts' }, +]) + testFixture('v4/basic', [ // { config: 'app.css' }, diff --git a/packages/tailwindcss-language-server/tests/fixtures/v3/cts-config/tailwind.config.cts b/packages/tailwindcss-language-server/tests/fixtures/v3/cts-config/tailwind.config.cts new file mode 100644 index 00000000..12077ba3 --- /dev/null +++ b/packages/tailwindcss-language-server/tests/fixtures/v3/cts-config/tailwind.config.cts @@ -0,0 +1,7 @@ +export default { + theme: { + colors: { cool: 'blue' }, + }, +} satisfies { + theme: Record +} diff --git a/packages/tailwindcss-language-server/tests/fixtures/v3/mts-config/tailwind.config.mts b/packages/tailwindcss-language-server/tests/fixtures/v3/mts-config/tailwind.config.mts new file mode 100644 index 00000000..12077ba3 --- /dev/null +++ b/packages/tailwindcss-language-server/tests/fixtures/v3/mts-config/tailwind.config.mts @@ -0,0 +1,7 @@ +export default { + theme: { + colors: { cool: 'blue' }, + }, +} satisfies { + theme: Record +} From da183bc1966ea1bbbed682c4fa15fc96c2039489 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Wed, 4 Sep 2024 13:53:54 -0400 Subject: [PATCH 07/10] Revert "chore: bump vscode-tailwindcss version" This reverts commit ae427c15850f7dedf9a0e2ed116b34de4e5e05aa. --- packages/vscode-tailwindcss/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vscode-tailwindcss/package.json b/packages/vscode-tailwindcss/package.json index bf8541c8..1099ce1b 100644 --- a/packages/vscode-tailwindcss/package.json +++ b/packages/vscode-tailwindcss/package.json @@ -4,7 +4,7 @@ "description": "Intelligent Tailwind CSS tooling for VS Code", "author": "Brad Cornes ", "license": "MIT", - "version": "0.12.6", + "version": "0.12.5", "homepage": "https://github.com/tailwindlabs/tailwindcss-intellisense", "bugs": { "url": "https://github.com/tailwindlabs/tailwindcss-intellisense/issues", @@ -366,4 +366,4 @@ "typescript": "5.3.3", "vscode-languageclient": "8.0.2" } -} \ No newline at end of file +} From 49c30011b92d30754b1d33d9965ff83a7f7e5ba7 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Wed, 4 Sep 2024 13:54:04 -0400 Subject: [PATCH 08/10] Revert "chore: update change.log and readme" This reverts commit 75a1e724ba720aa9cbe817990a9756d62cf53c44. --- packages/vscode-tailwindcss/CHANGELOG.md | 4 ---- packages/vscode-tailwindcss/README.md | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/vscode-tailwindcss/CHANGELOG.md b/packages/vscode-tailwindcss/CHANGELOG.md index 86b31379..f64fc958 100644 --- a/packages/vscode-tailwindcss/CHANGELOG.md +++ b/packages/vscode-tailwindcss/CHANGELOG.md @@ -4,10 +4,6 @@ - Nothing yet! -## 0.12.6 - -- Add support for .cts and .mts config files ([#1025](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1025)) - ## 0.12.5 - Use paths relative to opened folder when searching for projects ([#1013](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1013)) diff --git a/packages/vscode-tailwindcss/README.md b/packages/vscode-tailwindcss/README.md index ac38d6ad..e972cc48 100644 --- a/packages/vscode-tailwindcss/README.md +++ b/packages/vscode-tailwindcss/README.md @@ -6,7 +6,7 @@ Tailwind CSS IntelliSense enhances the Tailwind development experience by provid **[Install via the Visual Studio Code Marketplace →](https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss)** -In order for the extension to activate you must have [`tailwindcss` installed](https://tailwindcss.com/docs/installation) and a [Tailwind config file](https://tailwindcss.com/docs/installation#create-your-configuration-file) named `tailwind.config.{js,cjs,mjs,ts,cts,mts}` in your workspace. +In order for the extension to activate you must have [`tailwindcss` installed](https://tailwindcss.com/docs/installation) and a [Tailwind config file](https://tailwindcss.com/docs/installation#create-your-configuration-file) named `tailwind.config.{js,cjs,mjs,ts}` in your workspace. ## Features From e19a42f37f4b36cee944c8482466a4cd9d570d7b Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Wed, 4 Sep 2024 14:55:48 -0400 Subject: [PATCH 09/10] Tweak changelog and readme --- packages/vscode-tailwindcss/CHANGELOG.md | 2 +- packages/vscode-tailwindcss/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vscode-tailwindcss/CHANGELOG.md b/packages/vscode-tailwindcss/CHANGELOG.md index bd243738..580d1bb2 100644 --- a/packages/vscode-tailwindcss/CHANGELOG.md +++ b/packages/vscode-tailwindcss/CHANGELOG.md @@ -2,7 +2,7 @@ ## Prerelease -- Nothing yer! +- Add support for .cts and .mts config files ([#1025](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1025)) ## 0.12.10 diff --git a/packages/vscode-tailwindcss/README.md b/packages/vscode-tailwindcss/README.md index a0bd8535..9b7d626c 100644 --- a/packages/vscode-tailwindcss/README.md +++ b/packages/vscode-tailwindcss/README.md @@ -6,7 +6,7 @@ Tailwind CSS IntelliSense enhances the Tailwind development experience by provid **[Install via the Visual Studio Code Marketplace →](https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss)** -In order for the extension to activate you must have [`tailwindcss` installed](https://tailwindcss.com/docs/installation) and a [Tailwind config file](https://tailwindcss.com/docs/installation#create-your-configuration-file) named `tailwind.config.{js,cjs,mjs,ts}` in your workspace. +In order for the extension to activate you must have [`tailwindcss` installed](https://tailwindcss.com/docs/installation) and a [Tailwind config file](https://tailwindcss.com/docs/installation#create-your-configuration-file) named `tailwind.config.{js,cjs,mjs,ts,cts,mts}` in your workspace. ## Features From eb96820b7bf97f2462cf763dfa7cf21b76e4fd84 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Wed, 4 Sep 2024 14:58:10 -0400 Subject: [PATCH 10/10] Tweak changelog --- packages/vscode-tailwindcss/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vscode-tailwindcss/CHANGELOG.md b/packages/vscode-tailwindcss/CHANGELOG.md index 580d1bb2..9a056fc0 100644 --- a/packages/vscode-tailwindcss/CHANGELOG.md +++ b/packages/vscode-tailwindcss/CHANGELOG.md @@ -2,7 +2,7 @@ ## Prerelease -- Add support for .cts and .mts config files ([#1025](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1025)) +- Add support for `.cts` and `.mts` config files ([#1025](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1025)) ## 0.12.10