Merge pull request #115 from selemondev/fix-package-name

fix(app): package name
selemondev · Aug 10, 2023 · 8c260f8 · 8c260f8
2 parents 3ee22de + 033e47d
commit 8c260f8
Show file tree

Hide file tree

Showing 18 changed files with 6,457 additions and 234 deletions.
diff --git a/README.md b/README.md
@@ -20,13 +20,13 @@ Add `Windi UI` to your project by running one of the following commands:
 ```bash
 
 # pnpm
-pnpm add @windi/ui-vue
+pnpm add windi-vue
 
 # yarn
-yarn add @windi/ui-vue
+yarn add windi-vue
 
 # npm
-npm install @windi/ui-vue
+npm install windi-vue
 
 ```
 
@@ -37,7 +37,7 @@ npm install @windi/ui-vue
 ```ts
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}', 'node_modules/@windi/ui-vue/dist/theme/*.{js,jsx,ts,tsx,vue}'],
+  content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}', 'node_modules/windi-vue/dist/theme/*.{js,jsx,ts,tsx,vue}'],
   darkMode: 'class',
   theme: {
     extend: {},
@@ -57,8 +57,8 @@ To import all the components provided by `Windi UI`, add `WindiUI` in your main
 
 ```ts
 import { createApp } from 'vue'
-import windiTheme from '@windi/ui-vue/dist/theme/windiTheme'
-import WindiUI from '@windi/ui-vue'
+import windiTheme from 'windi-vue/dist/theme/windiTheme'
+import WindiUI from 'windi-vue'
 import App from './App.vue'
 
 const app = createApp(App)
@@ -78,9 +78,9 @@ Probably you might not want to globally register all the components but instead
 ```ts
 import { createApp } from 'vue'
 import './style.css'
-import windiTheme from '@windi/ui-vue/dist/theme/windiTheme'
+import windiTheme from 'windi-vue/dist/theme/windiTheme'
 
-import { WKbd, createWindiUI } from '@windi/ui-vue'
+import { WKbd, createWindiUI } from 'windi-vue'
 
 import App from './App.vue'
 
@@ -137,9 +137,9 @@ npm i -D unplugin-vue-components
 ```ts
 import { createApp } from 'vue'
 import './style.css'
-import windiTheme from '@windi/ui-vue/dist/theme/windiTheme'
+import windiTheme from 'windi-vue/dist/theme/windiTheme'
 
-import { createWindiUI } from '@windi/ui-vue'
+import { createWindiUI } from 'windi-vue'
 
 import App from './App.vue'
 
@@ -158,7 +158,7 @@ app.mount('#app')
 
 ```ts
 // other imports
-import { WindiUIComponentResolver } from '@windi/ui-vue'
+import { WindiUIComponentResolver } from 'windi-vue'
 import Components from 'unplugin-vue-components/vite'
 
 export default defineConfig({

diff --git a/docs/docs/.vitepress/theme/index.ts b/docs/docs/.vitepress/theme/index.ts
@@ -8,8 +8,8 @@ import "./rainbow.css"
 import "./style.css"
 import './tailwind.css'
 import 'uno.css'
-import windiTheme from '@windi/ui-vue/dist/theme/windiTheme'
-import WindiUI from '@windi/ui-vue'
+import windiTheme from 'windi-vue/dist/theme/windiTheme'
+import WindiUI from 'windi-vue'
 let homePageStyle: HTMLStyleElement | undefined
 export default {
   extend: Theme,

diff --git a/docs/docs/guide/getting-started/installation.md b/docs/docs/guide/getting-started/installation.md
@@ -4,13 +4,13 @@ Adding `Windi UI` to your project is relatively straightforward. Run one of the
 
 ::: code-group
   ```bash [pnpm]
-  pnpm add @windi/ui-vue
+  pnpm add windi-vue
   ```
   ```bash [yarn]
-  yarn add @windi/ui-vue
+  yarn add windi-vue
   ```
   ```bash [npm]
