From cc94c76ee51184b4352291efae6a0c0f842232e6 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Tue, 5 Dec 2023 12:26:33 -0500 Subject: [PATCH 1/3] Fix support for container query utilities with arbitrary values (#12534) * Fix support for container query utilities with arbitrary values * Update changelog --- CHANGELOG.md | 4 +++- src/lib/defaultExtractor.js | 7 ++++++- tests/default-extractor.test.js | 16 ++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e99e80392cad..81e9fc50a686 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -- Nothing yet! +### Fixed + +- Fix support for container query utilities with arbitrary values ([#12534](https://github.com/tailwindlabs/tailwindcss/pull/12534)) ## [3.3.6] - 2023-12-04 diff --git a/src/lib/defaultExtractor.js b/src/lib/defaultExtractor.js index 3a1ff321eee7..5e168f37b8c2 100644 --- a/src/lib/defaultExtractor.js +++ b/src/lib/defaultExtractor.js @@ -40,7 +40,12 @@ function* buildRegExps(context) { // Utilities regex.pattern([ // Utility Name / Group Name - /-?(?:\w+)/, + regex.any([ + /-?(?:\w+)/, + + // This is here to make sure @container supports everything that other utilities do + /@(?:\w+)/, + ]), // Normal/Arbitrary values regex.optional( diff --git a/tests/default-extractor.test.js b/tests/default-extractor.test.js index bbf0960bd805..e4b40e1ce8e3 100644 --- a/tests/default-extractor.test.js +++ b/tests/default-extractor.test.js @@ -517,3 +517,19 @@ it.each([ expect(extractions).toContain(value) } }) + +it.each([ + ['@container', ['@container']], + ['@container/sidebar', ['@container/sidebar']], + ['@container/[sidebar]', ['@container/[sidebar]']], + ['@container-size', ['@container-size']], + ['@container-size/sidebar', ['@container-size/sidebar']], + ['@container-[size]/sidebar', ['@container-[size]/sidebar']], + ['@container-[size]/[sidebar]', ['@container-[size]/[sidebar]']], +])('should support utilities starting with @ (%#)', async (content, expectations) => { + let extractions = defaultExtractor(content) + + for (let value of expectations) { + expect(extractions).toContain(value) + } +}) From 67fd939d3e8565f9293e48f8ec13f4313d296019 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Mon, 18 Dec 2023 13:50:21 -0500 Subject: [PATCH 2/3] Fix custom config loading in Standalone CLI (#12616) * Fix custom config loading in Standalone CLI * Update changelog --- CHANGELOG.md | 1 + src/lib/load-config.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81e9fc50a686..4b27d21fcd0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Fix support for container query utilities with arbitrary values ([#12534](https://github.com/tailwindlabs/tailwindcss/pull/12534)) +- Fix custom config loading in Standalone CLI ([#12616](https://github.com/tailwindlabs/tailwindcss/pull/12616)) ## [3.3.6] - 2023-12-04 diff --git a/src/lib/load-config.ts b/src/lib/load-config.ts index e879412a3977..345b262e80a3 100644 --- a/src/lib/load-config.ts +++ b/src/lib/load-config.ts @@ -8,8 +8,8 @@ let jiti: ReturnType | null = null // @internal // This WILL be removed in some future release // If you rely on this your stuff WILL break -export function useCustomJiti(_jiti: ReturnType) { - jiti = _jiti +export function useCustomJiti(_jiti: () => ReturnType) { + jiti = _jiti() } function lazyJiti() { From b01283cc9b66cf830d87cbfe1fbb5ebb8561226a Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Mon, 18 Dec 2023 13:46:47 -0500 Subject: [PATCH 3/3] 3.3.7 --- CHANGELOG.md | 7 ++- package-lock.json | 4 +- package-lock.stable.json | 4 +- package.json | 2 +- package.stable.json | 2 +- standalone-cli/package-lock.json | 101 ++++++++++++++----------------- 6 files changed, 59 insertions(+), 61 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b27d21fcd0e..31f65b985218 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- Nothing yet! + +## [3.3.7] - 2023-12-18 + ### Fixed - Fix support for container query utilities with arbitrary values ([#12534](https://github.com/tailwindlabs/tailwindcss/pull/12534)) @@ -2306,7 +2310,8 @@ No release notes - Everything! -[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.6...HEAD +[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.7...HEAD +[3.3.7]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.6...v3.3.7 [3.3.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.5...v3.3.6 [3.3.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.4...v3.3.5 [3.3.4]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.3...v3.3.4 diff --git a/package-lock.json b/package-lock.json index 0f7ddc503f1a..79d5ffac9056 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tailwindcss", - "version": "3.3.6", + "version": "3.3.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "tailwindcss", - "version": "3.3.6", + "version": "3.3.7", "license": "MIT", "workspaces": [ "integrations/*", diff --git a/package-lock.stable.json b/package-lock.stable.json index f8b4709fade9..8d5a555afee3 100644 --- a/package-lock.stable.json +++ b/package-lock.stable.json @@ -1,12 +1,12 @@ { "name": "tailwindcss", - "version": "3.3.6", + "version": "3.3.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "tailwindcss", - "version": "3.3.6", + "version": "3.3.7", "license": "MIT", "dependencies": { "@alloc/quick-lru": "^5.2.0", diff --git a/package.json b/package.json index 5a93cb514e61..9c7590fe33c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tailwindcss", - "version": "3.3.6", + "version": "3.3.7", "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "main": "lib/index.js", diff --git a/package.stable.json b/package.stable.json index ba9d99f52b17..ce3215c4066a 100644 --- a/package.stable.json +++ b/package.stable.json @@ -1,6 +1,6 @@ { "name": "tailwindcss", - "version": "3.3.6", + "version": "3.3.7", "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "main": "lib/index.js", diff --git a/standalone-cli/package-lock.json b/standalone-cli/package-lock.json index 0cf3daabf72d..7073bb61b7e9 100644 --- a/standalone-cli/package-lock.json +++ b/standalone-cli/package-lock.json @@ -24,7 +24,7 @@ } }, "..": { - "version": "3.2.7", + "version": "3.3.7", "dev": true, "license": "MIT", "workspaces": [ @@ -32,62 +32,57 @@ "oxide/crates/node" ], "dependencies": { + "@alloc/quick-lru": "^5.2.0", "@tailwindcss/oxide": "file:oxide/crates/node", "arg": "^5.0.2", "browserslist": "^4.21.5", "chokidar": "^3.5.3", - "color-name": "^1.1.4", "didyoumean": "^1.2.2", "dlv": "^1.1.3", - "fast-glob": "^3.2.12", + "fast-glob": "^3.3.0", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", - "jiti": "^1.17.2", + "jiti": "^1.19.1", "lightningcss": "^1.18.0", "lilconfig": "^2.1.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.21", - "postcss-import": "^14.1.0", + "postcss": "^8.4.23", + "postcss-import": "^15.1.0", "postcss-js": "^4.0.1", - "postcss-load-config": "^3.1.4", - "postcss-nested": "6.0.1", + "postcss-load-config": "^4.0.1", + "postcss-nested": "^6.0.1", "postcss-selector-parser": "^6.0.11", - "postcss-value-parser": "^4.2.0", - "quick-lru": "^5.1.1", - "resolve": "^1.22.1", - "sucrase": "^3.29.0" + "resolve": "^1.22.2", + "sucrase": "^3.32.0" }, "bin": { "tailwind": "lib/cli.js", "tailwindcss": "lib/cli.js" }, "devDependencies": { - "@swc/cli": "0.1.62", - "@swc/core": "1.3.41", - "@swc/jest": "0.2.24", - "@swc/register": "0.1.10", + "@swc/cli": "^0.1.62", + "@swc/core": "^1.3.55", + "@swc/jest": "^0.2.26", + "@swc/register": "^0.1.10", "autoprefixer": "^10.4.14", - "concurrently": "^7.5.0", - "cssnano": "^5.1.15", - "esbuild": "^0.17.10", - "eslint": "^8.35.0", - "eslint-config-prettier": "^8.7.0", + "concurrently": "^8.0.1", + "cssnano": "^6.0.0", + "esbuild": "^0.17.18", + "eslint": "^8.39.0", + "eslint-config-prettier": "^8.8.0", "eslint-plugin-prettier": "^4.2.1", - "jest": "^29.5.0", - "jest-diff": "^29.5.0", - "prettier": "^2.8.4", - "rimraf": "^4.4.0", + "jest": "^29.6.0", + "jest-diff": "^29.6.0", + "prettier": "^2.8.8", + "rimraf": "^5.0.0", "source-map-js": "^1.0.2", - "turbo": "^1.8.3" + "turbo": "^1.9.3" }, "engines": { "node": ">=16.0.0" - }, - "peerDependencies": { - "postcss": "^8.0.9" } }, "node_modules/@ampproject/remapping": { @@ -9849,50 +9844,48 @@ "tailwindcss": { "version": "file:..", "requires": { - "@swc/cli": "0.1.62", - "@swc/core": "1.3.41", - "@swc/jest": "0.2.24", - "@swc/register": "0.1.10", + "@alloc/quick-lru": "^5.2.0", + "@swc/cli": "^0.1.62", + "@swc/core": "^1.3.55", + "@swc/jest": "^0.2.26", + "@swc/register": "^0.1.10", "@tailwindcss/oxide": "file:oxide/crates/node", "arg": "^5.0.2", "autoprefixer": "^10.4.14", "browserslist": "^4.21.5", "chokidar": "^3.5.3", - "color-name": "^1.1.4", - "concurrently": "^7.5.0", - "cssnano": "^5.1.15", + "concurrently": "^8.0.1", + "cssnano": "^6.0.0", "didyoumean": "^1.2.2", "dlv": "^1.1.3", - "esbuild": "^0.17.10", - "eslint": "^8.35.0", - "eslint-config-prettier": "^8.7.0", + "esbuild": "^0.17.18", + "eslint": "^8.39.0", + "eslint-config-prettier": "^8.8.0", "eslint-plugin-prettier": "^4.2.1", - "fast-glob": "^3.2.12", + "fast-glob": "^3.3.0", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", - "jest": "^29.5.0", - "jest-diff": "^29.5.0", - "jiti": "^1.17.2", + "jest": "^29.6.0", + "jest-diff": "^29.6.0", + "jiti": "^1.19.1", "lightningcss": "^1.18.0", "lilconfig": "^2.1.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.21", - "postcss-import": "^14.1.0", + "postcss": "^8.4.23", + "postcss-import": "^15.1.0", "postcss-js": "^4.0.1", - "postcss-load-config": "^3.1.4", - "postcss-nested": "6.0.1", + "postcss-load-config": "^4.0.1", + "postcss-nested": "^6.0.1", "postcss-selector-parser": "^6.0.11", - "postcss-value-parser": "^4.2.0", - "prettier": "^2.8.4", - "quick-lru": "^5.1.1", - "resolve": "^1.22.1", - "rimraf": "^4.4.0", + "prettier": "^2.8.8", + "resolve": "^1.22.2", + "rimraf": "^5.0.0", "source-map-js": "^1.0.2", - "sucrase": "^3.29.0", - "turbo": "^1.8.3" + "sucrase": "^3.32.0", + "turbo": "^1.9.3" } }, "tar-fs": {