fix(nf): update script tags in place to respect #733

manfredsteyer · manfredsteyer · commit 3daa0a8b02d0 · 2025-02-15T12:43:24.000+01:00
diff --git a/libs/native-federation-core/src/lib/config/federation-config.ts b/libs/native-federation-core/src/lib/config/federation-config.ts
@@ -26,7 +26,7 @@ export interface FederationConfig {
   externals?: string[];
   features?: {
     mappingVersion?: boolean;
-  }
+  };
 }
 
 export interface NormalizedSharedConfig {
@@ -53,5 +53,5 @@ export interface NormalizedFederationConfig {
   externals: string[];
   features: {
     mappingVersion: boolean;
-  }
+  };
 }
diff --git a/libs/native-federation-core/src/lib/core/bundle-exposed-and-mappings.ts b/libs/native-federation-core/src/lib/core/bundle-exposed-and-mappings.ts
@@ -63,7 +63,9 @@ export async function bundleExposedAndMappings(
       requiredVersion: '',
       singleton: true,
       strictVersion: false,
-      version: config.features.mappingVersion ? getMappingVersion(item.fileName) : '',
+      version: config.features.mappingVersion
+        ? getMappingVersion(item.fileName)
+        : '',
       dev: !fedOptions.dev
         ? undefined
         : {
diff --git a/libs/native-federation-core/src/lib/core/bundle-shared.ts b/libs/native-federation-core/src/lib/core/bundle-shared.ts
@@ -87,16 +87,14 @@ export async function bundleShared(
     );
   }
 
-  const additionalExternals = platform === 'browser' ? DEFAULT_EXTERNAL_LIST : [];
+  const additionalExternals =
+    platform === 'browser' ? DEFAULT_EXTERNAL_LIST : [];
 
   try {
     await bundle({
       entryPoints,
       tsConfigPath: fedOptions.tsConfig,
-      external: [
-        ...additionalExternals,
-        ...externals
-      ],
+      external: [...additionalExternals, ...externals],
       outdir: cachePath,
       mappedPaths: config.sharedMappings,
       dev: fedOptions.dev,
diff --git a/libs/native-federation-core/src/lib/core/default-external-list.ts b/libs/native-federation-core/src/lib/core/default-external-list.ts
@@ -27,4 +27,7 @@ const NODE_PACKAGES = [
   'zlib',
 ];
 
-export const DEFAULT_EXTERNAL_LIST = NODE_PACKAGES.flatMap(p => ([p, 'node:' + p]));
+export const DEFAULT_EXTERNAL_LIST = NODE_PACKAGES.flatMap((p) => [
+  p,
+  'node:' + p,
+]);
diff --git a/libs/native-federation/src/utils/updateIndexHtml.ts b/libs/native-federation/src/utils/updateIndexHtml.ts
@@ -54,16 +54,17 @@ export function updateScriptTags(
 
   const htmlFragment = `
 <script type="esms-options">${JSON.stringify(esmsOptions)}</script>
-
-<script type="module" src="${polyfillsName}"></script>
-<script type="module-shim" src="${mainName}"></script>
 `;
 
   indexContent = indexContent.replace(
-    /<script src="polyfills.*?><\/script>/,
-    ''
+    /<script src="(.*?polyfills.*?)><\/script>/,
+    '<script type="module" src="$1"></script>'
+  );
+  indexContent = indexContent.replace(
+    /<script src="(.*?main.*?)><\/script>/,
+    '<script type="module-shim" src="$1"></script>'
   );
-  indexContent = indexContent.replace(/<script src="main.*?><\/script>/, '');
-  indexContent = indexContent.replace('</body>', `${htmlFragment}</body>`);
+
+  indexContent = indexContent.replace('<body>', `<body>${htmlFragment}`);
   return indexContent;
 }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ export interface FederationConfig {`
`26`	`26`	`externals?: string[];`
`27`	`27`	`features?: {`
`28`	`28`	`mappingVersion?: boolean;`
`29`		`- }`
	`29`	`+ };`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`export interface NormalizedSharedConfig {`
`@@ -53,5 +53,5 @@ export interface NormalizedFederationConfig {`
`53`	`53`	`externals: string[];`
`54`	`54`	`features: {`
`55`	`55`	`mappingVersion: boolean;`
`56`		`- }`
	`56`	`+ };`
`57`	`57`	`}`