Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vueComponent/ant-design-vue-nuxt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.1.0
Choose a base ref
...
head repository: vueComponent/ant-design-vue-nuxt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.1.1
Choose a head ref
  • 9 commits
  • 7 files changed
  • 1 contributor

Commits on Aug 22, 2023

  1. chore: fix conflict

    aibayanyu20 committed Aug 22, 2023
    Copy the full SHA
    2390912 View commit details
  2. chore: update changelog

    aibayanyu20 committed Aug 22, 2023
    Copy the full SHA
    877283b View commit details
  3. chore: fix conflict

    aibayanyu20 committed Aug 22, 2023
    Copy the full SHA
    a63e70a View commit details
  4. chore(release): v1.0.1

    aibayanyu20 committed Aug 22, 2023
    Copy the full SHA
    0874a44 View commit details
  5. chore: fix conflict

    aibayanyu20 committed Aug 22, 2023
    Copy the full SHA
    56ef500 View commit details
  6. chore(release): v1.1.0

    aibayanyu20 committed Aug 22, 2023
    Copy the full SHA
    733841a View commit details
  7. chore(release): v1.2.0

    aibayanyu20 committed Aug 22, 2023
    Copy the full SHA
    adbadd8 View commit details
  8. chore: change version

    aibayanyu20 committed Aug 22, 2023
    Copy the full SHA
    2f1cfa6 View commit details
  9. chore(release): v1.1.1

    aibayanyu20 committed Aug 22, 2023
    Copy the full SHA
    0f143b5 View commit details
Showing with 101 additions and 24 deletions.
  1. +4 −0 .gitignore
  2. +56 −1 CHANGELOG.md
  3. +3 −3 package.json
  4. +4 −4 pnpm-lock.yaml
  5. +5 −3 src/antdv.ts
  6. +28 −12 src/core/components.ts
  7. +1 −1 src/types.ts
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@ pids
*.pid
*.seed
*.pid.lock
.idea
.vscode

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
@@ -82,6 +84,8 @@ web_modules/
# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache
.idea
.vscode

# Next.js build output
.next
57 changes: 56 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## v1.1.1

[compare changes](https://undefined/undefined/compare/v1.2.0...v1.1.1)


### 🏡 Chore

- Change version (2f1cfa6)

### ❤️ Contributors

- Aibayanyu <aibayanyu@qq.com>

## v1.1.0

@@ -22,13 +34,56 @@
- 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 <aibayanyu@qq.com>
- Aibayanyu20 <aibayanyu@qq.com>
- Zev Zhu
- Zev Zhu

## v1.0.1

[compare changes](https://undefined/undefined/compare/v1.1.0...v1.0.1)


### 🏡 Chore

- Change version (a9b926f)

### ❤️ Contributors

- Aibayanyu <aibayanyu@qq.com>

## v1.0.0

[compare changes](https://undefined/undefined/compare/v1.0.0-alpha.1...v1.0.0)


### 🚀 Enhancements

- Support style-provider (2e7da59)

### 🏡 Chore

- Change readme (f52e16b)
- Change readme (1032a1e)
- Add license close #5 (#5)
- Resolve conflict (796f01d)
- Add online playground (703c8be)
- Change (8016cc8)


### ❤️ Contributors

- Aibayanyu <aibayanyu@qq.com>
- Aibayanyu20 <aibayanyu@qq.com>

## v1.0.0-alpha.1


6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
@@ -27,15 +27,15 @@
"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 --pacth --output CHANGELOG.md",
"lint": "eslint .",
"test": "vitest run",
"test:watch": "vitest watch"
},
"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",
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions src/antdv.ts
Original file line number Diff line number Diff line change
@@ -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'];
40 changes: 28 additions & 12 deletions src/core/components.ts
Original file line number Diff line number Diff line change
@@ -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
})
}
})
}
2 changes: 1 addition & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export type PresetImport = string
export type PresetImport = string | [string,string]


export interface Options {