fix: correct debugger code

5 years ago · 759e532079
11 changed files with 75 additions and 69 deletions
--- a/build/config/themeConfig.ts
+++ b/build/config/themeConfig.ts
@ -1,6 +1,6 @@
 import { generate } from '@ant-design/colors';

-export const primaryColor = '#0084f4';
+export const primaryColor = '#0960bd';

 export const themeMode = 'light';

--- a/build/constant.ts
+++ b/build/constant.ts
@ -2,3 +2,5 @@
 * The name of the configuration file entered in the production environment
 */
 export const GLOB_CONFIG_FILE_NAME = '_app.config.js';
+
+export const OUTPUT_DIR = 'dist';
--- a/build/script/buildConf.ts
+++ b/build/script/buildConf.ts
@ -1,13 +1,15 @@
 /**
 * Generate additional configuration files when used for packaging. The file can be configured with some global variables, so that it can be changed directly externally without repackaging
 */
-import { GLOB_CONFIG_FILE_NAME } from '../constant';
+import { GLOB_CONFIG_FILE_NAME, OUTPUT_DIR } from '../constant';
 import fs, { writeFileSync } from 'fs-extra';
 import chalk from 'chalk';

 import { getCwdPath, getEnvConfig } from '../utils';
 import { getShortName } from '../getShortName';

