A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
feat(app): Improve module map concatenation handling (#3865)
toonlink666bc26583bb
diff --git a/fluxer_app/scripts/module-map/exports.ts b/fluxer_app/scripts/module-map/exports.tsindex d225056db..14c101b61 100644--- a/fluxer_app/scripts/module-map/exports.ts+++ b/fluxer_app/scripts/module-map/exports.ts@@ -38,7 +38,7 @@ const getObjectPropertyName = (property: t.ObjectProperty): string | undefined =const getGeneratedBinding = (node: AstNode | null | undefined): string | undefined => {if (t.isIdentifier(node)) return node.name;- if (t.isArrowFunctionExpression(node)) {+ if (t.isArrowFunctionExpression(node) || t.isFunctionExpression(node)) {if (t.isBlockStatement(node.body)) {const [statement] = node.body.body;@@ -49,7 +49,7 @@ const getGeneratedBinding = (node: AstNode | null | undefined): string | undefinreturn undefined;}- return getGeneratedBinding(node.body);+ return t.isArrowFunctionExpression(node) ? getGeneratedBinding(node.body) : undefined;}return undefined;@@ -61,6 +61,9 @@ const hasDefaultBindingComment = (node: t.ObjectProperty): boolean => {return comments.some((comment) => comment.value.includes('export default binding'));};+const getExportSourceModule = (module: CompilationModule): CompilationModule =>+ (module as CompilationModule & {rootModule?: CompilationModule | null}).rootModule ?? module;+const getGeneratedExports = (code: string): Array<GeneratedExport> => {const ast = parseModuleSource(code);const exports: Array<GeneratedExport> = [];@@ -85,7 +88,8 @@ const getGeneratedExports = (code: string): Array<GeneratedExport> => {if (t.isMemberExpression(callee) &&t.isIdentifier(callee.object, {name: '__webpack_require__'}) &&- t.isIdentifier(callee.property, {name: 'd'})+ t.isIdentifier(callee.property, {name: 'd'}) &&+ t.isIdentifier(args[0], {name: '__webpack_exports__'})) {for (const argument of args.slice(1, 3)) {if (!t.isObjectExpression(argument)) continue;@@ -174,6 +178,8 @@ const collectExportBindings = (code: string): Map<string, Set<string>> => {if ((t.isFunctionDeclaration(declaration) || t.isClassDeclaration(declaration)) && declaration.id) {addBinding(declaration.id.name, 'default');+ } else if (t.isIdentifier(declaration)) {+ addBinding(declaration.name, 'default');}}}@@ -263,8 +269,11 @@ export const getModuleExportMap = (if (generatedExports.length !== exportNames.length) return undefined;+ const sourceModule = getExportSourceModule(module);const originalSource =- typeof module.type === 'string' && module.type.startsWith('javascript/') ? module.originalSource() : null;+ typeof sourceModule.type === 'string' && sourceModule.type.startsWith('javascript/')+ ? sourceModule.originalSource()+ : null;const sourceBindings = originalSource? collectExportBindings(originalSource.source().toString())diff --git a/fluxer_app/scripts/module-map/index.ts b/fluxer_app/scripts/module-map/index.tsindex a100194f5..7d9612750 100644--- a/fluxer_app/scripts/module-map/index.ts+++ b/fluxer_app/scripts/module-map/index.ts@@ -36,68 +36,92 @@ interface ModuleMapManifest {assets: Record<string, string>;}+interface ModuleWithResource {+ resource?: string | null;+}+interface ConcatenatedModuleLike {- modules?: Set<{resource?: string | null}>;- rootModule?: {resource?: string | null} | null;+ modules?: Array<ModuleWithResource> | Set<ModuleWithResource>;+ rootModule?: ModuleWithResource | null;}type CompilationModule = Parameters<Compilation['chunkGraph']['getModuleId']>[0];-const getConcatenatedModules = (module: CompilationModule): ConcatenatedModuleLike | undefined => {- const concatenated = module as CompilationModule & ConcatenatedModuleLike;+const getConcatenatedModules = (module: CompilationModule): Array<ModuleWithResource> | undefined => {+ const {modules} = module as CompilationModule & ConcatenatedModuleLike;++ if (modules == null) return undefined;++ const list = Array.isArray(modules) ? modules : [...modules];++ return list.length ? list : undefined;+};++const getModuleKey = (root: string, filename: string): {key: string; packageName?: string} => {+ const nodeModuleInfo = getNodeModuleInfo(root, filename);- return concatenated.modules?.size ? concatenated : undefined;+ if (nodeModuleInfo) {+ return {key: `npm/${nodeModuleInfo.packagePath}`, packageName: nodeModuleInfo.packageName};+ }++ const relativePath = normalizePath(path.relative(root, filename));++ return {key: relativePath.startsWith('apps/') ? relativePath.slice(5) : relativePath};};const collectModuleMetadata = (compilation: Compilation, root: string, includeDependencies: boolean) => {const modules: Record<string, ModuleEntry> = {};const packages: Record<string, string> = {};+ const concatenatedChildren = new Map<string, string | number>();+ const concatenatedRoots = new Set<string>();for (const module of compilation.modules) {+ const concatenated = getConcatenatedModules(module);+ if (!concatenated) continue;+const id = compilation.chunkGraph.getModuleId(module);if (id == null) continue;+ const rootModule = (module as CompilationModule & ConcatenatedModuleLike).rootModule ?? concatenated[0];++ if (typeof rootModule?.resource === 'string') {+ concatenatedRoots.add(stripQuery(rootModule.resource));+ }++ for (const child of concatenated) {+ if (!child.resource || child === rootModule || !path.isAbsolute(child.resource)) continue;++ concatenatedChildren.set(stripQuery(child.resource), id);+ }+ }++ for (const module of compilation.modules) {const resource = getModuleResource(module);if (!resource || !path.isAbsolute(resource)) continue;const moduleFilename = stripQuery(resource);- const nodeModuleInfo = getNodeModuleInfo(root, moduleFilename);- const packageName = nodeModuleInfo?.packageName;- const packagePath = nodeModuleInfo?.packagePath;+ const {key, packageName} = getModuleKey(root, moduleFilename);if (packageName ? !includeDependencies : !isInRoot(root, moduleFilename)) {continue;}- const key = packageName ? `npm/${packagePath}` : normalizePath(path.relative(root, moduleFilename));-- const concatenated = getConcatenatedModules(module);-- if (concatenated) {- const rootModule = concatenated.rootModule ?? [...concatenated.modules!][0];+ const id = compilation.chunkGraph.getModuleId(module);- for (const child of concatenated.modules!) {- if (!child.resource || child === rootModule) continue;+ if (id == null) {+ if (concatenatedRoots.has(moduleFilename)) continue;- const childResource = stripQuery(child.resource);- const childRelative = path.relative(root, childResource);+ const concatenatedInto = concatenatedChildren.get(moduleFilename);+ if (concatenatedInto === undefined) continue;- if (isInRoot(root, childResource)) {- modules[normalizePath(childRelative)] = {- concatenatedInto: id,- };- }- }- }+ modules[key] = {concatenatedInto};- let moduleKey = key;- if (!packageName && key.startsWith('apps/')) {- moduleKey = key.slice(5);+ continue;}const exportMap = getModuleExportMap(compilation, module);- modules[moduleKey] = {+ modules[key] = {id,files: getModuleFiles(compilation, module),...(exportMap ? {exportMap} : {}),diff --git a/fluxer_app/scripts/module-map/modules.ts b/fluxer_app/scripts/module-map/modules.tsindex fd247afb1..f473bf5ea 100644--- a/fluxer_app/scripts/module-map/modules.ts+++ b/fluxer_app/scripts/module-map/modules.ts@@ -45,11 +45,13 @@ export const getModuleFiles = (compilation: Compilation, module: CompilationModu};export const getModuleResource = (module: CompilationModule): string | undefined => {- if (!('resource' in module) || typeof module.resource !== 'string') {- return undefined;+ if ('resource' in module && typeof module.resource === 'string') {+ return module.resource;}- return module.resource;+ const {rootModule} = module as CompilationModule & {rootModule?: {resource?: string | null} | null};++ return typeof rootModule?.resource === 'string' ? rootModule.resource : undefined;};export const isAssetFile = (file: string): boolean => ASSET_FILE_REGEX.test(file);