Merge pull request #195 from oku-ui/tailwindcss

dammy001 · web-flow · commit 039315939fc4 · 2023-07-09T09:01:32.000+01:00
chore: unocss to tailwindcss
diff --git a/package.json b/package.json
@@ -45,7 +45,6 @@
     "@storybook/testing-library": "^0.2.0",
     "@storybook/vue3": "^7.0.26",
     "@storybook/vue3-vite": "^7.0.26",
-    "@unocss/preset-icons": "^0.53.5",
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitest/coverage-v8": "^0.33.0",
     "@vue/test-utils": "^2.4.0",
@@ -71,7 +70,6 @@
     "turbo": "^1.10.7",
     "typescript": "^5.1.6",
     "unbuild": "^1.2.1",
-    "unocss": "^0.53.5",
     "unplugin-vue-macros": "^2.3.3",
     "vite": "^4.4.2",
     "vite-plugin-dts": "^3.2.0",
diff --git a/playground/nuxt3/nuxt.config.ts b/playground/nuxt3/nuxt.config.ts
@@ -5,7 +5,7 @@ import { resolve } from 'pathe'
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
   modules: [
-    '@unocss/nuxt',
+    '@nuxtjs/tailwindcss',
     async () => {
       const components = globbySync('../../packages/components/**/src/stories/*.@(vue)')
       if (components.length > 0) {
@@ -16,7 +16,4 @@ export default defineNuxtConfig({
       }
     },
   ],
-  css: [
-    '@unocss/reset/tailwind.css',
-  ],
 })
diff --git a/playground/nuxt3/package.json b/playground/nuxt3/package.json
@@ -19,8 +19,8 @@
     "@oku-ui/separator": "workspace:^"
   },
   "devDependencies": {
+    "@nuxtjs/tailwindcss": "^6.8.0",
     "@types/node": "^18.16.19",
-    "@unocss/nuxt": "^0.53.5",
     "nuxt": "^3.6.2"
   }
 }
diff --git a/playground/nuxt3/tailwind.config.js b/playground/nuxt3/tailwind.config.js
@@ -0,0 +1,10 @@
+/** @type {import('tailwindcss').Config} */
+export default {
+  content: [
+    '../../packages/**/src/**/*.vue',
+  ],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+}
diff --git a/playground/nuxt3/uno.config.ts b/playground/nuxt3/uno.config.ts
diff --git a/playground/vue3/package.json b/playground/vue3/package.json
@@ -24,7 +24,6 @@
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.2.3",
     "typescript": "^5.1.6",
-    "unocss": "^0.53.5",
     "unplugin-auto-import": "^0.16.6",
     "unplugin-vue-components": "^0.25.1",
     "vite": "^4.4.2",
diff --git a/playground/vue3/postcss.config.js b/playground/vue3/postcss.config.js
@@ -0,0 +1,8 @@
+export default {
+  plugins: {
+    'postcss-import': {},
+    'tailwindcss/nesting': {},
+    'tailwindcss': {},
+    'autoprefixer': {},
+  },
+}
diff --git a/playground/vue3/src/main.ts b/playground/vue3/src/main.ts
@@ -1,5 +1,3 @@
-import '@unocss/reset/tailwind.css'
-import 'virtual:uno.css'
 import { createRouter, createWebHistory } from 'vue-router'
 import { createApp } from 'vue'
 import App from './App.vue'
diff --git a/playground/vue3/src/style.css b/playground/vue3/src/style.css
@@ -1,3 +1,7 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
 body {
  @apply p-4
 }
diff --git a/playground/vue3/tailwind.config.js b/playground/vue3/tailwind.config.js
@@ -0,0 +1,12 @@
+/** @type {import('tailwindcss').Config} */
+export default {
+  content: [
+    './index.html',
+    './src/**/*.{js,ts,jsx,tsx,vue}',
+    '../../packages/**/src/**/*.vue',
+  ],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+}
diff --git a/playground/vue3/uno.config.ts b/playground/vue3/uno.config.ts
diff --git a/playground/vue3/vite.config.ts b/playground/vue3/vite.config.ts
@@ -1,7 +1,6 @@
 import { resolve } from 'node:path'
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
-import UnoCSS from 'unocss/vite'
 import Pages from 'vite-plugin-pages'
 
 import Components from 'unplugin-vue-components/vite'
@@ -11,7 +10,6 @@ import AutoImport from 'unplugin-auto-import/vite'
 export default defineConfig({
   plugins: [
     vue(),
-    UnoCSS(),
     Pages(),
     Components({
       dirs: [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@`
`19`	`19`	`"@oku-ui/separator": "workspace:^"`
`20`	`20`	`},`
`21`	`21`	`"devDependencies": {`
	`22`	`+ "@nuxtjs/tailwindcss": "^6.8.0",`
`22`	`23`	`"@types/node": "^18.16.19",`
`23`		`- "@unocss/nuxt": "^0.53.5",`
`24`	`24`	`"nuxt": "^3.6.2"`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import '@unocss/reset/tailwind.css'`
`2`		`-import 'virtual:uno.css'`
`3`	`1`	`import { createRouter, createWebHistory } from 'vue-router'`
`4`	`2`	`import { createApp } from 'vue'`
`5`	`3`	`import App from './App.vue'`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,7 @@`
	`1`	`+@tailwind base;`
	`2`	`+@tailwind components;`
	`3`	`+@tailwind utilities;`
	`4`	`+`
`1`	`5`	`body {`
`2`	`6`	`@apply p-4`
`3`	`7`	`}`