fix(nf): correctly check for public directory in init schematic

angular-architects · Aug 27, 2024 · 097c809 · 097c809
1 parent 7487744
commit 097c809
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/libs/native-federation/package.json b/libs/native-federation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/native-federation",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "main": "src/index.js",
   "generators": "./collection.json",
   "builders": "./builders.json",

diff --git a/libs/native-federation/src/builders/build/builder.ts b/libs/native-federation/src/builders/build/builder.ts
@@ -191,7 +191,7 @@ export async function* runBuilder(
         fedOptions.outputPath,
         url
       );
-      
+
       const exists = fs.existsSync(fileName);
 
       if (url !== '/' && url !== '' && exists) {

diff --git a/libs/native-federation/src/patch-angular-build.ts b/libs/native-federation/src/patch-angular-build.ts
@@ -3,4 +3,6 @@
 // const workspaceRoot = process.cwd();
 // patchAngularBuild(workspaceRoot);
 
-console.log('Please remove the postbuild task calling patch-angular-build. This is not needed since Native Federation 18.1 anymore!');
+console.log(
+  'Please remove the postbuild task calling patch-angular-build. This is not needed since Native Federation 18.1 anymore!'
+);
diff --git a/libs/native-federation/src/schematics/init/schematic.ts b/libs/native-federation/src/schematics/init/schematic.ts
@@ -283,7 +283,9 @@ function normalizeOptions(
 
   let manifestRelPath = 'public/federation.manifest.json';
 
-  if (!tree.exists(publicPath)) {
+  const hasPublicFolder = tree.getDir(projectRoot).subdirs.map(p => String(p)).includes('public');
+
+  if (!hasPublicFolder) {
     manifestPath = path
       .join(projectRoot, 'src/assets/federation.manifest.json')
       .replace(/\\/g, '/');