Skip to content

Commit f0c518f

Browse files
chore: add license info (#3143)
1 parent 31479c4 commit f0c518f

File tree

10 files changed

+39
-18
lines changed

10 files changed

+39
-18
lines changed

packages/enhanced/src/lib/container/AsyncBoundaryPlugin.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
MIT License http://www.opensource.org/licenses/mit-license.php
3+
Author Zackary Jackson @ScriptedAlchemy
4+
*/
15
import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
26
import { moduleFederationPlugin } from '@module-federation/sdk';
37
import type {

packages/enhanced/src/lib/container/ModuleFederationPlugin.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ class ModuleFederationPlugin implements WebpackPluginInstance {
122122
) {
123123
compiler.options.output.enabledLibraryTypes?.push(library.type);
124124
}
125+
125126
compiler.hooks.afterPlugins.tap('ModuleFederationPlugin', () => {
126127
if (useContainerPlugin) {
127128
new ContainerPlugin({

packages/enhanced/src/lib/container/constant.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
MIT License http://www.opensource.org/licenses/mit-license.php
3+
Author Zackary Jackson @ScriptedAlchemy
4+
*/
15
import path from 'path';
26
import { TEMP_DIR as BasicTempDir } from '@module-federation/sdk';
37

packages/enhanced/src/lib/container/runtime/ChildCompilationRuntimePlugin.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
MIT License http://www.opensource.org/licenses/mit-license.php
3+
Author Zackary Jackson @ScriptedAlchemy
4+
*/
5+
16
// This stores the previous child compilation based solution
27
// it is not currently used
38

packages/enhanced/src/lib/container/runtime/EmbedFederationRuntimeModule.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
MIT License http://www.opensource.org/licenses/mit-license.php
3+
Author Zackary Jackson @ScriptedAlchemy
4+
*/
15
import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
26
import ContainerEntryDependency from '../ContainerEntryDependency';
37

@@ -12,6 +16,7 @@ class EmbedFederationRuntimeModule extends RuntimeModule {
1216
private containerEntrySet: Set<
1317
ContainerEntryDependency | FederationRuntimeDependency
1418
>;
19+
1520
constructor(
1621
containerEntrySet: Set<
1722
ContainerEntryDependency | FederationRuntimeDependency
@@ -20,9 +25,11 @@ class EmbedFederationRuntimeModule extends RuntimeModule {
2025
super('embed federation', RuntimeModule.STAGE_ATTACH);
2126
this.containerEntrySet = containerEntrySet;
2227
}
28+
2329
override identifier() {
2430
return 'webpack/runtime/embed/federation';
2531
}
32+
2633
override generate(): string | null {
2734
const { compilation, chunk, chunkGraph } = this;
2835
if (!chunk || !chunkGraph || !compilation) {

packages/enhanced/src/lib/container/runtime/FederationModulesPlugin.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ import ContainerEntryDependency from '../ContainerEntryDependency';
99
import FederationRuntimeDependency from './FederationRuntimeDependency';
1010

1111
/** @type {WeakMap<import("webpack").Compilation, CompilationHooks>} */
12-
const compilationHooksMap = new WeakMap<
13-
import('webpack').Compilation,
14-
CompilationHooks
15-
>();
12+
const compilationHooksMap = new WeakMap<CompilationType, CompilationHooks>();
1613

1714
const PLUGIN_NAME = 'FederationModulesPlugin';
1815

packages/enhanced/src/lib/container/runtime/FederationRuntimePlugin.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
import fs from 'fs';
2+
import path from 'path';
3+
import pBtoa from 'btoa';
14
import type {
25
Compiler,
36
WebpackPluginInstance,
47
Compilation,
58
Chunk,
69
} from 'webpack';
10+
import type { EntryDescription } from 'webpack/lib/Entrypoint';
711
import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
812
import { PrefetchPlugin } from '@module-federation/data-prefetch/cli';
913
import { moduleFederationPlugin } from '@module-federation/sdk';
@@ -15,13 +19,10 @@ import {
1519
createHash,
1620
normalizeToPosixPath,
1721
} from './utils';
18-
import fs from 'fs';
19-
import path from 'path';
2022
import { TEMP_DIR } from '../constant';
2123
import EmbedFederationRuntimePlugin from './EmbedFederationRuntimePlugin';
2224
import FederationModulesPlugin from './FederationModulesPlugin';
2325
import HoistContainerReferences from '../HoistContainerReferencesPlugin';
24-
import pBtoa from 'btoa';
2526
import FederationRuntimeDependency from './FederationRuntimeDependency';
2627

2728
const ModuleDependency = require(
@@ -55,7 +56,7 @@ const EmbeddedRuntimePath = require.resolve(
5556

5657
const federationGlobal = getFederationGlobalScope(RuntimeGlobals);
5758

58-
const onceForCompler = new WeakSet();
59+
const onceForCompler = new WeakSet<Compiler>();
5960

6061
class FederationRuntimePlugin {
6162
options?: moduleFederationPlugin.ModuleFederationPluginOptions;
@@ -277,7 +278,7 @@ class FederationRuntimePlugin {
277278
const entryFilePath = this.getFilePath(compiler);
278279
modifyEntry({
279280
compiler,
280-
prependEntry: (entry) => {
281+
prependEntry: (entry: Record<string, EntryDescription>) => {
281282
Object.keys(entry).forEach((entryName) => {
282283
const entryItem = entry[entryName];
283284
if (!entryItem.import) {
@@ -397,7 +398,6 @@ class FederationRuntimePlugin {
397398
);
398399

399400
if (useModuleFederationPlugin && !this.options) {
400-
// @ts-ignore
401401
this.options = useModuleFederationPlugin._options;
402402
}
403403

packages/enhanced/src/lib/container/runtime/utils.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
MIT License http://www.opensource.org/licenses/mit-license.php
3+
Author Zackary Jackson @ScriptedAlchemy
4+
*/
15
import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
26
import upath from 'upath';
37
import path from 'path';

packages/enhanced/src/lib/startup/StartupHelpers.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ export const generateESMEntryStartup = (
156156
passive: boolean,
157157
): string => {
158158
const { chunkHasJs, getChunkFilenameTemplate } =
159+
compilation.compiler.webpack?.javascript?.JavascriptModulesPlugin ||
159160
compilation.compiler.webpack.JavascriptModulesPlugin;
160161
const { ConcatSource } = compilation.compiler.webpack.sources;
161162
const hotUpdateChunk = chunk instanceof HotUpdateChunk ? chunk : null;

packages/nextjs-mf/src/plugins/container/InvertedContainerRuntimeModule.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@ class InvertedContainerRuntimeModule extends RuntimeModule {
1919
this.options = options;
2020
}
2121

22-
private findEntryModuleOfContainer(): Module | undefined {
23-
if (!this.chunk || !this.chunkGraph) return undefined;
24-
const modules = this.chunkGraph.getChunkModules(this.chunk);
25-
return Array.from(modules).find(
26-
(module) => module instanceof container.ContainerEntryModule,
27-
);
28-
}
29-
3022
override generate(): string {
3123
const { compilation, chunk, chunkGraph } = this;
3224
if (!compilation || !chunk || !chunkGraph) {
@@ -46,6 +38,12 @@ class InvertedContainerRuntimeModule extends RuntimeModule {
4638

4739
if (!containerEntryModule) return '';
4840

41+
if (
42+
compilation.chunkGraph.isEntryModuleInChunk(containerEntryModule, chunk)
43+
) {
44+
// dont apply to remote entry itself
45+
return '';
46+
}
4947
const initRuntimeModuleGetter = compilation.runtimeTemplate.moduleRaw({
5048
module: containerEntryModule,
5149
chunkGraph,

0 commit comments

Comments
 (0)