ptech-preset 1.2.9 → 1.3.1

package/dist/index.js

@@ -239,51 +239,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, baseDir } = opts;
+  const outDir = path3.resolve(root, ".mf-auto");
+  fs3.mkdirSync(outDir, { recursive: true });
   const baseAbs = path3.resolve(root, baseTsconfigPath);
   let base = {};
   try {
-    const raw = fs3.readFileSync(baseAbs, "utf8");
-    base = JSON.parse(stripJsonComments(raw));
+    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
-    );
+    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 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 paths = { ...compilerOptions.paths ?? {} };
   for (const scope of remoteAliases) {
     const key = `${scope}/*`;
-    const val = `./${typesFolder}/${scope}/*`;
+    const val = `${typesDirRel}/${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");
+  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`);
   compilerOptions.typeRoots = Array.from(tr);
   base.compilerOptions = compilerOptions;
-  const include = new Set(
-    Array.isArray(base.include) ? base.include : []
-  );
-  include.add(`./${baseDir}/**/*`);
-  include.add(`./${typesFolder}/**/*`);
+  const include = new Set(Array.isArray(base.include) ? base.include : []);
+  if (baseDirRel) include.add(`${baseDirRel}/**/*`);
+  include.add(`${typesDirRel}/**/*`);
+  include.add("./**/*");
   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;
@@ -413,13 +405,19 @@ function pluginCore(opts) {
       const baseTsconfigPath = "./tsconfig.json";
       const tsconfigForDtsAbs = writePatchedTsconfig({
         root,
-        baseTsconfigPath,
+        baseTsconfigPath: "./tsconfig.json",
         typesFolder,
-        remoteAliases,
+        remoteAliases: Object.keys(autoTypeUrls),
         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;
       if (isDev) {
         const refresh = process.env[devTypesRefreshEnvVar] === "1";
         const typesRootAbs = path3.resolve(root, typesFolder);
@@ -435,31 +433,31 @@ function pluginCore(opts) {
             urls: autoTypeUrls
           });
         }
-        const dtsObj = ensureDtsObject(mfMerged.dts);
-        dtsObj.generateTypes = {
-          ...dtsObj.generateTypes ?? {},
+        const dtsObj2 = ensureDtsObject(mfMerged.dts);
+        dtsObj2.generateTypes = {
+          ...dtsObj2.generateTypes ?? {},
           tsConfigPath: tsconfigForDtsRel
         };
-        mfMerged.dts = dtsObj;
+        mfMerged.dts = dtsObj2;
       } else {
         if (mfMerged.dts !== false) {
-          const dtsObj = ensureDtsObject(mfMerged.dts);
+          const dtsObj2 = ensureDtsObject(mfMerged.dts);
           if (Object.keys(autoTypeUrls).length > 0) {
-            const existingConsume = dtsObj.consumeTypes ?? {};
+            const existingConsume = dtsObj2.consumeTypes ?? {};
             const existingRt = existingConsume.remoteTypeUrls ?? {};
-            dtsObj.consumeTypes = {
+            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 }
             };
           }
-          dtsObj.generateTypes = {
-            ...dtsObj.generateTypes ?? {},
+          dtsObj2.generateTypes = {
+            ...dtsObj2.generateTypes ?? {},
             tsConfigPath: tsconfigForDtsRel
             // dùng tsconfig đã patch từ tsconfig của app
           };
-          mfMerged.dts = dtsObj;
+          mfMerged.dts = dtsObj2;
         }
       }
       const mfPlugin = pluginModuleFederation(mfMerged);

package/package.json

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