From 2390912ea7b4b7f4fa72b947b7f16c6431f5a581 Mon Sep 17 00:00:00 2001 From: aibayanyu Date: Tue, 22 Aug 2023 23:41:00 +0800 Subject: [PATCH 1/9] chore: fix conflict --- .gitignore | 2 ++ package.json | 2 +- pnpm-lock.yaml | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 899747f..3abe41f 100644 --- a/.gitignore +++ b/.gitignore @@ -82,6 +82,8 @@ web_modules/ # parcel-bundler cache (https://parceljs.org/) .cache .parcel-cache +.idea +.vscode # Next.js build output .next diff --git a/package.json b/package.json index 70bdb9a..52ab2bc 100644 --- a/package.json +++ b/package.json @@ -48,4 +48,4 @@ "nuxt": "^3.5.1", "vitest": "^0.31.1" } -} \ No newline at end of file +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 93b81fe..94ac6b2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,7 +13,7 @@ dependencies: version: 3.5.2(rollup@3.23.0) ant-design-vue: specifier: ^4.0.0 - version: 4.0.0(vue@3.3.4) + version: 4.0.1(vue@3.3.4) devDependencies: '@nuxt/eslint-config': @@ -1626,8 +1626,8 @@ packages: engines: {node: '>=10'} dev: true - /ant-design-vue@4.0.0(vue@3.3.4): - resolution: {integrity: sha512-6V8DxHPv3HJYDdv48W/KFOUjeZDsYJhFlk13HFSKCJSR2MQs4YnPIAC+rWie9vYcVEKbO+cQDqiOM3cBoHMNUQ==} + /ant-design-vue@4.0.1(vue@3.3.4): + resolution: {integrity: sha512-/gZEB/e6166hlqaYfSAJLgzr6zAPuVimITYx+OaifMaHYcxKOvbISEFTsDnn7qRshVYHFyUL2HIyN9sSrWDP3w==} engines: {node: '>=12.22.0'} peerDependencies: vue: '>=3.2.0' From 877283b1d40c445cff6e732d70c556364c0b32ae Mon Sep 17 00:00:00 2001 From: aibayanyu Date: Tue, 22 Aug 2023 23:41:43 +0800 Subject: [PATCH 2/9] chore: update changelog --- CHANGELOG.md | 8 ++------ package.json | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 514c06b..74fbf8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,10 +10,6 @@ - Support style-provider (2e7da59) -### 🩹 Fixes - - - Change dependencies (02efbad) - ### 🏡 Chore - Change readme (f52e16b) @@ -23,11 +19,11 @@ - Add online playground (703c8be) - Change (8016cc8) + ### ❤️ Contributors -- Aibayanyu20 -- Zev Zhu - Aibayanyu +- Aibayanyu20 ## v1.0.0-alpha.1 diff --git a/package.json b/package.json index 52ab2bc..70bdb9a 100644 --- a/package.json +++ b/package.json @@ -48,4 +48,4 @@ "nuxt": "^3.5.1", "vitest": "^0.31.1" } -} +} \ No newline at end of file From a63e70acbff80a18856c5c2c2830b2325fc64937 Mon Sep 17 00:00:00 2001 From: aibayanyu Date: Tue, 22 Aug 2023 23:43:11 +0800 Subject: [PATCH 3/9] chore: fix conflict --- CHANGELOG.md | 4 ++-- package.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74fbf8a..3221015 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ # Changelog -## v1.1.0 +## v1.0.0 -[compare changes](https://undefined/undefined/compare/v1.0.0-alpha.1...v1.1.0) +[compare changes](https://undefined/undefined/compare/v1.0.0-alpha.1...v1.0.0) ### 🚀 Enhancements diff --git a/package.json b/package.json index 70bdb9a..9bdc596 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ant-design-vue/nuxt", - "version": "1.1.0", + "version": "1.0.0", "description": "ant-design-vue-nuxt module", "repository": "vueComponent/ant-design-vue-nuxt", "license": "MIT", @@ -27,7 +27,7 @@ "dev:prepare": "nuxt-module-build --stub && nuxi prepare playground", "release": "npm run lint && npm run test && npm run prepack && changelogen --release && npm publish && git push --follow-tags", "build": "npm run lint && npm run test && npm run prepack", - "changelog": "changelogen --release --prerelease --output CHANGELOG.md", + "changelog": "changelogen --release --output CHANGELOG.md", "lint": "eslint .", "test": "vitest run", "test:watch": "vitest watch" @@ -48,4 +48,4 @@ "nuxt": "^3.5.1", "vitest": "^0.31.1" } -} \ No newline at end of file +} From 0874a445fa8a541d5790bb7dee725e069f53d924 Mon Sep 17 00:00:00 2001 From: aibayanyu Date: Sat, 15 Jul 2023 11:15:57 +0800 Subject: [PATCH 4/9] chore(release): v1.0.1 --- CHANGELOG.md | 13 +++++++++++++ package.json | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3221015..93a95bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,19 @@ # Changelog +## v1.0.1 + +[compare changes](https://undefined/undefined/compare/v1.1.0...v1.0.1) + + +### 🏡 Chore + + - Change version (a9b926f) + +### ❤️ Contributors + +- Aibayanyu + ## v1.0.0 [compare changes](https://undefined/undefined/compare/v1.0.0-alpha.1...v1.0.0) diff --git a/package.json b/package.json index 9bdc596..c35b653 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ant-design-vue/nuxt", - "version": "1.0.0", + "version": "1.0.1", "description": "ant-design-vue-nuxt module", "repository": "vueComponent/ant-design-vue-nuxt", "license": "MIT", @@ -48,4 +48,4 @@ "nuxt": "^3.5.1", "vitest": "^0.31.1" } -} +} \ No newline at end of file From 56ef5001991e37a5bbfbcfe057c484f06b5b4ae3 Mon Sep 17 00:00:00 2001 From: aibayanyu Date: Tue, 22 Aug 2023 23:44:35 +0800 Subject: [PATCH 5/9] chore: fix conflict --- .gitignore | 2 ++ package.json | 4 ++-- pnpm-lock.yaml | 2 +- src/antdv.ts | 8 +++++--- src/core/components.ts | 40 ++++++++++++++++++++++++++++------------ src/types.ts | 2 +- 6 files changed, 39 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 3abe41f..4ab458b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,8 @@ pids *.pid *.seed *.pid.lock +.idea +.vscode # Directory for instrumented libs generated by jscoverage/JSCover lib-cov diff --git a/package.json b/package.json index c35b653..db37153 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "dependencies": { "@nuxt/kit": "^3.5.2", "@ant-design/icons-vue": "^6.1.0", - "ant-design-vue": "^4.0.0" + "ant-design-vue": "^4.0.1" }, "devDependencies": { "@nuxt/eslint-config": "^0.1.1", @@ -48,4 +48,4 @@ "nuxt": "^3.5.1", "vitest": "^0.31.1" } -} \ No newline at end of file +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 94ac6b2..7098013 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,7 +12,7 @@ dependencies: specifier: ^3.5.2 version: 3.5.2(rollup@3.23.0) ant-design-vue: - specifier: ^4.0.0 + specifier: ^4.0.1 version: 4.0.1(vue@3.3.4) devDependencies: diff --git a/src/antdv.ts b/src/antdv.ts index 95ea9ae..86959c6 100644 --- a/src/antdv.ts +++ b/src/antdv.ts @@ -1,4 +1,5 @@ -export const allComponents = [ +export const allComponents:(string | [string,string])[] = [ + 'App', 'Affix', 'Alert', 'Anchor', @@ -30,6 +31,7 @@ export const allComponents = [ 'CollapsePanel', 'Comment', 'ConfigProvider', + ['Compact','SpaceCompact'], 'DatePicker', 'Descriptions', 'DescriptionsItem', @@ -74,7 +76,7 @@ export const allComponents = [ 'Popconfirm', 'Popover', 'Progress', - 'QRCode', + ['QRCode','Qrcode'], 'QuarterPicker', 'Radio', 'RadioButton', @@ -136,4 +138,4 @@ export const allComponents = [ ] -export const allImports = ['message','notification','Modal']; +export const allImports = ['message','notification','Modal','App']; diff --git a/src/core/components.ts b/src/core/components.ts index e60351c..b93e454 100644 --- a/src/core/components.ts +++ b/src/core/components.ts @@ -3,22 +3,38 @@ import { iconLibraryName, libraryName, prefix } from "../config" import { addComponent } from "@nuxt/kit"; export const resolveComponents = (config:Options) =>{ - const { components, icons } = config; + const { components,icons } = config; const allComponents = components === false ? [] : components; - allComponents.forEach(component => { - addComponent({ - export: component, - name: prefix + component, - filePath: libraryName + '/es' - }) + allComponents.forEach(component=>{ + if (typeof component === 'string'){ + addComponent({ + export: component, + name: prefix + component, + filePath: libraryName + '/es' + }) + }else if (Array.isArray(component)){ + addComponent({ + export: component[0], + name: prefix + component[1], + filePath: libraryName + '/es' + }) + } }) const allIcons = icons === false ? [] : icons; allIcons.forEach(icon=>{ - addComponent({ - export: icon, - name: icon, - filePath: iconLibraryName - }) + if (typeof icon === 'string'){ + addComponent({ + export: icon, + name: icon, + filePath: iconLibraryName + }) + }else if (Array.isArray(icon)){ + addComponent({ + export: icon[0], + name: icon[1], + filePath: iconLibraryName + }) + } }) } diff --git a/src/types.ts b/src/types.ts index edd34a6..a6eea6c 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,4 +1,4 @@ -export type PresetImport = string +export type PresetImport = string | [string,string] export interface Options { From 733841ada67e1115f2c9b3aee372ff1ea24287de Mon Sep 17 00:00:00 2001 From: aibayanyu Date: Tue, 22 Aug 2023 23:45:27 +0800 Subject: [PATCH 6/9] chore(release): v1.1.0 --- CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++ package.json | 4 ++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93a95bd..38736bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,40 @@ # Changelog +## v1.1.0 + +[compare changes](https://undefined/undefined/compare/v1.0.0-alpha.1...v1.1.0) + + +### 🚀 Enhancements + + - Support style-provider (2e7da59) + +### 🩹 Fixes + + - Change dependencies (02efbad) + +### 🏡 Chore + + - Change readme (f52e16b) + - Change readme (1032a1e) + - Add license close #5 (#5) + - Resolve conflict (796f01d) + - Add online playground (703c8be) + - Change (8016cc8) + - **release:** V1.1.0 (9dadc07) + - Fix conflict (2390912) + - Update changelog (877283b) + - Fix conflict (a63e70a) + - **release:** V1.0.1 (0874a44) + - Fix conflict (56ef500) + +### ❤️ Contributors + +- Aibayanyu +- Aibayanyu20 +- Zev Zhu + ## v1.0.1 [compare changes](https://undefined/undefined/compare/v1.1.0...v1.0.1) diff --git a/package.json b/package.json index db37153..c32cc39 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ant-design-vue/nuxt", - "version": "1.0.1", + "version": "1.1.0", "description": "ant-design-vue-nuxt module", "repository": "vueComponent/ant-design-vue-nuxt", "license": "MIT", @@ -48,4 +48,4 @@ "nuxt": "^3.5.1", "vitest": "^0.31.1" } -} +} \ No newline at end of file From adbadd85f99ad94e40664f425f15adc37626cf8f Mon Sep 17 00:00:00 2001 From: aibayanyu Date: Tue, 22 Aug 2023 23:45:35 +0800 Subject: [PATCH 7/9] chore(release): v1.2.0 --- CHANGELOG.md | 35 +++++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38736bf..d37c44d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,41 @@ # Changelog +## v1.2.0 + +[compare changes](https://undefined/undefined/compare/v1.0.0-alpha.1...v1.2.0) + + +### 🚀 Enhancements + + - Support style-provider (2e7da59) + +### 🩹 Fixes + + - Change dependencies (02efbad) + +### 🏡 Chore + + - Change readme (f52e16b) + - Change readme (1032a1e) + - Add license close #5 (#5) + - Resolve conflict (796f01d) + - Add online playground (703c8be) + - Change (8016cc8) + - **release:** V1.1.0 (9dadc07) + - Fix conflict (2390912) + - Update changelog (877283b) + - Fix conflict (a63e70a) + - **release:** V1.0.1 (0874a44) + - Fix conflict (56ef500) + - **release:** V1.1.0 (733841a) + +### ❤️ Contributors + +- Aibayanyu +- Aibayanyu20 +- Zev Zhu + ## v1.1.0 [compare changes](https://undefined/undefined/compare/v1.0.0-alpha.1...v1.1.0) diff --git a/package.json b/package.json index c32cc39..2f0cdc3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ant-design-vue/nuxt", - "version": "1.1.0", + "version": "1.2.0", "description": "ant-design-vue-nuxt module", "repository": "vueComponent/ant-design-vue-nuxt", "license": "MIT", From 2f1cfa68bc706cc4591d52abb7a61eb35b557fe3 Mon Sep 17 00:00:00 2001 From: aibayanyu Date: Tue, 22 Aug 2023 23:47:38 +0800 Subject: [PATCH 8/9] chore: change version --- CHANGELOG.md | 36 ------------------------------------ package.json | 6 +++--- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d37c44d..c6d9f42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,41 +1,5 @@ # Changelog - -## v1.2.0 - -[compare changes](https://undefined/undefined/compare/v1.0.0-alpha.1...v1.2.0) - - -### 🚀 Enhancements - - - Support style-provider (2e7da59) - -### 🩹 Fixes - - - Change dependencies (02efbad) - -### 🏡 Chore - - - Change readme (f52e16b) - - Change readme (1032a1e) - - Add license close #5 (#5) - - Resolve conflict (796f01d) - - Add online playground (703c8be) - - Change (8016cc8) - - **release:** V1.1.0 (9dadc07) - - Fix conflict (2390912) - - Update changelog (877283b) - - Fix conflict (a63e70a) - - **release:** V1.0.1 (0874a44) - - Fix conflict (56ef500) - - **release:** V1.1.0 (733841a) - -### ❤️ Contributors - -- Aibayanyu -- Aibayanyu20 -- Zev Zhu - ## v1.1.0 [compare changes](https://undefined/undefined/compare/v1.0.0-alpha.1...v1.1.0) diff --git a/package.json b/package.json index 2f0cdc3..63b64e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ant-design-vue/nuxt", - "version": "1.2.0", + "version": "1.1.0", "description": "ant-design-vue-nuxt module", "repository": "vueComponent/ant-design-vue-nuxt", "license": "MIT", @@ -27,7 +27,7 @@ "dev:prepare": "nuxt-module-build --stub && nuxi prepare playground", "release": "npm run lint && npm run test && npm run prepack && changelogen --release && npm publish && git push --follow-tags", "build": "npm run lint && npm run test && npm run prepack", - "changelog": "changelogen --release --output CHANGELOG.md", + "changelog": "changelogen --release --pacth --output CHANGELOG.md", "lint": "eslint .", "test": "vitest run", "test:watch": "vitest watch" @@ -48,4 +48,4 @@ "nuxt": "^3.5.1", "vitest": "^0.31.1" } -} \ No newline at end of file +} From 0f143b5eb18dcfacec440de649d6d334a3261de9 Mon Sep 17 00:00:00 2001 From: aibayanyu Date: Tue, 22 Aug 2023 23:48:07 +0800 Subject: [PATCH 9/9] chore(release): v1.1.1 --- CHANGELOG.md | 13 +++++++++++++ package.json | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6d9f42..0ab2369 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## v1.1.1 + +[compare changes](https://undefined/undefined/compare/v1.2.0...v1.1.1) + + +### 🏡 Chore + + - Change version (2f1cfa6) + +### ❤️ Contributors + +- Aibayanyu + ## v1.1.0 [compare changes](https://undefined/undefined/compare/v1.0.0-alpha.1...v1.1.0) diff --git a/package.json b/package.json index 63b64e8..682b75e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ant-design-vue/nuxt", - "version": "1.1.0", + "version": "1.1.1", "description": "ant-design-vue-nuxt module", "repository": "vueComponent/ant-design-vue-nuxt", "license": "MIT", @@ -48,4 +48,4 @@ "nuxt": "^3.5.1", "vitest": "^0.31.1" } -} +} \ No newline at end of file