From 92e7b82a9c7cd271f681f1bfd87a8aa6632ebc91 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 10 Feb 2025 14:24:17 +0100 Subject: [PATCH 1/2] Update tailwind example to v4 --- examples/pnpm-lock.yaml | 167 ++++++++++++++++++- examples/with-tailwindcss/package.json | 5 +- examples/with-tailwindcss/postcss.config.cjs | 6 - examples/with-tailwindcss/postcss.config.mjs | 5 + examples/with-tailwindcss/src/app.css | 4 +- 5 files changed, 173 insertions(+), 14 deletions(-) delete mode 100644 examples/with-tailwindcss/postcss.config.cjs create mode 100644 examples/with-tailwindcss/postcss.config.mjs diff --git a/examples/pnpm-lock.yaml b/examples/pnpm-lock.yaml index b3f6b7c7e..2160b1e98 100644 --- a/examples/pnpm-lock.yaml +++ b/examples/pnpm-lock.yaml @@ -308,6 +308,9 @@ importers: '@solidjs/start': specifier: ^1.0.11 version: 1.0.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.4)(vinxi@0.4.3(@types/node@20.17.17)(better-sqlite3@11.8.1)(drizzle-orm@0.31.4(@prisma/client@5.22.0(prisma@5.22.0))(@types/better-sqlite3@7.6.12)(better-sqlite3@11.8.1)(prisma@5.22.0))(ioredis@5.4.2)(lightningcss@1.29.1)(terser@5.37.0)(typescript@5.7.3))(vite@5.4.14(@types/node@20.17.17)(lightningcss@1.29.1)(terser@5.37.0)) + '@tailwindcss/postcss': + specifier: ^4.0.5 + version: 4.0.5 solid-js: specifier: ^1.9.2 version: 1.9.4 @@ -319,11 +322,11 @@ importers: specifier: ^10.4.19 version: 10.4.20(postcss@8.5.1) postcss: - specifier: ^8.4.38 + specifier: ^8.5.1 version: 8.5.1 tailwindcss: - specifier: ^3.4.3 - version: 3.4.17 + specifier: ^4.0.5 + version: 4.0.5 with-trpc: dependencies: @@ -2075,6 +2078,82 @@ packages: '@solidjs/router': optional: true + '@tailwindcss/node@4.0.5': + resolution: {integrity: sha512-ffTz4DX1cgr4XPuqjhm32YV6Lyx58R1CxAAnSFTamg6wXwfk3oWdb6exgAbGesPzvUgicTO0gwUdQGSsg4nNog==} + + '@tailwindcss/oxide-android-arm64@4.0.5': + resolution: {integrity: sha512-kK/ik8aIAKWDIEYDZGUCJcnU1qU5sPoMBlVzPvtsUqiV6cSHcnVRUdkcLwKqTeUowzZtjjRiamELLd9Gb0x5BQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [android] + + '@tailwindcss/oxide-darwin-arm64@4.0.5': + resolution: {integrity: sha512-vkbXFv0FfAEbrSa5NBjFEE+xi06ha7mxuxjY8LRn7d7/tBGrAZOEJnnsEbB6M1+x2pGRTjjei0XyTIXdVCglJA==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + + '@tailwindcss/oxide-darwin-x64@4.0.5': + resolution: {integrity: sha512-PedA64rHBXEa4e6abBWE4Yj4gHulfPb5T+rBNnX+WGkjjge5Txa2oS99TLmJ5BPDkXXqz/Ba7oweWIDDG7i5NQ==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + + '@tailwindcss/oxide-freebsd-x64@4.0.5': + resolution: {integrity: sha512-silz3nuZdEYDfic3v/ooVUQChj9hbxDSee43GCQNwr/iD9L4K/JsZtoNqr0w69pUkvWcKINOGOG0r7WqUqkAeg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [freebsd] + + '@tailwindcss/oxide-linux-arm-gnueabihf@4.0.5': + resolution: {integrity: sha512-ElneG75XS64B9I2G83A/Hc7EtNVOD5xahs7avq0aeW7mEX6CtMc8m8RCXMn3jGhz8enFE52l6QU0wO7iVkEtXQ==} + engines: {node: '>= 10'} + cpu: [arm] + os: [linux] + + '@tailwindcss/oxide-linux-arm64-gnu@4.0.5': + resolution: {integrity: sha512-8yoXpWTeIFaByUaKy2qRAppznLVaDHP9xYCAbS3FG7+uUwHi8CHE4TcomM7eyamo0U7dbUIDgKMGoAX5s2iVrA==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + + '@tailwindcss/oxide-linux-arm64-musl@4.0.5': + resolution: {integrity: sha512-BDlVSiiJ08GRz9KKnXgaPFs2fkukPF3pym6uK3oWEKW45jKlVGgybLqulcV5nLEqREOuyq4Rn4vnZss4/bbQ/g==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + + '@tailwindcss/oxide-linux-x64-gnu@4.0.5': + resolution: {integrity: sha512-DYgieNDRkTy69bWPgdsc47nAXa74P63P/RetUwYM9vYj5USyOfHCEcqIthkCuYw3dXKBhjgwe697TmL2g2jpAw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + + '@tailwindcss/oxide-linux-x64-musl@4.0.5': + resolution: {integrity: sha512-z2RzUvOQl0ZqrZqmCFP53tJbBXQ3UmLD/E6J7+q0e+4VaFnXCcIYTfQbHgI8f3fash+q6gK80Ko/ywEQ+bvv6Q==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + + '@tailwindcss/oxide-win32-arm64-msvc@4.0.5': + resolution: {integrity: sha512-ho1dJ4o5Q8nAOxdMkbfBu5aSqI+/bzQ0jEeHcXaEdEJzf2fSWs3HY7bIKtE6vQS8c4SmSBvls7IhGPuJxNg+2Q==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + + '@tailwindcss/oxide-win32-x64-msvc@4.0.5': + resolution: {integrity: sha512-yjw6JhtyDXr+G0aZrj3L3NlEV7CobSqOdPyfo6G3d91WEZ5b8PyGm86IAreX08Jp9DChGXEd53gWysVpWCTs+w==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + + '@tailwindcss/oxide@4.0.5': + resolution: {integrity: sha512-iWGyOCu0TuzvCBisWbGv2K9+7QCfE0ztgtrZOvb9iF7V7ChVkD15Obe3HevZrhjngAc34jDA+OMSuSvkrpTy4A==} + engines: {node: '>= 10'} + + '@tailwindcss/postcss@4.0.5': + resolution: {integrity: sha512-U7IPb+KMASETtUvISwePM+1h+jLQspXf2ncfX/LmP/4AaH7b7DJQhqXzDCaJQd/MIh54dRUO93i9q4+Xm7dlVg==} + '@testing-library/dom@10.4.0': resolution: {integrity: sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==} engines: {node: '>=18'} @@ -3123,6 +3202,10 @@ packages: end-of-stream@1.4.4: resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} + enhanced-resolve@5.18.1: + resolution: {integrity: sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==} + engines: {node: '>=10.13.0'} + entities@4.5.0: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} @@ -4865,6 +4948,13 @@ packages: engines: {node: '>=14.0.0'} hasBin: true + tailwindcss@4.0.5: + resolution: {integrity: sha512-DZZIKX3tA23LGTjHdnwlJOTxfICD1cPeykLLsYF1RQBI9QsCR3i0szohJfJDVjr6aNRAIio5WVO7FGB77fRHwg==} + + tapable@2.2.1: + resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} + engines: {node: '>=6'} + tar-fs@2.1.2: resolution: {integrity: sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==} @@ -6751,6 +6841,68 @@ snapshots: optionalDependencies: '@solidjs/router': 0.15.3(solid-js@1.9.4) + '@tailwindcss/node@4.0.5': + dependencies: + enhanced-resolve: 5.18.1 + jiti: 2.4.2 + tailwindcss: 4.0.5 + + '@tailwindcss/oxide-android-arm64@4.0.5': + optional: true + + '@tailwindcss/oxide-darwin-arm64@4.0.5': + optional: true + + '@tailwindcss/oxide-darwin-x64@4.0.5': + optional: true + + '@tailwindcss/oxide-freebsd-x64@4.0.5': + optional: true + + '@tailwindcss/oxide-linux-arm-gnueabihf@4.0.5': + optional: true + + '@tailwindcss/oxide-linux-arm64-gnu@4.0.5': + optional: true + + '@tailwindcss/oxide-linux-arm64-musl@4.0.5': + optional: true + + '@tailwindcss/oxide-linux-x64-gnu@4.0.5': + optional: true + + '@tailwindcss/oxide-linux-x64-musl@4.0.5': + optional: true + + '@tailwindcss/oxide-win32-arm64-msvc@4.0.5': + optional: true + + '@tailwindcss/oxide-win32-x64-msvc@4.0.5': + optional: true + + '@tailwindcss/oxide@4.0.5': + optionalDependencies: + '@tailwindcss/oxide-android-arm64': 4.0.5 + '@tailwindcss/oxide-darwin-arm64': 4.0.5 + '@tailwindcss/oxide-darwin-x64': 4.0.5 + '@tailwindcss/oxide-freebsd-x64': 4.0.5 + '@tailwindcss/oxide-linux-arm-gnueabihf': 4.0.5 + '@tailwindcss/oxide-linux-arm64-gnu': 4.0.5 + '@tailwindcss/oxide-linux-arm64-musl': 4.0.5 + '@tailwindcss/oxide-linux-x64-gnu': 4.0.5 + '@tailwindcss/oxide-linux-x64-musl': 4.0.5 + '@tailwindcss/oxide-win32-arm64-msvc': 4.0.5 + '@tailwindcss/oxide-win32-x64-msvc': 4.0.5 + + '@tailwindcss/postcss@4.0.5': + dependencies: + '@alloc/quick-lru': 5.2.0 + '@tailwindcss/node': 4.0.5 + '@tailwindcss/oxide': 4.0.5 + lightningcss: 1.29.1 + postcss: 8.5.1 + tailwindcss: 4.0.5 + '@testing-library/dom@10.4.0': dependencies: '@babel/code-frame': 7.26.2 @@ -7848,6 +8000,11 @@ snapshots: dependencies: once: 1.4.0 + enhanced-resolve@5.18.1: + dependencies: + graceful-fs: 4.2.11 + tapable: 2.2.1 + entities@4.5.0: {} error-stack-parser@2.1.4: @@ -10058,6 +10215,10 @@ snapshots: transitivePeerDependencies: - ts-node + tailwindcss@4.0.5: {} + + tapable@2.2.1: {} + tar-fs@2.1.2: dependencies: chownr: 1.1.4 diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index b39ad4d43..27d6d71e5 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -9,13 +9,14 @@ "dependencies": { "@solidjs/router": "^0.15.0", "@solidjs/start": "^1.0.11", + "@tailwindcss/postcss": "^4.0.5", "solid-js": "^1.9.2", "vinxi": "^0.4.3" }, "devDependencies": { "autoprefixer": "^10.4.19", - "postcss": "^8.4.38", - "tailwindcss": "^3.4.3" + "postcss": "^8.5.1", + "tailwindcss": "^4.0.5" }, "overrides": { "vite": "5.4.10" diff --git a/examples/with-tailwindcss/postcss.config.cjs b/examples/with-tailwindcss/postcss.config.cjs deleted file mode 100644 index 33ad091d2..000000000 --- a/examples/with-tailwindcss/postcss.config.cjs +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - plugins: { - tailwindcss: {}, - autoprefixer: {}, - }, -} diff --git a/examples/with-tailwindcss/postcss.config.mjs b/examples/with-tailwindcss/postcss.config.mjs new file mode 100644 index 000000000..7e0ba624f --- /dev/null +++ b/examples/with-tailwindcss/postcss.config.mjs @@ -0,0 +1,5 @@ +export default { + plugins: { + "@tailwindcss/postcss": {}, + } +} diff --git a/examples/with-tailwindcss/src/app.css b/examples/with-tailwindcss/src/app.css index 867b3508f..c9f72dd41 100644 --- a/examples/with-tailwindcss/src/app.css +++ b/examples/with-tailwindcss/src/app.css @@ -1,6 +1,4 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; +@import "tailwindcss"; :root { --background-rgb: 214, 219, 220; From 04458208ab32c4ed7f67dd43085299a8b70ee710 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 10 Feb 2025 14:25:58 +0100 Subject: [PATCH 2/2] move to devDeps --- examples/pnpm-lock.yaml | 6 +++--- examples/with-tailwindcss/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/pnpm-lock.yaml b/examples/pnpm-lock.yaml index 2160b1e98..e7390cbcb 100644 --- a/examples/pnpm-lock.yaml +++ b/examples/pnpm-lock.yaml @@ -308,9 +308,6 @@ importers: '@solidjs/start': specifier: ^1.0.11 version: 1.0.11(@testing-library/jest-dom@6.6.3)(solid-js@1.9.4)(vinxi@0.4.3(@types/node@20.17.17)(better-sqlite3@11.8.1)(drizzle-orm@0.31.4(@prisma/client@5.22.0(prisma@5.22.0))(@types/better-sqlite3@7.6.12)(better-sqlite3@11.8.1)(prisma@5.22.0))(ioredis@5.4.2)(lightningcss@1.29.1)(terser@5.37.0)(typescript@5.7.3))(vite@5.4.14(@types/node@20.17.17)(lightningcss@1.29.1)(terser@5.37.0)) - '@tailwindcss/postcss': - specifier: ^4.0.5 - version: 4.0.5 solid-js: specifier: ^1.9.2 version: 1.9.4 @@ -318,6 +315,9 @@ importers: specifier: ^0.4.3 version: 0.4.3(@types/node@20.17.17)(better-sqlite3@11.8.1)(drizzle-orm@0.31.4(@prisma/client@5.22.0(prisma@5.22.0))(@types/better-sqlite3@7.6.12)(better-sqlite3@11.8.1)(prisma@5.22.0))(ioredis@5.4.2)(lightningcss@1.29.1)(terser@5.37.0)(typescript@5.7.3) devDependencies: + '@tailwindcss/postcss': + specifier: ^4.0.5 + version: 4.0.5 autoprefixer: specifier: ^10.4.19 version: 10.4.20(postcss@8.5.1) diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 27d6d71e5..bed72408c 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -9,11 +9,11 @@ "dependencies": { "@solidjs/router": "^0.15.0", "@solidjs/start": "^1.0.11", - "@tailwindcss/postcss": "^4.0.5", "solid-js": "^1.9.2", "vinxi": "^0.4.3" }, "devDependencies": { + "@tailwindcss/postcss": "^4.0.5", "autoprefixer": "^10.4.19", "postcss": "^8.5.1", "tailwindcss": "^4.0.5"