@pubinfo/vite 0.6.7 → 0.6.10

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import * as vite from 'vite';
-import { UserConfig } from 'vite';
+import { UserConfig, UserConfigFnObject } from 'vite';
 
-declare function defineConfig(defineOptions?: UserConfig): vite.UserConfigExport;
+declare function defineConfig(defineOptions?: UserConfig | UserConfigFnObject): vite.UserConfigExport;
 
 export { defineConfig };

package/dist/index.d.ts

@@ -1,11 +1,10 @@
 
 /// <reference types="@intlify/unplugin-vue-i18n/messages" />
 /// <reference types="unplugin-icons/types/vue" />
-/// <reference types="vite-plugin-vue-meta-layouts/client" />
 
 import * as vite from 'vite';
-import { UserConfig } from 'vite';
+import { UserConfig, UserConfigFnObject } from 'vite';
 
-declare function defineConfig(defineOptions?: UserConfig): vite.UserConfigExport;
+declare function defineConfig(defineOptions?: UserConfig | UserConfigFnObject): vite.UserConfigExport;
 
 export { defineConfig };

package/dist/index.mjs

@@ -1,36 +1,90 @@
+import path, { resolve as resolve$1 } from 'node:path';
 import process from 'node:process';
-import path, { resolve as resolve$1, relative, join } from 'node:path';
 import { defineConfig as defineConfig$1, loadEnv, mergeConfig } from 'vite';
+import fs from 'node:fs/promises';
+import { readPackageJSON } from 'pkg-types';
+import dayjs from 'dayjs';
+import consola from 'consola';
+import chalk from 'chalk';
+import vueLegacy from '@vitejs/plugin-legacy';
 import vue from '@vitejs/plugin-vue';
 import vueJsx from '@vitejs/plugin-vue-jsx';
-import vueLegacy from '@vitejs/plugin-legacy';
 import autoImport from 'unplugin-auto-import/vite';
 import { AntDesignVueResolver } from 'unplugin-vue-components/resolvers';
 import IconsResolver from 'unplugin-icons/resolver';
+import banner from 'vite-plugin-banner';
 import components from 'unplugin-vue-components/vite';
-import Unocss from 'unocss/vite';
-import { createSvgIconsPlugin } from 'vite-plugin-svg-icons';
+import compression from 'vite-plugin-compression';
+import TurboConsole from 'unplugin-turbo-console/vite';
 import vueI18n from '@intlify/unplugin-vue-i18n/vite';
+import { existsSync } from 'node:fs';
 import { vitePluginFakeServer } from 'vite-plugin-fake-server';
-import Layouts from 'vite-plugin-vue-meta-layouts';
-import compression from 'vite-plugin-compression';
-import banner from 'vite-plugin-banner';
-import dayjs from 'dayjs';
 import fg from 'fast-glob';
-import { Buffer } from 'node:buffer';
-import { readFileSync, writeFileSync, readdirSync, statSync } from 'node:fs';
-import JSZip from 'jszip';
-import fse from 'fs-extra/esm';
-import consola$1, { consola } from 'consola';
+import { createSvgIconsPlugin } from 'vite-plugin-svg-icons';
+import Unocss from 'unocss/vite';
 import Icons from 'unplugin-icons/vite';
-import TurboConsole from 'unplugin-turbo-console/vite';
 import VueDevTools from 'vite-plugin-vue-devtools';
 import OpenAPI from '@pubinfo/unplugin-openapi/vite';
-import EnvRuntime from 'vite-plugin-env-runtime';
 import boxen from 'boxen';
