@bleedingdev/modern-js-create 3.5.0-ultramodern.4 → 3.5.0-ultramodern.41

package/template-workspace/patches/@module-federation__bridge-react@2.7.0.patch

@@ -0,0 +1,140 @@
+diff --git a/dist/lazy-load-component-plugin-BjMVNoep.js b/dist/lazy-load-component-plugin-BjMVNoep.js
+index 9f16c3f..bde8e11 100644
+--- a/dist/lazy-load-component-plugin-BjMVNoep.js
++++ b/dist/lazy-load-component-plugin-BjMVNoep.js
+@@ -236,6 +236,41 @@ function getTargetModuleInfo(id, instance) {
+     remoteEntry
+   };
+ }
++function normalizeHref(href) {
++  if (typeof document === "undefined") {
++    return href;
++  }
++  try {
++    return new URL(href, document.baseURI).href;
++  } catch {
++    return href;
++  }
++}
++function isStylesheetLink(link) {
++  return link.relList.contains("stylesheet") || link.rel.toLowerCase().split(/\s+/u).includes("stylesheet");
++}
++function hasStylesheetLinkInHead(href, ignoredLink) {
++  if (typeof document === "undefined" || !document.head) {
++    return false;
++  }
++  const normalizedHref = normalizeHref(href);
++  return Array.from(
++    document.head.querySelectorAll("link[href]")
++  ).some(
++    (link) => link !== ignoredLink && isStylesheetLink(link) && normalizeHref(link.href) === normalizedHref
++  );
++}
++function StylesheetAsset({ href }) {
++  const [shouldRender, setShouldRender] = React.useState(true);
++  const linkRef = React.useRef(null);
++  React.useEffect(() => {
++    setShouldRender(!hasStylesheetLinkInHead(href, linkRef.current));
++  }, [href]);
++  if (!shouldRender) {
++    return null;
++  }
++  return /* @__PURE__ */ React.createElement("link", { ref: linkRef, href, rel: "stylesheet", type: "text/css" });
++}
+ function collectSSRAssets(options) {
+   const {
+     id,
+@@ -254,15 +289,19 @@ function collectSSRAssets(options) {
+   }
+   const { module: targetModule, publicPath, remoteEntry } = moduleAndPublicPath;
+   if (injectLink) {
++    const stylesheetHrefs = /* @__PURE__ */ new Set();
+     [...targetModule.assets.css.sync, ...targetModule.assets.css.async].sort().forEach((file, index) => {
++      const href = `${publicPath}${file}`;
++      if (stylesheetHrefs.has(href)) {
++        return;
++      }
++      stylesheetHrefs.add(href);
+       links.push(
+         /* @__PURE__ */ React.createElement(
+-          "link",
++          StylesheetAsset,
+           {
+             key: `${file.split(".")[0]}_${index}`,
+-            href: `${publicPath}${file}`,
+-            rel: "stylesheet",
+-            type: "text/css"
++            href
+           }
+         )
+       );
+diff --git a/dist/lazy-load-component-plugin-aj97Vt-4.mjs b/dist/lazy-load-component-plugin-aj97Vt-4.mjs
+index ed1dc8f..fd603ab 100644
+--- a/dist/lazy-load-component-plugin-aj97Vt-4.mjs
++++ b/dist/lazy-load-component-plugin-aj97Vt-4.mjs
+@@ -235,6 +235,41 @@ function getTargetModuleInfo(id, instance) {
+     remoteEntry
+   };
+ }
++function normalizeHref(href) {
++  if (typeof document === "undefined") {
++    return href;
++  }
++  try {
++    return new URL(href, document.baseURI).href;
++  } catch {
++    return href;
++  }
++}
++function isStylesheetLink(link) {
++  return link.relList.contains("stylesheet") || link.rel.toLowerCase().split(/\s+/u).includes("stylesheet");
++}
++function hasStylesheetLinkInHead(href, ignoredLink) {
++  if (typeof document === "undefined" || !document.head) {
++    return false;
++  }
++  const normalizedHref = normalizeHref(href);
++  return Array.from(
++    document.head.querySelectorAll("link[href]")
++  ).some(
++    (link) => link !== ignoredLink && isStylesheetLink(link) && normalizeHref(link.href) === normalizedHref
++  );
++}
++function StylesheetAsset({ href }) {
++  const [shouldRender, setShouldRender] = useState(true);
++  const linkRef = useRef(null);
++  useEffect(() => {
++    setShouldRender(!hasStylesheetLinkInHead(href, linkRef.current));
++  }, [href]);
++  if (!shouldRender) {
++    return null;
++  }
++  return /* @__PURE__ */ React__default.createElement("link", { ref: linkRef, href, rel: "stylesheet", type: "text/css" });
++}
+ function collectSSRAssets(options) {
+   const {
+     id,
+@@ -253,15 +288,19 @@ function collectSSRAssets(options) {
+   }
+   const { module: targetModule, publicPath, remoteEntry } = moduleAndPublicPath;
+   if (injectLink) {
++    const stylesheetHrefs = /* @__PURE__ */ new Set();
+     [...targetModule.assets.css.sync, ...targetModule.assets.css.async].sort().forEach((file, index) => {
++      const href = `${publicPath}${file}`;
++      if (stylesheetHrefs.has(href)) {
++        return;
++      }
++      stylesheetHrefs.add(href);
+       links.push(
+         /* @__PURE__ */ React__default.createElement(
+-          "link",
++          StylesheetAsset,
+           {
+             key: `${file.split(".")[0]}_${index}`,
+-            href: `${publicPath}${file}`,
+-            rel: "stylesheet",
+-            type: "text/css"
++            href
+           }
+         )
+       );

package/template-workspace/patches/@module-federation__dts-plugin@2.7.0.patch

@@ -0,0 +1,37 @@
+diff --git a/dist/DtsWorker-Bt7-_SGH.d.ts b/dist/DtsWorker-Bt7-_SGH.d.ts
+index 3d82f9d..2f82c65 100644
+--- a/dist/DtsWorker-Bt7-_SGH.d.ts
++++ b/dist/DtsWorker-Bt7-_SGH.d.ts
+@@ -1,5 +1,5 @@
+ import { moduleFederationPlugin } from "@module-federation/sdk";
+-import ts from "typescript";
++import ts from "@typescript/typescript6";
+ import { ChildProcess } from "child_process";
+ 
+ //#region \0rolldown/runtime.js
+diff --git a/dist/esm/expose-rpc-CDdqA9PX.mjs b/dist/esm/expose-rpc-CDdqA9PX.mjs
+index 9eae3ff..071b45d 100644
+--- a/dist/esm/expose-rpc-CDdqA9PX.mjs
++++ b/dist/esm/expose-rpc-CDdqA9PX.mjs
+@@ -6,7 +6,7 @@ import { fileURLToPath } from "url";
+ import path, { dirname, extname, isAbsolute, join, normalize, relative, resolve, sep } from "path";
+ import { cp, mkdir, readFile, readdir, rm, stat, writeFile } from "fs/promises";
+ import { utils } from "@module-federation/managers";
+-import typescript from "typescript";
++import typescript from "@typescript/typescript6";
+ import { styleText } from "node:util";
+ import { ENCODE_NAME_PREFIX, MANIFEST_EXT, TEMP_DIR, decodeName, getProcessEnv, inferAutoPublicPath, parseEntry } from "@module-federation/sdk";
+ import { Agent } from "undici";
+diff --git a/dist/expose-rpc-BpRiu3VK.js b/dist/expose-rpc-BpRiu3VK.js
+index 2e81fb9..7688d8b 100644
+--- a/dist/expose-rpc-BpRiu3VK.js
++++ b/dist/expose-rpc-BpRiu3VK.js
+@@ -7,7 +7,7 @@ let path = require("path");
+ path = require_Action.__toESM(path);
+ let fs_promises = require("fs/promises");
+ let _module_federation_managers = require("@module-federation/managers");
+-let typescript = require("typescript");
++let typescript = require("@typescript/typescript6");
+ typescript = require_Action.__toESM(typescript);
+ let node_util = require("node:util");
+ let _module_federation_sdk = require("@module-federation/sdk");

package/template-workspace/patches/@module-federation__modern-js-v3@2.7.0.patch

@@ -0,0 +1,57 @@
+diff --git a/dist/cjs/cli/configPlugin.js b/dist/cjs/cli/configPlugin.js
+index 3f1af86..a038365 100644
+--- a/dist/cjs/cli/configPlugin.js
++++ b/dist/cjs/cli/configPlugin.js
+@@ -216,9 +216,12 @@ var __webpack_exports__ = {};
+         if (!chain.output.get('uniqueName')) chain.output.uniqueName(mfConfig.name);
+         const splitChunkConfig = chain.optimization.splitChunks.entries();
+         if (!isServer) (0, utils_namespaceObject.autoDeleteSplitChunkCacheGroups)(mfConfig, splitChunkConfig);
+-        if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups) {
++        if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups && splitChunkConfig.chunks !== undefined && splitChunkConfig.chunks !== 'async') {
++            const previousChunks = splitChunkConfig.chunks;
+             splitChunkConfig.chunks = 'async';
+-            external_logger_js_default().warn('splitChunks.chunks = async is not allowed with stream SSR mode, it will auto changed to "async"');
++            if (void 0 !== previousChunks) {
++                external_logger_js_default().warn(`splitChunks.chunks = ${previousChunks} is not allowed with stream SSR mode, it will auto changed to "async"`);
++            }
+         }
+         if ((0, external_utils_js_namespaceObject.isDev)() && 'auto' === chain.output.get('publicPath')) {
+             var _modernjsConfig_server;
+diff --git a/dist/esm-node/cli/configPlugin.mjs b/dist/esm-node/cli/configPlugin.mjs
+index c238b85..7350973 100644
+--- a/dist/esm-node/cli/configPlugin.mjs
++++ b/dist/esm-node/cli/configPlugin.mjs
+@@ -156,9 +156,12 @@ function patchBundlerConfig(options) {
+     if (!chain.output.get('uniqueName')) chain.output.uniqueName(mfConfig.name);
+     const splitChunkConfig = chain.optimization.splitChunks.entries();
+     if (!isServer) autoDeleteSplitChunkCacheGroups(mfConfig, splitChunkConfig);
+-    if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups) {
++    if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups && splitChunkConfig.chunks !== undefined && splitChunkConfig.chunks !== 'async') {
++        const previousChunks = splitChunkConfig.chunks;
+         splitChunkConfig.chunks = 'async';
+-        logger.warn('splitChunks.chunks = async is not allowed with stream SSR mode, it will auto changed to "async"');
++        if (void 0 !== previousChunks) {
++            logger.warn(`splitChunks.chunks = ${previousChunks} is not allowed with stream SSR mode, it will auto changed to "async"`);
++        }
+     }
+     if (isDev() && 'auto' === chain.output.get('publicPath')) {
+         var _modernjsConfig_server;
+diff --git a/dist/esm/cli/configPlugin.mjs b/dist/esm/cli/configPlugin.mjs
+index c8c2ace..fee11da 100644
+--- a/dist/esm/cli/configPlugin.mjs
++++ b/dist/esm/cli/configPlugin.mjs
+@@ -185,9 +185,12 @@ function patchBundlerConfig(options) {
+     if (!chain.output.get('uniqueName')) chain.output.uniqueName(mfConfig.name);
+     var splitChunkConfig = chain.optimization.splitChunks.entries();
+     if (!isServer) autoDeleteSplitChunkCacheGroups(mfConfig, splitChunkConfig);
+-    if (!isServer && enableSSR && splitChunkConfig && (void 0 === splitChunkConfig ? "undefined" : _type_of__(splitChunkConfig)) === 'object' && splitChunkConfig.cacheGroups) {
++    if (!isServer && enableSSR && splitChunkConfig && (void 0 === splitChunkConfig ? "undefined" : _type_of__(splitChunkConfig)) === 'object' && splitChunkConfig.cacheGroups && void 0 !== splitChunkConfig.chunks && splitChunkConfig.chunks !== 'async') {
++        var previousChunks = splitChunkConfig.chunks;
+         splitChunkConfig.chunks = 'async';
+-        logger.warn('splitChunks.chunks = async is not allowed with stream SSR mode, it will auto changed to "async"');
++        if (void 0 !== previousChunks) {
++            logger.warn("splitChunks.chunks = ".concat(previousChunks, " is not allowed with stream SSR mode, it will auto changed to \"async\""));
++        }
+     }
+     if (isDev() && 'auto' === chain.output.get('publicPath')) {
+         var _modernjsConfig_server;

package/template-workspace/patches/@tanstack__router-core@1.171.14.patch

@@ -0,0 +1,123 @@
+diff --git a/dist/cjs/load-matches.cjs b/dist/cjs/load-matches.cjs
+index c09976a..c08e017 100644
+--- a/dist/cjs/load-matches.cjs
++++ b/dist/cjs/load-matches.cjs
+@@ -439,6 +439,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 				try {
+ 					await runLoader(inner, matchPromises, matchId, index, route);
+ 					const match = inner.router.getMatch(matchId);
++					if (!match) return;
+ 					match._nonReactive.loaderPromise?.resolve();
+ 					match._nonReactive.loadPromise?.resolve();
+ 					match._nonReactive.loaderPromise = void 0;
+@@ -469,6 +470,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 			if (prevMatch.status === "success" && !inner.sync && !prevMatch.preload && shouldReloadInBackground) return prevMatch;
+ 			await prevMatch._nonReactive.loaderPromise;
+ 			const match = inner.router.getMatch(matchId);
++			if (!match) return inner.matches[index];
+ 			const error = match._nonReactive.error || match.error;
+ 			if (error) handleRedirectAndNotFound(inner, match, error);
+ 			if (match.status === "pending") await handleLoader(preload, prevMatch, previousRouteMatchId, match, route);
+@@ -484,6 +486,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 		}
+ 	}
+ 	const match = inner.router.getMatch(matchId);
++	if (!match) return inner.matches[index];
+ 	if (!loaderIsRunningAsync) {
+ 		match._nonReactive.loaderPromise?.resolve();
+ 		match._nonReactive.loadPromise?.resolve();
+@@ -500,7 +503,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 			isFetching: nextIsFetching,
+ 			invalid: false
+ 		}));
+-		return inner.router.getMatch(matchId);
++		return inner.router.getMatch(matchId) ?? inner.matches[index];
+ 	} else return match;
+ };
+ async function loadMatches(arg) {
+diff --git a/dist/esm/load-matches.js b/dist/esm/load-matches.js
+index bcea2e0..fd9ebbf 100644
+--- a/dist/esm/load-matches.js
++++ b/dist/esm/load-matches.js
+@@ -439,6 +439,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 				try {
+ 					await runLoader(inner, matchPromises, matchId, index, route);
+ 					const match = inner.router.getMatch(matchId);
++					if (!match) return;
+ 					match._nonReactive.loaderPromise?.resolve();
+ 					match._nonReactive.loadPromise?.resolve();
+ 					match._nonReactive.loaderPromise = void 0;
+@@ -469,6 +470,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 			if (prevMatch.status === "success" && !inner.sync && !prevMatch.preload && shouldReloadInBackground) return prevMatch;
+ 			await prevMatch._nonReactive.loaderPromise;
+ 			const match = inner.router.getMatch(matchId);
++			if (!match) return inner.matches[index];
+ 			const error = match._nonReactive.error || match.error;
+ 			if (error) handleRedirectAndNotFound(inner, match, error);
+ 			if (match.status === "pending") await handleLoader(preload, prevMatch, previousRouteMatchId, match, route);
+@@ -484,6 +486,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 		}
+ 	}
+ 	const match = inner.router.getMatch(matchId);
++	if (!match) return inner.matches[index];
+ 	if (!loaderIsRunningAsync) {
+ 		match._nonReactive.loaderPromise?.resolve();
+ 		match._nonReactive.loadPromise?.resolve();
+@@ -500,7 +503,7 @@ const loadRouteMatch = async (inner, matchPromises, index) => {
+ 			isFetching: nextIsFetching,
+ 			invalid: false
+ 		}));
+-		return inner.router.getMatch(matchId);
++		return inner.router.getMatch(matchId) ?? inner.matches[index];
+ 	} else return match;
+ };
+ async function loadMatches(arg) {
+diff --git a/src/load-matches.ts b/src/load-matches.ts
+index f901a0c..76674e0 100644
+--- a/src/load-matches.ts
++++ b/src/load-matches.ts
+@@ -835,7 +835,10 @@ const loadRouteMatch = async (
+       ;(async () => {
+         try {
+           await runLoader(inner, matchPromises, matchId, index, route)
+-          const match = inner.router.getMatch(matchId)!
++          const match = inner.router.getMatch(matchId)
++          if (!match) {
++            return
++          }
+           match._nonReactive.loaderPromise?.resolve()
+           match._nonReactive.loadPromise?.resolve()
+           match._nonReactive.loaderPromise = undefined
+@@ -903,7 +906,10 @@ const loadRouteMatch = async (
+         return prevMatch
+       }
+       await prevMatch._nonReactive.loaderPromise
+-      const match = inner.router.getMatch(matchId)!
++      const match = inner.router.getMatch(matchId)
++      if (!match) {
++        return inner.matches[index]!
++      }
+       const error = match._nonReactive.error || match.error
+       if (error) {
+         handleRedirectAndNotFound(inner, match, error)
+@@ -933,7 +939,10 @@ const loadRouteMatch = async (
+       await handleLoader(preload, prevMatch, previousRouteMatchId, match, route)
+     }
+   }
+-  const match = inner.router.getMatch(matchId)!
++  const match = inner.router.getMatch(matchId)
++  if (!match) {
++    return inner.matches[index]!
++  }
+   if (!loaderIsRunningAsync) {
+     match._nonReactive.loaderPromise?.resolve()
+     match._nonReactive.loadPromise?.resolve()
+@@ -952,7 +961,7 @@ const loadRouteMatch = async (
+       isFetching: nextIsFetching,
+       invalid: false,
+     }))
+-    return inner.router.getMatch(matchId)!
++    return inner.router.getMatch(matchId) ?? inner.matches[index]!
+   } else {
+     return match
+   }