ptech-preset 1.3.3 → 1.3.5

package/dist/index.js

@@ -1,10 +1,3 @@
-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";
@@ -134,6 +127,10 @@ async function collectAutoRemotes(opts = {}) {
 }
 
 // src/index.ts
+import { createRequire } from "module";
+import { fileURLToPath } from "url";
+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 },
@@ -227,11 +224,11 @@ async function devFetchRemoteTypesOnce(params) {
   );
 }
 function tryRequireTs(root) {
-  const paths = [root, __dirname, process.cwd()];
-  for (const p of paths) {
+  const searchPaths = [root, HERE, process.cwd()];
+  for (const p of searchPaths) {
     try {
-      const tsPath = __require.resolve("typescript", { paths: [p] });
-      return __require(tsPath);
+      const tsPath = esmRequire.resolve("typescript", { paths: [p] });
+      return esmRequire(tsPath);
     } catch {
     }
   }
@@ -248,21 +245,21 @@ function readBaseTsConfigJSONC(baseAbs, root) {
       }
       if (r.config) return r.config;
     } catch (e) {
-      console.warn("[plugin-mf-auto] TS readConfigFile threw, fallback to JSONC:", e);
+      console.warn("[plugin-mf-auto] TS readConfigFile threw, fallback:", e);
     }
   }
   try {
-    const { parse } = __require("jsonc-parser");
+    const { parse } = esmRequire("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 {};
-    }
+  }
+  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) {
@@ -341,7 +338,6 @@ function pluginCore(opts) {
   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 });
@@ -380,6 +376,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" && "eager" in conf) {
+            conf.eager = false;
+          }
+        }
+      }
       if (cssInjection !== "none") {
         const cssAbs = path3.resolve(root, cssEntry);
         const hasCss = fs3.existsSync(cssAbs);
@@ -388,14 +395,24 @@ function pluginCore(opts) {
         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 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, "/");
@@ -405,9 +422,12 @@ 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"
           );
@@ -415,9 +435,6 @@ function pluginCore(opts) {
           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({
@@ -441,18 +458,23 @@ function pluginCore(opts) {
           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);
@@ -463,7 +485,7 @@ 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;
@@ -473,7 +495,7 @@ function pluginCore(opts) {
         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.3",
+  "version": "1.3.5",
   "description": "Auto Module.",
   "type": "module",
   "main": "dist/index.js",