From e265d3017e5bedd5e72eac760da4563c37451467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E7=BA=B8=E5=BF=98=E5=BF=A7?= Date: Sat, 15 Jul 2023 13:10:01 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8F=96=E6=B6=88=20monorepo=20?= =?UTF-8?q?=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.eslintrc.json => .eslintrc.json | 0 .gitignore | 1 + README.md | 2 +- packages/kms-tools/index.html => index.html | 0 package.json | 38 ++++++- packages/kms-tools/.gitignore | 5 - packages/kms-tools/package.json | 46 -------- pnpm-lock.yaml | 101 +++++++++++++++++- pnpm-workspace.yaml | 3 - {packages/kms-tools/src => src}/App.vue | 0 .../src => src}/assets/fonts/moonbridge.woff | Bin .../src => src}/assets/gvlks/office.ts | 0 .../assets/gvlks/windows-server.ts | 0 .../src => src}/assets/gvlks/windows.ts | 0 .../src => src}/assets/icons/favicon.ico | Bin .../src => src}/assets/icons/logo.svg | 0 .../src => src}/assets/images/preview.png | Bin .../src => src}/assets/images/readme-logo.svg | 0 .../src => src}/components/custom-footer.vue | 0 .../src => src}/components/custom-header.vue | 0 .../src => src}/composables/useScript.ts | 0 .../kms-tools/src => src}/locales/en-us.json | 0 .../kms-tools/src => src}/locales/zh-cn.json | 0 {packages/kms-tools/src => src}/main.ts | 0 .../kms-tools/src => src}/router/index.ts | 0 {packages/kms-tools/src => src}/store/app.ts | 0 .../kms-tools/src => src}/styles/style.css | 0 .../typings/auto-import.eslintrc.json | 0 .../src => src}/typings/auto-imports.d.ts | 1 + .../src => src}/typings/components.d.ts | 0 .../kms-tools/src => src}/typings/shims.d.ts | 0 .../src => src}/typings/typed-router.d.ts | 0 .../kms-tools/src => src}/views/activate.vue | 0 .../src => src}/views/activate/office.vue | 0 .../views/activate/windows-server.vue | 0 .../src => src}/views/activate/windows.vue | 0 .../kms-tools/src => src}/views/check.vue | 0 .../src => src}/views/download/index.vue | 0 .../src => src}/views/guide/index.vue | 0 .../kms-tools/src => src}/views/index.vue | 2 +- .../src => src}/views/monitor/index.vue | 0 .../kms-tools/tsconfig.json => tsconfig.json | 0 .../kms-tools/uno.config.ts => uno.config.ts | 0 packages/kms-tools/vercel.json => vercel.json | 0 .../vite.config.ts => vite.config.ts | 0 45 files changed, 135 insertions(+), 64 deletions(-) rename packages/kms-tools/.eslintrc.json => .eslintrc.json (100%) rename packages/kms-tools/index.html => index.html (100%) delete mode 100644 packages/kms-tools/.gitignore delete mode 100644 packages/kms-tools/package.json delete mode 100644 pnpm-workspace.yaml rename {packages/kms-tools/src => src}/App.vue (100%) rename {packages/kms-tools/src => src}/assets/fonts/moonbridge.woff (100%) rename {packages/kms-tools/src => src}/assets/gvlks/office.ts (100%) rename {packages/kms-tools/src => src}/assets/gvlks/windows-server.ts (100%) rename {packages/kms-tools/src => src}/assets/gvlks/windows.ts (100%) rename {packages/kms-tools/src => src}/assets/icons/favicon.ico (100%) rename {packages/kms-tools/src => src}/assets/icons/logo.svg (100%) rename {packages/kms-tools/src => src}/assets/images/preview.png (100%) rename {packages/kms-tools/src => src}/assets/images/readme-logo.svg (100%) rename {packages/kms-tools/src => src}/components/custom-footer.vue (100%) rename {packages/kms-tools/src => src}/components/custom-header.vue (100%) rename {packages/kms-tools/src => src}/composables/useScript.ts (100%) rename {packages/kms-tools/src => src}/locales/en-us.json (100%) rename {packages/kms-tools/src => src}/locales/zh-cn.json (100%) rename {packages/kms-tools/src => src}/main.ts (100%) rename {packages/kms-tools/src => src}/router/index.ts (100%) rename {packages/kms-tools/src => src}/store/app.ts (100%) rename {packages/kms-tools/src => src}/styles/style.css (100%) rename {packages/kms-tools/src => src}/typings/auto-import.eslintrc.json (100%) rename {packages/kms-tools/src => src}/typings/auto-imports.d.ts (99%) rename {packages/kms-tools/src => src}/typings/components.d.ts (100%) rename {packages/kms-tools/src => src}/typings/shims.d.ts (100%) rename {packages/kms-tools/src => src}/typings/typed-router.d.ts (100%) rename {packages/kms-tools/src => src}/views/activate.vue (100%) rename {packages/kms-tools/src => src}/views/activate/office.vue (100%) rename {packages/kms-tools/src => src}/views/activate/windows-server.vue (100%) rename {packages/kms-tools/src => src}/views/activate/windows.vue (100%) rename {packages/kms-tools/src => src}/views/check.vue (100%) rename {packages/kms-tools/src => src}/views/download/index.vue (100%) rename {packages/kms-tools/src => src}/views/guide/index.vue (100%) rename {packages/kms-tools/src => src}/views/index.vue (94%) rename {packages/kms-tools/src => src}/views/monitor/index.vue (100%) rename packages/kms-tools/tsconfig.json => tsconfig.json (100%) rename packages/kms-tools/uno.config.ts => uno.config.ts (100%) rename packages/kms-tools/vercel.json => vercel.json (100%) rename packages/kms-tools/vite.config.ts => vite.config.ts (100%) diff --git a/packages/kms-tools/.eslintrc.json b/.eslintrc.json similarity index 100% rename from packages/kms-tools/.eslintrc.json rename to .eslintrc.json diff --git a/.gitignore b/.gitignore index cc9ebc1c..d9b1678a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.vscode .idea .DS_Store node_modules diff --git a/README.md b/README.md index 592f7e29..90845b44 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

