ptech-preset 1.3.1 → 1.3.3

package/dist/index.js

@@ -1,3 +1,10 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
 // src/index.ts
 import path3 from "path";
 import fs3 from "fs";
@@ -127,6 +134,14 @@ async function collectAutoRemotes(opts = {}) {
 }
 
 // src/index.ts
+var DEFAULT_SHARED = {
+  react: { singleton: true, eager: true, requiredVersion: false },
+  "react-dom": { singleton: true, eager: true, requiredVersion: false },
+  "react-router": { singleton: true, eager: true, requiredVersion: false },
+  "@azure/msal-react": { singleton: true, eager: true, requiredVersion: false },
+  "@azure/msal-browser": { singleton: true, eager: true, requiredVersion: false }
+};
+var CDN_BASE = "https://oneportal.blob.core.windows.net/external/ts/";
 function getPackageName(root) {
   try {
     const pkgPath = path3.resolve(root, "package.json");
@@ -148,22 +163,6 @@ function normalizeExposePath(root, maybeRel) {
   return `./${relFromRoot}`;
 }
 var escapeRegExp = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-var DEFAULT_SHARED = {
-  react: { singleton: true, eager: true, requiredVersion: false },
-  "react-dom": {
-    singleton: true,
-    eager: true,
-    requiredVersion: false
-  },
-  "react-router": { singleton: true, eager: true, requiredVersion: false },
-  "@azure/msal-react": { singleton: true, eager: true, requiredVersion: false },
-  "@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(/^([^@]+)@(.+)$/);
@@ -193,12 +192,6 @@ function buildRemoteTypeUrls(remotes) {
   }
   return out;
 }
-function ensureDtsObject(dts) {
-  if (dts === false) return false;
-  if (dts == null || dts === true) return {};
-  if (typeof dts === "object") return { ...dts };
-  return {};
-}
 async function devFetchRemoteTypesOnce(params) {
   const { root, baseDir, typesFolderRel, urls } = params;
   if (!urls || Object.keys(urls).length === 0) return;
@@ -209,9 +202,7 @@ async function devFetchRemoteTypesOnce(params) {
     try {
       const res = await fetch(spec.api);
       if (!res.ok) {
-        console.warn(
-          `[mf-auto] fetch types failed for ${scope}: ${res.status} ${res.statusText}`
-        );
+        console.warn(`[mf-auto] fetch types failed for ${scope}: ${res.status} ${res.statusText}`);
         continue;
       }
       const txt = await res.text();
@@ -223,11 +214,7 @@ async function devFetchRemoteTypesOnce(params) {
   const refs = Object.keys(urls).map((s) => `/// <reference path="./__remotes/${s}.d.ts" />`).join(os.EOL);
   const banner = `// generated by plugin-mf-auto (dev once)
 `;
-  fs3.writeFileSync(
-    path3.join(typesRootAbs, "index.d.ts"),
-    banner + refs + os.EOL,
-    "utf8"
-  );
+  fs3.writeFileSync(path3.join(typesRootAbs, "index.d.ts"), banner + refs + os.EOL, "utf8");
   const shimDir = path3.join(root, baseDir, ".mf-auto");
   fs3.mkdirSync(shimDir, { recursive: true });
   const relToIndex = path3.relative(shimDir, path3.join(typesRootAbs, "index.d.ts")).replace(/\\/g, "/");
@@ -239,44 +226,95 @@ async function devFetchRemoteTypesOnce(params) {
     "utf8"
   );
 }
+function tryRequireTs(root) {
+  const paths = [root, __dirname, process.cwd()];
+  for (const p of paths) {
+    try {
+      const tsPath = __require.resolve("typescript", { paths: [p] });
+      return __require(tsPath);
+    } catch {
+    }
+  }
+  return null;
+}
+function readBaseTsConfigJSONC(baseAbs, root) {
+  const ts = tryRequireTs(root);
+  if (ts) {
+    try {
+      const r = ts.readConfigFile(baseAbs, ts.sys.readFile);
+      if (r.error) {
+        const msg = r.error.messageText && r.error.messageText.toString() || "unknown";
+        console.warn("[plugin-mf-auto] TypeScript readConfigFile error:", msg);
+      }
+      if (r.config) return r.config;
+    } catch (e) {
+      console.warn("[plugin-mf-auto] TS readConfigFile threw, fallback to JSONC:", e);
+    }
+  }
+  try {
+    const { parse } = __require("jsonc-parser");
+    const raw = fs3.readFileSync(baseAbs, "utf8");
+    return parse(raw);
+  } catch {
+    try {
+      const raw = fs3.readFileSync(baseAbs, "utf8").replace(/^\uFEFF/, "").replace(/(^|[\s{[,])\/\/.*$/gm, "$1").replace(/\/\*[\s\S]*?\*\//g, "").replace(/,(?=\s*[\]}])/g, "");
+      return JSON.parse(raw);
+    } catch (e) {
+      console.warn("[plugin-mf-auto] Cannot parse tsconfig (fallback) -> using minimal:", e);
+      return {};
+    }
+  }
+}
+function ensureDtsObject(dts) {
+  if (dts === false) return false;
+  if (dts == null || dts === true) return {};
+  if (typeof dts === "object") return { ...dts };
+  return {};
+}
 function writePatchedTsconfig(opts) {
   const { root, baseTsconfigPath, typesFolder, remoteAliases, baseDir } = opts;
-  const outDir = path3.resolve(root, ".mf-auto");
-  fs3.mkdirSync(outDir, { recursive: true });
+  const outDirAbs = path3.resolve(root, ".mf-auto");
+  fs3.mkdirSync(outDirAbs, { recursive: true });
   const baseAbs = path3.resolve(root, baseTsconfigPath);
-  let base = {};
-  try {
-    const raw = fs3.readFileSync(baseAbs, "utf8").replace(/^\uFEFF/, "").replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
-    base = JSON.parse(raw);
-  } catch (e) {
-    console.warn("[plugin-mf-auto] Cannot read base tsconfig, using minimal:", e);
-    base = {};
-  }
+  const base = readBaseTsConfigJSONC(baseAbs, root);
   const compilerOptions = { ...base.compilerOptions ?? {} };
-  const rootDirRel = path3.relative(outDir, root).replace(/\\/g, "/") || ".";
-  const baseDirRel = path3.relative(outDir, path3.resolve(root, baseDir)).replace(/\\/g, "/");
-  const typesDirRel = path3.relative(outDir, path3.resolve(root, typesFolder)).replace(/\\/g, "/");
-  compilerOptions.rootDir = compilerOptions.rootDir ?? rootDirRel;
-  compilerOptions.baseUrl = compilerOptions.baseUrl ?? rootDirRel;
+  const rootAbs = path3.resolve(root).replace(/\\/g, "/");
+  const baseUrlAbs = (compilerOptions.baseUrl ? path3.resolve(root, compilerOptions.baseUrl) : rootAbs).replace(/\\/g, "/");
+  const srcAbs = path3.resolve(root, baseDir).replace(/\\/g, "/");
+  const typesAbs = path3.resolve(root, typesFolder).replace(/\\/g, "/");
+  compilerOptions.rootDir = rootAbs;
+  compilerOptions.baseUrl = baseUrlAbs;
+  compilerOptions.jsx ??= "react-jsx";
+  compilerOptions.moduleResolution ??= "bundler";
+  compilerOptions.module ??= "ESNext";
+  compilerOptions.target ??= "ES2020";
+  compilerOptions.lib ??= ["DOM", "ES2020"];
+  compilerOptions.skipLibCheck ??= true;
+  compilerOptions.resolveJsonModule ??= true;
+  compilerOptions.allowSyntheticDefaultImports ??= true;
+  compilerOptions.esModuleInterop ??= true;
+  compilerOptions.verbatimModuleSyntax ??= true;
   const paths = { ...compilerOptions.paths ?? {} };
   for (const scope of remoteAliases) {
     const key = `${scope}/*`;
-    const val = `${typesDirRel}/${scope}/*`;
+    const val = `${typesAbs}/${scope}/*`;
     const arr = Array.isArray(paths[key]) ? paths[key] : paths[key] ? [paths[key]] : [];
     if (!arr.includes(val)) arr.push(val);
     paths[key] = arr;
   }
   compilerOptions.paths = paths;
   const tr = new Set(Array.isArray(compilerOptions.typeRoots) ? compilerOptions.typeRoots : []);
-  if (![...tr].some((s) => /node_modules\/@types$/.test(s))) tr.add(`${rootDirRel}/node_modules/@types`);
+  if (![...tr].some((s) => /node_modules\/@types$/.test(s))) tr.add(`${rootAbs}/node_modules/@types`);
   compilerOptions.typeRoots = Array.from(tr);
   base.compilerOptions = compilerOptions;
   const include = new Set(Array.isArray(base.include) ? base.include : []);
-  if (baseDirRel) include.add(`${baseDirRel}/**/*`);
-  include.add(`${typesDirRel}/**/*`);
-  include.add("./**/*");
+  include.add(`${srcAbs}/**/*`);
+  include.add(`${typesAbs}/**/*`);
+  include.add(`${outDirAbs.replace(/\\/g, "/")}/**/*`);
   base.include = Array.from(include);
-  const outPath = path3.join(outDir, "tsconfig.for-dts.json");
+  delete base.files;
+  delete base.references;
+  const outPath = path3.join(outDirAbs, "tsconfig.for-dts.json");
   fs3.writeFileSync(outPath, JSON.stringify(base, null, 2), "utf8");
   return outPath;
 }
@@ -298,19 +336,15 @@ function pluginCore(opts) {
     mf
   } = opts;
   if (!mf || typeof mf !== "object") {
-    throw new Error(
-      '[plugin-mf-auto] "mf" options is required and must be an object.'
-    );
+    throw new Error('[plugin-mf-auto] "mf" options is required and must be an object.');
   }
   return {
     name: "plugin-mf-auto",
     async setup(api) {
       const { pluginModuleFederation } = await import("@module-federation/rsbuild-plugin");
       const getExposes = async () => {
-        if (exposesMode === "jsdoc")
-          return collectAutoExposes({ baseDir, globs });
-        if (exposesMode === "wrapper")
-          return collectAutoExposesWithWrapper({ baseDir, globs });
+        if (exposesMode === "jsdoc") return collectAutoExposes({ baseDir, globs });
+        if (exposesMode === "wrapper") return collectAutoExposesWithWrapper({ baseDir, globs });
         const a = await collectAutoExposes({ baseDir, globs });
         const b = await collectAutoExposesWithWrapper({ baseDir, globs });
         return { ...a, ...b };
@@ -353,22 +387,11 @@ function pluginCore(opts) {
         fs3.mkdirSync(tempDir, { recursive: true });
         if (cssInjection === "wrapper" && mfMerged.exposes) {
           const wrapped = {};
-          for (const [key, rel] of Object.entries(
-            mfMerged.exposes
-          )) {
-            const targetAbs = path3.resolve(
-              root,
-              String(rel).replace(/^\.\//, "")
-            );
-            const proxyFile = path3.join(
-              tempDir,
-              `expose_${key.replace(/[./]/g, "_")}.ts`
-            );
+          for (const [key, rel] of Object.entries(mfMerged.exposes)) {
+            const targetAbs = path3.resolve(root, String(rel).replace(/^\.\//, ""));
+            const proxyFile = path3.join(tempDir, `expose_${key.replace(/[./]/g, "_")}.ts`);
             const lines = [];
-            if (hasCss)
-              lines.push(
-                `import ${JSON.stringify(cssAbs.replace(/\\/g, "/"))};`
-              );
+            if (hasCss) lines.push(`import ${JSON.stringify(cssAbs.replace(/\\/g, "/"))};`);
             else lines.push(`/* no css: ${cssEntry} not found */`);
             const target = JSON.stringify(targetAbs.replace(/\\/g, "/"));
             lines.push(`export * from ${target};`);
@@ -384,17 +407,12 @@ function pluginCore(opts) {
           const stylesFile = path3.join(tempDir, `styles_expose.ts`);
           fs3.writeFileSync(
             stylesFile,
-            `import ${JSON.stringify(
-              cssAbs.replace(/\\/g, "/")
-            )};
+            `import ${JSON.stringify(cssAbs.replace(/\\/g, "/"))};
 // generated by plugin-mf-auto`,
             "utf8"
           );
           const relFromRoot = path3.relative(root, stylesFile).replace(/\\/g, "/");
-          mfMerged.exposes = {
-            ...mfMerged.exposes ?? {},
-            [stylesExposeKey]: `./${relFromRoot}`
-          };
+          mfMerged.exposes = { ...mfMerged.exposes ?? {}, [stylesExposeKey]: `./${relFromRoot}` };
         }
       }
       const command = api?.context?.command;
@@ -402,65 +420,41 @@ function pluginCore(opts) {
       const isDev = !isProdLike;
       const autoTypeUrls = buildRemoteTypeUrls(mfMerged.remotes || {});
       const remoteAliases = Object.keys(autoTypeUrls);
-      const baseTsconfigPath = "./tsconfig.json";
       const tsconfigForDtsAbs = writePatchedTsconfig({
         root,
         baseTsconfigPath: "./tsconfig.json",
         typesFolder,
-        remoteAliases: Object.keys(autoTypeUrls),
+        remoteAliases,
         baseDir
       });
       const overrideTsCfg = process.env.MF_DTS_TSCONFIG;
-      const tsconfigForDtsRel = (overrideTsCfg ? overrideTsCfg : path3.relative(root, tsconfigForDtsAbs)).replace(/\\/g, "/");
-      const dtsObj = ensureDtsObject(mfMerged.dts);
-      dtsObj.generateTypes = {
-        ...dtsObj.generateTypes ?? {},
-        tsConfigPath: tsconfigForDtsRel
-      };
-      mfMerged.dts = dtsObj;
+      const tsconfigForDtsToUse = (() => {
+        if (!overrideTsCfg) return tsconfigForDtsAbs;
+        return path3.isAbsolute(overrideTsCfg) ? overrideTsCfg : path3.resolve(root, overrideTsCfg);
+      })().replace(/\\/g, "/");
       if (isDev) {
         const refresh = process.env[devTypesRefreshEnvVar] === "1";
         const typesRootAbs = path3.resolve(root, typesFolder);
         const indexFile = path3.join(typesRootAbs, "index.d.ts");
-        const needFetch = refresh || !fs3.existsSync(indexFile) || Object.keys(autoTypeUrls).some(
-          (s) => !fs3.existsSync(path3.join(typesRootAbs, "__remotes", `${s}.d.ts`))
-        );
-        if (Object.keys(autoTypeUrls).length > 0 && needFetch) {
-          await devFetchRemoteTypesOnce({
-            root,
-            baseDir,
-            typesFolderRel: typesFolder,
-            urls: autoTypeUrls
-          });
+        const needFetch = refresh || !fs3.existsSync(indexFile) || remoteAliases.some((s) => !fs3.existsSync(path3.join(typesRootAbs, "__remotes", `${s}.d.ts`)));
+        if (remoteAliases.length > 0 && needFetch) {
+          await devFetchRemoteTypesOnce({ root, baseDir, typesFolderRel: typesFolder, urls: autoTypeUrls });
         }
-        const dtsObj2 = ensureDtsObject(mfMerged.dts);
-        dtsObj2.generateTypes = {
-          ...dtsObj2.generateTypes ?? {},
-          tsConfigPath: tsconfigForDtsRel
+      }
+      const dtsGen = ensureDtsObject(mfMerged.dts);
+      dtsGen.generateTypes = { ...dtsGen.generateTypes ?? {}, tsConfigPath: tsconfigForDtsToUse };
+      if (!isDev && remoteAliases.length > 0) {
+        const existingConsume = dtsGen.consumeTypes ?? {};
+        const existingRt = existingConsume.remoteTypeUrls ?? {};
+        dtsGen.consumeTypes = {
+          typesFolder: existingConsume.typesFolder ?? typesFolder,
+          maxRetries: existingConsume.maxRetries ?? 3,
+          remoteTypeUrls: { ...autoTypeUrls, ...existingRt }
         };
-        mfMerged.dts = dtsObj2;
-      } else {
-        if (mfMerged.dts !== false) {
-          const dtsObj2 = ensureDtsObject(mfMerged.dts);
-          if (Object.keys(autoTypeUrls).length > 0) {
-            const existingConsume = dtsObj2.consumeTypes ?? {};
-            const existingRt = existingConsume.remoteTypeUrls ?? {};
-            dtsObj2.consumeTypes = {
-              typesFolder: existingConsume.typesFolder ?? typesFolder,
-              maxRetries: existingConsume.maxRetries ?? 3,
-              // ưu tiên config hiện hữu nếu trùng key
-              remoteTypeUrls: { ...autoTypeUrls, ...existingRt }
-            };
-          }
-          dtsObj2.generateTypes = {
-            ...dtsObj2.generateTypes ?? {},
-            tsConfigPath: tsconfigForDtsRel
-            // dùng tsconfig đã patch từ tsconfig của app
-          };
-          mfMerged.dts = dtsObj2;
-        }
       }
-      const mfPlugin = pluginModuleFederation(mfMerged);
+      mfMerged.dts = dtsGen;
+      const { pluginModuleFederation: mfPluginFactory } = await import("@module-federation/rsbuild-plugin");
+      const mfPlugin = mfPluginFactory(mfMerged);
       await mfPlugin.setup?.(api);
       const pkgSafe = getPackageName(root) || mfMerged.name || path3.basename(root).replace(/\W+/g, "");
       api.modifyRsbuildConfig((config) => {
@@ -476,9 +470,7 @@ function pluginCore(opts) {
       });
       if (separateExposes && mfMerged.exposes) {
         const force = {};
-        for (const [key, rel] of Object.entries(
-          mfMerged.exposes
-        )) {
+        for (const [key, rel] of Object.entries(mfMerged.exposes)) {
           const abs = path3.resolve(root, String(rel).replace(/^\.\//, "")).replace(/\\/g, "/");
           const safe = separateExposeChunkPrefix + key.replace(/[^a-zA-Z0-9_]/g, "_");
           force[safe] = new RegExp(`${escapeRegExp(abs)}$`);

package/package.json

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