fix: race condition with rebuilds

Author: manfredsteyer

libs/mf-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@angular-architects/module-federation-runtime",
   "license": "MIT",
-  "version": "17.0.4",
+  "version": "17.0.7",
   "peerDependencies": {
     "@angular/common": ">=17.0.0",
     "@angular/core": ">=17.0.0"

libs/mf-tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/module-federation-tools",
-  "version": "17.0.4",
+  "version": "17.0.7",
   "license": "MIT",
   "peerDependencies": {},
   "dependencies": {

libs/mf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/module-federation",
-  "version": "17.0.4",
+  "version": "17.0.7",
   "license": "MIT",
   "repository": {
     "type": "GitHub",
@@ -17,7 +17,7 @@
   "schematics": "./collection.json",
   "builders": "./builders.json",
   "dependencies": {
-    "@angular-architects/module-federation-runtime": "17.0.4",
+    "@angular-architects/module-federation-runtime": "17.0.7",
     "word-wrap": "^1.2.3",
     "callsite": "^1.0.0",
     "node-fetch": "^2.6.7",

libs/mf/src/schematics/mf/schematic.ts

@@ -147,14 +147,14 @@ function nxBuildersAvailable(tree: Tree): boolean {
 }
 
 function infereNxBuilderNames(tree: Tree): { dev: string; prod: string } {
-  
   const dep = getPackageJsonDependency(tree, '@nx/angular');
 
-  const useDevServer = semver.satisfies(dep.version, '>=18.0.0');
+  const useDevServer = dep && dep.version && semver.satisfies(semver.minVersion(dep.version), '>=17.2.0');
 
-  
   const defaultResult = {
-    dev: useDevServer ? '@nx/angular:dev-server' : '@nx/angular:webpack-dev-server',
+    dev: useDevServer
+      ? '@nx/angular:dev-server'
+      : '@nx/angular:webpack-dev-server',
     prod: '@nx/angular:webpack-browser',
   };
 

libs/native-federation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/native-federation",
-  "version": "17.1.6",
+  "version": "17.1.7",
   "main": "src/index.js",
   "generators": "./collection.json",
   "builders": "./builders.json",

libs/native-federation/src/builders/build/builder.ts

@@ -204,9 +204,11 @@ export async function* runBuilder(
         normOuterOptions,
         appBuilderName,
         context,
-        nfOptions.skipHtmlTransform ? {} : {
-          indexHtml: transformIndexHtml,
-        },
+        nfOptions.skipHtmlTransform
+          ? {}
+          : {
+              indexHtml: transformIndexHtml,
+            },
         {
           buildPlugins: plugins,
           middleware,

libs/native-federation/src/schematics/init/schematic.ts

@@ -278,7 +278,8 @@ function generateRemoteMap(workspace: any, projectName: string) {
       project?.architect?.serve &&
       project?.architect?.build
     ) {
-      const pPort = project.architect['serve-original']?.options?.port ?? 
+      const pPort =
+        project.architect['serve-original']?.options?.port ??
         project.architect.serve?.options?.port ??
         4200;
       result[

libs/native-federation/src/utils/angular-esbuild-adapter.ts

@@ -329,16 +329,16 @@ async function runEsbuild(
     ctx.dispose();
   }
 
-  cleanUpTsConfigForFederation(tsConfigPath);
+  // cleanUpTsConfigForFederation(tsConfigPath);
 
   return writtenFiles;
 }
 
-function cleanUpTsConfigForFederation(tsConfigPath: string) {
-  if (tsConfigPath.includes('.federation.')) {
-    fs.unlinkSync(tsConfigPath);
-  }
-}
+// function cleanUpTsConfigForFederation(tsConfigPath: string) {
+//   if (tsConfigPath.includes('.federation.')) {
+//     fs.unlinkSync(tsConfigPath);
+//   }
+// }
 
 function createTsConfigForFederation(
   workspaceRoot: string,
@@ -372,12 +372,25 @@ function createTsConfigForFederation(
     }
   }
 
+  const content = JSON.stringify(tsconfig, null, 2);
+
   const tsconfigFedPath = path.join(tsconfigDir, 'tsconfig.federation.json');
-  fs.writeFileSync(tsconfigFedPath, JSON.stringify(tsconfig, null, 2));
+  
+  if (!doesFileExist(tsconfigFedPath,content)) {
+    fs.writeFileSync(tsconfigFedPath, JSON.stringify(tsconfig, null, 2));
+  }
   tsConfigPath = tsconfigFedPath;
   return tsConfigPath;
 }
 
+function doesFileExist(path: string, content: string): boolean {
+  if (!fs.existsSync(path)) {
+    return false;
+  }
+  const currentContent = fs.readFileSync(path, 'utf-8');
+  return currentContent === content;
+}
+
 function writeResult(
   result: esbuild.BuildResult<esbuild.BuildOptions>,
   outdir: string,

update-local-mf.bat

@@ -2,9 +2,9 @@
 @REM call npm unpublish @softarc/[email protected] --registry http://localhost:4873
 @REM call npm unpublish @softarc/[email protected] --registry http://localhost:4873
 @REM call npm unpublish @angular-architects/[email protected] --registry http://localhost:4873
-call npm unpublish @angular-architects/module-federation-tools@17.0.3 --registry http://localhost:4873
-call npm unpublish @angular-architects/module-federation-runtime@17.0.3 --registry http://localhost:4873
-call npm unpublish @angular-architects/module-federation@17.0.3 --registry http://localhost:4873
+call npm unpublish @angular-architects/module-federation-tools@17.0.6 --registry http://localhost:4873
+call npm unpublish @angular-architects/module-federation-runtime@17.0.6 --registry http://localhost:4873
+call npm unpublish @angular-architects/module-federation@17.0.6 --registry http://localhost:4873
 
 call npx nx build mf
 call npx nx build mf-runtime

update-local.bat

@@ -1,7 +1,7 @@
 call npm unpublish @softarc/native-federation@2.0.8 --registry http://localhost:4873
 call npm unpublish @softarc/native-federation-runtime@2.0.8 --registry http://localhost:4873
 call npm unpublish @softarc/native-federation-esbuild@2.0.8 --registry http://localhost:4873
-call npm unpublish @angular-architects/native-federation@17.1.5 --registry http://localhost:4873
+call npm unpublish @angular-architects/native-federation@17.1.7 --registry http://localhost:4873
 
 call npx nx build native-federation
 call npx nx build native-federation-core