feat(nf): allow to version repo-internal libs (mapped paths)

manfredsteyer · manfredsteyer · commit ae03fbadcecb · 2025-02-15T10:30:29.000+01:00
diff --git a/libs/native-federation-core/package.json b/libs/native-federation-core/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@softarc/native-federation",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "type": "commonjs",
   "license": "MIT",
   "dependencies": {
     "json5": "^2.2.0",
     "npmlog": "^6.0.2",
-    "@softarc/native-federation-runtime": "2.0.20"
+    "@softarc/native-federation-runtime": "2.0.22"
   }
 }
diff --git a/libs/native-federation-core/src/lib/config/federation-config.ts b/libs/native-federation-core/src/lib/config/federation-config.ts
@@ -24,6 +24,9 @@ export interface FederationConfig {
   sharedMappings?: Array<string>;
   skip?: SkipList;
   externals?: string[];
+  features?: {
+    mappingVersion?: boolean;
+  }
 }
 
 export interface NormalizedSharedConfig {
@@ -48,4 +51,7 @@ export interface NormalizedFederationConfig {
   sharedMappings: Array<MappedPath>;
   skip: PreparedSkipList;
   externals: string[];
+  features: {
+    mappingVersion: boolean;
+  }
 }
diff --git a/libs/native-federation-core/src/lib/config/with-native-federation.ts b/libs/native-federation-core/src/lib/config/with-native-federation.ts
@@ -25,6 +25,9 @@ export function withNativeFederation(
     sharedMappings: normalizeSharedMappings(config, skip),
     skip,
     externals: config.externals ?? [],
+    features: {
+      mappingVersion: config.features?.mappingVersion ?? false,
+    },
   };
 }
 
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
@@ -1,4 +1,6 @@
 import path from 'path';
+import fs from 'fs';
+
 import { NormalizedFederationConfig } from '../config/federation-config';
 import { FederationOptions } from './federation-options';
 import { bundle } from '../utils/build-utils';
