fix: updating config to match new standards

gfidder · Oct 19, 2023 · d4253d4 · d4253d4
1 parent 6b6c683
commit d4253d4
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 22 deletions.
diff --git a/cli/src/installers/tailwind.ts b/cli/src/installers/tailwind.ts
@@ -24,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/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