feat: 20 update tailwind (#26)

* feat: updating version of tailwind * fix: updating config to match new standards * adding in changeset
gfidder · Oct 19, 2023 · 3fe6b8c · 3fe6b8c
1 parent 5b7ad1f
commit 3fe6b8c
Show file tree

Hide file tree

Showing 13 changed files with 117 additions and 92 deletions.
diff --git a/.changeset/sharp-ducks-talk.md b/.changeset/sharp-ducks-talk.md
@@ -0,0 +1,5 @@
+---
+"create-t3nuxt-app": patch
+---
+
+Updating tailwind to latest version
diff --git a/cli/package.json b/cli/package.json
@@ -59,7 +59,7 @@
     "@types/fs-extra": "^11.0.1",
     "@types/gradient-string": "^1.1.2",
     "@types/inquirer": "^9.0.3",
-    "@types/node": "^18.18.5",
+    "@types/node": "^20.2.5",
     "eslint-plugin-isaacscript": "^2.3.2",
     "eslint-plugin-nuxt": "^4.0.0",
     "next-auth": "4.18.8",

diff --git a/cli/src/installers/dependencyVersionMap.ts b/cli/src/installers/dependencyVersionMap.ts
@@ -17,9 +17,9 @@ export const dependencyVersionMap = {
   autoprefixer: "^10.4.7",
   postcss: "^8.4.14",
   prettier: "^3.0.1",
-  "prettier-plugin-tailwindcss": "^0.2.1",
-  "@types/prettier": "^2.7.2",
-  "@nuxtjs/tailwindcss": "^6.3.1",
+  "prettier-plugin-tailwindcss": "^0.5.6",
+  "@types/prettier": "^3.0.0",
+  "eslint-plugin-prettier": "^5.0.0",
 
   // tRPC
   "@trpc/client": "^10.9.0",

diff --git a/cli/src/installers/tailwind.ts b/cli/src/installers/tailwind.ts
@@ -15,7 +15,6 @@ export const tailwindInstaller: Installer = ({ projectDir }) => {
       "prettier",
       "prettier-plugin-tailwindcss",
       "@types/prettier",
-      "@nuxtjs/tailwindcss",
     ],
     devMode: true,
   });
@@ -25,17 +24,13 @@ export const tailwindInstaller: Installer = ({ projectDir }) => {
   const twCfgSrc = path.join(extrasDir, "config/tailwind.config.ts");
   const twCfgDest = path.join(projectDir, "tailwind.config.ts");
 
-  const postcssCfgSrc = path.join(extrasDir, "config/postcss.config.cjs");
-  const postcssCfgDest = path.join(projectDir, "postcss.config.cjs");
-
   const prettierSrc = path.join(extrasDir, "config/prettier.config.cjs");
   const prettierDest = path.join(projectDir, "prettier.config.cjs");
 
   const cssSrc = path.join(extrasDir, "src/assets/global.css");
   const cssDest = path.join(projectDir, "assets/global.css");
 
   fs.copySync(twCfgSrc, twCfgDest);
-  fs.copySync(postcssCfgSrc, postcssCfgDest);
   fs.copySync(cssSrc, cssDest);
   fs.copySync(prettierSrc, prettierDest);
 };
diff --git a/cli/template/base/package.json b/cli/template/base/package.json
@@ -11,12 +11,12 @@
     "lint": "eslint . --ext .vue,.js,.ts,.tsx --ignore-path .gitignore"
   },
   "devDependencies": {
-    "@types/node": "^18.13.0",
-    "@typescript-eslint/eslint-plugin": "^5.51.0",
-    "@typescript-eslint/parser": "^5.51.0",
+    "@types/node": "^20.2.5",
+    "@typescript-eslint/eslint-plugin": "^6.2.1",
+    "@typescript-eslint/parser": "^6.2.1",
     "eslint": "^8.33.0",
     "eslint-plugin-nuxt": "^4.0.0",
-    "nuxt": "^3.1.2",
+    "nuxt": "^3.7.0",
     "typescript": "^4.9.5",
     "vite-plugin-eslint": "^1.8.1"
   }

diff --git a/cli/template/extras/config/nuxt-config/with-auth-trpc-tw.ts b/cli/template/extras/config/nuxt-config/with-auth-trpc-tw.ts
@@ -2,7 +2,8 @@ import eslintPlugin from "vite-plugin-eslint";
 
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-  modules: ["@nuxtjs/tailwindcss", "@sidebase/nuxt-auth"],
+  modules: ["@sidebase/nuxt-auth"],
+  css: ["~/assets/global.css"],
   typescript: {
     shim: false,
   },
@@ -12,7 +13,10 @@ export default defineNuxtConfig({
   vite: {
     plugins: [eslintPlugin()],
   },
-  tailwindcss: {
-    cssPath: "~/assets/global.css",
+  postcss: {
+    plugins: {
+      tailwindcss: {},
+      autoprefixer: {},
+    },
   },
 });
diff --git a/cli/template/extras/config/nuxt-config/with-auth-tw.ts b/cli/template/extras/config/nuxt-config/with-auth-tw.ts
@@ -2,14 +2,18 @@ import eslintPlugin from "vite-plugin-eslint";
 
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-  modules: ["@nuxtjs/tailwindcss", "@sidebase/nuxt-auth"],
+  modules: ["@sidebase/nuxt-auth"],
+  css: ["~/assets/global.css"],
   typescript: {
     shim: false,
   },
   vite: {
     plugins: [eslintPlugin()],
   },
-  tailwindcss: {
-    cssPath: "~/assets/global.css",
+  postcss: {
+    plugins: {
+      tailwindcss: {},
+      autoprefixer: {},
+    },
   },
 });
diff --git a/cli/template/extras/config/nuxt-config/with-trpc-tw.ts b/cli/template/extras/config/nuxt-config/with-trpc-tw.ts
@@ -2,7 +2,7 @@ import eslintPlugin from "vite-plugin-eslint";
 
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-  modules: ["@nuxtjs/tailwindcss"],
+  css: ["~/assets/global.css"],
   typescript: {
     shim: false,
   },
@@ -12,7 +12,10 @@ export default defineNuxtConfig({
   vite: {
     plugins: [eslintPlugin()],
   },
-  tailwindcss: {
-    cssPath: "~/assets/global.css",
+  postcss: {
+    plugins: {
+      tailwindcss: {},
+      autoprefixer: {},
+    },
   },
 });
diff --git a/cli/template/extras/config/nuxt-config/with-tw.ts b/cli/template/extras/config/nuxt-config/with-tw.ts
@@ -2,14 +2,17 @@ import eslintPlugin from "vite-plugin-eslint";
 
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-  modules: ["@nuxtjs/tailwindcss"],
+  css: ["~/assets/global.css"],
   typescript: {
     shim: false,
   },
   vite: {
     plugins: [eslintPlugin()],
   },
-  tailwindcss: {
-    cssPath: "~/assets/global.css",
+  postcss: {
+    plugins: {
+      tailwindcss: {},
+      autoprefixer: {},
+    },
   },
 });
diff --git a/cli/template/extras/config/postcss.config.cjs b/cli/template/extras/config/postcss.config.cjs
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "@changesets/changelog-github": "^0.4.8",
     "@changesets/cli": "^2.26.2",
     "@manypkg/cli": "^0.20.0",
-    "@types/node": "^18.18.5",
+    "@types/node": "^20.2.5",
     "@typescript-eslint/eslint-plugin": "6.0.0",
     "@typescript-eslint/parser": "6.0.0",
     "eslint": "^8.40.0",