ptech-preset 1.2.6 → 1.2.8

package/dist/index.d.ts

@@ -13,7 +13,7 @@ type MfAutoOptions = {
     stylesExposeKey?: string;
     separateExposes?: boolean;
     separateExposeChunkPrefix?: string;
-    /** tên folder chứa types đã consume; mặc định "@mf-types" */
+    /** thư mục chứa types đã consume; mặc định "@mf-types" */
     typesFolder?: string;
     /** env để ép refresh types ở dev (khởi động lại dev) */
     devTypesRefreshEnvVar?: string;

package/dist/index.js

@@ -225,6 +225,43 @@ 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 } = 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 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(`./${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",
@@ -323,9 +360,19 @@ function pluginCore(opts) {
         }
       }
       const command = api?.context?.command;
-      const isProd = process.env.NODE_ENV === "production" || command === "build";
-      const isDev = !isProd;
+      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
+      });
+      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 +380,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);
@@ -359,22 +403,29 @@ function pluginCore(opts) {
             dtsObj.consumeTypes = {
               typesFolder: existingConsume.typesFolder ?? typesFolder,
               maxRetries: existingConsume.maxRetries ?? 3,
-              // ưu tiên config hiện hữu nếu đụng key
+              // ưu tiên config hiện hữu nếu trùng key
               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;
         }
       }
       const mfPlugin = pluginModuleFederation(mfMerged);
       await mfPlugin.setup?.(api);
       const pkgSafe = getPackageName(root) || mfMerged.name || path3.basename(root).replace(/\W+/g, "");
-      const cdnUrl = `${CDN_BASE}${pkgSafe}/`;
       api.modifyRsbuildConfig((config) => {
         config.output ??= {};
-        if (!config.output.assetPrefix && process.env.NODE_ENV === "production") {
-          config.output.assetPrefix = cdnUrl;
+        const current = config.output.assetPrefix;
+        const fromEnv = process.env.CDN_URL || process.env.ASSET_PREFIX;
+        const fallbackCdn = `${CDN_BASE}${pkgSafe}/`;
+        const target = fromEnv ?? fallbackCdn;
+        if (isProdLike && (!current || current === "/" || current === "./")) {
+          config.output.assetPrefix = target;
         }
         return config;
       });

package/package.json

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