Merged 'main' into 'release'.

Author: github-actions[bot]

libs/nx-angular-mf/README.md

@@ -82,7 +82,7 @@ Here’s an example of how the configuration might look in practice:
 {
   "skipList": ["dependency-to-skip"] // or 'dependency-to-skip.json',
   "externalList": ["@angular/core", "@angular/platform-browser"], // or 'external-list-dependency.json',
-  "esPlugins": ["path/to/esbuild/plugin1.ts", "path/to/esbuild/plugin2.ts"],
+  "esPlugins": ["path/to/esbuild/plugin1.ts", "path/to/esbuild/plugin2.ts"], // should be export default Plugin or () => Promise<Plugin> 
   "indexHtmlTransformer": "path/to/transform-index.ts",
   "exposes": {
     "./ComponentA": "./src/component-a.ts"
@@ -94,6 +94,9 @@ Here’s an example of how the configuration might look in practice:
 }
 
 ```
+- Module with `esPlugins` should be export `Plugin` as default of  `(configMf: ConfigMf) => Promise<Plugin>` as default too.
+- Module with `indexHtmlTransformer` should be export `(input: string) => string` as default
+
 This configuration excludes a dependency from processing, treats Angular core modules as external, includes custom plugins, modifies index.html, exposes a component, specifies a remote entry, and supports deployment via an environment variable.
 
 ### Import dinamic remote module

libs/nx-angular-mf/src/builders/custom-loader/custom-loader-serve.ts

@@ -113,7 +113,7 @@ export async function resolve(
   const resolveUrl = resolveModulePath(importMap, specifier, parentURL);
 
   if (checkIfNodeProtocol(resolveUrl) || checkIfFileProtocol(resolveUrl)) {
-    return nextResolve(specifier, context, nextResolve);
+    return nextResolve(specifier.replace('@fs/', ''), context, nextResolve);
   }
 
   if (!importMapName && !resolveUrl) {

libs/nx-angular-mf/src/builders/serve/index.ts

@@ -20,12 +20,20 @@ import {
   indexHtml,
   loadModule,
   patchBuilderContext,
-  prepareConfig, reloadDevServer
+  prepareConfig,
+  reloadDevServer,
 } from '../helpers';
-import { entryPointForExtendDependencies, importMapConfigPlugin } from '../es-plugin';
+import {
+  entryPointForExtendDependencies,
+  importMapConfigPlugin,
+} from '../es-plugin';
 import { register } from 'node:module';
-import { CACHE_FILE, CLEAR_REMOTE, IMPORT_MAP } from '../custom-loader/constants';
-import { OutputFileRecord } from '../types';
+import {
+  CACHE_FILE,
+  CLEAR_REMOTE,
+  IMPORT_MAP,
+} from '../custom-loader/constants';
+import { ConfigMf, OutputFileRecord } from '../types';
 import process from 'node:process';
 import { loadEsmModule } from '../custom-loader/custom-loader-utils';
 // @ts-expect-error need only type
@@ -40,7 +48,6 @@ function getBuilderAction(
   ssr: boolean
 ) {
   return async function* (options, context, pluginsOrExtensions) {
-
     let extensions;
     if (pluginsOrExtensions && Array.isArray(pluginsOrExtensions)) {
       extensions = {
@@ -104,7 +111,7 @@ export async function* runBuilder(
 ) {
   context.logger.info('Run serve mf');
 
-  const {mf: defaultOptionsMfe, ...defaultOptions} = options;
+  const { mf: defaultOptionsMfe, ...defaultOptions } = options;
 
   const buildTarget = targetFromTargetString(options.buildTarget);
   const targetOptions = (await context.getTargetOptions(
@@ -147,16 +154,27 @@ export async function* runBuilder(
     defaultOptions
   );
 
-  const esPluginPromise = optionsMfe.esPlugins.map((item) =>
-    loadModule<Plugin>(item, targetOptions.tsConfig, context.logger)
-  );
+  type FunctionEsPlugin = (config: ConfigMf) => Promise<Plugin>;
+
+  const esPluginPromise = optionsMfe.esPlugins.map((item) => {
+    return loadModule<Plugin | FunctionEsPlugin>(
+      item,
+      targetOptions.tsConfig,
+      context.logger
+    ).then(r => {
+      if (typeof r === 'function') {
+        return r(optionsMfe)
+      }
+      return r;
+    });
+  });
   const esPlugins = await Promise.all(esPluginPromise);
 
   const resultEsBuild = [
     ...esPlugins,
     importMapConfigPlugin(optionsMfe, true),
-    entryPointForExtendDependencies(optionsMfe)
-  ]
+    entryPointForExtendDependencies(optionsMfe),
+  ];
 
   const extensions = {
     middleware: [],
@@ -165,10 +183,11 @@ export async function* runBuilder(
 
   const mainTransform = await indexHtml(optionsMfe, true);
 
-
   const transforms = {
     indexHtml: async (input: string) => {
-      const mainTransformResult = await mainTransform(addLinkForReload(input));
+      const mainTransformResult = await mainTransform(
+        targetOptions['ssr'] ? addLinkForReload(input) : input
+      );
       return optionsMfe.indexHtmlTransformer(mainTransformResult);
     },
   };

libs/nx-angular-mf/src/index.ts

@@ -0,0 +1 @@
+export * from './builders/types'