feat: support Angular 17.x-next.x

Author: manfredsteyer

libs/native-federation-core/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@softarc/native-federation",
-  "version": "2.0.0",
+  "version": "2.0.4",
   "type": "commonjs",
   "dependencies": {
     "json5": "^2.2.0",
     "npmlog": "^6.0.2",
-    "@softarc/native-federation-runtime": "2.0.0"
+    "@softarc/native-federation-runtime": "2.0.4"
   }
 }

libs/native-federation-core/src/lib/config/share-utils.ts

@@ -232,6 +232,15 @@ function readConfiguredSecondaries(
       continue;
     }
 
+    const entry = getDefaultEntry(exports, key);
+    if (
+      entry?.endsWith('.css') ||
+      entry?.endsWith('.scss') ||
+      entry?.endsWith('.less')
+    ) {
+      continue;
+    }
+
     result[secondaryName] = {
       ...shareObject,
       // import: path.join(libPath, relPath)
@@ -241,6 +250,19 @@ function readConfiguredSecondaries(
   return result;
 }
 
+function getDefaultEntry(
+  exports: Record<string, Record<string, string>>,
+  key: string
+) {
+  let entry = '';
+  if (typeof exports[key] === 'string') {
+    entry = exports[key] as unknown as string;
+  } else {
+    entry = exports[key]?.['default'];
+  }
+  return entry;
+}
+
 export function shareAll(
   config: CustomSharedConfig = {},
   skip: SkipList = DEFAULT_SKIP_LIST,

libs/native-federation-core/src/lib/core/bundle-exposed-and-mappings.ts

@@ -8,6 +8,7 @@ import {
   lookupInResultMap,
 } from '../utils/build-result-map';
 import { logger } from '../utils/logger';
+import { normalize } from '../utils/normalize';
 
 export interface ArtefactInfo {
   mappings: SharedInfo[];
@@ -64,7 +65,7 @@ export async function bundleExposedAndMappings(
       dev: !fedOptions.dev
         ? undefined
         : {
-            entryPoint: path.normalize(item.fileName),
+            entryPoint: normalize(path.normalize(item.fileName)),
           },
     });
   }
@@ -78,7 +79,9 @@ export async function bundleExposedAndMappings(
       dev: !fedOptions.dev
         ? undefined
         : {
-            entryPoint: item.fileName,
+            entryPoint: normalize(
+              path.join(fedOptions.workspaceRoot, item.fileName)
+            ),
           },
     });
   }
@@ -93,8 +96,8 @@ export function describeExposed(
   const result: Array<ExposesInfo> = [];
 
   for (const key in config.exposes) {
-    const localPath = path.normalize(
-      path.join(options.workspaceRoot, config.exposes[key])
+    const localPath = normalize(
+      path.normalize(path.join(options.workspaceRoot, config.exposes[key]))
     );
 
     result.push({
@@ -128,7 +131,7 @@ export function describeSharedMappings(
       dev: !fedOptions.dev
         ? undefined
         : {
-            entryPoint: path.normalize(m.path),
+            entryPoint: normalize(path.normalize(m.path)),
           },
     });
   }

libs/native-federation-esbuild/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@softarc/native-federation-esbuild",
-  "version": "2.0.0",
+  "version": "2.0.4",
   "type": "commonjs",
   "dependencies": {
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-replace": "^4.0.0",
     "rollup": "^2.79.0",
     "rollup-plugin-node-externals": "^4.1.1",
-    "esbuild": "^0.15.5",
+    "esbuild": "^0.18.12",
     "npmlog": "^6.0.2",
     "acorn": "^8.8.1"
   }

libs/native-federation-runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softarc/native-federation-runtime",
-  "version": "2.0.0",
+  "version": "2.0.4",
   "peerDependencies": {},
   "dependencies": {
     "tslib": "^2.3.0"

libs/native-federation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/native-federation",
-  "version": "16.3.0",
+  "version": "16.3.4",
   "main": "src/index.js",
   "generators": "./collection.json",
   "builders": "./builders.json",
@@ -16,8 +16,8 @@
   },
   "dependencies": {
     "@babel/core": "^7.19.0",
-    "@softarc/native-federation": "2.0.0",
-    "@softarc/native-federation-runtime": "2.0.0",
+    "@softarc/native-federation": "2.0.4",
+    "@softarc/native-federation-runtime": "2.0.4",
     "@types/browser-sync": "^2.26.3",
     "browser-sync": "^2.29.3",
     "esbuild": "^0.18.12",

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

@@ -107,6 +107,12 @@ function updateWorkspaceConfig(
     originalBuild.builder = '@angular-devkit/build-angular:browser-esbuild';
   }
 
+  if (originalBuild.options.browser) {
+    const browser = originalBuild.options.browser;
+    delete originalBuild.options.browser;
+    originalBuild.options.main = browser;
+  }
+
   projectConfig.architect.esbuild = originalBuild;
 
   projectConfig.architect.build = {
@@ -190,7 +196,9 @@ function normalizeOptions(
     .join(projectRoot, 'src/assets/federation.manifest.json')
     .replace(/\\/g, '/');
 
-  const main = projectConfig.architect.build.options.main;
+  const main =
+    projectConfig.architect.build.options.main ||
+    projectConfig.architect.build.options.browser;
 
   if (!projectConfig.architect.build.options.polyfills) {
     projectConfig.architect.build.options.polyfills = [];

update-local.bat

@@ -1,7 +1,7 @@
-call npm unpublish @softarc/native-federation@2.0.0 --registry http://localhost:4873
-call npm unpublish @softarc/native-federation-runtime@2.0.0 --registry http://localhost:4873
-call npm unpublish @softarc/native-federation-esbuild@2.0.0 --registry http://localhost:4873
-call npm unpublish @angular-architects/native-federation@16.3.0 --registry http://localhost:4873
+call npm unpublish @softarc/native-federation@2.0.3 --registry http://localhost:4873
+call npm unpublish @softarc/native-federation-runtime@2.0.3 --registry http://localhost:4873
+call npm unpublish @softarc/native-federation-esbuild@2.0.3 --registry http://localhost:4873
+call npm unpublish @angular-architects/native-federation@16.3.3 --registry http://localhost:4873
 
 call npx nx build native-federation
 call npx nx build native-federation-core