@infly/libs 2.0.44 → 2.0.46

package/README.md

@@ -4,11 +4,12 @@
 
 `@infly/libs` 是不受 Vue、React 等前端框架限制的独立 JavaScript 工具库。包根入口无副作用；HTTP、Token、文件处理、Docker/Compose、通用项目命令等能力可被不同技术栈使用。
 
-Vue 2 专属的 Permission、Vuex store、Vue CLI 预览和 webpack 配置集中在 `adapters/vue2/`，避免核心入口依赖 Vue 项目约定。
+Vue 2 专属的 Permission、Vuex store、实例 mixin、Vue CLI 预览和 webpack 配置集中在 `adapters/vue2/`，避免核心入口依赖 Vue 项目约定。
 
 ## 注意事项
 
-新代码应显式导入 Vue 2 适配路径。原有 `module/Permission.js`、`store/`、`tools/project-preview.js`、`script/index.js` 和 `build/webpack5/` 路径继续作为兼容转发保留。
+新代码应显式导入 Vue 2 适配路径。Webpack 适配器仅服务脱离
+admin-monorepo 的子模块独立构建；Monorepo 根构建不会调用该实现。
 
 ## 软件架构
 
@@ -19,19 +20,30 @@ Vue 2 专属的 Permission、Vuex store、Vue CLI 预览和 webpack 配置集中
 ├── tools/                      # 文件与项目命令等通用工具
 ├── build/
 │   ├── docker/                 # Docker/Compose 工具
-│   ├── build-dist/             # 构建产物处理
-│   ├── build/webpack5/          # Vue 2 webpack 真实实现
-│   └── webpack5/               # 原路径兼容转发
+│   └── build-dist/             # 构建产物处理
 ├── adapters/vue2/
+│   ├── module/file-export.js  # 注入请求与 Element UI 能力的 Vue2 导出 mixin
 │   ├── module/Permission.js    # Vue Router/Vuex 权限适配
 │   ├── store/                  # Vuex 模块
 │   ├── project-preview.js      # Vue CLI 预览
 │   ├── script-config.js        # Vue CLI 脚本模板
+│   ├── vite/                   # Monorepo Vite 定位与兼容入口
+│   ├── webpack5/               # 独立子仓 Webpack 兼容适配器
 │   └── postinstall.js          # 仅 Vue 2 项目执行初始化
 ├── bin/cli.js                  # 命令行入口
 └── dataInit/                   # 公共枚举
 ```
 
+Vue2 文件导出适配：
+
+```javascript
+import { fileExportMixin } from "@infly/libs/adapters/vue2/module/file-export.js";
+
+Vue.mixin(fileExportMixin);
+```
+
+适配器只负责从 Vue 实例注入 `$axios`、`$message`、`$msgbox` 和 `$loading`；确认、请求与下载流程由 `@infly/ts-libs` 的 `exportFile` 实现。`@infly/ui` 不公开该 mixin。
+
 根入口加载示例：
 
 ```javascript

package/adapters/vue2/module/Permission.js

@@ -1,5 +1,5 @@
 import Uts from "../../../module/Uts";
-import TokenService from "../../../module/TokenService";
+import TokenService from "./TokenService.js";
 
 /**
  * 路由拦截器

package/{module → adapters/vue2/module}/REST.js

@@ -8,16 +8,16 @@
  *     新项目（React/非 Vue 生态）请使用 @infly/ts-libs createHttpClient。
  */
 import axios from "axios";
-import Uts from "./Uts.js";
+import Uts from "../../../module/Uts.js";
 import TokenService from "./TokenService.js";
 import {
   matchesConfiguredBaseURL,
   resolveInternalServiceURL
-} from "./cjs/request-url-rules.cjs";
+} from "../../../module/cjs/request-url-rules.js";
 import {
   normalizeErrorPayload,
   resolveStatusErrorMessage
-} from "./cjs/rest-error-rules.cjs";
+} from "../../../module/cjs/rest-error-rules.js";
 
 const baseURL = process.env.VUE_APP_BASE_API;
 const { env } = Uts.getEnv() || {};

