From 0789bb39dde2c09d82fd4473027e4dd03a25e3a8 Mon Sep 17 00:00:00 2001 From: Jonathan Reinink Date: Tue, 15 Nov 2022 20:52:42 -0500 Subject: [PATCH 1/3] Add container queries plugin to standalone CLI --- standalone-cli/package-lock.json | 59 +++++++++++++------- standalone-cli/package.json | 1 + standalone-cli/standalone.js | 1 + standalone-cli/tests/fixtures/test.config.js | 1 + 4 files changed, 41 insertions(+), 21 deletions(-) diff --git a/standalone-cli/package-lock.json b/standalone-cli/package-lock.json index 227eac6b9647..e2012c86ee46 100644 --- a/standalone-cli/package-lock.json +++ b/standalone-cli/package-lock.json @@ -12,6 +12,7 @@ }, "devDependencies": { "@tailwindcss/aspect-ratio": "^0.4.0", + "@tailwindcss/container-queries": "^0.1.0", "@tailwindcss/forms": "^0.5.2", "@tailwindcss/line-clamp": "^0.4.0", "@tailwindcss/typography": "^0.5.4", @@ -24,7 +25,7 @@ } }, "..": { - "version": "3.1.8", + "version": "3.2.4", "dev": true, "license": "MIT", "dependencies": { @@ -34,18 +35,19 @@ "detective": "^5.2.1", "didyoumean": "^1.2.2", "dlv": "^1.1.3", - "fast-glob": "^3.2.11", + "fast-glob": "^3.2.12", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", "lilconfig": "^2.0.6", + "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.14", + "postcss": "^8.4.18", "postcss-import": "^14.1.0", "postcss-js": "^4.0.0", "postcss-load-config": "^3.1.4", - "postcss-nested": "5.0.6", + "postcss-nested": "6.0.0", "postcss-selector-parser": "^6.0.10", "postcss-value-parser": "^4.2.0", "quick-lru": "^5.1.1", @@ -57,19 +59,18 @@ }, "devDependencies": { "@swc/cli": "^0.1.57", - "@swc/core": "^1.2.218", - "@swc/jest": "^0.2.22", + "@swc/core": "^1.3.11", + "@swc/jest": "^0.2.23", "@swc/register": "^0.1.10", - "autoprefixer": "^10.4.8", - "cssnano": "^5.1.12", - "esbuild": "^0.14.54", - "eslint": "^8.20.0", + "autoprefixer": "^10.4.13", + "cssnano": "^5.1.14", + "esbuild": "^0.15.12", + "eslint": "^8.26.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-prettier": "^4.2.1", "jest": "^28.1.3", "jest-diff": "^28.1.3", "prettier": "^2.7.1", - "prettier-plugin-tailwindcss": "^0.1.13", "rimraf": "^3.0.0", "source-map-js": "^1.0.2" }, @@ -1007,6 +1008,15 @@ "tailwindcss": ">=2.0.0 || >=3.0.0 || >=3.0.0-alpha.1" } }, + "node_modules/@tailwindcss/container-queries": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@tailwindcss/container-queries/-/container-queries-0.1.0.tgz", + "integrity": "sha512-t1GeJ9P8ual160BvKy6Y1sG7bjChArMaK6iRXm3ZYjZGN2FTzmqb5ztsTDb9AsTSJD4NMHtsnaI2ielrXEk+hw==", + "dev": true, + "peerDependencies": { + "tailwindcss": ">=3.2.0" + } + }, "node_modules/@tailwindcss/forms": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.2.tgz", @@ -6591,6 +6601,13 @@ "dev": true, "requires": {} }, + "@tailwindcss/container-queries": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@tailwindcss/container-queries/-/container-queries-0.1.0.tgz", + "integrity": "sha512-t1GeJ9P8ual160BvKy6Y1sG7bjChArMaK6iRXm3ZYjZGN2FTzmqb5ztsTDb9AsTSJD4NMHtsnaI2ielrXEk+hw==", + "dev": true, + "requires": {} + }, "@tailwindcss/forms": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.2.tgz", @@ -9840,39 +9857,39 @@ "version": "file:..", "requires": { "@swc/cli": "^0.1.57", - "@swc/core": "^1.2.218", - "@swc/jest": "^0.2.22", + "@swc/core": "^1.3.11", + "@swc/jest": "^0.2.23", "@swc/register": "^0.1.10", "arg": "^5.0.2", - "autoprefixer": "^10.4.8", + "autoprefixer": "^10.4.13", "chokidar": "^3.5.3", "color-name": "^1.1.4", - "cssnano": "^5.1.12", + "cssnano": "^5.1.14", "detective": "^5.2.1", "didyoumean": "^1.2.2", "dlv": "^1.1.3", - "esbuild": "^0.14.54", - "eslint": "^8.20.0", + "esbuild": "^0.15.12", + "eslint": "^8.26.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-prettier": "^4.2.1", - "fast-glob": "^3.2.11", + "fast-glob": "^3.2.12", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", "jest": "^28.1.3", "jest-diff": "^28.1.3", "lilconfig": "^2.0.6", + "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.14", + "postcss": "^8.4.18", "postcss-import": "^14.1.0", "postcss-js": "^4.0.0", "postcss-load-config": "^3.1.4", - "postcss-nested": "5.0.6", + "postcss-nested": "6.0.0", "postcss-selector-parser": "^6.0.10", "postcss-value-parser": "^4.2.0", "prettier": "^2.7.1", - "prettier-plugin-tailwindcss": "^0.1.13", "quick-lru": "^5.1.1", "resolve": "^1.22.1", "rimraf": "^3.0.0", diff --git a/standalone-cli/package.json b/standalone-cli/package.json index 13328a65dfd5..03640b32272d 100644 --- a/standalone-cli/package.json +++ b/standalone-cli/package.json @@ -10,6 +10,7 @@ }, "devDependencies": { "@tailwindcss/aspect-ratio": "^0.4.0", + "@tailwindcss/container-queries": "^0.1.0", "@tailwindcss/forms": "^0.5.2", "@tailwindcss/line-clamp": "^0.4.0", "@tailwindcss/typography": "^0.5.4", diff --git a/standalone-cli/standalone.js b/standalone-cli/standalone.js index 6c14d5b93c32..a9e2343748a5 100644 --- a/standalone-cli/standalone.js +++ b/standalone-cli/standalone.js @@ -9,6 +9,7 @@ let localModules = { 'tailwindcss/plugin': require('tailwindcss/plugin'), '@tailwindcss/aspect-ratio': require('@tailwindcss/aspect-ratio'), + '@tailwindcss/container-queries': require('@tailwindcss/container-queries'), '@tailwindcss/forms': require('@tailwindcss/forms'), '@tailwindcss/line-clamp': require('@tailwindcss/line-clamp'), '@tailwindcss/typography': require('@tailwindcss/typography'), diff --git a/standalone-cli/tests/fixtures/test.config.js b/standalone-cli/tests/fixtures/test.config.js index 6ec03bbdefd6..1ae85369f8b9 100644 --- a/standalone-cli/tests/fixtures/test.config.js +++ b/standalone-cli/tests/fixtures/test.config.js @@ -1,6 +1,7 @@ module.exports = { plugins: [ require('@tailwindcss/aspect-ratio'), + require('@tailwindcss/container-queries'), require('@tailwindcss/forms')({ strategy: 'class' }), require('@tailwindcss/line-clamp'), require('@tailwindcss/typography'), From b60d1b8376be51796457b1e7f316d1dc9cd9af7b Mon Sep 17 00:00:00 2001 From: Jonathan Reinink Date: Thu, 17 Nov 2022 10:08:09 -0500 Subject: [PATCH 2/3] Add container queries to standalone CLI tests --- standalone-cli/tests/fixtures/plugins.html | 1 + standalone-cli/tests/test.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/standalone-cli/tests/fixtures/plugins.html b/standalone-cli/tests/fixtures/plugins.html index 8fafc837ace0..0260bfa4bdb5 100644 --- a/standalone-cli/tests/fixtures/plugins.html +++ b/standalone-cli/tests/fixtures/plugins.html @@ -2,3 +2,4 @@
+
diff --git a/standalone-cli/tests/test.js b/standalone-cli/tests/test.js index f575c11d32ea..f96faf1be643 100644 --- a/standalone-cli/tests/test.js +++ b/standalone-cli/tests/test.js @@ -30,6 +30,8 @@ it('supports first-party plugins', () => { expect(result).toContain('.form-input') expect(result).toContain('.line-clamp-2') expect(result).toContain('.prose') + expect(result).toContain('@container') + expect(result).toContain('@md\\:bg-teal-600') }) it('supports postcss config files', async () => { From f6ba317f6125f0c948ec9dee148aa06de2428cd1 Mon Sep 17 00:00:00 2001 From: Jonathan Reinink Date: Thu, 17 Nov 2022 10:10:04 -0500 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d56c386cb7d..4b1981c3223c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Cleanup unused `variantOrder` ([#9829](https://github.com/tailwindlabs/tailwindcss/pull/9829)) +### Added + +- Add container queries plugin to standalone CLI ([#9865](https://github.com/tailwindlabs/tailwindcss/pull/9865)) + ## [3.2.4] - 2022-11-11 ### Added