github_mirrors/gf-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/gf-vben-admin.git synced 2025-01-23 20:00:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: build error

Browse Source
This commit is contained in:
vben 2022-02-28 00:21:26 +08:00
parent ecc2135b5e
commit af6ab98945
11 changed files with 1816 additions and 1603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/vite/plugin/compress.ts
View File

@ -2,16 +2,16 @@
* Used to package and output gzip. Note that this does not work properly in Vite, the specific reason is still being investigated * Used to package and output gzip. Note that this does not work properly in Vite, the specific reason is still being investigated
* https://github.com/anncwb/vite-plugin-compression * https://github.com/anncwb/vite-plugin-compression
*/ */
import type { Plugin } from 'vite'; import type { PluginOption } from 'vite';
import compressPlugin from 'vite-plugin-compression'; import compressPlugin from 'vite-plugin-compression';
export function configCompressPlugin( export function configCompressPlugin(
compress: 'gzip' | 'brotli' | 'none', compress: 'gzip' | 'brotli' | 'none',
deleteOriginFile = false, deleteOriginFile = false,
): Plugin | Plugin[] { ): PluginOption | PluginOption[] {
const compressList = compress.split(','); const compressList = compress.split(',');
const plugins: Plugin[] = []; const plugins: PluginOption[] = [];
if (compressList.includes('gzip')) { if (compressList.includes('gzip')) {
plugins.push( plugins.push(

6
build/vite/plugin/html.ts
View File

@ -2,8 +2,8 @@
* Plugin to minimize and use ejs template syntax in index.html. * Plugin to minimize and use ejs template syntax in index.html.
* https://github.com/anncwb/vite-plugin-html * https://github.com/anncwb/vite-plugin-html
*/ */
import type { Plugin } from 'vite'; import type { PluginOption } from 'vite';
import html from 'vite-plugin-html'; import { createHtmlPlugin } from 'vite-plugin-html';
import pkg from '../../../package.json'; import pkg from '../../../package.json';
import { GLOB_CONFIG_FILE_NAME } from '../../constant'; import { GLOB_CONFIG_FILE_NAME } from '../../constant';
@ -16,7 +16,7 @@ export function configHtmlPlugin(env: ViteEnv, isBuild: boolean) {
return `${path || '/'}${GLOB_CONFIG_FILE_NAME}?v=${pkg.version}-${new Date().getTime()}`; return `${path || '/'}${GLOB_CONFIG_FILE_NAME}?v=${pkg.version}-${new Date().getTime()}`;
}; };
const htmlPlugin: Plugin[] = html({ const htmlPlugin: PluginOption[] = createHtmlPlugin({
minify: isBuild, minify: isBuild,
inject: { inject: {
// Inject data into ejs template // Inject data into ejs template

3
build/vite/plugin/index.ts
View File

@ -1,3 +1,4 @@
import { PluginOption } from 'vite';
import vue from '@vitejs/plugin-vue'; import vue from '@vitejs/plugin-vue';
import vueJsx from '@vitejs/plugin-vue-jsx'; import vueJsx from '@vitejs/plugin-vue-jsx';
import legacy from '@vitejs/plugin-legacy'; import legacy from '@vitejs/plugin-legacy';
@ -24,7 +25,7 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE, VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE,
} = viteEnv; } = viteEnv;
const vitePlugins = [ const vitePlugins: (PluginOption | PluginOption[])[] = [
// have to // have to
vue(), vue(),
// have to // have to

4
build/vite/plugin/styleImport.ts
View File

@ -2,13 +2,13 @@
* Introduces component library styles on demand. * Introduces component library styles on demand.
* https://github.com/anncwb/vite-plugin-style-import * https://github.com/anncwb/vite-plugin-style-import
*/ */
import styleImport from 'vite-plugin-style-import'; import { createStyleImportPlugin } from 'vite-plugin-style-import';
export function configStyleImportPlugin(_isBuild: boolean) { export function configStyleImportPlugin(_isBuild: boolean) {
// if (!isBuild) { // if (!isBuild) {
// return []; // return [];
// } // }
const styleImportPlugin = styleImport({ const styleImportPlugin = createStyleImportPlugin({
libs: [ libs: [
{ {
libraryName: 'ant-design-vue', libraryName: 'ant-design-vue',

4
build/vite/plugin/svgSprite.ts
View File

@ -3,11 +3,11 @@
* https://github.com/anncwb/vite-plugin-svg-icons * https://github.com/anncwb/vite-plugin-svg-icons
*/ */
import SvgIconsPlugin from 'vite-plugin-svg-icons'; import { createSvgIconsPlugin } from 'vite-plugin-svg-icons';
import path from 'path'; import path from 'path';
export function configSvgIconsPlugin(isBuild: boolean) { export function configSvgIconsPlugin(isBuild: boolean) {
const svgIconsPlugin = SvgIconsPlugin({ const svgIconsPlugin = createSvgIconsPlugin({
iconDirs: [path.resolve(process.cwd(), 'src/assets/icons')], iconDirs: [path.resolve(process.cwd(), 'src/assets/icons')],
svgoOptions: isBuild, svgoOptions: isBuild,
// default // default

6
build/vite/plugin/theme.ts
View File

@ -2,7 +2,7 @@
* Vite plugin for website theme color switching * Vite plugin for website theme color switching
* https://github.com/anncwb/vite-plugin-theme * https://github.com/anncwb/vite-plugin-theme
*/ */
import type { Plugin } from 'vite'; import type { PluginOption } from 'vite';
import path from 'path'; import path from 'path';
import { import {
viteThemePlugin, viteThemePlugin,
@ -14,7 +14,7 @@ import {
import { getThemeColors, generateColors } from '../../config/themeConfig'; import { getThemeColors, generateColors } from '../../config/themeConfig';
import { generateModifyVars } from '../../generate/generateModifyVars'; import { generateModifyVars } from '../../generate/generateModifyVars';
export function configThemePlugin(isBuild: boolean): Plugin[] { export function configThemePlugin(isBuild: boolean): PluginOption[] {
const colors = generateColors({ const colors = generateColors({
mixDarken, mixDarken,
mixLighten, mixLighten,
@ -85,5 +85,5 @@ export function configThemePlugin(isBuild: boolean): Plugin[] {
}), }),
]; ];
return plugin as unknown as Plugin[]; return plugin as unknown as PluginOption[];
} }

125
package.json
View File

@ -35,117 +35,118 @@
"dependencies": { "dependencies": {
"@ant-design/colors": "^6.0.0", "@ant-design/colors": "^6.0.0",
"@ant-design/icons-vue": "^6.0.1", "@ant-design/icons-vue": "^6.0.1",
"@iconify/iconify": "^2.1.1", "@iconify/iconify": "^2.1.2",
"@logicflow/core": "^1.0.7", "@logicflow/core": "^1.1.4",
"@logicflow/extension": "^1.0.7", "@logicflow/extension": "^1.1.4",
"@vue/runtime-core": "^3.2.29", "@vue/runtime-core": "^3.2.31",
"@vue/shared": "^3.2.29", "@vue/shared": "^3.2.31",
"@vueuse/core": "^7.5.4", "@vueuse/core": "^7.7.0",
"@vueuse/shared": "^7.5.4", "@vueuse/shared": "^7.7.0",
"@zxcvbn-ts/core": "^1.2.0", "@zxcvbn-ts/core": "^2.0.0",
"ant-design-vue": "3.0.0-beta.8", "ant-design-vue": "3.0.0-beta.10",
"axios": "^0.25.0", "axios": "^0.26.0",
"codemirror": "^5.65.1", "codemirror": "^5.65.2",
"cropperjs": "^1.5.12", "cropperjs": "^1.5.12",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
"dayjs": "^1.10.7", "dayjs": "^1.10.7",
"echarts": "^5.2.2", "echarts": "^5.3.0",
"intro.js": "^4.3.0", "intro.js": "^5.0.0",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"mockjs": "^1.1.0", "mockjs": "^1.1.0",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"path-to-regexp": "^6.2.0", "path-to-regexp": "^6.2.0",
"pinia": "2.0.9", "pinia": "2.0.11",
"print-js": "^1.6.0", "print-js": "^1.6.0",
"qrcode": "^1.5.0", "qrcode": "^1.5.0",
"qs": "^6.10.3", "qs": "^6.10.3",
"resize-observer-polyfill": "^1.5.1", "resize-observer-polyfill": "^1.5.1",
"showdown": "^1.9.1", "showdown": "^2.0.0",
"sortablejs": "^1.14.0", "sortablejs": "^1.14.0",
"tinymce": "^5.10.2", "tinymce": "^5.10.3",
"vditor": "^3.8.11", "vditor": "^3.8.11",
"vue": "^3.2.29", "vue": "^3.2.31",
"vue-i18n": "^9.1.9", "vue-i18n": "^9.1.9",
"vue-json-pretty": "^1.8.2", "vue-json-pretty": "^2.0.6",
"vue-router": "^4.0.12", "vue-router": "^4.0.12",
"vue-types": "^4.1.1", "vue-types": "^4.1.1",
"xlsx": "^0.17.5" "xlsx": "^0.18.2"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^16.1.0", "@commitlint/cli": "^16.2.1",
"@commitlint/config-conventional": "^16.0.0", "@commitlint/config-conventional": "^16.2.1",
"@iconify/json": "^2.0.28", "@iconify/json": "^2.1.7",
"@purge-icons/generated": "^0.7.0", "@purge-icons/generated": "^0.8.0",
"@types/codemirror": "^5.60.5", "@types/codemirror": "^5.60.5",
"@types/crypto-js": "^4.1.0", "@types/crypto-js": "^4.1.1",
"@types/fs-extra": "^9.0.13", "@types/fs-extra": "^9.0.13",
"@types/inquirer": "^8.1.3", "@types/inquirer": "^8.2.0",
"@types/intro.js": "^3.0.2", "@types/intro.js": "^3.0.2",
"@types/jest": "^27.4.0", "@types/jest": "^27.4.1",
"@types/lodash-es": "^4.17.5", "@types/lodash-es": "^4.17.6",
"@types/mockjs": "^1.0.6", "@types/mockjs": "^1.0.6",
"@types/node": "^17.0.10", "@types/node": "^17.0.21",
"@types/nprogress": "^0.2.0", "@types/nprogress": "^0.2.0",
"@types/qrcode": "^1.4.2", "@types/qrcode": "^1.4.2",
"@types/qs": "^6.9.7", "@types/qs": "^6.9.7",
"@types/showdown": "^1.9.4", "@types/showdown": "^1.9.4",
"@types/sortablejs": "^1.10.7", "@types/sortablejs": "^1.10.7",
"@typescript-eslint/eslint-plugin": "^5.10.0", "@typescript-eslint/eslint-plugin": "^5.12.1",
"@typescript-eslint/parser": "^5.10.0", "@typescript-eslint/parser": "^5.12.1",
"@vitejs/plugin-legacy": "^1.6.4", "@vitejs/plugin-legacy": "^1.7.1",
"@vitejs/plugin-vue": "^2.1.0", "@vitejs/plugin-vue": "^2.2.2",
"@vitejs/plugin-vue-jsx": "^1.3.3", "@vitejs/plugin-vue-jsx": "^1.3.7",
"@vue/compiler-sfc": "3.2.29", "@vue/compiler-sfc": "3.2.31",
"@vue/test-utils": "^2.0.0-rc.18", "@vue/test-utils": "^2.0.0-rc.18",
"autoprefixer": "^10.4.2", "autoprefixer": "^10.4.2",
"commitizen": "^4.2.4", "commitizen": "^4.2.4",
"conventional-changelog-cli": "^2.2.2", "conventional-changelog-cli": "^2.2.2",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"dotenv": "^14.2.0", "dotenv": "^16.0.0",
"eslint": "^8.7.0", "eslint": "^8.10.0",
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^8.4.0",
"eslint-define-config": "^1.2.3", "eslint-define-config": "^1.2.5",
"eslint-plugin-jest": "^25.7.0", "eslint-plugin-jest": "^26.1.1",
"eslint-plugin-prettier": "^4.0.0", "eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-vue": "^8.3.0", "eslint-plugin-vue": "^8.5.0",
"esno": "^0.14.0", "esno": "^0.14.1",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.1",
"husky": "^7.0.4", "husky": "^7.0.4",
"inquirer": "^8.2.0", "inquirer": "^8.2.0",
"jest": "^27.4.7", "jest": "^27.5.1",
"less": "^4.1.2", "less": "^4.1.2",
"lint-staged": "12.3.1", "lint-staged": "12.3.4",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"postcss": "^8.4.5", "postcss": "^8.4.7",
"postcss-html": "^1.3.0", "postcss-html": "^1.3.0",
"postcss-less": "^6.0.0", "postcss-less": "^6.0.0",
"prettier": "^2.5.1", "prettier": "^2.5.1",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"rollup-plugin-visualizer": "^5.5.4", "rollup": "^2.68.0",
"stylelint": "^14.3.0", "rollup-plugin-visualizer": "^5.6.0",
"stylelint": "^14.5.3",
"stylelint-config-html": "^1.0.0", "stylelint-config-html": "^1.0.0",
"stylelint-config-prettier": "^9.0.3", "stylelint-config-prettier": "^9.0.3",
"stylelint-config-recommended": "^6.0.0", "stylelint-config-recommended": "^7.0.0",
"stylelint-config-standard": "^24.0.0", "stylelint-config-standard": "^25.0.0",
"stylelint-order": "^5.0.0", "stylelint-order": "^5.0.0",
"ts-jest": "^27.1.3", "ts-jest": "^27.1.3",
"ts-node": "^10.4.0", "ts-node": "^10.5.0",
"typescript": "^4.5.5", "typescript": "^4.5.5",
"vite": "^2.8.0-beta.3", "vite": "^2.8.4",
"vite-plugin-compression": "^0.4.0", "vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^2.1.2", "vite-plugin-html": "^3.1.0",
"vite-plugin-imagemin": "^0.5.2", "vite-plugin-imagemin": "^0.6.1",
"vite-plugin-mkcert": "^1.5.2", "vite-plugin-mkcert": "^1.6.0",
"vite-plugin-mock": "^2.9.6", "vite-plugin-mock": "^2.9.6",
"vite-plugin-purge-icons": "^0.7.0", "vite-plugin-purge-icons": "^0.8.0",
"vite-plugin-pwa": "^0.11.13", "vite-plugin-pwa": "^0.11.13",
"vite-plugin-style-import": "^1.4.1", "vite-plugin-style-import": "^2.0.0",
"vite-plugin-svg-icons": "^1.1.0", "vite-plugin-svg-icons": "^2.0.1",
"vite-plugin-theme": "^0.8.1", "vite-plugin-theme": "^0.8.1",
"vite-plugin-vue-setup-extend": "^0.3.0", "vite-plugin-vue-setup-extend": "^0.4.0",
"vite-plugin-windicss": "^1.6.3", "vite-plugin-windicss": "^1.8.1",
"vue-eslint-parser": "^8.2.0", "vue-eslint-parser": "^8.3.0",
"vue-tsc": "^0.31.1" "vue-tsc": "^0.32.0"
}, },
"resolutions": { "resolutions": {
"bin-wrapper": "npm:bin-wrapper-china", "bin-wrapper": "npm:bin-wrapper-china",

3251
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

2
src/components/Excel/src/Export2Excel.ts
View File

@ -1,4 +1,4 @@
import xlsx from 'xlsx'; import * as xlsx from 'xlsx';
import type { WorkBook } from 'xlsx'; import type { WorkBook } from 'xlsx';
import type { JsonToSheet, AoAToSheet } from './typing'; import type { JsonToSheet, AoAToSheet } from './typing';

2
src/components/Excel/src/ImportExcel.vue
View File

@ -14,7 +14,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent, ref, unref } from 'vue'; import { defineComponent, ref, unref } from 'vue';
import XLSX from 'xlsx'; import * as XLSX from 'xlsx';
import { dateUtil } from '/@/utils/dateUtil'; import { dateUtil } from '/@/utils/dateUtil';
import type { ExcelData } from './typing'; import type { ExcelData } from './typing';

10
tests/server/package.json
View File

@ -10,7 +10,7 @@
"stop": "npx pm2 stop ecosystem.config.js" "stop": "npx pm2 stop ecosystem.config.js"
}, },
"dependencies": { "dependencies": {
"fs-extra": "^10.0.0", "fs-extra": "^10.0.1",
"koa": "^2.13.4", "koa": "^2.13.4",
"koa-body": "^4.2.0", "koa-body": "^4.2.0",
"koa-bodyparser": "^4.3.0", "koa-bodyparser": "^4.3.0",
@ -24,13 +24,13 @@
"@types/koa": "^2.13.4", "@types/koa": "^2.13.4",
"@types/koa-bodyparser": "^5.0.2", "@types/koa-bodyparser": "^5.0.2",
"@types/koa-router": "^7.4.4", "@types/koa-router": "^7.4.4",
"@types/node": "^17.0.10", "@types/node": "^17.0.21",
"nodemon": "^2.0.15", "nodemon": "^2.0.15",
"pm2": "^5.1.2", "pm2": "^5.2.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"ts-node": "^10.4.0", "ts-node": "^10.5.0",
"tsconfig-paths": "^3.12.0", "tsconfig-paths": "^3.12.0",
"tsup": "^5.11.11", "tsup": "^5.11.13",
"typescript": "^4.5.5" "typescript": "^4.5.5"
} }
} }