-import chalk from 'chalk';
-import { readPackageJSON } from 'pkg-types';
-import fs from 'node:fs/promises';
+
+function cleanse() {
+  return {
+    name: "esbuild-plugin-cleanse",
+    setup(build) {
+      build.onLoad({ filter: /\/dist\/alova\.esm\.js$/ }, async (args) => {
+        let alovaContnet = await fs.readFile(args.path, "utf-8");
+        alovaContnet = alovaContnet.replace(/\/\* c8 ignore start \*\/[\s\S]*?\/\* c8 ignore stop \*\//g, "");
+        return {
+          contents: `${alovaContnet}`
+        };
+      });
+    }
+  };
+}
+
+async function createDefineSystemInfo(root) {
+  try {
+    const pkgJson = await readPackageJSON(root);
+    const { dependencies, devDependencies, version } = pkgJson;
+    const lastBuildTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
+    const SYSTEM_INFO = {
+      pkg: {
+        dependencies,
+        devDependencies,
+        version
+      },
+      lastBuildTime
+    };
+    return JSON.stringify(SYSTEM_INFO);
+  } catch (error) {
+    return "";
+  }
+}
+function getServerProxy(env, isProxy, rewrite = true) {
+  if (!isProxy) {
+    return {};
+  }
+  const targetPrefix = "VITE_APP_API_";
+  const proxyKey = Object.keys(env).filter((key) => key.startsWith(targetPrefix));
+  const serverProxy = {};
+  for (const envKey of proxyKey) {
+    const url = env[envKey];
+    const { pathname } = new URL(url);
+    const pk = `${pathname}/proxy`;
+    if (pk in serverProxy) {
+      consola.error(`The proxy key ${chalk.bold.redBright(envKey)} \u279C ${chalk.bold.yellowBright(url)} already exists`);
+    } else {
+      serverProxy[pk] = {
+        target: url,
+        changeOrigin: rewrite,
+        rewrite: (path) => {
+          return path.replace(pk, "");
+        }
+      };
+    }
+  }
+  return serverProxy;
+}
 
 function resolve(name) {
   if (!name.startsWith("usePub")) {
@@ -77,6 +131,17 @@ function createAutoImport() {
   });
 }
 
+const deploymentTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
+function createBanner() {
+  return banner(`
+/**
+ * \u7531 \u793E\u4F1A\u6CBB\u7406\u4E8B\u4E1A\u90E8 \u63D0\u4F9B\u6280\u672F\u652F\u6301
+ * Powered by wsy-admin
+ * ${deploymentTime}
+ */
+`);
+}
+
 function resolveComponent(componentName) {
   if (!componentName.match(/^Pub[A-Z]/)) {
     return;
@@ -133,45 +198,9 @@ function createComponents() {
   });
 }
 
-function createUnocss() {
-  return Unocss();
-}
-
-function createSvgIcon(isBuild) {
-  return createSvgIconsPlugin({
-    iconDirs: [path.resolve(process.cwd(), "src/assets/icons/")],
-    symbolId: "icon-[dir]-[name]",
-    svgoOptions: isBuild
-  });
-}
-
-function createI18n() {
-  const root = process.cwd();
-  const pathResolve = (pathname) => resolve$1(root, ".", pathname);
-  return vueI18n({
-    include: `${pathResolve("src")}/locales/lang/**`
-  });
-}
-
-function createMock(env, isBuild) {
-  const { VITE_BUILD_MOCK } = env;
-  return vitePluginFakeServer({
-    logger: !isBuild,
-    include: "src/mock",
-    infixName: false,
-    enableProd: isBuild && VITE_BUILD_MOCK === "true"
-  });
-}
-
-function createLayouts() {
-  return Layouts({
-    defaultLayout: "index"
-  });
-}
-
 function createCompression(env) {
   const { VITE_BUILD_COMPRESS } = env;
-  const compressList = VITE_BUILD_COMPRESS.split(",");
+  const compressList = VITE_BUILD_COMPRESS?.split(",") ?? [];
   const plugin = [];
   if (compressList.includes("gzip")) {
     plugin.push(
@@ -193,29 +222,46 @@ function createCompression(env) {
   return plugin;
 }
 
-const deploymentTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
-function createBanner() {
-  return banner(`
-/**
- * \u7531 \u793E\u4F1A\u6CBB\u7406\u4E8B\u4E1A\u90E8 \u63D0\u4F9B\u6280\u672F\u652F\u6301
- * Powered by wsy-admin
- * ${deploymentTime}
- */
-`);
+function createConsole() {
+  return TurboConsole({
+    disableLaunchEditor: true
+  });
 }
 
-var __defProp$2 = Object.defineProperty;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$2 = (obj, key, value) => {
-  __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
+function createI18n() {
+  const root = process.cwd();
+  const pathResolve = (pathname) => resolve$1(root, ".", pathname);
+  return vueI18n({
+    include: `${pathResolve("src")}/locales/lang/**`
+  });
+}
+
+function createMock(env, isBuild) {
+  const { VITE_BUILD_MOCK } = env;
+  const root = process.cwd();
+  if (!existsSync(resolve$1(root, "src/mock"))) {
+    return;
+  }
+  return vitePluginFakeServer({
+    logger: !isBuild,
+    include: "src/mock",
+    infixName: false,
+    enableProd: isBuild && VITE_BUILD_MOCK === "true"
+  });
+}
+
+var __defProp$1 = Object.defineProperty;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$1 = (obj, key, value) => {
+  __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-let Ctx$2 = class Ctx {
+let Ctx$1 = class Ctx {
   constructor(options) {
-    __publicField$2(this, "root");
-    __publicField$2(this, "globs");
-    __publicField$2(this, "sourcePath");
-    __publicField$2(this, "path");
+    __publicField$1(this, "root");
+    __publicField$1(this, "globs");
+    __publicField$1(this, "sourcePath");
+    __publicField$1(this, "path");
     this.globs = options.globs;
   }
   setRoot(root) {
@@ -238,7 +284,7 @@ let Ctx$2 = class Ctx {
   }
 };
 function scssPreprocessor(options) {
-  const ctx = new Ctx$2(options);
+  const ctx = new Ctx$1(options);
   return {
     name: "vite-plugin-scssPreprocessor",
     enforce: "pre",
@@ -263,91 +309,16 @@ function createPreprocessor() {
   });
 }
 
-var __defProp$1 = Object.defineProperty;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$1 = (obj, key, value) => {
-  __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-let Ctx$1 = class Ctx {
-  constructor() {
-    __publicField$1(this, "root");
-    __publicField$1(this, "outDirName");
-    __publicField$1(this, "dir");
-    __publicField$1(this, "outDir");
-  }
-  setOptions(options) {
-    this.root = options.root;
-    this.outDirName = options.outDirName;
-    this.getDirPath();
-  }
-  getDirPath() {
-    const dir = resolve$1(this.root, this.outDirName);
-    const outDir = `${dir}.zip`;
-    this.dir = dir;
-    this.outDir = outDir;
-  }
-  async clean() {
-    const pathExists = await fse.pathExists(this.outDir);
-    if (pathExists) {
-      fse.remove(this.outDir);
-    }
-  }
-  async compress() {
-    const zip = new JSZip();
-    const files = this.getAllFiles(this.dir);
-    if (files && Array.isArray(files) && files.length) {
-      files.forEach((file) => {
-        const fileData = readFileSync(file, { encoding: "binary" });
-        zip.file(relative(this.dir, file), fileData, { binary: true });
-      });
-    }
-    const content = await zip.generateAsync({ type: "arraybuffer" });
-    writeFileSync(this.outDir, Buffer.from(content));
-  }
-  getAllFiles(dirPath) {
-    const files = readdirSync(dirPath);
-    const result = [];
-    for (const file of files) {
-      const filePath = join(dirPath, file);
-      if (statSync(filePath).isDirectory()) {
-        result.push(...this.getAllFiles(filePath));
-      } else {
-        result.push(filePath);
-      }
-    }
-    return result;
-  }
-};
-const ctx$1 = new Ctx$1();
-function zipPack() {
-  return {
-    name: "vite-plugin-zip",
-    apply: "build",
-    enforce: "post",
-    configResolved(configuration) {
-      const outDirName = configuration.build.outDir;
-      const root = configuration.root;
-      ctx$1.setOptions({ root, outDirName });
-    },
-    buildEnd() {
-      let isCompress = false;
-      process.on("beforeExit", async () => {
-        if (isCompress) {
-          return;
-        }
-        consola.start("\u5C06\u6587\u4EF6\u5305\u538B\u7F29\u6210zip...");
-        isCompress = true;
-        await ctx$1.clean();
-        await ctx$1.compress();
-        consola.success("\u6587\u4EF6\u538B\u7F29\u5B8C\u6210");
-        consola.success("\u6253\u5305\u6D41\u7A0B\u7ED3\u675F!");
-      });
-    }
-  };
+function createSvgIcon(isBuild) {
+  return createSvgIconsPlugin({
+    iconDirs: [path.resolve(process.cwd(), "src/assets/icons/")],
+    symbolId: "icon-[dir]-[name]",
+    svgoOptions: isBuild
+  });
 }
-function createZip() {
-  return zipPack();
+
+function createUnocss() {
+  return Unocss();
 }
 
 function createIcons() {
@@ -356,12 +327,6 @@ function createIcons() {
   });
 }
 
-function createConsole() {
-  return TurboConsole({
-    disableLaunchEditor: true
-  });
-}
-
 function createInspector(env) {
   const { VITE_APP_INSPECTOR } = env;
   if (VITE_APP_INSPECTOR && VITE_APP_INSPECTOR === "true") {
@@ -375,17 +340,6 @@ function createOpenAPI() {
   return OpenAPI();
 }
 
-function createConfig() {
-  return EnvRuntime({
-    name: "__PRODUCTION__PUBINFO__CONFIG__",
-    filename: "config.js",
-    include: [
-      "VITE_APP_TITLE",
-      "VITE_APP_API_BASEURL"
-    ]
-  });
-}
-
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => {
@@ -445,7 +399,13 @@ function createVitePlugins(viteEnv, isBuild = false) {
   const vitePlugins = [
     vue(),
     vueJsx(),
-    vueLegacy(),
+    vueLegacy({
+      modernPolyfills: [
+        "es.array.at",
+        "es.array.find-last"
+      ],
+      additionalLegacyPolyfills: ["abort-controller/polyfill"]
+    }),
     createAutoImport(),
     createComponents(),
     createUnocss(),
@@ -453,14 +413,13 @@ function createVitePlugins(viteEnv, isBuild = false) {
     createIcons(),
     createI18n(),
     createMock(viteEnv, isBuild),
-    createLayouts(),
     createBanner(),
     createPreprocessor(),
-    createZip(),
+    // createZip(),
     createConsole(),
     createInspector(viteEnv),
     createOpenAPI(),
-    createConfig(),
+    // createConfig(),
     appInfo()
   ];
   const buildPlugins = () => [
@@ -472,75 +431,16 @@ function createVitePlugins(viteEnv, isBuild = false) {
   return vitePlugins.filter(Boolean);
 }
 
-async function createDefineSystemInfo(root) {
-  try {
-    const pkgJson = await readPackageJSON(root);
-    const { dependencies, devDependencies, version } = pkgJson;
-    const lastBuildTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
-    const SYSTEM_INFO = {
-      pkg: {
-        dependencies,
-        devDependencies,
-        version
-      },
-      lastBuildTime
-    };
-    return JSON.stringify(SYSTEM_INFO);
-  } catch (error) {
-    return "";
-  }
-}
-function getServerProxy(env, isProxy, rewrite = true) {
-  if (!isProxy) {
-    return {};
-  }
-  const targetPrefix = "VITE_APP_API_";
-  const proxyKey = Object.keys(env).filter((key) => key.startsWith(targetPrefix));
-  const serverProxy = {};
-  for (const envKey of proxyKey) {
-    const url = env[envKey];
-    const { pathname } = new URL(url);
-    const pk = `${pathname}/proxy`;
-    if (pk in serverProxy) {
-      consola$1.error(`The proxy key ${chalk.bold.redBright(envKey)} \u279C ${chalk.bold.yellowBright(url)} already exists`);
-    } else {
-      serverProxy[pk] = {
-        target: url,
-        changeOrigin: rewrite,
-        rewrite: (path) => {
-          return path.replace(pk, "");
-        }
-      };
-    }
-  }
-  return serverProxy;
-}
-
-function cleanse() {
-  return {
-    name: "esbuild-plugin-cleanse",
-    setup(build) {
-      build.onLoad({ filter: /\/dist\/alova\.esm\.js$/ }, async (args) => {
-        let alovaContnet = await fs.readFile(args.path, "utf-8");
-        alovaContnet = alovaContnet.replace(/\/\* c8 ignore start \*\/[\s\S]*?\/\* c8 ignore stop \*\//g, "");
-        return {
-          contents: `${alovaContnet}`
-        };
-      });
-    }
-  };
-}
-
 function defineConfig(defineOptions = {}) {
   return defineConfig$1(async ({ mode, command }) => {
     const root = process.cwd();
     const pathResolve = (pathname) => resolve$1(root, ".", pathname);
-    const env = loadEnv(mode, root);
-    const timestamp = (/* @__PURE__ */ new Date()).getTime();
+    const __SYSTEM_INFO__ = await createDefineSystemInfo(root);
     const isBuild = command === "build";
+    const timestamp = (/* @__PURE__ */ new Date()).getTime();
+    const env = loadEnv(mode, root);
     const { VITE_OPEN_PROXY, VITE_BUILD_SOURCEMAP } = env;
     const serverProxy = getServerProxy(env, !isBuild && VITE_OPEN_PROXY === "true");
-    const __SYSTEM_INFO__ = await createDefineSystemInfo(root);
     const applicationConfig = {
       base: "./",
       server: {
@@ -571,17 +471,17 @@ function defineConfig(defineOptions = {}) {
         ]
       },
       optimizeDeps: {
-        include: [
-          "ant-design-vue/es/locale/zh_CN",
-          "ant-design-vue/es/locale/en_US",
-          "@ant-design/icons-vue",
-          "dayjs",
-          "dayjs/locale/eu",
-          "dayjs/locale/zh-cn",
-          "@pubinfo/pro-components",
-          "qrcode",
-          "@pubinfo/headlessui"
-        ],
+        // include: [
+        //   'ant-design-vue/es/locale/zh_CN',
+        //   'ant-design-vue/es/locale/en_US',
+        //   '@ant-design/icons-vue',
+        //   'dayjs',
+        //   'dayjs/locale/eu',
+        //   'dayjs/locale/zh-cn',
+        //   '@pubinfo/pro-components',
+        //   'qrcode',
+        //   '@pubinfo/headlessui',
+        // ],
         esbuildOptions: {
           plugins: [
             cleanse()
@@ -595,13 +495,13 @@ function defineConfig(defineOptions = {}) {
         chunkSizeWarningLimit: 2e3,
         rollupOptions: {
           output: {
-            entryFileNames: `assets/entry/[name]-[hash]-${timestamp}.js`,
-            manualChunks: {
-              vue: ["vue", "pinia", "vue-router"],
-              lodash: ["lodash-es"],
-              antd: ["ant-design-vue", "@ant-design/icons-vue"],
-              lottie: ["lottie-web"]
-            }
+            entryFileNames: `assets/entry/[name]-[hash]-${timestamp}.js`
+            // manualChunks: {
+            //   vue: ['vue', 'pinia', 'vue-router'],
+            //   lodash: ['lodash-es'],
+            //   antd: ['ant-design-vue', '@ant-design/icons-vue'],
+            //   lottie: ['lottie-web'],
+            // },
           }
         }
       },
@@ -612,7 +512,10 @@ function defineConfig(defineOptions = {}) {
       },
       plugins: createVitePlugins(env, isBuild)
     };
-    return mergeConfig(applicationConfig, defineOptions);
+    return mergeConfig(
+      applicationConfig,
+      typeof defineOptions === "function" ? defineOptions({ mode, command }) : defineOptions
+    );
   });
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/vite",
   "type": "module",
-  "version": "0.6.7",
+  "version": "0.6.10",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -20,39 +20,38 @@
   },
   "dependencies": {
     "@intlify/unplugin-vue-i18n": "^4.0.0",
-    "@pubinfo/unplugin-openapi": "^0.6.4",
-    "@vitejs/plugin-legacy": "^5.4.1",
-    "@vitejs/plugin-vue": "^5.0.5",
-    "@vitejs/plugin-vue-jsx": "^4.0.0",
-    "boxen": "^7.1.1",
+    "@pubinfo/unplugin-openapi": "^0.7.0",
+    "@vitejs/plugin-legacy": "^5.4.2",
+    "@vitejs/plugin-vue": "^5.1.4",
+    "@vitejs/plugin-vue-jsx": "^4.0.1",
+    "abort-controller": "^3.0.0",
+    "boxen": "^8.0.1",
     "chalk": "^5.3.0",
     "consola": "^3.2.3",
-    "dayjs": "^1.11.11",
+    "dayjs": "^1.11.13",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
     "jszip": "^3.10.1",
-    "pkg-types": "^1.1.3",
-    "terser": "^5.31.1",
-    "unocss": "^0.61.3",
-    "unplugin-auto-import": "^0.17.6",
-    "unplugin-icons": "^0.19.0",
-    "unplugin-turbo-console": "^1.9.1",
-    "unplugin-vue-components": "^0.27.2",
+    "pkg-types": "^1.2.0",
+    "terser": "^5.31.6",
+    "unocss": "^0.62.3",
+    "unplugin-auto-import": "^0.18.2",
+    "unplugin-icons": "^0.19.2",
+    "unplugin-turbo-console": "^1.10.1",
+    "unplugin-vue-components": "^0.27.4",
     "vite-plugin-banner": "^0.7.1",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-env-runtime": "^0.3.5",
     "vite-plugin-fake-server": "^2.1.1",
     "vite-plugin-pages": "^0.32.3",
     "vite-plugin-svg-icons": "^2.0.1",
-    "vite-plugin-vue-devtools": "^7.3.5",
-    "vite-plugin-vue-meta-layouts": "^0.4.3"
+    "vite-plugin-vue-devtools": "^7.3.9"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
-    "esbuild": "^0.21.5",
-    "vite": "^5.3.3",
-    "vue": "^3.4.31",
-    "vue-i18n": "^9.13.1"
+    "vite": "^5.4.8",
+    "vue": "^3.5.12",
+    "vue-i18n": "^10.0.4"
   },
   "scripts": {
     "clean": "pnpm rimraf node_modules dist .turbo",