+

diff --git a/packages/kms-tools/index.html b/index.html similarity index 100% rename from packages/kms-tools/index.html rename to index.html diff --git a/package.json b/package.json index f0fc4988..7534282b 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,42 @@ "author": "一纸忘忧 ", "type": "module", "scripts": { - "dev": "pnpm --filter kms-tools run dev", - "build": "pnpm --filter kms-tools run build" + "dev": "vite", + "build": "vue-tsc && vite build" + }, + "dependencies": { + "@arco-design/web-vue": "^2.48.1", + "@arco-themes/vue-ant-design": "^0.0.1", + "@iconify-json/flag": "^1.1.32", + "@iconify-json/ic": "^1.1.13", + "@iconify-json/mdi": "^1.1.53", + "@vueuse/core": "^10.2.1", + "dayjs": "^1.11.9", + "less": "^4.1.3", + "markdown-it-shiki": "^0.9.0", + "pinia": "^2.1.4", + "unocss": "^0.53.5", + "vue": "^3.3.4", + "vue-i18n": "^9.2.2", + "vue-router": "^4.2.4" }, "devDependencies": { - "prettier": "^2.8.8" + "@intlify/unplugin-vue-i18n": "^0.11.0", + "@types/node": "^20.4.2", + "@typescript-eslint/eslint-plugin": "^6.0.0", + "@typescript-eslint/parser": "^6.0.0", + "@vitejs/plugin-vue": "^4.2.3", + "eslint": "^8.44.0", + "eslint-config-prettier": "^8.8.0", + "eslint-plugin-vue": "^9.15.1", + "prettier": "^3.0.0", + "typescript": "^5.1.6", + "unplugin-auto-import": "^0.16.6", + "unplugin-vue-components": "^0.25.1", + "unplugin-vue-router": "^0.6.4", + "vite": "^4.4.4", + "vite-plugin-vue-markdown": "^0.23.5", + "vue-eslint-parser": "^9.3.1", + "vue-tsc": "^1.8.4" } } diff --git a/packages/kms-tools/.gitignore b/packages/kms-tools/.gitignore deleted file mode 100644 index d9b1678a..00000000 --- a/packages/kms-tools/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.vscode -.idea -.DS_Store -node_modules -dist diff --git a/packages/kms-tools/package.json b/packages/kms-tools/package.json deleted file mode 100644 index 046c0394..00000000 --- a/packages/kms-tools/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "kms-tools", - "private": true, - "version": "1.2.0", - "description": "一个用于生成kms激活脚本的小工具", - "author": "一纸忘忧 ", - "type": "module", - "scripts": { - "dev": "vite", - "build": "vue-tsc && vite build" - }, - "dependencies": { - "@arco-design/web-vue": "^2.48.1", - "@arco-themes/vue-ant-design": "^0.0.1", - "@iconify-json/flag": "^1.1.32", - "@iconify-json/ic": "^1.1.13", - "@iconify-json/mdi": "^1.1.53", - "@vueuse/core": "^10.2.1", - "dayjs": "^1.11.9", - "less": "^4.1.3", - "markdown-it-shiki": "^0.9.0", - "pinia": "^2.1.4", - "unocss": "^0.53.5", - "vue": "^3.3.4", - "vue-i18n": "^9.2.2", - "vue-router": "^4.2.4" - }, - "devDependencies": { - "@intlify/unplugin-vue-i18n": "^0.11.0", - "@types/node": "^20.4.2", - "@typescript-eslint/eslint-plugin": "^6.0.0", - "@typescript-eslint/parser": "^6.0.0", - "@vitejs/plugin-vue": "^4.2.3", - "eslint": "^8.44.0", - "eslint-config-prettier": "^8.8.0", - "eslint-plugin-vue": "^9.15.1", - "typescript": "^5.1.6", - "unplugin-auto-import": "^0.16.6", - "unplugin-vue-components": "^0.25.1", - "unplugin-vue-router": "^0.6.4", - "vite": "^4.4.4", - "vite-plugin-vue-markdown": "^0.23.5", - "vue-eslint-parser": "^9.3.1", - "vue-tsc": "^1.8.4" - } -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0f30238c..07d4a84e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,10 +7,101 @@ settings: importers: .: + dependencies: + '@arco-design/web-vue': + specifier: ^2.48.1 + version: 2.48.1(vue@3.3.4) + '@arco-themes/vue-ant-design': + specifier: ^0.0.1 + version: 0.0.1(@arco-design/web-vue@2.48.1) + '@iconify-json/flag': + specifier: ^1.1.32 + version: 1.1.32 + '@iconify-json/ic': + specifier: ^1.1.13 + version: 1.1.13 + '@iconify-json/mdi': + specifier: ^1.1.53 + version: 1.1.53 + '@vueuse/core': + specifier: ^10.2.1 + version: 10.2.1(vue@3.3.4) + dayjs: + specifier: ^1.11.9 + version: 1.11.9 + less: + specifier: ^4.1.3 + version: 4.1.3 + markdown-it-shiki: + specifier: ^0.9.0 + version: 0.9.0 + pinia: + specifier: ^2.1.4 + version: 2.1.4(typescript@5.1.6)(vue@3.3.4) + unocss: + specifier: ^0.53.5 + version: 0.53.5(postcss@8.4.26)(vite@4.4.4) + vue: + specifier: ^3.3.4 + version: 3.3.4 + vue-i18n: + specifier: ^9.2.2 + version: 9.2.2(vue@3.3.4) + vue-router: + specifier: ^4.2.4 + version: 4.2.4(vue@3.3.4) devDependencies: + '@intlify/unplugin-vue-i18n': + specifier: ^0.11.0 + version: 0.11.0(vue-i18n@9.2.2) + '@types/node': + specifier: ^20.4.2 + version: 20.4.2 + '@typescript-eslint/eslint-plugin': + specifier: ^6.0.0 + version: 6.0.0(@typescript-eslint/parser@6.0.0)(eslint@8.44.0)(typescript@5.1.6) + '@typescript-eslint/parser': + specifier: ^6.0.0 + version: 6.0.0(eslint@8.44.0)(typescript@5.1.6) + '@vitejs/plugin-vue': + specifier: ^4.2.3 + version: 4.2.3(vite@4.4.4)(vue@3.3.4) + eslint: + specifier: ^8.44.0 + version: 8.44.0 + eslint-config-prettier: + specifier: ^8.8.0 + version: 8.8.0(eslint@8.44.0) + eslint-plugin-vue: + specifier: ^9.15.1 + version: 9.15.1(eslint@8.44.0) prettier: - specifier: ^2.8.8 - version: 2.8.8 + specifier: ^3.0.0 + version: 3.0.0 + typescript: + specifier: ^5.1.6 + version: 5.1.6 + unplugin-auto-import: + specifier: ^0.16.6 + version: 0.16.6(@vueuse/core@10.2.1) + unplugin-vue-components: + specifier: ^0.25.1 + version: 0.25.1(vue@3.3.4) + unplugin-vue-router: + specifier: ^0.6.4 + version: 0.6.4(vue-router@4.2.4)(vue@3.3.4) + vite: + specifier: ^4.4.4 + version: 4.4.4(@types/node@20.4.2)(less@4.1.3) + vite-plugin-vue-markdown: + specifier: ^0.23.5 + version: 0.23.5(vite@4.4.4) + vue-eslint-parser: + specifier: ^9.3.1 + version: 9.3.1(eslint@8.44.0) + vue-tsc: + specifier: ^1.8.4 + version: 1.8.4(typescript@5.1.6) packages/kms-check: devDependencies: @@ -2833,9 +2924,9 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier@2.8.8: - resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} - engines: {node: '>=10.13.0'} + /prettier@3.0.0: + resolution: {integrity: sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==} + engines: {node: '>=14'} hasBin: true dev: true diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml deleted file mode 100644 index 5f4698c9..00000000 --- a/pnpm-workspace.yaml +++ /dev/null @@ -1,3 +0,0 @@ -packages: - - 'packages/kms-tools' - - 'packages/kms-check' diff --git a/packages/kms-tools/src/App.vue b/src/App.vue similarity index 100% rename from packages/kms-tools/src/App.vue rename to src/App.vue diff --git a/packages/kms-tools/src/assets/fonts/moonbridge.woff b/src/assets/fonts/moonbridge.woff similarity index 100% rename from packages/kms-tools/src/assets/fonts/moonbridge.woff rename to src/assets/fonts/moonbridge.woff diff --git a/packages/kms-tools/src/assets/gvlks/office.ts b/src/assets/gvlks/office.ts similarity index 100% rename from packages/kms-tools/src/assets/gvlks/office.ts rename to src/assets/gvlks/office.ts diff --git a/packages/kms-tools/src/assets/gvlks/windows-server.ts b/src/assets/gvlks/windows-server.ts similarity index 100% rename from packages/kms-tools/src/assets/gvlks/windows-server.ts rename to src/assets/gvlks/windows-server.ts diff --git a/packages/kms-tools/src/assets/gvlks/windows.ts b/src/assets/gvlks/windows.ts similarity index 100% rename from packages/kms-tools/src/assets/gvlks/windows.ts rename to src/assets/gvlks/windows.ts diff --git a/packages/kms-tools/src/assets/icons/favicon.ico b/src/assets/icons/favicon.ico similarity index 100% rename from packages/kms-tools/src/assets/icons/favicon.ico rename to src/assets/icons/favicon.ico diff --git a/packages/kms-tools/src/assets/icons/logo.svg b/src/assets/icons/logo.svg similarity index 100% rename from packages/kms-tools/src/assets/icons/logo.svg rename to src/assets/icons/logo.svg diff --git a/packages/kms-tools/src/assets/images/preview.png b/src/assets/images/preview.png similarity index 100% rename from packages/kms-tools/src/assets/images/preview.png rename to src/assets/images/preview.png diff --git a/packages/kms-tools/src/assets/images/readme-logo.svg b/src/assets/images/readme-logo.svg similarity index 100% rename from packages/kms-tools/src/assets/images/readme-logo.svg rename to src/assets/images/readme-logo.svg diff --git a/packages/kms-tools/src/components/custom-footer.vue b/src/components/custom-footer.vue similarity index 100% rename from packages/kms-tools/src/components/custom-footer.vue rename to src/components/custom-footer.vue diff --git a/packages/kms-tools/src/components/custom-header.vue b/src/components/custom-header.vue similarity index 100% rename from packages/kms-tools/src/components/custom-header.vue rename to src/components/custom-header.vue diff --git a/packages/kms-tools/src/composables/useScript.ts b/src/composables/useScript.ts similarity index 100% rename from packages/kms-tools/src/composables/useScript.ts rename to src/composables/useScript.ts diff --git a/packages/kms-tools/src/locales/en-us.json b/src/locales/en-us.json similarity index 100% rename from packages/kms-tools/src/locales/en-us.json rename to src/locales/en-us.json diff --git a/packages/kms-tools/src/locales/zh-cn.json b/src/locales/zh-cn.json similarity index 100% rename from packages/kms-tools/src/locales/zh-cn.json rename to src/locales/zh-cn.json diff --git a/packages/kms-tools/src/main.ts b/src/main.ts similarity index 100% rename from packages/kms-tools/src/main.ts rename to src/main.ts diff --git a/packages/kms-tools/src/router/index.ts b/src/router/index.ts similarity index 100% rename from packages/kms-tools/src/router/index.ts rename to src/router/index.ts diff --git a/packages/kms-tools/src/store/app.ts b/src/store/app.ts similarity index 100% rename from packages/kms-tools/src/store/app.ts rename to src/store/app.ts diff --git a/packages/kms-tools/src/styles/style.css b/src/styles/style.css similarity index 100% rename from packages/kms-tools/src/styles/style.css rename to src/styles/style.css diff --git a/packages/kms-tools/src/typings/auto-import.eslintrc.json b/src/typings/auto-import.eslintrc.json similarity index 100% rename from packages/kms-tools/src/typings/auto-import.eslintrc.json rename to src/typings/auto-import.eslintrc.json diff --git a/packages/kms-tools/src/typings/auto-imports.d.ts b/src/typings/auto-imports.d.ts similarity index 99% rename from packages/kms-tools/src/typings/auto-imports.d.ts rename to src/typings/auto-imports.d.ts index 87cf7f27..e97ec29c 100644 --- a/packages/kms-tools/src/typings/auto-imports.d.ts +++ b/src/typings/auto-imports.d.ts @@ -1,6 +1,7 @@ /* eslint-disable */ /* prettier-ignore */ // @ts-nocheck +// noinspection JSUnusedGlobalSymbols // Generated by unplugin-auto-import export {} declare global { diff --git a/packages/kms-tools/src/typings/components.d.ts b/src/typings/components.d.ts similarity index 100% rename from packages/kms-tools/src/typings/components.d.ts rename to src/typings/components.d.ts diff --git a/packages/kms-tools/src/typings/shims.d.ts b/src/typings/shims.d.ts similarity index 100% rename from packages/kms-tools/src/typings/shims.d.ts rename to src/typings/shims.d.ts diff --git a/packages/kms-tools/src/typings/typed-router.d.ts b/src/typings/typed-router.d.ts similarity index 100% rename from packages/kms-tools/src/typings/typed-router.d.ts rename to src/typings/typed-router.d.ts diff --git a/packages/kms-tools/src/views/activate.vue b/src/views/activate.vue similarity index 100% rename from packages/kms-tools/src/views/activate.vue rename to src/views/activate.vue diff --git a/packages/kms-tools/src/views/activate/office.vue b/src/views/activate/office.vue similarity index 100% rename from packages/kms-tools/src/views/activate/office.vue rename to src/views/activate/office.vue diff --git a/packages/kms-tools/src/views/activate/windows-server.vue b/src/views/activate/windows-server.vue similarity index 100% rename from packages/kms-tools/src/views/activate/windows-server.vue rename to src/views/activate/windows-server.vue diff --git a/packages/kms-tools/src/views/activate/windows.vue b/src/views/activate/windows.vue similarity index 100% rename from packages/kms-tools/src/views/activate/windows.vue rename to src/views/activate/windows.vue diff --git a/packages/kms-tools/src/views/check.vue b/src/views/check.vue similarity index 100% rename from packages/kms-tools/src/views/check.vue rename to src/views/check.vue diff --git a/packages/kms-tools/src/views/download/index.vue b/src/views/download/index.vue similarity index 100% rename from packages/kms-tools/src/views/download/index.vue rename to src/views/download/index.vue diff --git a/packages/kms-tools/src/views/guide/index.vue b/src/views/guide/index.vue similarity index 100% rename from packages/kms-tools/src/views/guide/index.vue rename to src/views/guide/index.vue diff --git a/packages/kms-tools/src/views/index.vue b/src/views/index.vue similarity index 94% rename from packages/kms-tools/src/views/index.vue rename to src/views/index.vue index 3c102ad2..e890375d 100644 --- a/packages/kms-tools/src/views/index.vue +++ b/src/views/index.vue @@ -1,5 +1,5 @@