ptech-preset 1.3.4 → 1.3.6

package/dist/index.js

@@ -133,10 +133,18 @@ var esmRequire = createRequire(import.meta.url);
 var HERE = typeof __dirname !== "undefined" ? __dirname : path3.dirname(fileURLToPath(import.meta.url));
 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 getPackageName(root) {
@@ -199,7 +207,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();
@@ -211,7 +221,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, "/");
@@ -258,7 +272,10 @@ function readBaseTsConfigJSONC(baseAbs, root) {
     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);
+    console.warn(
+      "[plugin-mf-auto] Cannot parse tsconfig (fallback) -> using minimal:",
+      e
+    );
     return {};
   }
 }
@@ -274,7 +291,9 @@ function writePatchedTsconfig(opts) {
   fs3.mkdirSync(outDirAbs, { recursive: true });
   const baseAbs = path3.resolve(root, baseTsconfigPath);
   const base = readBaseTsConfigJSONC(baseAbs, root);
-  const compilerOptions = { ...base.compilerOptions ?? {} };
+  const compilerOptions = {
+    ...base.compilerOptions ?? {}
+  };
   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, "/");
@@ -300,11 +319,16 @@ function writePatchedTsconfig(opts) {
     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(`${rootAbs}/node_modules/@types`);
+  const tr = new Set(
+    Array.isArray(compilerOptions.typeRoots) ? compilerOptions.typeRoots : []
+  );
+  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 : []);
+  const include = new Set(
+    Array.isArray(base.include) ? base.include : []
+  );
   include.add(`${srcAbs}/**/*`);
   include.add(`${typesAbs}/**/*`);
   include.add(`${outDirAbs.replace(/\\/g, "/")}/**/*`);
@@ -333,15 +357,18 @@ 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 };
@@ -377,6 +404,17 @@ function pluginCore(opts) {
       if (typeof mfMerged.shared === "undefined") {
         mfMerged.shared = DEFAULT_SHARED;
       }
+      const command = api?.context?.command;
+      const isBuild = command === "build";
+      const isDev = !isBuild;
+      if (isDev && mfMerged.shared && typeof mfMerged.shared === "object") {
+        for (const key of Object.keys(mfMerged.shared)) {
+          const conf = mfMerged.shared[key];
+          if (!conf || typeof conf !== "object") continue;
+          if (/^react(-dom)?$/.test(key)) continue;
+          if ("eager" in conf) conf.eager = false;
+        }
+      }
       if (cssInjection !== "none") {
         const cssAbs = path3.resolve(root, cssEntry);
         const hasCss = fs3.existsSync(cssAbs);
@@ -384,15 +422,30 @@ 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(/^\.\//, "")).replace(/\\/g, "/");
+            const proxyFile = path3.join(
+              tempDir,
+              `expose_${key.replace(/[./]/g, "_")}.ts`
+            );
             const lines = [];
-            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, "/"));
+            if (hasCss) {
+              const cssRel = path3.relative(path3.dirname(proxyFile), cssAbs).replace(/\\/g, "/");
+              const cssImport = cssRel.startsWith(".") ? cssRel : `./${cssRel}`;
+              lines.push(`import ${JSON.stringify(cssImport)};`);
+            } else {
+              lines.push(`/* no css: ${cssEntry} not found */`);
+            }
+            const targetRel = path3.relative(path3.dirname(proxyFile), targetAbs).replace(/\\/g, "/");
+            const targetImport = targetRel.startsWith(".") ? targetRel : `./${targetRel}`;
+            const target = JSON.stringify(targetImport);
             lines.push(`export * from ${target};`);
             lines.push(`export { default } from ${target};`);
+            lines.push(
+              `if (import.meta && (import.meta as any).webpackHot) {(import.meta as any).webpackHot.accept();}`
+            );
             lines.push(`// generated by plugin-mf-auto`);
             fs3.writeFileSync(proxyFile, lines.join(os.EOL), "utf8");
             const relFromRoot = path3.relative(root, proxyFile).replace(/\\/g, "/");
@@ -402,19 +455,22 @@ function pluginCore(opts) {
         }
         if (cssInjection === "styles-expose" && hasCss) {
           const stylesFile = path3.join(tempDir, `styles_expose.ts`);
+          const cssRel = path3.relative(path3.dirname(stylesFile), cssAbs).replace(/\\/g, "/");
+          const cssImport = cssRel.startsWith(".") ? cssRel : `./${cssRel}`;
           fs3.writeFileSync(
             stylesFile,
-            `import ${JSON.stringify(cssAbs.replace(/\\/g, "/"))};
+            `import ${JSON.stringify(cssImport)};
+if (import.meta && (import.meta as any).webpackHot) {(import.meta as any).webpackHot.accept();}
 // 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 tsconfigForDtsAbs = writePatchedTsconfig({
@@ -433,23 +489,38 @@ function pluginCore(opts) {
         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) || remoteAliases.some((s) => !fs3.existsSync(path3.join(typesRootAbs, "__remotes", `${s}.d.ts`)));
+        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 });
+          await devFetchRemoteTypesOnce({
+            root,
+            baseDir,
+            typesFolderRel: typesFolder,
+            urls: autoTypeUrls
+          });
         }
       }
-      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 }
+      const dtsGenMaybe = ensureDtsObject(mfMerged.dts);
+      if (dtsGenMaybe !== false) {
+        const dtsGen = dtsGenMaybe;
+        dtsGen.generateTypes = {
+          ...dtsGen.generateTypes ?? {},
+          tsConfigPath: tsconfigForDtsToUse
         };
+        if (isBuild && 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 = dtsGen;
+      } else {
+        mfMerged.dts = false;
       }
-      mfMerged.dts = dtsGen;
       const { pluginModuleFederation: mfPluginFactory } = await import("@module-federation/rsbuild-plugin");
       const mfPlugin = mfPluginFactory(mfMerged);
       await mfPlugin.setup?.(api);
@@ -460,17 +531,19 @@ function pluginCore(opts) {
         const fromEnv = process.env.CDN_URL || process.env.ASSET_PREFIX;
         const fallbackCdn = `${CDN_BASE}${pkgSafe}/`;
         const target = fromEnv ?? fallbackCdn;
-        if (isProdLike && (!current || current === "/" || current === "./")) {
+        if (isBuild && (!current || current === "/" || current === "./")) {
           config.output.assetPrefix = target;
         }
         return config;
       });
       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)}$`);
+          force[safe] = new RegExp(`${escapeRegExp(abs)}(\\?.*)?$`);
         }
         api.modifyRsbuildConfig((config) => {
           (config.performance ??= {}).chunkSplit ??= {};

package/package.json

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