fix: 🐛 fix conflicts

fix conflicts
zanedeng · Aug 11, 2023 · e0e4d3e · e0e4d3e
2 parents 536c636 + 6637295
commit e0e4d3e
Show file tree

Hide file tree

Showing 34 changed files with 924 additions and 2,615 deletions.
diff --git a/.changeset/clean-snakes-add.md b/.changeset/clean-snakes-add.md
diff --git a/.changeset/loud-deers-yell.md b/.changeset/loud-deers-yell.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,3 +7,36 @@ section: 'introduction'
 The Changelog gives an overview of the changes we've made to @zanejs
 
 <!-- CHANGELOG:INSERT -->
+
+## 04-08-2023
+
+**@zanejs/vue3** `v1.0.0`
+
+- 初始化
+
+**@zanejs/vue2** `v1.0.0`
+
+- 初始化
+
+**@zanejs/theme-chalk** `v1.0.0`
+
+- 初始化
+
+**@zanejs/react** `v1.0.0`
+
+- 初始化
+
+**@zanejs/mvc** `v0.1.0`
+
+- 加入一个 mvc 包
+
+**@zanejs/utils** `v1.0.0`
+
+- 加入一个 mvc 包
+- 初始化
+
+**@zanejs/constants** `v1.0.0`
+
+- 加入一个 mvc 包
+- 初始化
+
diff --git a/apps/docs/content/changelog.mdx b/apps/docs/content/changelog.mdx
@@ -5,3 +5,36 @@ section: 'introduction'
 ---
 
 The Changelog gives an overview of the changes we've made to @zanejs