-  npm install @windi/ui-vue
+  npm install windi-vue
   ```
 :::
 
@@ -21,7 +21,7 @@ Adding `Windi UI` to your project is relatively straightforward. Run one of the
 ```ts
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  content: ["./index.html", "./src/**/*.{vue,js,ts,jsx,tsx}", "node_modules/@windi/ui-vue/dist/theme/*.{js,jsx,ts,tsx,vue}"],
+  content: ["./index.html", "./src/**/*.{vue,js,ts,jsx,tsx}", "node_modules/windi-vue/dist/theme/*.{js,jsx,ts,tsx,vue}"],
   darkMode: "class",
   theme: {
     extend: {},
@@ -43,8 +43,8 @@ To import all the components provided by `Windi UI`, add `WindiUI` in your main
 ```ts
 import { createApp } from 'vue'
 import App from './App.vue'
-import windiTheme from '@windi/ui-vue/dist/theme/windiTheme'
-import WindiUI from '@windi/ui-vue'
+import windiTheme from 'windi-vue/dist/theme/windiTheme'
+import WindiUI from 'windi-vue'
 
 const app = createApp(App)
 app.use(WindiUI, windiTheme)
@@ -66,11 +66,11 @@ Probably you might not want to globally register all the components but instead
 import { createApp } from 'vue'
 import './style.css'
 import App from './App.vue'
-import windiTheme from '@windi/ui-vue/dist/theme/windiTheme'
+import windiTheme from 'windi-vue/dist/theme/windiTheme'
 
-import { WKbd, createWindiUI } from '@windi/ui-vue' // [!code ++]
+import { WKbd, createWindiUI } from 'windi-vue' // [!code ++]
 
-import WindiUI from '@windi/ui-vue' // [!code --]
+import WindiUI from 'windi-vue' // [!code --]
 
 const app = createApp(App)
 
@@ -130,13 +130,13 @@ To achieve this you need to do the following:
 import { createApp } from 'vue'
 import './style.css'
 import App from './App.vue'
-import windiTheme from '@windi/ui-vue/dist/theme/windiTheme'
+import windiTheme from 'windi-vue/dist/theme/windiTheme'
 
-import { WKbd, createWindiUI } from '@windi/ui-vue' // [!code --]
+import { WKbd, createWindiUI } from 'windi-vue' // [!code --]
 
-import { createWindiUI } from '@windi/ui-vue' // [!code ++]
+import { createWindiUI } from 'windi-vue' // [!code ++]
 
-import WindiUI from '@windi/ui-vue' // [!code --]
+import WindiUI from 'windi-vue' // [!code --]
 
 const app = createApp(App)
 
@@ -161,7 +161,7 @@ app.mount('#app')
 
 ```ts
 // other imports
-import { WindiUIComponentResolver } from '@windi/ui-vue'
+import { WindiUIComponentResolver } from 'windi-vue'
 import Components from "unplugin-vue-components/vite"
 
 export default defineConfig({

diff --git a/docs/docs/package.json b/docs/docs/package.json
@@ -13,7 +13,7 @@
     "serve": "vitepress serve"
   },
   "dependencies": {
-    "@windi/ui-vue": "workspace:^",
+    "windi-vue": "workspace:^",
     "markdown-it": "^13.0.1"
   },
   "devDependencies": {

diff --git a/docs/docs/tailwind.config.js b/docs/docs/tailwind.config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  content: ['./docs/.vitepress/**/*.{js,ts,vue}', './components/**/*.{js,ts,vue,md}', './src/**/*.{js,ts,vue}', 'node_modules/@windi/ui-vue/dist/theme/*.{js,ts,json}'],
+  content: ['./docs/.vitepress/**/*.{js,ts,vue}', './components/**/*.{js,ts,vue,md}', './src/**/*.{js,ts,vue}', 'node_modules/windi-vue/dist/theme/*.{js,ts,json}'],
   plugins: [],
   darkMode: 'class',
   theme: {

diff --git a/example/package.json b/example/package.json
@@ -13,7 +13,7 @@
     "vue": "^3.3.4"
   },
   "devDependencies": {
-    "@windi/ui-vue": "workspace:^",
+    "windi-vue": "workspace:^",
     "@tsconfig/node18": "^18.2.0",
     "@types/node": "^20.4.5",
     "@vitejs/plugin-vue": "^4.2.3",

diff --git a/example/src/main.ts b/example/src/main.ts
@@ -1,8 +1,8 @@
 import "./assets/css/tailwind.css"
 import { createApp } from 'vue'
 import App from './App.vue'
-import install from "@windi/ui-vue"
-import config from "@windi/ui-vue/dist/theme/windiTheme"
+import install from "windi-vue"
+import config from "windi-vue/dist/theme/windiTheme"
 const app = createApp(App)
 app.use(install, config)
 app.mount('#app')
diff --git a/example/tailwind.config.js b/example/tailwind.config.js
@@ -1,6 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  content: ["./index.html", "./src/**/*.{vue,js,ts,jsx,tsx}", 'node_modules/@windi/ui-vue/dist/theme/*.{js,ts,json}'],
+  content: ["./index.html", "./src/**/*.{vue,js,ts,jsx,tsx}", 'node_modules/windi-vue/dist/theme/*.{js,ts,json}'],
   theme: {
     extend: {},
   },

diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "test": "vitest",
     "test:update": "vitest -u",
     "test:coverage": "vitest --coverage",
-    "windi-ui": "pnpm --filter @windi/ui-vue",
+    "windi-ui": "pnpm --filter windi-vue",
     "postinstall": "npx simple-git-hooks",
     "major": "taze minor -wIr"
   },

diff --git a/packages/windi/README.md b/packages/windi/README.md
@@ -20,13 +20,13 @@ Add `Windi UI` to your project by running one of the following commands:
 ```bash
 
 # pnpm
-pnpm add @windi/ui-vue
+pnpm add windi-vue
 
 # yarn
-yarn add @windi/ui-vue
+yarn add windi-vue
 
 # npm
-npm install @windi/ui-vue
+npm install windi-vue
 
 ```
 
@@ -37,7 +37,7 @@ npm install @windi/ui-vue
 ```ts
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}', 'node_modules/@windi/ui-vue/dist/theme/*.{js,jsx,ts,tsx,vue}'],
+  content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}', 'node_modules/windi-vue/dist/theme/*.{js,jsx,ts,tsx,vue}'],
   darkMode: 'class',
   theme: {
     extend: {},
@@ -57,8 +57,8 @@ To import all the components provided by `Windi UI`, add `WindiUI` in your main
 
 ```ts
 import { createApp } from 'vue'
-import windiTheme from '@windi/ui-vue/dist/theme/windiTheme'
-import WindiUI from '@windi/ui-vue'
+import windiTheme from 'windi-vue/dist/theme/windiTheme'
+import WindiUI from 'windi-vue'
 import App from './App.vue'
 
 const app = createApp(App)
@@ -78,9 +78,9 @@ Probably you might not want to globally register all the components but instead
 ```ts
 import { createApp } from 'vue'
 import './style.css'
-import windiTheme from '@windi/ui-vue/dist/theme/windiTheme'
+import windiTheme from 'windi-vue/dist/theme/windiTheme'
 
-import { WKbd, createWindiUI } from '@windi/ui-vue'
+import { WKbd, createWindiUI } from 'windi-vue'
 
 import App from './App.vue'
 
@@ -137,9 +137,9 @@ npm i -D unplugin-vue-components
 ```ts
 import { createApp } from 'vue'
 import './style.css'
-import windiTheme from '@windi/ui-vue/dist/theme/windiTheme'
+import windiTheme from 'windi-vue/dist/theme/windiTheme'
 
-import { createWindiUI } from '@windi/ui-vue'
+import { createWindiUI } from 'windi-vue'
 
 import App from './App.vue'
 
@@ -158,7 +158,7 @@ app.mount('#app')
 
 ```ts
 // other imports
-import { WindiUIComponentResolver } from '@windi/ui-vue'
+import { WindiUIComponentResolver } from 'windi-vue'
 import Components from 'unplugin-vue-components/vite'
 
 export default defineConfig({

diff --git a/packages/windi/package.json b/packages/windi/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@windi/ui-vue",
+  "name": "windi-vue",
   "version": "0.0.0",
   "packageManager": "[email protected]",
   "description": "Build Accessible Apps 10x faster",

diff --git a/packages/windi/src/componentResolver.ts b/packages/windi/src/componentResolver.ts
@@ -5,7 +5,7 @@ export function WindiUIComponentResolver(): ComponentResolver {
     type: 'component',
     resolve: (name: string) => {
       if (name.match(/^W[A-Z]/))
-        return { name, from: '@windi/ui-vue' }
+        return { name, from: 'windi-vue' }
     },
   }
 }
diff --git a/packages/windi/tailwind.config.js b/packages/windi/tailwind.config.js
@@ -1,7 +1,7 @@
 // module.exports = require('@windi-ui/tailwind-config/tailwind.config')
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}', 'node_modules/@windi/ui-vue/dist/theme/*.{js,ts,json}'],
+  content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}', 'node_modules/windi-vue/dist/theme/*.{js,ts,json}'],
   darkMode: 'class',
   theme: {
     extend: {
@@ -12,5 +12,5 @@ module.exports = {
       },
     },
   },
-  plugins: [require()],
+  plugins: [],
 }
diff --git a/playground/package.json b/playground/package.json
@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/selemondev/windi-ui#readme",
   "dependencies": {
-    "@windi/ui-vue": "workspace:^",
+    "windi-vue": "workspace:^",
     "@vue/repl": "^1.4.1",
     "autoprefixer": "^10.4.14",
     "compare-versions": "^4.1.4",

diff --git a/playground/playground.config.ts b/playground/playground.config.ts
@@ -32,20 +32,20 @@ export default {
       path: '/dist/shared.esm-bundler.js',
       source: 'jsdelivr',
     },
-    // '@windi/ui-vue': {
-    //   pkg: '@windi/ui-vue',
+    // 'windi-vue': {
+    //   pkg: 'windi-vue',
     //   version: 'latest',
-    //   path: '/dist/@windi/ui-vue.js',
+    //   path: '/dist/windi-vue.js',
     //   source: 'jsdelivr',
-    //   cssPath: '@windi/ui-vue/dist/theme/windiTheme',
+    //   cssPath: 'windi-vue/dist/theme/windiTheme',
     // }
   } as Record<string, Dependency>,
   cdnUrl: {
     skypack: 'https://cdn.skypack.dev/',
     jsdelivr: 'https://cdn.jsdelivr.net/npm/',
   },
   devDeps: {
-    // '@windi/ui-vue': {
+    // 'windi-vue': {
     //   path: `${location.origin}/play/src/vue-ui-next-dev-proxy`,
     // },
     'vue': {

diff --git a/playground/src/template/lib-install.js b/playground/src/template/lib-install.js
@@ -1,5 +1,5 @@
 import { getCurrentInstance } from 'vue'
-// import install from '@windi/ui-vue'
+// import install from 'windi-vue'
 
 let installed = false
 

diff --git a/playground/tailwind.config.cjs b/playground/tailwind.config.cjs
@@ -1,6 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  content: ["./index.html", "./src/**/*.{vue,js,ts,jsx,tsx}", './node_modules/@windi/ui-vue/dist/theme/*.{js,ts,json}'],
+  content: ["./index.html", "./src/**/*.{vue,js,ts,jsx,tsx}", './node_modules/windi-vue/dist/theme/*.{js,ts,json}'],
   theme: {
     extend: {},
   },