ptech-preset 1.2.4 → 1.2.5

package/dist/index.js

@@ -85,10 +85,12 @@ import path2 from "path";
 async function collectAutoRemotes(opts = {}) {
   const remotes = {};
   const prefix = opts.envPrefix ?? "REMOTE_";
-  for (const [k, v] of Object.entries(process.env)) {
-    if (!v) continue;
+  for (const [k, vRaw] of Object.entries(process.env)) {
+    if (!vRaw) continue;
     if (k.startsWith(prefix)) {
       const scope = k.slice(prefix.length).toLowerCase();
+      const v = String(vRaw).trim();
+      if (!v) continue;
       remotes[scope] = `${scope}@${v}`;
     }
   }
@@ -115,9 +117,13 @@ async function collectAutoRemotes(opts = {}) {
         console.warn(`[mf-auto] read manifest error:`, e);
       }
     }
-    for (const [scope, url] of Object.entries(obj)) {
-      if (typeof url === "string" && url.trim()) {
-        remotes[scope] = `${scope}@${url}`;
+    for (const [scopeRaw, urlRaw] of Object.entries(obj)) {
+      const scope = String(scopeRaw).toLowerCase();
+      const url = String(urlRaw || "").trim();
+      if (url) {
+        if (!remotes[scope]) {
+          remotes[scope] = `${scope}@${url}`;
+        }
       }
     }
   }
@@ -154,6 +160,54 @@ var DEFAULT_SHARED = {
   "@azure/msal-browser": { singleton: true, eager: true, requiredVersion: false }
 };
 var CDN_BASE = "https://oneportal.blob.core.windows.net/external/ts/";
+function parseRemoteSpec(key, val) {
+  if (typeof val !== "string") return null;
+  const m = val.match(/^([^@]+)@(.+)$/);
+  if (m) return { scope: m[1], url: m[2] };
+  return { scope: key, url: val };
+}
+function inferTypeUrls(remoteUrl) {
+  if (typeof remoteUrl !== "string") return null;
+  const base = remoteUrl.replace(/\/remoteEntry(\.[cm]?js)?(\?.*)?$/i, "");
+  if (!base || base === remoteUrl) {
+    const idx = remoteUrl.lastIndexOf("/");
+    const fallbackBase = idx > 7 ? remoteUrl.slice(0, idx) : remoteUrl;
+    return {
+      base: fallbackBase,
+      zip: `${fallbackBase}/@mf-types.zip`,
+      api: `${fallbackBase}/@mf-types.d.ts`
+    };
+  }
+  return {
+    base,
+    zip: `${base}/@mf-types.zip`,
+    api: `${base}/@mf-types.d.ts`
+  };
+}
+function buildRemoteTypeUrls(remotes) {
+  const out = {};
+  if (!remotes || typeof remotes !== "object") return out;
+  for (const [key, val] of Object.entries(remotes)) {
+    if (typeof val !== "string") continue;
+    const parsed = parseRemoteSpec(key, val);
+    if (!parsed) continue;
+    const t = inferTypeUrls(parsed.url);
+    if (!t) continue;
+    const scope = (parsed.scope || key).toString();
+    out[scope] = {
+      alias: scope,
+      zip: t.zip,
+      api: t.api
+    };
+  }
+  return out;
+}
+function ensureDtsObject(dts) {
+  if (dts === false) return false;
+  if (dts == null || dts === true) return {};
+  if (typeof dts === "object") return { ...dts };
+  return {};
+}
 function pluginCore(opts) {
   const {
     baseDir = "src",
@@ -249,9 +303,35 @@ function pluginCore(opts) {
           mfMerged.exposes = { ...mfMerged.exposes ?? {}, [stylesExposeKey]: `./${relFromRoot}` };
         }
       }
-      const isBuild = api?.context?.command === "build" || process.env.NODE_ENV === "production";
-      if (typeof mfMerged.dts === "undefined") {
-        mfMerged.dts = isBuild;
+      if (mfMerged.remotes && Object.keys(mfMerged.remotes).length > 0) {
+        if (mfMerged.dts !== false) {
+          const dtsObj = ensureDtsObject(mfMerged.dts);
+          const autoTypeUrls = buildRemoteTypeUrls(mfMerged.remotes);
+          if (Object.keys(autoTypeUrls).length > 0) {
+            const existingConsume = dtsObj.consumeTypes ?? {};
+            const existingRt = existingConsume.remoteTypeUrls ?? {};
+            dtsObj.consumeTypes = {
+              typesFolder: existingConsume.typesFolder ?? "@mf-types",
+              maxRetries: existingConsume.maxRetries ?? 3,
+              remoteTypeUrls: { ...autoTypeUrls, ...existingRt }
+              // existing wins? or auto wins?
+              // Nếu muốn "khóa" theo existing ưu tiên, đảo thứ tự:
+              // remoteTypeUrls: { ...autoTypeUrls, ...existingRt },
+            };
+            dtsObj.generateTypes = dtsObj.generateTypes ?? { tsConfigPath: "./tsconfig.json" };
+          }
+          mfMerged.dts = dtsObj;
+        }
+      } else {
+        const isBuild = api?.context?.command === "build" || process.env.NODE_ENV === "production";
+        if (typeof mfMerged.dts === "undefined") {
+          mfMerged.dts = isBuild ? {} : {};
+        }
+        if (mfMerged.dts !== false) {
+          const dtsObj = ensureDtsObject(mfMerged.dts);
+          dtsObj.generateTypes = dtsObj.generateTypes ?? { tsConfigPath: "./tsconfig.json" };
+          mfMerged.dts = dtsObj;
+        }
       }
       const mfPlugin = pluginModuleFederation(mfMerged);
       await mfPlugin.setup?.(api);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ptech-preset",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "Auto Module.",
   "type": "module",
   "main": "dist/index.js",