@@ -61,7 +63,7 @@ export async function bundleExposedAndMappings(
       requiredVersion: '',
       singleton: true,
       strictVersion: false,
-      version: '',
+      version: config.features.mappingVersion ? getMappingVersion(item.fileName) : '',
       dev: !fedOptions.dev
         ? undefined
         : {
@@ -127,7 +129,7 @@ export function describeSharedMappings(
       requiredVersion: '',
       singleton: true,
       strictVersion: false,
-      version: '',
+      version: config.features.mappingVersion ? getMappingVersion(m.path) : '',
       dev: !fedOptions.dev
         ? undefined
         : {
@@ -138,3 +140,16 @@ export function describeSharedMappings(
 
   return result;
 }
+
+function getMappingVersion(fileName: string): string {
+  const entryFileDir = path.dirname(fileName);
+  const cand1 = path.join(entryFileDir, 'package.json');
+  const cand2 = path.join(path.dirname(entryFileDir), 'package.json');
+
+  const packageJsonPath = [cand1, cand2].find((cand) => fs.existsSync(cand));
+  if (packageJsonPath) {
+    const json = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+    return json.version ?? '';
+  }
+  return '';
+}
diff --git a/libs/native-federation-core/src/lib/core/bundle-shared.ts b/libs/native-federation-core/src/lib/core/bundle-shared.ts
@@ -1,6 +1,9 @@
 import * as path from 'path';
 import * as fs from 'fs';
-import { NormalizedFederationConfig, NormalizedSharedConfig } from '../config/federation-config';
+import {
+  NormalizedFederationConfig,
+  NormalizedSharedConfig,
+} from '../config/federation-config';
 import { bundle } from '../utils/build-utils';
 import { getPackageInfo, PackageInfo } from '../utils/package-info';
 import { SharedInfo } from '@softarc/native-federation-runtime';
@@ -9,6 +12,7 @@ import { copySrcMapIfExists } from '../utils/copy-src-map-if-exists';
 import { logger } from '../utils/logger';
 import { normalize } from '../utils/normalize';
 import crypto from 'crypto';
+import { DEFAULT_EXTERNAL_LIST } from './default-external-list';
 
 export async function bundleShared(
   sharedBundles: Record<string, NormalizedSharedConfig>,
@@ -83,11 +87,16 @@ export async function bundleShared(
     );
   }
 
+  const additionalExternals = platform === 'browser' ? DEFAULT_EXTERNAL_LIST : [];
+
   try {
     await bundle({
       entryPoints,
       tsConfigPath: fedOptions.tsConfig,
-      external: 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
@@ -0,0 +1,30 @@
+const NODE_PACKAGES = [
+  'assert',
+  'buffer',
+  'child_process',
+  'cluster',
+  'crypto',
+  'dgram',
+  'dns',
+  'events',
+  'fs',
+  'http',
+  'https',
+  'module',
+  'net',
+  'os',
+  'path',
+  'querystring',
+  'readline',
+  'stream',
+  'timers',
+  'tls',
+  'tty',
+  'url',
+  'util',
+  'v8',
+  'vm',
+  'zlib',
+];
+
+export const DEFAULT_EXTERNAL_LIST = NODE_PACKAGES.flatMap(p => ([p, 'node:' + p]));
diff --git a/libs/native-federation-esbuild/package.json b/libs/native-federation-esbuild/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@softarc/native-federation-esbuild",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "type": "commonjs",
   "dependencies": {
     "@rollup/plugin-commonjs": "^22.0.2",
diff --git a/libs/native-federation-node/package.json b/libs/native-federation-node/package.json
@@ -1,4 +1,4 @@
 {
   "name": "@softarc/native-federation-node",
-  "version": "2.0.20"
+  "version": "2.0.22"
 }
diff --git a/libs/native-federation-runtime/package.json b/libs/native-federation-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@softarc/native-federation-runtime",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "dependencies": {
     "tslib": "^2.3.0"
   },
diff --git a/libs/native-federation/package.json b/libs/native-federation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/native-federation",
-  "version": "19.0.8",
+  "version": "19.0.10",
   "main": "src/index.js",
   "generators": "./collection.json",
   "builders": "./builders.json",
@@ -20,8 +20,8 @@
   },
   "dependencies": {
     "@babel/core": "^7.19.0",
-    "@softarc/native-federation": "2.0.20",
-    "@softarc/native-federation-runtime": "2.0.20",
+    "@softarc/native-federation": "2.0.22",
+    "@softarc/native-federation-runtime": "2.0.22",
     "@types/browser-sync": "^2.29.0",
     "@chialab/esbuild-plugin-commonjs": "^0.18.0",
     "browser-sync": "^3.0.2",
diff --git a/libs/native-federation/src/builders/build/builder.ts b/libs/native-federation/src/builders/build/builder.ts
@@ -31,7 +31,7 @@ import { buildForFederation } from '@softarc/native-federation/build';
 import { targetFromTargetString } from '@angular-devkit/architect';
 
 import { NfBuilderSchema } from './schema';
-import { reloadBrowser, reloadShell, setError } from '../../utils/dev-server';
+import { reloadBrowser, setError } from '../../utils/dev-server';
 import { RebuildHubs } from '../../utils/rebuild-events';
 import { updateIndexHtml, updateScriptTags } from '../../utils/updateIndexHtml';
 import { existsSync, mkdirSync, rmSync } from 'fs';
@@ -101,7 +101,11 @@ export async function* runBuilder(
     ? await normalizeOptions(context, context.target.project, outerOptions)
     : null;
 
-  if (nfOptions.dev) {
+  const runServer = nfOptions.dev && nfOptions.devServer !== false;
+  const write = true;
+  const watch = nfOptions.watch;
+
+  if (runServer) {
     target = targetFromTargetString(outerOptions.buildTarget);
     _options = (await context.getTargetOptions(
       target
@@ -112,10 +116,6 @@ export async function* runBuilder(
       ApplicationBuilderOptions;
   }
 
-  const runServer = !!nfOptions.port;
-  const write = !runServer;
-  const watch = !!runServer || nfOptions.watch;
-
   options.watch = watch;
 
   if (nfOptions.baseHref) {
@@ -241,7 +241,7 @@ export async function* runBuilder(
 
   const appBuilderName = '@angular-devkit/build-angular:application';
 
-  const builderRun = nfOptions.dev
+  const builderRun = runServer
     ? serveWithVite(
         normOuterOptions,
         appBuilderName,
@@ -281,22 +281,26 @@ export async function* runBuilder(
       );
     }
 
-    if (write && !nfOptions.dev && !nfOptions.skipHtmlTransform) {
+    if (write && !runServer && !nfOptions.skipHtmlTransform) {
       updateIndexHtml(fedOptions, nfOptions);
     }
 
-    if (!runServer) {
-      yield output;
-    }
+    // if (!runServer) {
+    //   yield output;
+    // }
 
     if (!first && (nfOptions.dev || watch)) {
       setTimeout(async () => {
-        await buildForFederation(config, fedOptions, externals);
-        logger.info('Done!');
-
-        if (runServer) {
-          setTimeout(() => reloadShell(nfOptions.shell), 0);
+        try {
+          await buildForFederation(config, fedOptions, externals);
+          logger.info('Done!');
+        } catch {
+          logger.error('Not successful!');
         }
+
+        // if (runServer) {
+        //   setTimeout(() => reloadShell(nfOptions.shell), 0);
+        // }
       }, nfOptions.rebuildDelay);
     }
 
diff --git a/libs/native-federation/src/builders/build/schema.d.ts b/libs/native-federation/src/builders/build/schema.d.ts
@@ -13,4 +13,5 @@ export interface NfBuilderSchema extends JsonObject {
   esmsInitOptions: ESMSInitOptions;
   baseHref?: string;
   ssr: boolean;
+  devServer?: boolean;
 } // eslint-disable-line
diff --git a/libs/native-federation/src/builders/build/schema.json b/libs/native-federation/src/builders/build/schema.json
@@ -57,6 +57,10 @@
       "type": "boolean",
       "description": "uses federation for ssr in ApplicationBuilder too",
       "default": false
+    },
+    "devServer": {
+      "type": "boolean",
+      "description": "can be used to disable the dev server when dev=true"
     }
   }
 }
diff --git a/libs/native-federation/src/schematics/init/schematic.ts b/libs/native-federation/src/schematics/init/schematic.ts
@@ -494,11 +494,8 @@ function makeServerAsync(
         `const app = express();`,
         `const app = express();\n  app.set('view engine', 'html');`
       )
-      .replace(
-        `if (isMainModule(import.meta.url)) {`,
-        ``
-      )
-      .replace(/\}(?![\s\S]*\})/, '')
+      .replace(`if (isMainModule(import.meta.url)) {`, ``)
+      .replace(/\}(?![\s\S]*\})/, '');
 
     tree.create(bootstrapName, updatedContent);
 

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@softarc/native-federation",`
`3`		`- "version": "2.0.20",`
	`3`	`+ "version": "2.0.22",`
`4`	`4`	`"type": "commonjs",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"dependencies": {`
`7`	`7`	`"json5": "^2.2.0",`
`8`	`8`	`"npmlog": "^6.0.2",`
`9`		`- "@softarc/native-federation-runtime": "2.0.20"`
	`9`	`+ "@softarc/native-federation-runtime": "2.0.22"`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,9 @@ export function withNativeFederation(`
`25`	`25`	`sharedMappings: normalizeSharedMappings(config, skip),`
`26`	`26`	`skip,`
`27`	`27`	`externals: config.externals ?? [],`
	`28`	`+ features: {`
	`29`	`+ mappingVersion: config.features?.mappingVersion ?? false,`
	`30`	`+ },`
`28`	`31`	`};`
`29`	`32`	`}`
`30`	`33`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@softarc/native-federation-esbuild",`
`3`		`- "version": "2.0.20",`
	`3`	`+ "version": "2.0.22",`
`4`	`4`	`"type": "commonjs",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@rollup/plugin-commonjs": "^22.0.2",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@softarc/native-federation-node",`
`3`		`- "version": "2.0.20"`
	`3`	`+ "version": "2.0.22"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@softarc/native-federation-runtime",`
`3`		`- "version": "2.0.20",`
	`3`	`+ "version": "2.0.22",`
`4`	`4`	`"dependencies": {`
`5`	`5`	`"tslib": "^2.3.0"`
`6`	`6`	`},`