hifun-tools 1.3.24 → 1.3.26

package/dist/init/getResource.d.ts

@@ -1,5 +1,5 @@
 /**
- * 通用资源加载函数（支持 Vite / Webpack / Rspack）
+ * 通用资源加载函数（支持 Vite 与 Webpack）
  * @param path - 相对路径，如 "tenant/config.json" 或 "tenant/logo.png"
  */
 export declare function getResource(path: string): any;

package/dist/init/getResource.js

@@ -1,38 +1,18 @@
 /**
- * 通用资源加载函数（支持 Vite / Webpack / Rspack）
+ * 通用资源加载函数（支持 Vite 与 Webpack）
  * @param path - 相对路径，如 "tenant/config.json" 或 "tenant/logo.png"
  */
 export function getResource(path) {
     const isVite = typeof import.meta !== "undefined" && !!import.meta.env;
-    // ---------------- 新增 RSPACK 检测 ----------------
-    const isRspack = typeof __rspack_require__ === "function" ||
-        (typeof __webpack_require__ === "function" &&
-            !!__webpack_require__.s && // Rspack 专属字段
-            !__webpack_require__.m); // Webpack 有 m，Rspack 不一定有
-    const isWebpack = !isRspack && // 不冲突：优先识别 Rspack
-        (typeof __webpack_require__ === "function" ||
-            (typeof require !== "undefined" &&
-                typeof require.context === "function"));
-    // ---------------- RSPACK ----------------
-    if (isRspack) {
-        try {
-            const ctx = require.context("/config", true, /\.(json|png|jpg|jpeg|svg|webp)$/);
-            const files = ctx.keys();
-            const match = files.find((key) => key.endsWith(path));
-            if (!match) {
-                console.warn(`[getResource] 未找到文件: ${path}`);
-                return null;
-            }
-            return ctx(match);
-        }
-        catch (e) {
-            console.error("[getResource] Rspack context 加载失败", e);
-        }
+    const isWebpack = typeof __webpack_require__ === "function" ||
+        (typeof require !== "undefined" &&
+            typeof require.context === "function");
+    if (process.env.__rspack__) {
+        return;
     }
-    // ---------------- VITE ----------------
     else if (isVite) {
-        const { glob } = import.meta;
-        const modules = glob([
+        // ---------------- VITE ----------------
+        const modules = import.meta.glob([
             "/config/**/*.json",
             "/config/**/*.png",
             "/config/**/*.jpg",
@@ -48,10 +28,11 @@ export function getResource(path) {
             console.warn(`[getResource] 未找到文件: ${path}`);
             return null;
         }
-        return match[1];
+        const [, mod] = match;
+        return mod;
     }
-    // ---------------- WEBPACK ----------------
     else if (isWebpack) {
+        // ---------------- WEBPACK ----------------
         const ctx = require.context("/config", true, /\.(json|png|jpg|jpeg|svg|webp)$/);
         const files = ctx.keys();
         const match = files.find((key) => key.endsWith(path));
@@ -61,6 +42,6 @@ export function getResource(path) {
         }
         return ctx(match);
     }
-    console.error("[getResource] 不支持的构建环境（需要 Vite/Webpack/Rspack）");
+    console.error("[getResource] 不支持的构建环境（需要 Vite 或 Webpack）");
     return null;
 }

package/dist/init/index.js

@@ -97,7 +97,7 @@ class InitCls {
             this.tenant = tenantInfo.tenant;
             this.tenantConfig = getResource(`${tenantInfo.tenant}/config.json`);
             this.initialized = true;
-            console.info(`🏢 严格加载租户成功: ${this.tenant}`, this.getImgPath("logo-default.png"));
+            console.info(`🏢 严格加载租户成功: ${this.tenant}`);
             return this.tenant;
         }
         catch (error) {
@@ -134,9 +134,9 @@ class InitCls {
             const response = await fetch(`/lineAddress.txt?t=${Date.now()}`);
             const configText = await response.text();
             let baseUrl = JSON.parse(AesDecrypt(configText));
-            const { lineGroup, tenant } = this.getTenantDict();
+            const { lineGroup } = this.getTenantDict();
             const dictList = this.getTenantDictList();
-            baseUrl = filterSmartLines(dictList, baseUrl, lineGroup, tenant);
+            baseUrl = filterSmartLines(dictList, baseUrl, lineGroup);
             if (Array.isArray(baseUrl)) {
                 try {
                     this.domainBaseUrl = toStandardUrl(await getOptimalDecodedString(baseUrl));

package/dist/init/viteResource.d.ts

@@ -0,0 +1 @@
+export declare function viteLoadSync(path: string): any;

package/dist/init/viteResource.js

@@ -0,0 +1,13 @@
+// viteResource.ts
+export function viteLoadSync(path) {
+    const modules = import.meta.glob([
+        "/config/**/*.json",
+        "/config/**/*.png",
+        "/config/**/*.jpg",
+        "/config/**/*.jpeg",
+        "/config/**/*.svg",
+        "/config/**/*.webp",
+    ], { eager: true, import: "default" });
+    const match = Object.entries(modules).find(([key]) => key.endsWith(path));
+    return match ? match[1] : null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hifun-tools",
-  "version": "1.3.24",
+  "version": "1.3.26",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",