@module-federation/esbuild 0.0.0-next-20240523235135 → 0.0.0-next-20240524034417

package/dist/build.cjs.js

@@ -58,7 +58,8 @@ const DEFAULT_SKIP_LIST = [
     /\/schematics(\/|$)/,
     /^@nx\/angular/,
     (pkg)=>pkg.startsWith('@angular/') && !!pkg.match(/\/testing(\/|$)/),
-    (pkg)=>pkg.startsWith('@types/')
+    (pkg)=>pkg.startsWith('@types/'),
+    (pkg)=>pkg.startsWith('@module-federation/')
 ];
 const PREPARED_DEFAULT_SKIP_LIST = prepareSkipList(DEFAULT_SKIP_LIST);
 function prepareSkipList(skipList) {

package/dist/build.esm.js

@@ -29,7 +29,8 @@ const DEFAULT_SKIP_LIST = [
     /\/schematics(\/|$)/,
     /^@nx\/angular/,
     (pkg)=>pkg.startsWith('@angular/') && !!pkg.match(/\/testing(\/|$)/),
-    (pkg)=>pkg.startsWith('@types/')
+    (pkg)=>pkg.startsWith('@types/'),
+    (pkg)=>pkg.startsWith('@module-federation/')
 ];
 const PREPARED_DEFAULT_SKIP_LIST = prepareSkipList(DEFAULT_SKIP_LIST);
 function prepareSkipList(skipList) {

package/dist/esbuild.cjs.js

@@ -8,33 +8,15 @@ var fs = require('fs');
 var path = require('path');
 var commonjs = require('@rollup/plugin-commonjs');
 var replace = require('@rollup/plugin-replace');
-require('acorn');
+var esModuleLexer = require('es-module-lexer');
+var cjsModuleLexer = require('cjs-module-lexer');
 var util = require('util');
 var enhancedResolve = require('enhanced-resolve');
-var moduleLexer = require('cjs-module-lexer');
 var federationBuilder = require('./federation-builder.cjs.js');
 require('npmlog');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-function _interopNamespace(e) {
-	if (e && e.__esModule) return e;
-	var n = Object.create(null);
-	if (e) {
-		Object.keys(e).forEach(function (k) {
-			if (k !== 'default') {
-				var d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		});
-	}
-	n["default"] = e;
-	return Object.freeze(n);
-}
-
 var esbuild__default = /*#__PURE__*/_interopDefaultLegacy(esbuild$1);
 var pluginNodeResolve__default = /*#__PURE__*/_interopDefaultLegacy(pluginNodeResolve);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
@@ -42,7 +24,6 @@ var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 var commonjs__default = /*#__PURE__*/_interopDefaultLegacy(commonjs);
 var replace__default = /*#__PURE__*/_interopDefaultLegacy(replace);
 var enhancedResolve__default = /*#__PURE__*/_interopDefaultLegacy(enhancedResolve);
-var moduleLexer__namespace = /*#__PURE__*/_interopNamespace(moduleLexer);
 
 function getAugmentedNamespace(n) {
     if (n.__esModule) return n;
@@ -68,12 +49,9 @@ const resolve = util.promisify(enhancedResolve__default["default"].create({
         'main'
     ]
 }));
-let lexerInitialized = false;
 async function getExports(modulePath) {
-    if (!lexerInitialized) {
-        await moduleLexer__namespace.init();
-        lexerInitialized = true;
-    }
+    await esModuleLexer.init;
+    await cjsModuleLexer.init;
     try {
         const exports = [];
         const paths = [];
@@ -84,19 +62,18 @@ async function getExports(modulePath) {
         while(paths.length > 0){
             const currentPath = paths.pop();
             if (currentPath) {
-                const results = moduleLexer__namespace.parse(await fs__default["default"].readFileSync(currentPath, 'utf8'));
-                exports.push(...results.exports);
-                for (const reexport of results.reexports){
-                    const resolvedPath = await resolve(path__default["default"].dirname(currentPath), reexport);
-                    if (typeof resolvedPath === 'string') {
-                        paths.push(resolvedPath);
-                    }
+                const content = await fs__default["default"].promises.readFile(currentPath, 'utf8');
+                try {
+                    const { exports: cjsExports } = cjsModuleLexer.parse(content);
+                    exports.push(...cjsExports);
+                } catch (e) {
+                    const [, esExports] = esModuleLexer.parse(content);
+                    exports.push(...esExports.map((exp)=>exp.n));
                 }
+            // TODO: Handle re-exports
             }
         }
-        /**
-     * 追加default
-     */ if (!exports.includes('default')) {
+        if (!exports.includes('default')) {
             exports.push('default');
         }
         return exports;
@@ -567,7 +544,7 @@ const createContainerPlugin = (config)=>({
             const filter = new RegExp([
                 filename
             ].map((name)=>`${name}$`).join('|'));
-            const sharedExternals = new RegExp(externals.map((name)=>`${name}$`).join('|'));
+            const sharedExternals = new RegExp(Object.keys(federationBuilder.federationBuilder.config.shared || {}).map((name)=>`${name}$`).join('|'));
             build.onResolve({
                 filter
             }, async (args)=>({
@@ -604,7 +581,7 @@ const createContainerPlugin = (config)=>({
             build.onResolve({
                 filter: /.*/,
                 namespace: 'esm-shares'
-            }, (args)=>{
+            }, async (args)=>{
                 if (sharedExternals.test(args.path)) {
                     return {
                         path: args.path,
@@ -615,14 +592,10 @@ const createContainerPlugin = (config)=>({
                         }
                     };
                 }
-                return {
-                    path: args.path,
-                    namespace: 'esm-shares',
-                    pluginData: {
-                        kind: args.kind,
-                        resolveDir: args.resolveDir
-                    }
-                };
+                await build.resolve(args.path, {
+                    resolveDir: args.resolveDir
+                });
+                return undefined;
             });
             build.onLoad({
                 filter,
@@ -743,15 +716,37 @@ const initializeHostPlugin = {
                 contents: buildFederationHost(),
                 resolveDir: args.pluginData.resolveDir
             }));
+        // Add custom loaders
+        const loaders = build.initialOptions.loader || {};
+        // Apply custom loaders
+        for (const [ext, loader] of Object.entries(loaders)){
+            build.onLoad({
+                filter: new RegExp(`\\${ext}$`),
+                namespace: 'file'
+            }, async (args)=>{
+                const contents = await fs__default["default"].promises.readFile(args.path, 'utf8');
+                return {
+                    contents: buildFederationHost() + contents,
+                    loader
+                };
+            });
+        }
+        // Fallback loader for files not matched by custom loaders
+        const fallbackFilter = new RegExp(Object.keys(loaders).map((ext)=>`\\${ext}$`).join('|'));
         build.onLoad({
             filter: /.*\.(ts|js|mjs)$/,
             namespace: 'file'
-        }, async (args)=>{
-            if (!build.initialOptions.entryPoints.some((e)=>args.path.includes(e))) return;
-            const contents = await fs__default["default"].promises.readFile(args.path, 'utf8');
-            return {
-                contents: buildFederationHost() + contents
-            };
+        }, //@ts-ignore
+        async (args)=>{
+            if (!fallbackFilter.test(args.path)) {
+                if (!build.initialOptions.entryPoints.some((e)=>args.path.includes(e))) {
+                    return;
+                }
+                const contents = await fs__default["default"].promises.readFile(args.path, 'utf8');
+                return {
+                    contents: buildFederationHost() + contents
+                };
+            }
         });
     }
 };
@@ -837,15 +832,26 @@ const cjsToEsmPlugin = {
                 throw new Error(`Unable to resolve path: ${args.path}`);
             }
             const fileContent = fs__default["default"].readFileSync(resolver, 'utf-8');
-            const { code } = await transform(fileContent);
-            return {
-                contents: code,
-                loader: 'js',
-                resolveDir: path__default["default"].dirname(resolver),
-                pluginData: _extends$1({}, args.pluginData, {
-                    path: resolver
-                })
-            };
+            try {
+                const { code } = await transform(fileContent);
+                return {
+                    contents: code,
+                    loader: 'js',
+                    resolveDir: path__default["default"].dirname(resolver),
+                    pluginData: _extends$1({}, args.pluginData, {
+                        path: resolver
+                    })
+                };
+            } catch (e) {
+                return {
+                    contents: fileContent,
+                    loader: 'js',
+                    resolveDir: path__default["default"].dirname(resolver),
+                    pluginData: _extends$1({}, args.pluginData, {
+                        path: resolver
+                    })
+                };
+            }
         });
     }
 };
@@ -853,7 +859,56 @@ const cjsToEsmPlugin = {
 const linkSharedPlugin = {
     name: 'linkShared',
     setup (build) {
-        const filter = new RegExp(federationBuilder.federationBuilder.externals.map((name)=>`${name}$`).join('|'));
+        const filter = new RegExp(Object.keys(federationBuilder.federationBuilder.config.shared || {}).map((name)=>`${name}$`).join('|'));
+        build.onResolve({
+            filter
+        }, (args)=>{
+            if (args.namespace === 'esm-shares') return null;
+            return {
+                path: args.path,
+                namespace: 'virtual-share-module',
+                pluginData: {
+                    kind: args.kind,
+                    resolveDir: args.resolveDir
+                }
+            };
+        });
+        build.onResolve({
+            filter: /.*/,
+            namespace: 'esm-shares'
+        }, (args)=>{
+            if (filter.test(args.path)) {
+                return {
+                    path: args.path,
+                    namespace: 'virtual-share-module',
+                    pluginData: {
+                        kind: args.kind,
+                        resolveDir: args.resolveDir
+                    }
+                };
+            }
+            if (filter.test(args.importer)) {
+                return {
+                    path: args.path,
+                    namespace: 'esm-shares',
+                    pluginData: {
+                        kind: args.kind,
+                        resolveDir: args.resolveDir
+                    }
+                };
+            }
+            return undefined;
+        });
+        build.onResolve({
+            filter: /^federationShare/
+        }, async (args)=>({
+                path: args.path.replace('federationShare/', ''),
+                namespace: 'esm-shares',
+                pluginData: {
+                    kind: args.kind,
+                    resolveDir: args.resolveDir
+                }
+            }));
         build.onLoad({
             filter,
             namespace: 'virtual-share-module'

package/dist/esbuild.esm.js

@@ -6,10 +6,10 @@ import fs__default from 'fs';
 import path__default from 'path';
 import commonjs from '@rollup/plugin-commonjs';
 import replace from '@rollup/plugin-replace';
-import 'acorn';
+import { init, parse as parse$1 } from 'es-module-lexer';
+import { init as init$1, parse } from 'cjs-module-lexer';
 import { promisify } from 'util';
 import enhancedResolve from 'enhanced-resolve';
-import * as moduleLexer from 'cjs-module-lexer';
 import { f as federationBuilder } from './federation-builder.esm.js';
 import 'npmlog';
 
@@ -37,12 +37,9 @@ const resolve = promisify(enhancedResolve.create({
         'main'
     ]
 }));
-let lexerInitialized = false;
 async function getExports(modulePath) {
-    if (!lexerInitialized) {
-        await moduleLexer.init();
-        lexerInitialized = true;
-    }
+    await init;
+    await init$1;
     try {
         const exports = [];
         const paths = [];
@@ -53,19 +50,18 @@ async function getExports(modulePath) {
         while(paths.length > 0){
             const currentPath = paths.pop();
             if (currentPath) {
-                const results = moduleLexer.parse(await fs__default.readFileSync(currentPath, 'utf8'));
-                exports.push(...results.exports);
-                for (const reexport of results.reexports){
-                    const resolvedPath = await resolve(path__default.dirname(currentPath), reexport);
-                    if (typeof resolvedPath === 'string') {
-                        paths.push(resolvedPath);
-                    }
+                const content = await fs__default.promises.readFile(currentPath, 'utf8');
+                try {
+                    const { exports: cjsExports } = parse(content);
+                    exports.push(...cjsExports);
+                } catch (e) {
+                    const [, esExports] = parse$1(content);
+                    exports.push(...esExports.map((exp)=>exp.n));
                 }
+            // TODO: Handle re-exports
             }
         }
-        /**
-     * 追加default
-     */ if (!exports.includes('default')) {
+        if (!exports.includes('default')) {
             exports.push('default');
         }
         return exports;
@@ -536,7 +532,7 @@ const createContainerPlugin = (config)=>({
             const filter = new RegExp([
                 filename
             ].map((name)=>`${name}$`).join('|'));
-            const sharedExternals = new RegExp(externals.map((name)=>`${name}$`).join('|'));
+            const sharedExternals = new RegExp(Object.keys(federationBuilder.config.shared || {}).map((name)=>`${name}$`).join('|'));
             build.onResolve({
                 filter
             }, async (args)=>({
@@ -573,7 +569,7 @@ const createContainerPlugin = (config)=>({
             build.onResolve({
                 filter: /.*/,
                 namespace: 'esm-shares'
-            }, (args)=>{
+            }, async (args)=>{
                 if (sharedExternals.test(args.path)) {
                     return {
                         path: args.path,
@@ -584,14 +580,10 @@ const createContainerPlugin = (config)=>({
                         }
                     };
                 }
-                return {
-                    path: args.path,
-                    namespace: 'esm-shares',
-                    pluginData: {
-                        kind: args.kind,
-                        resolveDir: args.resolveDir
-                    }
-                };
+                await build.resolve(args.path, {
+                    resolveDir: args.resolveDir
+                });
+                return undefined;
             });
             build.onLoad({
                 filter,
@@ -712,15 +704,37 @@ const initializeHostPlugin = {
                 contents: buildFederationHost(),
                 resolveDir: args.pluginData.resolveDir
             }));
+        // Add custom loaders
+        const loaders = build.initialOptions.loader || {};
+        // Apply custom loaders
+        for (const [ext, loader] of Object.entries(loaders)){
+            build.onLoad({
+                filter: new RegExp(`\\${ext}$`),
+                namespace: 'file'
+            }, async (args)=>{
+                const contents = await fs__default.promises.readFile(args.path, 'utf8');
+                return {
+                    contents: buildFederationHost() + contents,
+                    loader
+                };
+            });
+        }
+        // Fallback loader for files not matched by custom loaders
+        const fallbackFilter = new RegExp(Object.keys(loaders).map((ext)=>`\\${ext}$`).join('|'));
         build.onLoad({
             filter: /.*\.(ts|js|mjs)$/,
             namespace: 'file'
-        }, async (args)=>{
-            if (!build.initialOptions.entryPoints.some((e)=>args.path.includes(e))) return;
-            const contents = await fs__default.promises.readFile(args.path, 'utf8');
-            return {
-                contents: buildFederationHost() + contents
-            };
+        }, //@ts-ignore
+        async (args)=>{
+            if (!fallbackFilter.test(args.path)) {
+                if (!build.initialOptions.entryPoints.some((e)=>args.path.includes(e))) {
+                    return;
+                }
+                const contents = await fs__default.promises.readFile(args.path, 'utf8');
+                return {
+                    contents: buildFederationHost() + contents
+                };
+            }
         });
     }
 };
@@ -806,15 +820,26 @@ const cjsToEsmPlugin = {
                 throw new Error(`Unable to resolve path: ${args.path}`);
             }
             const fileContent = fs__default.readFileSync(resolver, 'utf-8');
-            const { code } = await transform(fileContent);
-            return {
-                contents: code,
-                loader: 'js',
-                resolveDir: path__default.dirname(resolver),
-                pluginData: _extends$1({}, args.pluginData, {
-                    path: resolver
-                })
-            };
+            try {
+                const { code } = await transform(fileContent);
+                return {
+                    contents: code,
+                    loader: 'js',
+                    resolveDir: path__default.dirname(resolver),
+                    pluginData: _extends$1({}, args.pluginData, {
+                        path: resolver
+                    })
+                };
+            } catch (e) {
+                return {
+                    contents: fileContent,
+                    loader: 'js',
+                    resolveDir: path__default.dirname(resolver),
+                    pluginData: _extends$1({}, args.pluginData, {
+                        path: resolver
+                    })
+                };
+            }
         });
     }
 };
@@ -822,7 +847,56 @@ const cjsToEsmPlugin = {
 const linkSharedPlugin = {
     name: 'linkShared',
     setup (build) {
-        const filter = new RegExp(federationBuilder.externals.map((name)=>`${name}$`).join('|'));
+        const filter = new RegExp(Object.keys(federationBuilder.config.shared || {}).map((name)=>`${name}$`).join('|'));
+        build.onResolve({
+            filter
+        }, (args)=>{
+            if (args.namespace === 'esm-shares') return null;
+            return {
+                path: args.path,
+                namespace: 'virtual-share-module',
+                pluginData: {
+                    kind: args.kind,
+                    resolveDir: args.resolveDir
+                }
+            };
+        });
+        build.onResolve({
+            filter: /.*/,
+            namespace: 'esm-shares'
+        }, (args)=>{
+            if (filter.test(args.path)) {
+                return {
+                    path: args.path,
+                    namespace: 'virtual-share-module',
+                    pluginData: {
+                        kind: args.kind,
+                        resolveDir: args.resolveDir
+                    }
+                };
+            }
+            if (filter.test(args.importer)) {
+                return {
+                    path: args.path,
+                    namespace: 'esm-shares',
+                    pluginData: {
+                        kind: args.kind,
+                        resolveDir: args.resolveDir
+                    }
+                };
+            }
+            return undefined;
+        });
+        build.onResolve({
+            filter: /^federationShare/
+        }, async (args)=>({
+                path: args.path.replace('federationShare/', ''),
+                namespace: 'esm-shares',
+                pluginData: {
+                    kind: args.kind,
+                    resolveDir: args.resolveDir
+                }
+            }));
         build.onLoad({
             filter,
             namespace: 'virtual-share-module'

package/dist/package.json

@@ -54,6 +54,8 @@
     "esm-cjs-lexer": "^0.10.0",
     "cjs-module-lexer": "^1.3.1",
     "@chialab/cjs-to-esm": "^0.18.0",
+    "es-module-lexer": "^1.5.3",
+    "@chialab/estransform": "^0.18.1",
     "@module-federation/sdk": "workspace:*",
     "json5": "^2.2.3",
     "@rollup/plugin-commonjs": "^22.0.2",

package/dist/src/adapters/lib/collect-exports.d.ts

@@ -1,11 +1,2 @@
 export declare const resolve: (arg1: string, arg2: string) => Promise<string | false | undefined>;
 export declare function getExports(modulePath: string): Promise<string[]>;
-declare function collectExports(filePath: string): {
-    hasDefaultExport: boolean;
-    hasFurtherExports: boolean;
-    defaultExportName: string;
-    exports: string[];
-};
-declare function traverse(node: any, visit: (node: any) => void): void;
-declare function isDefaultExport(exportSpecifier: any): boolean;
-export { collectExports, traverse, isDefaultExport };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/esbuild",
-  "version": "0.0.0-next-20240523235135",
+  "version": "0.0.0-next-20240524034417",
   "author": "Zack Jackson (@ScriptedAlchemy)",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
@@ -54,6 +54,8 @@
     "esm-cjs-lexer": "^0.10.0",
     "cjs-module-lexer": "^1.3.1",
     "@chialab/cjs-to-esm": "^0.18.0",
+    "es-module-lexer": "^1.5.3",
+    "@chialab/estransform": "^0.18.1",
     "json5": "^2.2.3",
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-node-resolve": "^13.3.0",
@@ -63,6 +65,6 @@
     "esbuild": "^0.18.12",
     "npmlog": "^6.0.2",
     "acorn": "^8.8.1",
-    "@module-federation/sdk": "0.0.0-next-20240523235135"
+    "@module-federation/sdk": "0.0.0-next-20240524034417"
   }
 }