From ca49950dece06d3388925c440301121698142f32 Mon Sep 17 00:00:00 2001 From: jaskang Date: Thu, 21 Sep 2023 16:40:38 +0800 Subject: [PATCH] feat: pkg --- package.json | 3 +- packages/vue/postcss.config.cjs | 1 + packages/vue/src/components/Button/index.tsx | 2 - packages/vue/src/components/Switch/index.tsx | 2 - packages/vue/src/index.ts | 2 +- packages/vue/src/styles/_index.scss | 4 ++ .../vue/src/styles/{base.css => _var.scss} | 2 - .../src/styles/{index.ts => breadcrumb.scss} | 0 .../Button/button.css => styles/button.scss} | 0 .../Switch/switch.css => styles/switch.scss} | 0 packages/vue/tsconfig.json | 5 ++ packages/vue/vite.config.ts | 3 + pnpm-lock.yaml | 69 +++++++++---------- 13 files changed, 48 insertions(+), 45 deletions(-) create mode 100644 packages/vue/src/styles/_index.scss rename packages/vue/src/styles/{base.css => _var.scss} (91%) rename packages/vue/src/styles/{index.ts => breadcrumb.scss} (100%) rename packages/vue/src/{components/Button/button.css => styles/button.scss} (100%) rename packages/vue/src/{components/Switch/switch.css => styles/switch.scss} (100%) diff --git a/package.json b/package.json index c8bdc61e..1d152c34 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "dev": "pnpm --filter docs dev", "docs:build": "pnpm --filter docs build", "docs:preview": "pnpm --filter docs preview", - "build": "pnpm --filter docs preview" + "build": "pnpm --filter @zonda/vue build" }, "dependencies": { "@floating-ui/vue": "^1.0.2", @@ -37,6 +37,7 @@ "prettier": "^3.0.3", "prettier-plugin-tailwindcss": "^0.5.4", "rimraf": "^5.0.1", + "sass": "^1.68.0", "tailwindcss": "^3.3.3", "typescript": "^5.2.2", "vite": "^4.4.9", diff --git a/packages/vue/postcss.config.cjs b/packages/vue/postcss.config.cjs index d15d2f9c..3f0b4142 100644 --- a/packages/vue/postcss.config.cjs +++ b/packages/vue/postcss.config.cjs @@ -1,3 +1,4 @@ module.exports = { 'postcss-nested': {}, + autoprefixer: {}, } diff --git a/packages/vue/src/components/Button/index.tsx b/packages/vue/src/components/Button/index.tsx index 55c17091..d9f38340 100644 --- a/packages/vue/src/components/Button/index.tsx +++ b/packages/vue/src/components/Button/index.tsx @@ -1,5 +1,3 @@ -import './button.css' - import { type ComponentObjectPropsOptions, computed, diff --git a/packages/vue/src/components/Switch/index.tsx b/packages/vue/src/components/Switch/index.tsx index 16bbfbbf..c22ea214 100644 --- a/packages/vue/src/components/Switch/index.tsx +++ b/packages/vue/src/components/Switch/index.tsx @@ -1,5 +1,3 @@ -import './switch.css' - import { defineComponent, type ExtractPropTypes, diff --git a/packages/vue/src/index.ts b/packages/vue/src/index.ts index 6c3ea45c..5645862c 100644 --- a/packages/vue/src/index.ts +++ b/packages/vue/src/index.ts @@ -1,4 +1,4 @@ -import './styles/base.css' +import './styles/_index.scss' import type { Plugin } from 'vue' diff --git a/packages/vue/src/styles/_index.scss b/packages/vue/src/styles/_index.scss new file mode 100644 index 00000000..d27e4fdf --- /dev/null +++ b/packages/vue/src/styles/_index.scss @@ -0,0 +1,4 @@ +@import './var.scss'; +@import './button.scss'; +@import './switch.scss'; +@import './breadcrumb.scss'; diff --git a/packages/vue/src/styles/base.css b/packages/vue/src/styles/_var.scss similarity index 91% rename from packages/vue/src/styles/base.css rename to packages/vue/src/styles/_var.scss index 1c0805db..b1a41ac5 100644 --- a/packages/vue/src/styles/base.css +++ b/packages/vue/src/styles/_var.scss @@ -1,5 +1,3 @@ -@layer reset, base, tokens, recipes, utilities; - :root { --shadow-sm: 0 1px 2px 0 rgb(0 0 0 / 0.05); --shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1); diff --git a/packages/vue/src/styles/index.ts b/packages/vue/src/styles/breadcrumb.scss similarity index 100% rename from packages/vue/src/styles/index.ts rename to packages/vue/src/styles/breadcrumb.scss diff --git a/packages/vue/src/components/Button/button.css b/packages/vue/src/styles/button.scss similarity index 100% rename from packages/vue/src/components/Button/button.css rename to packages/vue/src/styles/button.scss diff --git a/packages/vue/src/components/Switch/switch.css b/packages/vue/src/styles/switch.scss similarity index 100% rename from packages/vue/src/components/Switch/switch.css rename to packages/vue/src/styles/switch.scss diff --git a/packages/vue/tsconfig.json b/packages/vue/tsconfig.json index 8592c271..e85f7287 100644 --- a/packages/vue/tsconfig.json +++ b/packages/vue/tsconfig.json @@ -1,4 +1,9 @@ { "extends": "@jaskang/config/tsconfig.vue.json", + "compilerOptions": { + "paths": { + "@": ["./src"] + } + }, "include": ["src"] } diff --git a/packages/vue/vite.config.ts b/packages/vue/vite.config.ts index e8d4886e..f09a3b6d 100644 --- a/packages/vue/vite.config.ts +++ b/packages/vue/vite.config.ts @@ -7,6 +7,9 @@ import { defineConfig } from 'vite' // https://vitejs.dev/config/ export default defineConfig({ plugins: [vue(), vueJsx()], + css: { + transformer: 'postcss', + }, build: { lib: { entry: 'src/index.ts', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4059d841..d3fdd3a2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,9 +72,6 @@ importers: postcss-nested: specifier: ^6.0.1 version: 6.0.1(postcss@8.4.30) - postcss-nesting: - specifier: ^12.0.1 - version: 12.0.1(postcss@8.4.30) prettier: specifier: ^3.0.3 version: 3.0.3 @@ -84,6 +81,9 @@ importers: rimraf: specifier: ^5.0.1 version: 5.0.1 + sass: + specifier: ^1.68.0 + version: 1.68.0 tailwindcss: specifier: ^3.3.3 version: 3.3.3 @@ -92,7 +92,7 @@ importers: version: 5.2.2 vite: specifier: ^4.4.9 - version: 4.4.9(@types/node@20.6.0) + version: 4.4.9(@types/node@20.6.0)(sass@1.68.0) vite-plugin-inspect: specifier: ^0.7.38 version: 0.7.38(vite@4.4.9) @@ -101,10 +101,10 @@ importers: version: 1.1.1 vitepress: specifier: 1.0.0-rc.12 - version: 1.0.0-rc.12(@types/node@20.6.0)(search-insights@2.7.0) + version: 1.0.0-rc.12(@types/node@20.6.0)(sass@1.68.0)(search-insights@2.7.0) vitest: specifier: ^0.34.4 - version: 0.34.4(happy-dom@11.0.2) + version: 0.34.4(happy-dom@11.0.2)(sass@1.68.0) vue-tsc: specifier: ^1.8.10 version: 1.8.10(typescript@5.2.2) @@ -655,15 +655,6 @@ packages: to-fast-properties: 2.0.0 dev: true - /@csstools/selector-specificity@3.0.0(postcss-selector-parser@6.0.13): - resolution: {integrity: sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==} - engines: {node: ^14 || ^16 || >=18} - peerDependencies: - postcss-selector-parser: ^6.0.13 - dependencies: - postcss-selector-parser: 6.0.13 - dev: true - /@docsearch/css@3.5.2: resolution: {integrity: sha512-SPiDHaWKQZpwR2siD0KQUwlStvIAnEyK6tAE2h2Wuoq8ue9skzhlyVQ1ddzOxX6khULnAALDiR/isSF3bnuciA==} dev: true @@ -1384,7 +1375,7 @@ packages: '@babel/core': 7.22.15 '@babel/plugin-transform-typescript': 7.22.15(@babel/core@7.22.15) '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.22.15) - vite: 4.4.9(@types/node@20.6.0) + vite: 4.4.9(@types/node@20.6.0)(sass@1.68.0) vue: 3.3.4 transitivePeerDependencies: - supports-color @@ -1397,7 +1388,7 @@ packages: vite: ^4.0.0 vue: ^3.2.25 dependencies: - vite: 4.4.9(@types/node@20.6.0) + vite: 4.4.9(@types/node@20.6.0)(sass@1.68.0) vue: 3.3.4 dev: true @@ -3071,6 +3062,10 @@ packages: engines: {node: '>= 4'} dev: true + /immutable@4.3.4: + resolution: {integrity: sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==} + dev: true + /import-fresh@3.3.0: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} engines: {node: '>=6'} @@ -4194,17 +4189,6 @@ packages: postcss-selector-parser: 6.0.13 dev: true - /postcss-nesting@12.0.1(postcss@8.4.30): - resolution: {integrity: sha512-6LCqCWP9pqwXw/njMvNK0hGY44Fxc4B2EsGbn6xDcxbNRzP8GYoxT7yabVVMLrX3quqOJ9hg2jYMsnkedOf8pA==} - engines: {node: ^14 || ^16 || >=18} - peerDependencies: - postcss: ^8.4 - dependencies: - '@csstools/selector-specificity': 3.0.0(postcss-selector-parser@6.0.13) - postcss: 8.4.30 - postcss-selector-parser: 6.0.13 - dev: true - /postcss-selector-parser@6.0.10: resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==} engines: {node: '>=4'} @@ -4484,6 +4468,16 @@ packages: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} dev: true + /sass@1.68.0: + resolution: {integrity: sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==} + engines: {node: '>=14.0.0'} + hasBin: true + dependencies: + chokidar: 3.5.3 + immutable: 4.3.4 + source-map-js: 1.0.2 + dev: true + /search-insights@2.7.0: resolution: {integrity: sha512-GLbVaGgzYEKMvuJbHRhLi1qoBFnjXZGZ6l4LxOYPCp4lI2jDRB3jPU9/XNhMwv6kvnA9slTreq6pvK+b3o3aqg==} engines: {node: '>=8.16.0'} @@ -4978,7 +4972,7 @@ packages: sade: 1.8.1 dev: true - /vite-node@0.34.4(@types/node@20.6.0): + /vite-node@0.34.4(@types/node@20.6.0)(sass@1.68.0): resolution: {integrity: sha512-ho8HtiLc+nsmbwZMw8SlghESEE3KxJNp04F/jPUCLVvaURwt0d+r9LxEqCX5hvrrOQ0GSyxbYr5ZfRYhQ0yVKQ==} engines: {node: '>=v14.18.0'} hasBin: true @@ -4988,7 +4982,7 @@ packages: mlly: 1.4.0 pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.4.9(@types/node@20.6.0) + vite: 4.4.9(@types/node@20.6.0)(sass@1.68.0) transitivePeerDependencies: - '@types/node' - less @@ -5018,7 +5012,7 @@ packages: open: 9.1.0 picocolors: 1.0.0 sirv: 2.0.3 - vite: 4.4.9(@types/node@20.6.0) + vite: 4.4.9(@types/node@20.6.0)(sass@1.68.0) transitivePeerDependencies: - rollup - supports-color @@ -5037,7 +5031,7 @@ packages: - supports-color dev: true - /vite@4.4.9(@types/node@20.6.0): + /vite@4.4.9(@types/node@20.6.0)(sass@1.68.0): resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -5069,11 +5063,12 @@ packages: esbuild: 0.18.17 postcss: 8.4.30 rollup: 3.27.2 + sass: 1.68.0 optionalDependencies: fsevents: 2.3.2 dev: true - /vitepress@1.0.0-rc.12(@types/node@20.6.0)(search-insights@2.7.0): + /vitepress@1.0.0-rc.12(@types/node@20.6.0)(sass@1.68.0)(search-insights@2.7.0): resolution: {integrity: sha512-mZknN5l9lgbBjXwumwdOQQDM+gPivswFEykEQeenY0tv7eocS+bb801IpFZT3mFV6YRhSddmbutHlFgPPADjEg==} hasBin: true dependencies: @@ -5086,7 +5081,7 @@ packages: mark.js: 8.11.1 minisearch: 6.1.0 shiki: 0.14.4 - vite: 4.4.9(@types/node@20.6.0) + vite: 4.4.9(@types/node@20.6.0)(sass@1.68.0) vue: 3.3.4 transitivePeerDependencies: - '@algolia/client-search' @@ -5115,7 +5110,7 @@ packages: - universal-cookie dev: true - /vitest@0.34.4(happy-dom@11.0.2): + /vitest@0.34.4(happy-dom@11.0.2)(sass@1.68.0): resolution: {integrity: sha512-SE/laOsB6995QlbSE6BtkpXDeVNLJc1u2LHRG/OpnN4RsRzM3GQm4nm3PQCK5OBtrsUqnhzLdnT7se3aeNGdlw==} engines: {node: '>=v14.18.0'} hasBin: true @@ -5168,8 +5163,8 @@ packages: strip-literal: 1.0.1 tinybench: 2.5.0 tinypool: 0.7.0 - vite: 4.4.9(@types/node@20.6.0) - vite-node: 0.34.4(@types/node@20.6.0) + vite: 4.4.9(@types/node@20.6.0)(sass@1.68.0) + vite-node: 0.34.4(@types/node@20.6.0)(sass@1.68.0) why-is-node-running: 2.2.2 transitivePeerDependencies: - less