ptech-preset 1.2.7 → 1.2.9

package/dist/index.js

@@ -150,10 +150,18 @@ function normalizeExposePath(root, maybeRel) {
 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-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 }
+  "@azure/msal-browser": {
+    singleton: true,
+    eager: true,
+    requiredVersion: false
+  }
 };
 var CDN_BASE = "https://oneportal.blob.core.windows.net/external/ts/";
 function parseRemoteSpec(key, val) {
@@ -201,7 +209,9 @@ 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();
@@ -213,7 +223,11 @@ 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, "/");
@@ -225,6 +239,55 @@ async function devFetchRemoteTypesOnce(params) {
     "utf8"
   );
 }
+function stripJsonComments(json) {
+  return json.replace(/^\uFEFF/, "").replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
+}
+function writePatchedTsconfig(opts) {
+  const { root, baseTsconfigPath, typesFolder, remoteAliases, baseDir } = opts;
+  const baseAbs = path3.resolve(root, baseTsconfigPath);
+  let base = {};
+  try {
+    const raw = fs3.readFileSync(baseAbs, "utf8");
+    base = JSON.parse(stripJsonComments(raw));
+  } catch (e) {
+    console.warn(
+      "[plugin-mf-auto] Cannot read base tsconfig, using minimal:",
+      e
+    );
+    base = {};
+  }
+  const compilerOptions = { ...base.compilerOptions ?? {} };
+  const rootDirFromEnv = process.env.MF_DTS_ROOTDIR;
+  compilerOptions.rootDir = compilerOptions.rootDir ?? rootDirFromEnv ?? ".";
+  compilerOptions.baseUrl = compilerOptions.baseUrl ?? ".";
+  const paths = { ...compilerOptions.paths ?? {} };
+  for (const scope of remoteAliases) {
+    const key = `${scope}/*`;
+    const val = `./${typesFolder}/${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("./node_modules/@types");
+  compilerOptions.typeRoots = Array.from(tr);
+  base.compilerOptions = compilerOptions;
+  const include = new Set(
+    Array.isArray(base.include) ? base.include : []
+  );
+  include.add(`./${baseDir}/**/*`);
+  include.add(`./${typesFolder}/**/*`);
+  base.include = Array.from(include);
+  const outDir = path3.resolve(root, ".mf-auto");
+  fs3.mkdirSync(outDir, { recursive: true });
+  const outPath = path3.join(outDir, "tsconfig.for-dts.json");
+  fs3.writeFileSync(outPath, JSON.stringify(base, null, 2), "utf8");
+  return outPath;
+}
 function pluginCore(opts) {
   const {
     baseDir = "src",
@@ -243,15 +306,19 @@ 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 };
@@ -294,11 +361,22 @@ 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};`);
@@ -314,18 +392,34 @@ 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;
       const isProdLike = command === "build" || process.env.NODE_ENV === "production";
       const isDev = !isProdLike;
       const autoTypeUrls = buildRemoteTypeUrls(mfMerged.remotes || {});
+      const remoteAliases = Object.keys(autoTypeUrls);
+      const baseTsconfigPath = "./tsconfig.json";
+      const tsconfigForDtsAbs = writePatchedTsconfig({
+        root,
+        baseTsconfigPath,
+        typesFolder,
+        remoteAliases,
+        baseDir
+      });
+      const overrideTsCfg = process.env.MF_DTS_TSCONFIG;
+      const tsconfigForDtsRel = (overrideTsCfg ? overrideTsCfg : path3.relative(root, tsconfigForDtsAbs)).replace(/\\/g, "/");
       if (isDev) {
         const refresh = process.env[devTypesRefreshEnvVar] === "1";
         const typesRootAbs = path3.resolve(root, typesFolder);
@@ -333,23 +427,20 @@ function pluginCore(opts) {
         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) {
-          if (needFetch) {
-            await devFetchRemoteTypesOnce({
-              root,
-              baseDir,
-              typesFolderRel: typesFolder,
-              urls: autoTypeUrls
-            });
-          }
-          const dtsObj = ensureDtsObject(mfMerged.dts);
-          dtsObj.generateTypes = dtsObj.generateTypes ?? { tsConfigPath: "./tsconfig.json" };
-          mfMerged.dts = dtsObj;
-        } else {
-          const dtsObj = ensureDtsObject(mfMerged.dts);
-          dtsObj.generateTypes = dtsObj.generateTypes ?? { tsConfigPath: "./tsconfig.json" };
-          mfMerged.dts = dtsObj;
+        if (Object.keys(autoTypeUrls).length > 0 && needFetch) {
+          await devFetchRemoteTypesOnce({
+            root,
+            baseDir,
+            typesFolderRel: typesFolder,
+            urls: autoTypeUrls
+          });
         }
+        const dtsObj = ensureDtsObject(mfMerged.dts);
+        dtsObj.generateTypes = {
+          ...dtsObj.generateTypes ?? {},
+          tsConfigPath: tsconfigForDtsRel
+        };
+        mfMerged.dts = dtsObj;
       } else {
         if (mfMerged.dts !== false) {
           const dtsObj = ensureDtsObject(mfMerged.dts);
@@ -363,7 +454,11 @@ function pluginCore(opts) {
               remoteTypeUrls: { ...autoTypeUrls, ...existingRt }
             };
           }
-          dtsObj.generateTypes = dtsObj.generateTypes ?? { tsConfigPath: "./tsconfig.json" };
+          dtsObj.generateTypes = {
+            ...dtsObj.generateTypes ?? {},
+            tsConfigPath: tsconfigForDtsRel
+            // dùng tsconfig đã patch từ tsconfig của app
+          };
           mfMerged.dts = dtsObj;
         }
       }
@@ -383,7 +478,9 @@ 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.2.7",
+  "version": "1.2.9",
   "description": "Auto Module.",
   "type": "module",
   "main": "dist/index.js",