From 5d34524e3c6c2a5460872de3ba8305e5a4588c6e Mon Sep 17 00:00:00 2001 From: Selemondev Date: Fri, 4 Aug 2023 12:05:16 +0300 Subject: [PATCH] feat(app): #58 Auto Imports This pull request is intended to close issue #58 by adding the auto imports feature. Closes: #58 --- example/package.json | 2 +- package.json | 2 +- packages/windi/package.json | 24 +++-- packages/windi/src/componentResolver.ts | 11 +++ .../windi/src/components/Button/WButton.vue | 1 - packages/windi/src/components/index.ts | 17 ++++ packages/windi/src/index.ts | 68 +------------- packages/windi/src/install.ts | 8 ++ packages/windi/src/plugin.ts | 41 ++++++++ packages/windi/tsconfig.json | 6 -- packages/windi/vite.config.ts | 18 ++-- playground/package.json | 2 +- playground/src/main.ts | 3 - playground/src/template/lib-install.js | 4 +- playground/src/vue-ui-next-dev-proxy.ts | 3 - playground/tailwind.config.cjs | 2 +- pnpm-lock.yaml | 93 ++++++++++++------- 17 files changed, 170 insertions(+), 135 deletions(-) create mode 100644 packages/windi/src/componentResolver.ts create mode 100644 packages/windi/src/components/index.ts create mode 100644 packages/windi/src/install.ts create mode 100644 packages/windi/src/plugin.ts diff --git a/example/package.json b/example/package.json index d82b438..a736250 100644 --- a/example/package.json +++ b/example/package.json @@ -13,7 +13,7 @@ "vue": "^3.3.4" }, "devDependencies": { - "@selemondev/windi-ui": "workspace:^", + "@windi-ui/vue": "workspace:^", "@tsconfig/node18": "^18.2.0", "@types/node": "^20.4.5", "@vitejs/plugin-vue": "^4.2.3", diff --git a/package.json b/package.json index fb4f927..bc71fb1 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "test": "vitest", "test:update": "vitest -u", "test:coverage": "vitest --coverage", - "windi-ui": "pnpm --filter @selemondev/windi-ui", + "windi-ui": "pnpm --filter @windi-ui/vue", "postinstall": "npx simple-git-hooks", "major": "taze minor -wIr" }, diff --git a/packages/windi/package.json b/packages/windi/package.json index 59b9a63..0e43173 100644 --- a/packages/windi/package.json +++ b/packages/windi/package.json @@ -1,5 +1,5 @@ { - "name": "@selemondev/windi-ui", + "name": "@windi-ui/vue", "version": "0.0.6", "packageManager": "pnpm@8.6.10", "description": "Build Accessible Apps 10x faster", @@ -22,15 +22,15 @@ ], "exports": { ".": { - "types": "./dist/index.d.ts", - "require": "./dist/index.umd.js", - "import": "./dist/index.es.js" + "types": "./dist/src/index.d.ts", + "require": "./dist/windi-ui.cjs", + "import": "./dist/windi-ui.mjs" }, "./dist/theme/windiTheme": "./dist/theme/windiTheme" }, - "main": "./dist/index.umd.js", - "module": "./dist/index.es.js", - "types": "./dist/index.d.ts", + "main": "./dist/windi-ui.cjs", + "module": "./dist/windi-ui.mjs", + "types": "./dist/src/index.d.ts", "files": [ "dist", "src" @@ -38,7 +38,7 @@ "scripts": { "build": "vite build && pnpm run build:theme", "build:watch": "vite build --watch", - "build:theme": "ts-node ./scripts/theme.ts", + "build:theme": "esno ./scripts/theme.ts", "dev": "vite", "play": "pnpm --filter playground dev", "prepublishOnly": "pnpm run build", @@ -46,11 +46,15 @@ "lint": "eslint .", "lint:fix": "eslint . --fix" }, - "dependencies": { + "peerDependencies": { "@headlessui/vue": "^1.7.15", + "vue": "^3.3.4" + }, + "dependencies": { "@heroicons/vue": "^2.0.18", - "@selemondev/windi-ui": "workspace:^", + "@windi-ui/vue": "workspace:^", "classnames": "^2.3.2", + "esno": "^0.17.0", "tailwind-merge": "^1.14.0", "vue-router": "^4.2.4" }, diff --git a/packages/windi/src/componentResolver.ts b/packages/windi/src/componentResolver.ts new file mode 100644 index 0000000..54f2a0c --- /dev/null +++ b/packages/windi/src/componentResolver.ts @@ -0,0 +1,11 @@ +import type { ComponentResolver } from 'unplugin-vue-components' + +export function WindiUIComponentResolver(): ComponentResolver { + return { + type: 'component', + resolve: (name: string) => { + if (name.match(/^W[A-Z]/)) + return { name, from: '@windi-ui/vue' } + }, + } +} diff --git a/packages/windi/src/components/Button/WButton.vue b/packages/windi/src/components/Button/WButton.vue index b394ed9..99f174e 100644 --- a/packages/windi/src/components/Button/WButton.vue +++ b/packages/windi/src/components/Button/WButton.vue @@ -152,7 +152,6 @@ export default defineComponent({