feat(adapter): add loader config option

Author: manfredsteyer

libs/native-federation-core/README.md

@@ -310,7 +310,8 @@ This library uses Import Maps. As currently not all browsers support this emergi
 ```html
 <script type="esms-options">
   {
-      "shimMode": true
+      "shimMode": true,
+      "mapOverrides": true
   }
 </script>
 

libs/native-federation-core/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@softarc/native-federation",
-  "version": "1.1.0",
+  "version": "1.1.1-beta.0",
   "type": "commonjs",
   "dependencies": {
     "json5": "^2.2.0",
     "npmlog": "^6.0.2",
-    "@softarc/native-federation-runtime": "1.1.0"
+    "@softarc/native-federation-runtime": "1.1.1-beta.0"
   }
 }

libs/native-federation-core/src/lib/config/configuration-context.ts

@@ -1,5 +1,6 @@
 export interface ConfigurationContext {
   workspaceRoot?: string;
+  packageJson?: string;
 }
 
 let _context: ConfigurationContext = {};
@@ -8,6 +9,11 @@ export function useWorkspace(workspaceRoot: string): void {
   _context = {..._context, workspaceRoot};
 }
 
+export function usePackageJson(packageJson?: string): void {
+  _context = {..._context, packageJson};
+}
+
+
 export function getConfigContext(): ConfigurationContext {
   return _context;
 }

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

@@ -245,19 +245,17 @@ export function shareAll(
   projectPath = ''
 ): Config | null {
 
-  let workspacePath: string | undefined = undefined;
+  // let workspacePath: string | undefined = undefined;
 
-  if (!projectPath) {
-    projectPath = cwd();
-  }
+  projectPath = inferProjectPath(projectPath);
 
-  workspacePath = getConfigContext().workspaceRoot ?? '';
+  // workspacePath = getConfigContext().workspaceRoot ?? '';
 
-  if (!workspacePath) {
-    workspacePath = projectPath;
-  }
+  // if (!workspacePath) {
+  //   workspacePath = projectPath;
+  // }
 
-  const versionMaps = getVersionMaps(projectPath, workspacePath);
+  const versionMaps = getVersionMaps(projectPath, projectPath);
   const share: Record<string, unknown> = {};
 
   for(const versions of versionMaps) {
@@ -283,14 +281,28 @@ export function shareAll(
   return module.exports.share(share, projectPath);
 }
 
+function inferProjectPath(projectPath: string) {
+  if (!projectPath && getConfigContext().packageJson) {
+    projectPath = path.dirname(getConfigContext().packageJson || '');
+  }
+
+  if (!projectPath && getConfigContext().workspaceRoot) {
+    projectPath = getConfigContext().workspaceRoot || '';
+  }
+
+  if (!projectPath) {
+    projectPath = cwd();
+  }
+  return projectPath;
+}
+
 export function setInferVersion(infer: boolean): void {
   inferVersion = infer;
 }
 
 export function share(shareObjects: Config, projectPath = ''): Config {
-  if (!projectPath) {
-    projectPath = cwd();
-  }
+  
+  projectPath = inferProjectPath(projectPath);
 
   const packagePath = findPackageJson(projectPath);
 

libs/native-federation-core/src/lib/core/bundle-shared.ts

@@ -15,11 +15,16 @@ export async function bundleShared(
   externals: string[]
 ): Promise<Array<SharedInfo>> {
   const result: Array<SharedInfo> = [];
+
+  const folder = fedOptions.packageJson ? 
+    path.dirname(fedOptions.packageJson) :
+    fedOptions.workspaceRoot;
+
   const packageInfos = Object.keys(config.shared)
     // .filter((packageName) => !isInSkipList(packageName, PREPARED_DEFAULT_SKIP_LIST))
     .map((packageName) => getPackageInfo(
       packageName, 
-      fedOptions.workspaceRoot,
+      folder,
     ))
     .filter((pi) => !!pi) as PackageInfo[];
 
@@ -42,6 +47,8 @@ export async function bundleShared(
     const encName = pi.packageName.replace(/[^A-Za-z0-9]/g, '_');
     const encVersion = pi.version.replace(/[^A-Za-z0-9]/g, '_');
 
+    // const env = fedOptions.dev ? 'dev' : 'prod';
+
     // const outFileName = `${encName}-${encVersion}-${hash}.js`;
     const outFileName = `${encName}-${encVersion}.js`;
 

libs/native-federation-core/src/lib/core/federation-builder.ts

@@ -1,4 +1,4 @@
-import { getConfigContext, useWorkspace } from '../config/configuration-context';
+import { getConfigContext, usePackageJson, useWorkspace } from '../config/configuration-context';
 import { NormalizedFederationConfig } from '../config/federation-config';
 import { BuildAdapter, setBuildAdapter } from './build-adapter';
 import { buildForFederation, defaultBuildParams } from './build-for-federation';
@@ -19,6 +19,7 @@ async function init(params: BuildHelperParams): Promise<void> {
   setBuildAdapter(params.adapter);
   fedOptions = params.options;
   useWorkspace(params.options.workspaceRoot);
+  usePackageJson(params.options.packageJson);
   config = await loadFederationConfig(fedOptions);
   params.options.workspaceRoot = getConfigContext().workspaceRoot ?? params.options.workspaceRoot;
   externals = getExternals(config);

libs/native-federation-core/src/lib/core/federation-options.ts

@@ -6,4 +6,5 @@ export interface FederationOptions {
   verbose?: boolean;
   dev?: boolean;
   watch?: boolean;
+  packageJson?: string;
 }

libs/native-federation-core/src/lib/utils/package-info.ts

@@ -1,4 +1,3 @@
-import { dir } from 'console';
 import * as fs from 'fs';
 import * as path from 'path';
 import { logger } from './logger';
@@ -63,7 +62,6 @@ export function getPackageInfo(
 
   workspaceRoot = normalize(workspaceRoot, true);
 
-
   const packageJsonInfos = getPackageJsonFiles(workspaceRoot, workspaceRoot);
 
   for (const info of packageJsonInfos) {
@@ -207,6 +205,27 @@ export function _getPackageInfo(
     };
   }
 
+  cand = mainPkgJson?.exports?.[relSecondaryPath]?.module;
+
+  if (typeof cand === 'object') {
+    if (cand.module) {
+      cand = cand.module;
+    } else if (cand.default) {
+      cand = cand.default;
+    } else {
+      cand = null;
+    }
+  }
+
+  if (cand) {
+    return {
+      entryPoint: path.join(mainPkgPath, cand),
+      packageName,
+      version,
+      esm,
+    };
+  }
+
   cand = mainPkgJson?.exports?.[relSecondaryPath]?.default;
   if (cand) {
     return {

libs/native-federation-esbuild/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softarc/native-federation-esbuild",
-  "version": "1.1.0",
+  "version": "1.1.1-beta.0",
   "type": "commonjs",
   "dependencies": {
     "@rollup/plugin-commonjs": "^22.0.2",

libs/native-federation-esbuild/src/lib/adapter.ts

@@ -24,15 +24,20 @@ export type ReplacementConfig = {
   file: string
 };
 
+export type Environment = 'dev' | 'prod';
+
 export interface EsBuildAdapterConfig {
   plugins: esbuild.Plugin[];
   fileReplacements?: Record<string, string | ReplacementConfig>
   skipRollup?: boolean,
-  compensateExports?: RegExp[]
+  compensateExports?: RegExp[],
+  loader?: { [ext: string]: esbuild.Loader }
 }
 
 export function createEsBuildAdapter(config: EsBuildAdapterConfig) {
 
+  normalizeConfig(config);
+
   if (!config.compensateExports) {
     config.compensateExports = [new RegExp('/react/')];
   }
@@ -52,6 +57,7 @@ export function createEsBuildAdapter(config: EsBuildAdapterConfig) {
       entryPoints: [isPkg ? tmpFolder : entryPoint],
       external,
       outfile,
+      loader: config.loader,
       bundle: true,
       sourcemap: true,
       minify: true,
@@ -80,6 +86,16 @@ export function createEsBuildAdapter(config: EsBuildAdapterConfig) {
   };
 }
 
+function normalizeConfig(config: EsBuildAdapterConfig) {
+  if (!config.environment) {
+    config.environment = 'dev';
+  }
+
+  if (!config.sourcemap) {
+    config.sourcemap = config.environment === 'dev';
+  }
+}
+
 function compensateExports(entryPoint: string, outfile?: string): void {
   const inExports = collectExports(entryPoint);
   const outExports = outfile ? collectExports(outfile) : inExports;