package/{module → adapters/vue2/module}/TokenService.js

@@ -8,7 +8,7 @@
  *     新项目（React/非 Vue 生态）请使用 @infly/ts-libs createStorageTokenStore。
  */
 // TokenService.js
-import Uts from "./Uts"; // 假设Uts工具类在同级目录或可访问路径
+import Uts from "../../../module/Uts.js"; // 假设Uts工具类在同级目录或可访问路径
 
 let TOKEN_KEY = "accessToken"; // 默认的token键名
 let CHAT_TOKEN_KEY = "chatAccessToken"; // 默认的聊天token键名

package/adapters/vue2/module/file-export.js

@@ -0,0 +1,18 @@
+import { exportFile } from "@infly/ts-libs";
+
+const fileExportMixin = {
+  methods: {
+    async $exportFile(config = {}) {
+      return exportFile({
+        ...config,
+        message: this.$message || config.message || config.Message || {},
+        messageBox:
+          this.$msgbox || config.messageBox || config.MessageBox || {},
+        loading: this.$loading || config.loading || config.Loading || {},
+        request: config.request || this.$axios,
+      });
+    },
+  },
+};
+
+export { fileExportMixin };

package/adapters/vue2/project-preview.js

@@ -84,6 +84,8 @@ async function init(skipBuild = false) {
     const serveStatic = require("serve-static");
     const app = connect();
     const noBuild = skipBuild || rawArgv.includes("--no-build");
+    // Vite 构建：使用 workspace runner 传入的 target 输出目录
+    const useViteOutput = buildContext.outputDir && fs.existsSync(buildContext.outputDir);
     const { devServer } = projectConfig || {};
     const { port: devServerPort } = devServer || {};
     projectConfig.port = devServerPort || DEFAULT_CONFIG.port;
@@ -91,6 +93,7 @@ async function init(skipBuild = false) {
       ...DEFAULT_CONFIG,
       ...projectConfig
     };
+    const serveDir = useViteOutput ? buildContext.outputDir : outputDir;
     const baseListenPort = port - 1000;
 
     if (!noBuild) {
@@ -101,16 +104,17 @@ async function init(skipBuild = false) {
 
     app.use(
       publicPath,
-      serveStatic(outputDir, {
+      serveStatic(serveDir, {
         index: ["index.html", "/"]
       })
     );
 
     const server = app.listen(listenPort, function () {
       const previewUrl = `http://localhost:${listenPort}${publicPath}`;
+      const targetSuffix = buildContext.targetLabel ? ` (${buildContext.targetLabel})` : '';
 
       if (buildContext.batchPreview === true || process.env.INFLY_BATCH_PREVIEW === "1") {
-        console.log(global.logColor.link, `${projectPackage.name || path.basename(projectRoot)}: ${previewUrl}`);
+        console.log(global.logColor.link, `${projectPackage.name || path.basename(projectRoot)}${targetSuffix}: ${previewUrl}`);
         return;
       }
 

package/adapters/vue2/script-config.js

@@ -16,7 +16,7 @@ module.exports = {
     },
     {
       key: "build:stage",
-      value: "infly-libs beforeBuild && vue-cli-service build --mode staging && infly-libs afterBuild"
+      value: "infly-libs beforeBuild && vue-cli-service build --mode staging --no-module && infly-libs afterBuild"
     },
     {
       key: "build:test",

package/adapters/vue2/store/modules/user.js

@@ -1,5 +1,5 @@
 import Uts from "../../../../module/Uts.js";
-import TokenService from "../../../../module/TokenService.js";
+import TokenService from "../../module/TokenService.js";
 
 const CONFIG = {
   router: {},

package/adapters/vue2/vite/index.js

@@ -0,0 +1,95 @@
+const fs = require("node:fs");
+const path = require("node:path");
+
+function findAdminMonorepoRoot(startDir = process.cwd()) {
+  let directory = path.resolve(startDir);
+  for (;;) {
+    if (
+      fs.existsSync(path.join(directory, "pnpm-workspace.yaml"))
+      && fs.existsSync(path.join(directory, "configs/vite-configs/registry.js"))
+    ) return directory;
+    const parent = path.dirname(directory);
+    if (parent === directory) return null;
+    directory = parent;
+  }
+}
+
+function resolveAppScssImport(importPath, importer, appRoot) {
+  const cleanImporter = importer.replace(/[?#].*$/, "");
+  if (importPath.startsWith("@/")) {
+    return path.resolve(appRoot, "src", importPath.slice(2));
+  }
+  if (importPath.startsWith("./") || importPath.startsWith("../")) {
+    return path.resolve(path.dirname(cleanImporter), importPath);
+  }
+  if (path.isAbsolute(importPath)) return path.resolve(importPath);
+  return null;
+}
+
+function transformScssExportImports(code, importer, options) {
+  const { appRoot, readFile = (file) => fs.readFileSync(file, "utf8") } = options;
+  return code.replace(
+    /import\s+([\w$]+)\s+from\s+(["'])([^"'?]+\.scss)\2\s*;?/g,
+    (statement, binding, quote, importPath) => {
+      const resolved = resolveAppScssImport(importPath, importer, appRoot);
+      if (!resolved) return statement;
+      let scss;
+      try {
+        scss = readFile(resolved);
+      } catch (_) {
+        return statement;
+      }
+      if (typeof scss !== "string") return statement;
+      const exportBlock = scss.match(/:export\s*\{([\s\S]*?)\}/);
+      if (!exportBlock) return statement;
+
+      const variables = new Map();
+      for (const match of scss.matchAll(/^\s*\$([\w-]+)\s*:\s*([^;]+);/gm)) {
+        variables.set(match[1], match[2].trim());
+      }
+      const exported = {};
+      for (const match of exportBlock[1].matchAll(/([\w-]+)\s*:\s*([^;]+);/g)) {
+        const rawValue = match[2].trim();
+        const variableName = rawValue.match(/^\$([\w-]+)$/);
+        exported[match[1]] = variableName && variables.has(variableName[1])
+          ? variables.get(variableName[1])
+          : rawValue;
+      }
+      return `import ${quote}${importPath}${quote};\nconst ${binding} = ${JSON.stringify(exported)};`;
+    },
+  );
+}
+
+function createScssExportCompatPlugin(appRoot) {
+  return {
+    name: "infly-vue2:scss-export-compat",
+    enforce: "pre",
+    transform(code, id) {
+      if (
+        id.includes("node_modules")
+        || (!id.includes(".vue") && !/\.[cm]?[jt]sx?(?:[?#].*)?$/.test(id))
+        || !/import\s+[\w$]+\s+from\s+["'][^"']+\.scss["']/.test(code)
+      ) return null;
+      const transformed = transformScssExportImports(code, id, { appRoot });
+      return transformed === code ? null : { code: transformed, map: null };
+    },
+  };
+}
+
+function addAppRootSassLoadPath(css, appRoot) {
+  if (!css.preprocessorOptions) css.preprocessorOptions = {};
+  if (!css.preprocessorOptions.scss) css.preprocessorOptions.scss = {};
+  const loadPaths = css.preprocessorOptions.scss.loadPaths || [];
+  const resolvedAppRoot = path.resolve(appRoot);
+  css.preprocessorOptions.scss.loadPaths = loadPaths.includes(resolvedAppRoot)
+    ? loadPaths
+    : [...loadPaths, resolvedAppRoot];
+  return css;
+}
+
+module.exports = {
+  addAppRootSassLoadPath,
+  findAdminMonorepoRoot,
+  transformScssExportImports,
+  createScssExportCompatPlugin,
+};

package/adapters/vue2/vite/jest.config.js

@@ -0,0 +1,11 @@
+module.exports = {
+  moduleFileExtensions: ["js", "json", "vue"],
+  moduleNameMapper: {
+    "^@/(.*)$": "<rootDir>/src/$1",
+  },
+  testEnvironment: "jsdom",
+  transform: {
+    "^.+\\.js$": "babel-jest",
+    ".*\\.(vue)$": "@vue/vue2-jest",
+  },
+};

package/adapters/vue2/{build/webpack5 → webpack5}/webpack.base.js

@@ -2,8 +2,6 @@
 
 const path = require("path");
 const InlineRuntimePlugin = require("./inline-runtime-plugin");
-const RemoveLegacyAssetsPlugin = require("./remove-legacy-assets-plugin");
-
 // 环境变量与常量配置
 const ENV = {
   IS_PROD: ["production", "staging"].includes(process.env.NODE_ENV),
@@ -11,13 +9,6 @@ const ENV = {
   IS_DEV: process.env.ENV === "development"
 };
 
-// 强制禁用 modern mode（staging 环境）
-if (ENV.IS_STAGING) {
-  process.env.VUE_CLI_MODERN_MODE = "false";
-  process.env.VUE_CLI_MODERN_BUILD = "false";
-  console.log("\n\x1b[36m⚡ Building for STAGING with Modern Bundle only (仅现代浏览器)...\x1b[0m");
-}
-
 /**
  * 解析项目路径（兼容monorepo）
  * @param {string} dir 相对路径
@@ -151,52 +142,6 @@ function chainWebpack(config, options = {}) {
     });
   }
 
-  // 强制禁用 modern mode（staging 环境）
-  if (ENV.IS_STAGING) {
-    // 删除 @vue/cli-service 的 modern mode 相关插件
-    config.plugins.delete("modern-mode-plugin");
-
-    // 强制修改 HTML 插件配置
-    config.plugin("html").tap((args) => {
-      args[0] = args[0] || {};
-
-      // 彻底禁用 modern mode
-      args[0].modern = false;
-      args[0].modulePreload = false;
-      args[0].scriptLoading = "defer";
-
-      // 删除所有 modern/legacy 相关的钩子和回调
-      delete args[0].modernBuild;
-      delete args[0].legacyBuild;
-      delete args[0].modernManifest;
-      delete args[0].legacyManifest;
-
-      // 关键：重写 templateParameters 来阻止 modern mode 注入
-      const originalTemplateParameters = args[0].templateParameters || {};
-      args[0].templateParameters = (compilation, assets, assetTags, options) => {
-        const params =
-          typeof originalTemplateParameters === "function"
-            ? originalTemplateParameters(compilation, assets, assetTags, options)
-            : originalTemplateParameters;
-
-        // 移除 modern/legacy 相关的参数
-        if (params) {
-          delete params.modernBuild;
-          delete params.legacyBuild;
-          delete params.modernManifest;
-          delete params.legacyManifest;
-        }
-
-        return params;
-      };
-
-      return args;
-    });
-
-    // 添加自定义插件来处理 legacy 文件问题
-    config.plugin("remove-legacy-assets").use(RemoveLegacyAssetsPlugin);
-  }
-
   // Babel 配置：只转译现代浏览器 + TypeScript（支持 @infly/ts-libs）
   config.module
     .rule("js")

package/build/build-dist/index.js

@@ -21,7 +21,7 @@ global.logColor = {
 const { zipSync } = require("./zip.js");
 const { buildList } = require("../../script");
 const { init: previewInit } = require("../../tools/project-preview.js");
-const { postVersionFileAndMsg } = require("../../script/webhook/webhook.js");
+const { postVersionFileAndMsg } = require("../build-utils/webhook-single.js");
 const { scriptWrite, targetProjectFileResolve, currentProjectFileResolve } = require("../../tools/file-process.js");
 const { shouldManageBuildScripts } = require("./script-management.js");
 const {
@@ -34,7 +34,7 @@ const {
   checkSingleDirGitStatus,
   pullSingleDirFromBranch
 } = require("../../script/git-automation");
-const { resolveSiblingAppDeps } = require("../../script/build/deps");
+const { resolveSiblingAppDeps } = require("../build-utils/deps");
 
 const scriptEvent = process.env.npm_lifecycle_event;
 const isBuilZipScript = process.env.npm_lifecycle_event;

package/{script/build → build/build-utils}/command.js

@@ -2,14 +2,19 @@ const { spawn } = require("child_process");
 
 function run(command, args, options = {}) {
   return new Promise((resolve, reject) => {
-    const child = spawn(command, args, {
+    const useShell = options.shell !== undefined ? options.shell : process.platform === "win32";
+    // Avoid DEP0190: when shell=true, pass command+args as single string
+    const [cmd, cmdArgs] = useShell
+      ? [[command, ...args].join(" "), []]
+      : [command, args];
+    const child = spawn(cmd, cmdArgs, {
       cwd: options.cwd || process.cwd(),
       env: {
         ...process.env,
         ...(options.env || {})
       },
       stdio: options.stdio || "inherit",
-      shell: process.platform === "win32"
+      shell: useShell
     });
 
     child.on("close", (code) => {
@@ -25,14 +30,18 @@ function run(command, args, options = {}) {
 }
 
 function spawnBackground(command, args, options = {}) {
-  const child = spawn(command, args, {
+  const useShell = options.shell !== undefined ? options.shell : process.platform === "win32";
+  const [cmd, cmdArgs] = useShell
+    ? [[command, ...args].join(" "), []]
+    : [command, args];
+  const child = spawn(cmd, cmdArgs, {
     cwd: options.cwd || process.cwd(),
     env: {
       ...process.env,
       ...(options.env || {})
     },
     stdio: options.stdio || "inherit",
-    shell: process.platform === "win32"
+    shell: useShell
   });
 
   child.on("error", (error) => {

package/{script/build → build/build-utils}/git.js

@@ -1,7 +1,7 @@
 const fs = require("fs");
 const path = require("path");
-const { checkAndUpdatePackages } = require("../git-automation");
-const { gitOutput, findGitRepo, getGitCommonDir } = require("../git-automation/git-utils");
+const { checkAndUpdatePackages } = require("../../script/git-automation");
+const { gitOutput, findGitRepo, getGitCommonDir } = require("../../script/git-automation/git-utils");
 const { run } = require("./command");
 
 function getTargetBranch(rootPackageJson, mode) {
@@ -77,9 +77,11 @@ function getDistRepoInfo(rootDir, pkg, targetBranch, options = {}) {
     fs.existsSync(nextConfigTs)
   );
 
-  let outputDir;
+  let outputDir = pkg.viteOutputDir;
 
-  if (hasVueConfig) {
+  if (outputDir) {
+    // Vite 注册表已经提供经过校验的 dist 根，禁止再执行历史 vue.config.js。
+  } else if (hasVueConfig) {
     outputDir = require(vueConfigPath).outputDir;
   } else if (hasNextConfig) {
     outputDir = pkg.packageJson.infly?.buildConfigs?.outputPath;

package/{script/build → build/build-utils}/preview.js

@@ -34,7 +34,10 @@ function startBatchPreviews(rootDir, packages) {
     const child = spawnBackground("infly-libs", ["preview", "--no-build"], {
       cwd: path.join(rootDir, pkg.dir),
       env: createBuildContext({
-        batchPreview: true
+        batchPreview: true,
+        outputDir: pkg.targetOutputDir || undefined,
+        target: pkg.targetKey || undefined,
+        targetLabel: pkg.targetLabel || undefined,
       })
     });