+import pkg from '../../package.json';
+
 function createConfig(
  {
    configName,
@ -17,21 +19,19 @@ function createConfig(
 ) {
  try {
    const windowConf = `window.${configName}`;
-    const outDir = 'dist';
    // Ensure that the variable will not be modified
    const configStr = `${windowConf}=${JSON.stringify(config)};
-
      Object.freeze(${windowConf});
      Object.defineProperty(window, "${configName}", {
        configurable: false,
        writable: false,
      });
-    `;
-    fs.mkdirp(getCwdPath(outDir));
-    writeFileSync(getCwdPath(`${outDir}/${configFileName}`), configStr);
+    `.replace(/\s/g, '');
+    fs.mkdirp(getCwdPath(OUTPUT_DIR));
+    writeFileSync(getCwdPath(`${OUTPUT_DIR}/${configFileName}`), configStr);

-    console.log(chalk.cyan('✨ configuration file is build successfully:'));
-    console.log(chalk.gray(outDir + '/' + chalk.green(configFileName)) + '\n');
+    console.log(chalk.cyan(`✨ [${pkg.name}]`) + ` - configuration file is build successfully:`);
+    console.log(chalk.gray(OUTPUT_DIR + '/' + chalk.green(configFileName)) + '\n');
  } catch (error) {
    console.log(chalk.red('configuration file configuration file failed to package:\n' + error));
  }
--- a/build/script/postBuild.ts
+++ b/build/script/postBuild.ts
@ -4,6 +4,8 @@ import { argv } from 'yargs';
 import { runBuildConfig } from './buildConf';
 import chalk from 'chalk';

+import pkg from '../../package.json';
+
 export const runBuild = async () => {
  try {
    const argvList = argv._;
@ -12,7 +14,7 @@ export const runBuild = async () => {
    if (!argvList.includes('no-conf')) {
      await runBuildConfig();
    }
-    console.log(chalk.green.bold('✨ vite build successfully!\n'));
+    console.log(`✨ ${chalk.cyan(`[${pkg.name}]`)}` + ' - build successfully!');
  } catch (error) {
    console.log(chalk.red('vite build error:\n' + error));
    process.exit(1);
--- a/build/typeing.d.ts
+++ b/build/typeing.d.ts
@ -0,0 +1,4 @@
+declare module '*.json' {
+  const src: any;
+  export default src;
+}
--- a/build/vite/plugin/html.ts
+++ b/build/vite/plugin/html.ts
@ -1,8 +1,7 @@
 import type { Plugin } from 'vite';
+import type { ViteEnv } from '../../utils';
 import html from 'vite-plugin-html';
-import { ViteEnv } from '../../utils';

-// @ts-ignore
 import pkg from '../../../package.json';
 import { GLOB_CONFIG_FILE_NAME } from '../../constant';

--- a/build/vite/plugin/index.ts
+++ b/build/vite/plugin/index.ts
@ -2,8 +2,6 @@ import type { Plugin } from 'vite';

 import PurgeIcons from 'vite-plugin-purge-icons';

-// @ts-ignore
-import pkg from '../../../package.json';
 import { ViteEnv } from '../../utils';
 import { configHtmlPlugin } from './html';
 import { configPwaConfig } from './pwa';
@ -16,13 +14,15 @@ import { configImageminPlugin } from './imagemin';

 // gen vite plugins
 export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
+  const { VITE_USE_IMAGEMIN, VITE_USE_MOCK } = viteEnv;
+
  const vitePlugins: (Plugin | Plugin[])[] = [];

  // vite-plugin-html
  vitePlugins.push(configHtmlPlugin(viteEnv, isBuild));

  // vite-plugin-mock
-  vitePlugins.push(configMockPlugin(viteEnv, isBuild));
+  VITE_USE_MOCK && vitePlugins.push(configMockPlugin(isBuild));

  // vite-plugin-purge-icons
  vitePlugins.push(PurgeIcons());
@ -38,7 +38,7 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {

  if (isBuild) {
    //vite-plugin-imagemin
-    viteEnv.VITE_USE_IMAGEMIN && vitePlugins.push(configImageminPlugin());
+    VITE_USE_IMAGEMIN && vitePlugins.push(configImageminPlugin());

    // rollup-plugin-gzip
    vitePlugins.push(configGzipPlugin(isBuild));
--- a/build/vite/plugin/mock.ts
+++ b/build/vite/plugin/mock.ts
@ -1,26 +1,16 @@
 import { viteMockServe } from 'vite-plugin-mock';
-import { ViteEnv } from '../../utils';

-export function configMockPlugin(env: ViteEnv, isBuild: boolean) {
-  const { VITE_USE_MOCK } = env;
-
-  const useLocalMock = !isBuild && VITE_USE_MOCK;
-  const useProdMock = isBuild && VITE_USE_MOCK;
-
-  if (useLocalMock || useProdMock) {
-    const mockPlugin = viteMockServe({
-      ignore: /^\_/,
-      mockPath: 'mock',
-      showTime: true,
-      localEnabled: useLocalMock,
-      prodEnabled: useProdMock,
-      injectCode: `
+export function configMockPlugin(isBuild: boolean) {
+  return viteMockServe({
+    ignore: /^\_/,
+    mockPath: 'mock',
+    showTime: true,
+    localEnabled: !isBuild,
+    prodEnabled: isBuild,
+    injectCode: `
      import { setupProdMockServer } from '../mock/_createProductionServer';

      setupProdMockServer();
      `,
-    });
-    return mockPlugin;
-  }
-  return [];
+  });
 }
--- a/package.json
+++ b/package.json
@ -25,7 +25,7 @@
    "ant-design-vue": "2.0.0",
    "apexcharts": "^3.24.0",
    "axios": "^0.21.1",
-    "crypto-es": "^1.2.6",
+    "crypto-es": "^1.2.7",
    "echarts": "^4.9.0",
    "lodash-es": "^4.17.20",
    "mockjs": "^1.1.0",
@ -46,7 +46,7 @@
  "devDependencies": {
    "@commitlint/cli": "^11.0.0",
    "@commitlint/config-conventional": "^11.0.0",
-    "@iconify/json": "^1.1.298",
+    "@iconify/json": "^1.1.299",
    "@ls-lint/ls-lint": "^1.9.2",
    "@purge-icons/generated": "^0.6.0",
    "@types/echarts": "^4.9.3",
@ -95,12 +95,12 @@
    "typescript": "^4.1.3",
    "vite": "2.0.0-beta.65",
    "vite-plugin-html": "^2.0.0",
-    "vite-plugin-imagemin": "^0.2.4",
-    "vite-plugin-mock": "^2.1.2",
+    "vite-plugin-imagemin": "^0.2.5",
+    "vite-plugin-mock": "^2.1.4",
    "vite-plugin-purge-icons": "^0.6.0",
    "vite-plugin-pwa": "^0.4.6",
-    "vite-plugin-style-import": "^0.7.1",
-    "vite-plugin-theme": "^0.4.1",
+    "vite-plugin-style-import": "^0.7.2",
+    "vite-plugin-theme": "^0.4.2",
    "vue-eslint-parser": "^7.4.1",
    "yargs": "^16.2.0"
  },
--- a/vite.config.ts
+++ b/vite.config.ts
@ -8,10 +8,9 @@ import { loadEnv } from 'vite';

 import { generateModifyVars } from './build/config/themeConfig';
 import { createProxy } from './build/vite/proxy';
-
 import { wrapperEnv } from './build/utils';
-
 import { createVitePlugins } from './build/vite/plugin';
+import { OUTPUT_DIR } from './build/constant';

 const pkg = require('./package.json');

@ -19,7 +18,7 @@ function pathResolve(dir: string) {
  return resolve(__dirname, '.', dir);
 }

-const root: string = process.cwd();
+const root = process.cwd();

 export default ({ command, mode }: ConfigEnv): UserConfig => {
  const env = loadEnv(mode, root);
@ -46,6 +45,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
    },

    build: {
+      outDir: OUTPUT_DIR,
      polyfillDynamicImport: VITE_LEGACY,
      terserOptions: {
        compress: {
--- a/yarn.lock
+++ b/yarn.lock
@ -1112,10 +1112,10 @@
  dependencies:
    cross-fetch "^3.0.6"

-"@iconify/json@^1.1.298":
-  version "1.1.298"
-  resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.298.tgz#32f4090d1b83e1a753e7cce7fe972efb856a72e1"
-  integrity sha512-h+IxOqYrW5zL4O+4zyaFl3kVnErHZEBE6d9ZCd6hK+oOAOx0uMkaUgesoR0Ci54U9igyY3Mp6vdMDzHLDCdzkg==
+"@iconify/json@^1.1.299":
+  version "1.1.299"
+  resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.299.tgz#e1aca556b83461316ba5ec04b232906b499a67a5"
+  integrity sha512-oYHUgp5RZNE2CT3wKE/MWbmGK7lmubi30PD5l33HUU7yh4CznmzPL0Ewgg51Wn86NkFveZDcT+odMBTaayh9Ew==

 "@intlify/core-base@9.0.0-beta.16":
  version "9.0.0-beta.16"
@ -3377,10 +3377,10 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2:
    shebang-command "^2.0.0"
    which "^2.0.1"

-crypto-es@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.npmjs.org/crypto-es/-/crypto-es-1.2.6.tgz#468f3573a5d7b82e3b63b0004f55f905a6d3b12c"
-  integrity sha512-PQnrovdr5ibmOxqAh/Vy+A30RokHom7kb9Z61EPwfASfbcJCrCG4+vNNegmebNVHiXvS7WjYpHDePxnE/biEbA==
+crypto-es@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.npmjs.org/crypto-es/-/crypto-es-1.2.7.tgz#754a6d52319a94fb4eb1f119297f17196b360f88"
+  integrity sha512-UUqiVJ2gUuZFmbFsKmud3uuLcNP2+Opt+5ysmljycFCyhA0+T16XJmo1ev/t5kMChMqWh7IEvURNCqsg+SjZGQ==

 crypto-random-string@^2.0.0:
  version "2.0.0"
@ -4919,11 +4919,16 @@ got@^8.3.1:
    url-parse-lax "^3.0.0"
    url-to-options "^1.0.1"

-graceful-fs@^4.1.10, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
+graceful-fs@^4.1.10, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
  version "4.2.4"
  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==

+graceful-fs@^4.2.2:
+  version "4.2.5"
+  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.5.tgz#bc18864a6c9fc7b303f2e2abdb9155ad178fbe29"
+  integrity sha512-kBBSQbz2K0Nyn+31j/w36fUfxkBW9/gfwRWdUY1ULReH3iokVJgddZAFcD1D0xlgTmFxJCbUkUclAlc6/IDJkw==
+
 handlebars@^4.7.6:
  version "4.7.6"
  resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
@ -9192,10 +9197,10 @@ vite-plugin-html@^2.0.0:
    fs-extra "^9.1.0"
    html-minifier-terser "^5.1.1"

-vite-plugin-imagemin@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.npmjs.org/vite-plugin-imagemin/-/vite-plugin-imagemin-0.2.4.tgz#c44f7a39d84b8a0af8468b90505a147fd5297b67"
-  integrity sha512-7VQwm2mip/JNp0oTqVOLZ+eo7ijZT5wP3AZF3PwJErZ48iT02PcDbC1Ij00Q2zoFPbtMkAuEbcLh1vK5C1m+pQ==
+vite-plugin-imagemin@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.npmjs.org/vite-plugin-imagemin/-/vite-plugin-imagemin-0.2.5.tgz#926b57f570f55d29081ebbea5c073298e411ef42"
+  integrity sha512-wweK2QLJTNIkqEoCXuKJJP1Y+Duu2tA0CKtST6ovzXra4kMx6BQ3nWCRkr66Ye6fQii5yPSuE1ZtTNVLSi9mmw==
  dependencies:
    "@types/imagemin" "^7.0.0"
    "@types/imagemin-gifsicle" "^7.0.0"
@ -9205,6 +9210,7 @@ vite-plugin-imagemin@^0.2.4:
    "@types/imagemin-svgo" "^8.0.0"
    "@types/imagemin-webp" "^5.1.1"
    chalk "^4.1.0"
+    debug "^4.3.1"
    fs-extra "^9.1.0"
    imagemin "^7.0.1"
    imagemin-gifsicle "^7.0.0"
@ -9214,10 +9220,10 @@ vite-plugin-imagemin@^0.2.4:
    imagemin-svgo "^8.0.0"
    imagemin-webp "^6.0.0"

-vite-plugin-mock@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/vite-plugin-mock/-/vite-plugin-mock-2.1.2.tgz#a66d65947d565862395a0a181cb210b0076db9cc"
-  integrity sha512-b/YoQyBQhuyXOm/30bfVOKKBD7N50nw/5xTyyIXOTsry8LOPa5AZR9/2s2zPTioMeb63Ey4vga6CG8E2Tj8XVg==
+vite-plugin-mock@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.npmjs.org/vite-plugin-mock/-/vite-plugin-mock-2.1.4.tgz#b1f91418e7ed4678c969d5581276fe68c27a27d0"
+  integrity sha512-3qYMDZ7jmTVk7mxPpKEgnbA6B19NKvkuEzpZrKq3I9yJH1tjsTIQi/t3EaH2rXJip4EZff6NRJO8aarW3OAsOg==
  dependencies:
    "@rollup/plugin-node-resolve" "^11.1.1"
    "@types/mockjs" "^1.0.3"
@ -9251,23 +9257,26 @@ vite-plugin-pwa@^0.4.6:
    pretty-bytes "^5.5.0"
    workbox-build "^6.1.0"

-vite-plugin-style-import@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.npmjs.org/vite-plugin-style-import/-/vite-plugin-style-import-0.7.1.tgz#f55949f6821937a7027c4afa8f6ce4c0b6ef9609"
-  integrity sha512-Nr2PH8i8i9GIQhQRkipwYTYKur+/1mkCrMi4sXbMLcoUsz7wq7uZ1c3XcXA8B0Au3lZm+AKN3KiUrDD4Evx9EQ==
+vite-plugin-style-import@^0.7.2:
+  version "0.7.3"
+  resolved "https://registry.npmjs.org/vite-plugin-style-import/-/vite-plugin-style-import-0.7.3.tgz#4a9fb08bf5f2fc4796391c9be9a587ecb5c97e9e"
+  integrity sha512-oKM6vOl7iWaB5U1HcR5oM1oPRhT1n5yJt7h4h9jwpMPCD5ckHPcSjjSU7ZlOJkoS/IWEnDkQqoZi162bOs1rTQ==
  dependencies:
    "@rollup/pluginutils" "^4.1.0"
    change-case "^4.1.2"
+    debug "^4.3.1"
    es-module-lexer "^0.3.26"
    magic-string "^0.25.7"

-vite-plugin-theme@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.4.1.tgz#02157947d1954ef59e3747e1b4f7d002b6b3f7cd"
-  integrity sha512-ap0NpgBAKOdKQD1zW5P56sYPTJc6DO9FtXsrnOjXtxQ2gb2qKuRAnVV5+UFuO/Mgjh2QyuN9AnT5ANwGTjl0og==
+vite-plugin-theme@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.4.2.tgz#bb4791ddd88205f2fd07ae9aff7a92d5d427b516"
+  integrity sha512-NOk56zCYloaVmqWh8o+OShJLVTNVsDZRLEeToHsv0yGXd94gCiYTflguGtcmsSQjQfQYOz/gGKjLAU4KPH/FKA==
  dependencies:
    "@types/tinycolor2" "^1.4.2"
+    chalk "^4.1.0"
    clean-css "^4.2.3"
+    debug "^4.3.1"
    es-module-lexer "^0.3.26"
    tinycolor2 "^1.4.2"