diff --git a/package.json b/package.json index 349ffb3..a7690e7 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "dependencies": { "@mdx-js/react": "^3.0.1", "@stefanprobst/rehype-extract-toc": "^2.2.0", + "@tailwindcss/vite": "^4.0.12", "highlight.js": "^11.9.0", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -42,9 +43,7 @@ "@typescript-eslint/eslint-plugin": "^7.13.0", "@typescript-eslint/parser": "^7.13.0", "@vitejs/plugin-react": "^4.3.1", - "autoprefixer": "^10.4.19", "lefthook": "^1.6.18", - "postcss": "^8.4.38", "tailwind-scrollbar": "^3.1.0", "tailwindcss": "^4.0.12", "vite": "^5.3.0", diff --git a/vite.config.ts b/vite.config.ts index 2de60fb..ff5cbe6 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -2,10 +2,10 @@ import { resolve } from "node:path"; import mdx from "@mdx-js/rollup"; import withToc from "@stefanprobst/rehype-extract-toc"; import withTocExport from "@stefanprobst/rehype-extract-toc/mdx"; +import tailwindcss from "@tailwindcss/vite"; import react from "@vitejs/plugin-react"; import withSlug from "rehype-slug"; import remarkGfm from "remark-gfm"; -import tailwindcss from "tailwindcss"; import { defineConfig } from "vite"; import dynamicImport from "vite-plugin-dynamic-import"; @@ -13,17 +13,13 @@ import dynamicImport from "vite-plugin-dynamic-import"; export default defineConfig({ plugins: [ react(), + tailwindcss(), mdx({ rehypePlugins: [withSlug, withToc, withTocExport], remarkPlugins: [remarkGfm], }), dynamicImport(), ], - css: { - postcss: { - plugins: [tailwindcss()], - }, - }, resolve: { alias: { "@pswui": resolve(__dirname, "./src/pswui/components"), diff --git a/yarn.lock b/yarn.lock index c443c2f..46eb9be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1170,6 +1170,136 @@ __metadata: languageName: node linkType: hard +"@tailwindcss/node@npm:4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/node@npm:4.0.12" + dependencies: + enhanced-resolve: "npm:^5.18.1" + jiti: "npm:^2.4.2" + tailwindcss: "npm:4.0.12" + checksum: 10c0/69468c6f6a4f2ff88449b13be245b9a9b0372f2d456a59959da0562dfb3f45f64ae8003965fe0c4f8c4f2fef92f88def003489c2e5b16fd912eb69c99bd064ad + languageName: node + linkType: hard + +"@tailwindcss/oxide-android-arm64@npm:4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/oxide-android-arm64@npm:4.0.12" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@tailwindcss/oxide-darwin-arm64@npm:4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/oxide-darwin-arm64@npm:4.0.12" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@tailwindcss/oxide-darwin-x64@npm:4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/oxide-darwin-x64@npm:4.0.12" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@tailwindcss/oxide-freebsd-x64@npm:4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/oxide-freebsd-x64@npm:4.0.12" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.0.12" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@tailwindcss/oxide-linux-arm64-gnu@npm:4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/oxide-linux-arm64-gnu@npm:4.0.12" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@tailwindcss/oxide-linux-arm64-musl@npm:4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/oxide-linux-arm64-musl@npm:4.0.12" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@tailwindcss/oxide-linux-x64-gnu@npm:4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/oxide-linux-x64-gnu@npm:4.0.12" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@tailwindcss/oxide-linux-x64-musl@npm:4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/oxide-linux-x64-musl@npm:4.0.12" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@tailwindcss/oxide-win32-arm64-msvc@npm:4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/oxide-win32-arm64-msvc@npm:4.0.12" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@tailwindcss/oxide-win32-x64-msvc@npm:4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/oxide-win32-x64-msvc@npm:4.0.12" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + +"@tailwindcss/oxide@npm:4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/oxide@npm:4.0.12" + dependencies: + "@tailwindcss/oxide-android-arm64": "npm:4.0.12" + "@tailwindcss/oxide-darwin-arm64": "npm:4.0.12" + "@tailwindcss/oxide-darwin-x64": "npm:4.0.12" + "@tailwindcss/oxide-freebsd-x64": "npm:4.0.12" + "@tailwindcss/oxide-linux-arm-gnueabihf": "npm:4.0.12" + "@tailwindcss/oxide-linux-arm64-gnu": "npm:4.0.12" + "@tailwindcss/oxide-linux-arm64-musl": "npm:4.0.12" + "@tailwindcss/oxide-linux-x64-gnu": "npm:4.0.12" + "@tailwindcss/oxide-linux-x64-musl": "npm:4.0.12" + "@tailwindcss/oxide-win32-arm64-msvc": "npm:4.0.12" + "@tailwindcss/oxide-win32-x64-msvc": "npm:4.0.12" + dependenciesMeta: + "@tailwindcss/oxide-android-arm64": + optional: true + "@tailwindcss/oxide-darwin-arm64": + optional: true + "@tailwindcss/oxide-darwin-x64": + optional: true + "@tailwindcss/oxide-freebsd-x64": + optional: true + "@tailwindcss/oxide-linux-arm-gnueabihf": + optional: true + "@tailwindcss/oxide-linux-arm64-gnu": + optional: true + "@tailwindcss/oxide-linux-arm64-musl": + optional: true + "@tailwindcss/oxide-linux-x64-gnu": + optional: true + "@tailwindcss/oxide-linux-x64-musl": + optional: true + "@tailwindcss/oxide-win32-arm64-msvc": + optional: true + "@tailwindcss/oxide-win32-x64-msvc": + optional: true + checksum: 10c0/02483551ebe381e0d23d325f726108f196770eda09118ddd33d052460aec76d492f176c34a9417d8f8c7461530095809993926d7f374673d2e5833bd90c6d316 + languageName: node + linkType: hard + "@tailwindcss/typography@npm:^0.5.13": version: 0.5.16 resolution: "@tailwindcss/typography@npm:0.5.16" @@ -1184,6 +1314,20 @@ __metadata: languageName: node linkType: hard +"@tailwindcss/vite@npm:^4.0.12": + version: 4.0.12 + resolution: "@tailwindcss/vite@npm:4.0.12" + dependencies: + "@tailwindcss/node": "npm:4.0.12" + "@tailwindcss/oxide": "npm:4.0.12" + lightningcss: "npm:^1.29.1" + tailwindcss: "npm:4.0.12" + peerDependencies: + vite: ^5.2.0 || ^6 + checksum: 10c0/5ba921ade4f23c34757895896ac0808c684c9f8f90af512b462754afeab977a5fee80fe784e7263ec086327924f158116c686346a2fe3318f7eb0efad51940a0 + languageName: node + linkType: hard + "@tufjs/canonical-json@npm:2.0.0": version: 2.0.0 resolution: "@tufjs/canonical-json@npm:2.0.0" @@ -1700,24 +1844,6 @@ __metadata: languageName: node linkType: hard -"autoprefixer@npm:^10.4.19": - version: 10.4.21 - resolution: "autoprefixer@npm:10.4.21" - dependencies: - browserslist: "npm:^4.24.4" - caniuse-lite: "npm:^1.0.30001702" - fraction.js: "npm:^4.3.7" - normalize-range: "npm:^0.1.2" - picocolors: "npm:^1.1.1" - postcss-value-parser: "npm:^4.2.0" - peerDependencies: - postcss: ^8.1.0 - bin: - autoprefixer: bin/autoprefixer - checksum: 10c0/de5b71d26d0baff4bbfb3d59f7cf7114a6030c9eeb66167acf49a32c5b61c68e308f1e0f869d92334436a221035d08b51cd1b2f2c4689b8d955149423c16d4d4 - languageName: node - linkType: hard - "bail@npm:^2.0.0": version: 2.0.2 resolution: "bail@npm:2.0.2" @@ -1780,7 +1906,7 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.24.0, browserslist@npm:^4.24.4": +"browserslist@npm:^4.24.0": version: 4.24.4 resolution: "browserslist@npm:4.24.4" dependencies: @@ -1814,7 +1940,7 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001688, caniuse-lite@npm:^1.0.30001702": +"caniuse-lite@npm:^1.0.30001688": version: 1.0.30001703 resolution: "caniuse-lite@npm:1.0.30001703" checksum: 10c0/ed88e318da28e9e59c4ac3a2e3c42859558b7b713aebf03696a1f916e4ed4b70734dda82be04635e2b62ec355b8639bbed829b7b12ff528d7f9cc31a3a5bea91 @@ -2128,6 +2254,13 @@ __metadata: languageName: node linkType: hard +"detect-libc@npm:^2.0.3": + version: 2.0.3 + resolution: "detect-libc@npm:2.0.3" + checksum: 10c0/88095bda8f90220c95f162bf92cad70bd0e424913e655c20578600e35b91edc261af27531cf160a331e185c0ced93944bc7e09939143225f56312d7fd800fdb7 + languageName: node + linkType: hard + "devlop@npm:^1.0.0, devlop@npm:^1.1.0": version: 1.1.0 resolution: "devlop@npm:1.1.0" @@ -2208,6 +2341,16 @@ __metadata: languageName: node linkType: hard +"enhanced-resolve@npm:^5.18.1": + version: 5.18.1 + resolution: "enhanced-resolve@npm:5.18.1" + dependencies: + graceful-fs: "npm:^4.2.4" + tapable: "npm:^2.2.0" + checksum: 10c0/4cffd9b125225184e2abed9fdf0ed3dbd2224c873b165d0838fd066cde32e0918626cba2f1f4bf6860762f13a7e2364fd89a82b99566be2873d813573ac71846 + languageName: node + linkType: hard + "env-paths@npm:^2.2.0": version: 2.2.1 resolution: "env-paths@npm:2.2.1" @@ -2565,13 +2708,6 @@ __metadata: languageName: node linkType: hard -"fraction.js@npm:^4.3.7": - version: 4.3.7 - resolution: "fraction.js@npm:4.3.7" - checksum: 10c0/df291391beea9ab4c263487ffd9d17fed162dbb736982dee1379b2a8cc94e4e24e46ed508c6d278aded9080ba51872f1bc5f3a5fd8d7c74e5f105b508ac28711 - languageName: node - linkType: hard - "fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" @@ -2683,7 +2819,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.6": +"graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2 @@ -3248,6 +3384,15 @@ __metadata: languageName: node linkType: hard +"jiti@npm:^2.4.2": + version: 2.4.2 + resolution: "jiti@npm:2.4.2" + bin: + jiti: lib/jiti-cli.mjs + checksum: 10c0/4ceac133a08c8faff7eac84aabb917e85e8257f5ad659e843004ce76e981c457c390a220881748ac67ba1b940b9b729b30fb85cbaf6e7989f04b6002c94da331 + languageName: node + linkType: hard + "js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0": version: 4.0.0 resolution: "js-tokens@npm:4.0.0" @@ -3559,6 +3704,116 @@ __metadata: languageName: node linkType: hard +"lightningcss-darwin-arm64@npm:1.29.2": + version: 1.29.2 + resolution: "lightningcss-darwin-arm64@npm:1.29.2" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"lightningcss-darwin-x64@npm:1.29.2": + version: 1.29.2 + resolution: "lightningcss-darwin-x64@npm:1.29.2" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"lightningcss-freebsd-x64@npm:1.29.2": + version: 1.29.2 + resolution: "lightningcss-freebsd-x64@npm:1.29.2" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"lightningcss-linux-arm-gnueabihf@npm:1.29.2": + version: 1.29.2 + resolution: "lightningcss-linux-arm-gnueabihf@npm:1.29.2" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"lightningcss-linux-arm64-gnu@npm:1.29.2": + version: 1.29.2 + resolution: "lightningcss-linux-arm64-gnu@npm:1.29.2" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"lightningcss-linux-arm64-musl@npm:1.29.2": + version: 1.29.2 + resolution: "lightningcss-linux-arm64-musl@npm:1.29.2" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"lightningcss-linux-x64-gnu@npm:1.29.2": + version: 1.29.2 + resolution: "lightningcss-linux-x64-gnu@npm:1.29.2" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"lightningcss-linux-x64-musl@npm:1.29.2": + version: 1.29.2 + resolution: "lightningcss-linux-x64-musl@npm:1.29.2" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"lightningcss-win32-arm64-msvc@npm:1.29.2": + version: 1.29.2 + resolution: "lightningcss-win32-arm64-msvc@npm:1.29.2" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"lightningcss-win32-x64-msvc@npm:1.29.2": + version: 1.29.2 + resolution: "lightningcss-win32-x64-msvc@npm:1.29.2" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + +"lightningcss@npm:^1.29.1": + version: 1.29.2 + resolution: "lightningcss@npm:1.29.2" + dependencies: + detect-libc: "npm:^2.0.3" + lightningcss-darwin-arm64: "npm:1.29.2" + lightningcss-darwin-x64: "npm:1.29.2" + lightningcss-freebsd-x64: "npm:1.29.2" + lightningcss-linux-arm-gnueabihf: "npm:1.29.2" + lightningcss-linux-arm64-gnu: "npm:1.29.2" + lightningcss-linux-arm64-musl: "npm:1.29.2" + lightningcss-linux-x64-gnu: "npm:1.29.2" + lightningcss-linux-x64-musl: "npm:1.29.2" + lightningcss-win32-arm64-msvc: "npm:1.29.2" + lightningcss-win32-x64-msvc: "npm:1.29.2" + dependenciesMeta: + lightningcss-darwin-arm64: + optional: true + lightningcss-darwin-x64: + optional: true + lightningcss-freebsd-x64: + optional: true + lightningcss-linux-arm-gnueabihf: + optional: true + lightningcss-linux-arm64-gnu: + optional: true + lightningcss-linux-arm64-musl: + optional: true + lightningcss-linux-x64-gnu: + optional: true + lightningcss-linux-x64-musl: + optional: true + lightningcss-win32-arm64-msvc: + optional: true + lightningcss-win32-x64-msvc: + optional: true + checksum: 10c0/e06bb99c98e9f56cfcf37b5ce0e0198cdeeac2993ef2e5b878b6b0934fff54c7528f38bf8875e7bd71e64c9b20b29c0cada222d1e0089c8f94c1159bbb5d611f + languageName: node + linkType: hard + "lilconfig@npm:^3.1.3": version: 3.1.3 resolution: "lilconfig@npm:3.1.3" @@ -4601,13 +4856,6 @@ __metadata: languageName: node linkType: hard -"normalize-range@npm:^0.1.2": - version: 0.1.2 - resolution: "normalize-range@npm:0.1.2" - checksum: 10c0/bf39b73a63e0a42ad1a48c2bd1bda5a07ede64a7e2567307a407674e595bcff0fa0d57e8e5f1e7fa5e91000797c7615e13613227aaaa4d6d6e87f5bd5cc95de6 - languageName: node - linkType: hard - "npm-audit-report@npm:^6.0.0": version: 6.0.0 resolution: "npm-audit-report@npm:6.0.0" @@ -5044,14 +5292,7 @@ __metadata: languageName: node linkType: hard -"postcss-value-parser@npm:^4.2.0": - version: 4.2.0 - resolution: "postcss-value-parser@npm:4.2.0" - checksum: 10c0/f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161 - languageName: node - linkType: hard - -"postcss@npm:^8.4.38, postcss@npm:^8.4.43": +"postcss@npm:^8.4.43": version: 8.5.3 resolution: "postcss@npm:8.5.3" dependencies: @@ -5901,13 +6142,20 @@ __metadata: languageName: node linkType: hard -"tailwindcss@npm:^4.0.12": +"tailwindcss@npm:4.0.12, tailwindcss@npm:^4.0.12": version: 4.0.12 resolution: "tailwindcss@npm:4.0.12" checksum: 10c0/186e94e49b97e974daf999c350bfc50e727039f22c44baf9144b987b6c9b754bc983e8c9ef5b99a3ca2d399115eb7811967f66cf9e88edc08ac729746d80dc56 languageName: node linkType: hard +"tapable@npm:^2.2.0": + version: 2.2.1 + resolution: "tapable@npm:2.2.1" + checksum: 10c0/bc40e6efe1e554d075469cedaba69a30eeb373552aaf41caeaaa45bf56ffacc2674261b106245bd566b35d8f3329b52d838e851ee0a852120acae26e622925c9 + languageName: node + linkType: hard + "tar@npm:^6.1.11, tar@npm:^6.2.1": version: 6.2.1 resolution: "tar@npm:6.2.1" @@ -6051,6 +6299,7 @@ __metadata: "@psw-ui/cli": "npm:^0.5.0" "@stefanprobst/rehype-extract-toc": "npm:^2.2.0" "@tailwindcss/typography": "npm:^0.5.13" + "@tailwindcss/vite": "npm:^4.0.12" "@types/mdx": "npm:^2.0.13" "@types/node": "npm:^20.14.2" "@types/react": "npm:^18.3.3" @@ -6060,10 +6309,8 @@ __metadata: "@typescript-eslint/eslint-plugin": "npm:^7.13.0" "@typescript-eslint/parser": "npm:^7.13.0" "@vitejs/plugin-react": "npm:^4.3.1" - autoprefixer: "npm:^10.4.19" highlight.js: "npm:^11.9.0" lefthook: "npm:^1.6.18" - postcss: "npm:^8.4.38" react: "npm:^18.3.1" react-dom: "npm:^18.3.1" react-router-dom: "npm:^6.23.1"