+
+## 04-08-2023
+
+**@zanejs/vue3** `v1.0.0`
+
+- 初始化
+
+**@zanejs/vue2** `v1.0.0`
+
+- 初始化
+
+**@zanejs/theme-chalk** `v1.0.0`
+
+- 初始化
+
+**@zanejs/react** `v1.0.0`
+
+- 初始化
+
+**@zanejs/mvc** `v0.1.0`
+
+- 加入一个 mvc 包
+
+**@zanejs/utils** `v1.0.0`
+
+- 加入一个 mvc 包
+- 初始化
+
+**@zanejs/constants** `v1.0.0`
+
+- 加入一个 mvc 包
+- 初始化
+
diff --git a/internals/commitlint-config/CHANGELOG.md b/internals/commitlint-config/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @zanejs/commitlint-config
+
+## 1.0.0
+
+### Major Changes
+
+- [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993) - 初始化
diff --git a/internals/commitlint-config/package.json b/internals/commitlint-config/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/commitlint-config",
- "version": "0.0.0",
+ "version": "1.0.0",
  "private": true,
  "description": "🚀 The package offer commitlint for @zanejs!",
  "keywords": [

diff --git a/internals/eslint-config/CHANGELOG.md b/internals/eslint-config/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @zanejs/eslint-config
+
+## 1.0.0
+
+### Major Changes
+
+- [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993) - 初始化
diff --git a/internals/eslint-config/package.json b/internals/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/eslint-config",
- "version": "0.0.0",
+ "version": "1.0.0",
  "private": true,
  "description": "🚀 The package offer eslint for @zanejs!",
  "keywords": [
@@ -49,7 +49,7 @@
  "eslint-plugin-prettier": "^4.2.1",
  "eslint-plugin-vue": "^9.7.0",
  "jsonc-eslint-parser": "^2.1.0",
- "prettier": "^2.7.1",
+ "prettier": "^3.0.1",
  "yaml-eslint-parser": "^1.1.0"
  },
  "devDependencies": {

diff --git a/internals/lint-staged-config/CHANGELOG.md b/internals/lint-staged-config/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @zanejs/lint-staged-config
+
+## 1.0.0
+
+### Major Changes
+
+- [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993) - 初始化
diff --git a/internals/lint-staged-config/package.json b/internals/lint-staged-config/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/lint-staged-config",
- "version": "0.0.0",
+ "version": "1.0.0",
  "private": true,
  "description": "🚀 The package offer lint-staged for @zanejs!",
  "keywords": [

diff --git a/internals/prettier-config/CHANGELOG.md b/internals/prettier-config/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @zanejs/prettier-config
+
+## 1.0.0
+
+### Major Changes
+
+- [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993) - 初始化
diff --git a/internals/prettier-config/package.json b/internals/prettier-config/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/prettier-config",
- "version": "0.0.0",
+ "version": "1.0.0",
  "private": true,
  "description": "🚀 The package offer prettier for @zanejs!",
  "keywords": [
@@ -36,7 +36,7 @@
  "clean:deps": "rimraf node_modules"
  },
  "dependencies": {
- "prettier": "^2.7.1"
+ "prettier": "^3.0.1"
  },
  "engines": {
  "node": ">=16"

diff --git a/internals/simple-git-hooks-config/CHANGELOG.md b/internals/simple-git-hooks-config/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @zanejs/simple-git-hooks-config
+
+## 1.0.0
+
+### Major Changes
+
+- [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993) - 初始化
diff --git a/internals/simple-git-hooks-config/package.json b/internals/simple-git-hooks-config/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/simple-git-hooks-config",
- "version": "0.0.0",
+ "version": "1.0.0",
  "private": true,
  "description": "🚀 The package offer simple-git-hooks for @zanejs!",
  "keywords": [

diff --git a/internals/stylelint-config/CHANGELOG.md b/internals/stylelint-config/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @zanejs/stylelint-config
+
+## 1.0.0
+
+### Major Changes
+
+- [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993) - 初始化
diff --git a/internals/stylelint-config/package.json b/internals/stylelint-config/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/stylelint-config",
- "version": "0.0.0",
+ "version": "1.0.0",
  "private": true,
  "description": "🚀 The package offer stylelint for @zanejs!",
  "keywords": [

diff --git a/internals/ts-config/CHANGELOG.md b/internals/ts-config/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @zanejs/ts-config
+
+## 1.0.0
+
+### Major Changes
+
+- [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993) - 初始化
diff --git a/internals/ts-config/package.json b/internals/ts-config/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/ts-config",
- "version": "0.0.0",
+ "version": "1.0.0",
  "private": true,
  "description": "🚀 The package offer tsconfig for @zanejs!",
  "keywords": [

diff --git a/package.json b/package.json
@@ -77,7 +77,7 @@
  "@types/inquirer": "9.0.3",
  "@types/jsdom": "20.0.1",
  "@types/node": "*",
- "@types/prettier": "2.7.1",
+ "@types/prettier": "3.0.0",
  "@types/semver": "7.3.13",
  "@vitest/ui": "^0.25.1",
  "inquirer": "^9.1.4",

diff --git a/packages/constants/CHANGELOG.md b/packages/constants/CHANGELOG.md
@@ -1 +1,11 @@
 # @zanejs/constants
+
+## 1.0.0
+
+### Major Changes
+
+- [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993) - 初始化
+
+### Minor Changes
+
+- [`375e11e`](https://github.com/zanedeng/zanejs/commit/375e11e66cb3fa778e342c8696acb36d5762d2d4) - 加入一个 mvc 包
diff --git a/packages/constants/package.json b/packages/constants/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/constants",
- "version": "0.0.4",
+ "version": "1.0.0",
  "description": "🚀 The package offer constants for @zanejs!",
  "keywords": [
  "zanejs",

diff --git a/packages/mvc/CHANGELOG.md b/packages/mvc/CHANGELOG.md
@@ -0,0 +1,12 @@
+# @zanejs/mvc
+
+## 0.1.0
+
+### Minor Changes
+
+- [`375e11e`](https://github.com/zanedeng/zanejs/commit/375e11e66cb3fa778e342c8696acb36d5762d2d4) - 加入一个 mvc 包
+
+### Patch Changes
+
+- Updated dependencies [[`375e11e`](https://github.com/zanedeng/zanejs/commit/375e11e66cb3fa778e342c8696acb36d5762d2d4), [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993)]:
+ - @zanejs/constants@1.0.0
diff --git a/packages/mvc/package.json b/packages/mvc/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/mvc",
- "version": "0.0.1",
+ "version": "0.1.0",
  "description": "🚀 The package mvc for @zanejs!",
  "keywords": [
  "zanejs",

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -1 +1,14 @@
 # @zanejs/react
+
+## 1.0.0
+
+### Major Changes
+
+- [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993) - 初始化
+
+### Patch Changes
+
+- Updated dependencies [[`375e11e`](https://github.com/zanedeng/zanejs/commit/375e11e66cb3fa778e342c8696acb36d5762d2d4), [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993)]:
+ - @zanejs/constants@1.0.0
+ - @zanejs/utils@1.0.0
+ - @zanejs/theme-chalk@1.0.0
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/react",
- "version": "0.0.4",
+ "version": "1.0.0",
  "description": "🚀 The package offer react library for @zanejs!",
  "keywords": [
  "zanejs",

diff --git a/packages/theme-chalk/CHANGELOG.md b/packages/theme-chalk/CHANGELOG.md
@@ -1 +1,7 @@
 # @zanejs/theme-chalk
+
+## 1.0.0
+
+### Major Changes
+
+- [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993) - 初始化
diff --git a/packages/theme-chalk/package.json b/packages/theme-chalk/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/theme-chalk",
- "version": "0.0.4",
+ "version": "1.0.0",
  "description": "🚀 The package offer theme-chalk for @zanejs!",
  "type": "module",
  "keywords": [

diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
@@ -1 +1,16 @@
 # @zanejs/utils
+
+## 1.0.0
+
+### Major Changes
+
+- [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993) - 初始化
+
+### Minor Changes
+
+- [`375e11e`](https://github.com/zanedeng/zanejs/commit/375e11e66cb3fa778e342c8696acb36d5762d2d4) - 加入一个 mvc 包
+
+### Patch Changes
+
+- Updated dependencies [[`375e11e`](https://github.com/zanedeng/zanejs/commit/375e11e66cb3fa778e342c8696acb36d5762d2d4), [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993)]:
+ - @zanejs/constants@1.0.0
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/utils",
- "version": "0.0.4",
+ "version": "1.0.0",
  "description": "🚀 The package offer utils for @zanejs!",
  "keywords": [
  "zanejs",

diff --git a/packages/vue2/CHANGELOG.md b/packages/vue2/CHANGELOG.md
@@ -1 +1,14 @@
 # @zanejs/vue2
+
+## 1.0.0
+
+### Major Changes
+
+- [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993) - 初始化
+
+### Patch Changes
+
+- Updated dependencies [[`375e11e`](https://github.com/zanedeng/zanejs/commit/375e11e66cb3fa778e342c8696acb36d5762d2d4), [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993)]:
+ - @zanejs/constants@1.0.0
+ - @zanejs/utils@1.0.0
+ - @zanejs/theme-chalk@1.0.0
diff --git a/packages/vue2/package.json b/packages/vue2/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/vue2",
- "version": "0.0.4",
+ "version": "1.0.0",
  "description": "🚀 The package offer vue2 library for @zanejs!",
  "keywords": [
  "zanejs",

diff --git a/packages/vue3/CHANGELOG.md b/packages/vue3/CHANGELOG.md
@@ -1 +1,14 @@
 # @zanejs/vue3
+
+## 1.0.0
+
+### Major Changes
+
+- [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993) - 初始化
+
+### Patch Changes
+
+- Updated dependencies [[`375e11e`](https://github.com/zanedeng/zanejs/commit/375e11e66cb3fa778e342c8696acb36d5762d2d4), [`ba51da4`](https://github.com/zanedeng/zanejs/commit/ba51da4f8e487efac887e2236b60112e38ba8993)]:
+ - @zanejs/constants@1.0.0
+ - @zanejs/utils@1.0.0
+ - @zanejs/theme-chalk@1.0.0
diff --git a/packages/vue3/package.json b/packages/vue3/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zanejs/vue3",
- "version": "0.0.4",
+ "version": "1.0.0",
  "description": "🚀 The package offer vue3 library for @zanejs!",
  "keywords": [
  "zanejs",