chore: remove unused vars from enhanced (#2994)

ScriptedAlchemy · web-flow · commit 44ac346ef421 · 2024-09-24T22:32:58.000-07:00
diff --git a/.github/workflows/devtools.yml b/.github/workflows/devtools.yml
@@ -8,7 +8,7 @@ on:
     branches: [main]
 
 env:
-  PLAYWRIGHT_BROWSERS_PATH: 0 # Places binaries to node_modules/@playwright/test
+  PLAYWRIGHT_BROWSERS_PATH: 0
 
 jobs:
   main:
@@ -44,8 +44,8 @@ jobs:
       - name: E2E Chrome Devtools Dev
         uses: nick-fields/retry@v3
         with:
-          timeout_minutes: 10
-          max_attempts: 3 # Initial attempt + 2 retries
+          timeout_minutes: 15
+          max_attempts: 3
           command: |
             npx kill-port 3009 3010 3011 3012 3013 4001 &&
             pnpm run app:manifest:dev & echo "done" && \
@@ -56,14 +56,19 @@ jobs:
       - name: E2E Chrome Devtools Prod
         uses: nick-fields/retry@v3
         with:
-          timeout_minutes: 10
-          max_attempts: 3 # Initial attempt + 2 retries
+          timeout_minutes: 15
+          max_attempts: 3
           command: |
+            npx kill-port 3009 3010 3011 3012 3013 4001 &&
             npx kill-port 3009 3010 3011 3012 3013 4001 &&
             pnpm run app:manifest:prod & echo "done" && \
+            npx kill-port 4001
             npx wait-on tcp:3009 tcp:3010 tcp:3011 tcp:3012 tcp:3013 && \
             sleep 10 &&
             npx nx e2e:devtools chrome-devtools
 
       - name: kill port
-        run: npx kill-port 3013 3009 3010 3011 3012 4001
+        run: npx kill-port 3013 3009 3010 3011 3012 4001; exit 0
+
+      - name: Kill All Node Processes
+        run: pkill -f node || true
diff --git a/packages/enhanced/.eslintrc.json b/packages/enhanced/.eslintrc.json
@@ -26,7 +26,11 @@
               }
             ]
           }
-        ]
+        ],
+        "no-unused-vars": "off",
+        "no-unused-expressions": "off",
+        "@typescript-eslint/no-unused-vars": "warn",
+        "@typescript-eslint/no-unused-expressions": "warn"
       }
     },
     {
diff --git a/packages/enhanced/jest.embed.ts b/packages/enhanced/jest.embed.ts
@@ -2,16 +2,15 @@
 import { readFileSync, rmdirSync, existsSync } from 'fs';
 import path from 'path';
 import os from 'os';
+const rimraf = require('rimraf');
 
 // Reading the SWC compilation config and remove the "exclude"
 // for the test files to be compiled by SWC
 const { exclude: _, ...swcJestConfig } = JSON.parse(
   readFileSync(`${__dirname}/.swcrc`, 'utf-8'),
 );
 
-if (existsSync(__dirname + '/test/js')) {
-  rmdirSync(__dirname + '/test/js', { recursive: true });
-}
+rimraf.sync(__dirname + '/test/js');
 
 // disable .swcrc look-up by SWC core because we're passing in swcJestConfig ourselves.
 // If we do not disable this, SWC Core will read .swcrc and won't transform our test files due to "exclude"
diff --git a/packages/enhanced/project.json b/packages/enhanced/project.json
@@ -42,7 +42,7 @@
         "commands": [
           {
             "command": "node packages/enhanced/test/script.js",
-            "forwardAllArgs": true
+            "forwardAllArgs": false
           }
         ]
       }
@@ -54,7 +54,7 @@
         "commands": [
           {
             "command": "node packages/enhanced/test/script-experiments.js",
-            "forwardAllArgs": true
+            "forwardAllArgs": false
           }
         ]
       }
diff --git a/packages/enhanced/src/lib/container/ContainerEntryModule.ts b/packages/enhanced/src/lib/container/ContainerEntryModule.ts
@@ -141,7 +141,6 @@ class ContainerEntryModule extends Module {
       arg1: boolean | undefined,
     ) => void,
   ): void {
-    const baseContext = context as NeedBuildContext;
     callback(null, !this.buildMeta);
   }
   /**
diff --git a/packages/enhanced/src/lib/container/ContainerReferencePlugin.ts b/packages/enhanced/src/lib/container/ContainerReferencePlugin.ts
@@ -3,10 +3,7 @@
 	Author Tobias Koppers @sokra and Zackary Jackson @ScriptedAlchemy
 */
 import type { Compiler } from 'webpack';
-import {
-  getWebpackPath,
-  normalizeWebpackPath,
-} from '@module-federation/sdk/normalize-webpack-path';
+import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
 
 // import * as RuntimeGlobals from 'webpack/lib/RuntimeGlobals';
 import FallbackDependency from './FallbackDependency';
diff --git a/packages/enhanced/src/lib/container/HoistContainerReferencesPlugin.ts b/packages/enhanced/src/lib/container/HoistContainerReferencesPlugin.ts
@@ -5,58 +5,27 @@ import type {
   WebpackPluginInstance,
   Module,
   Dependency,
-  NormalModule as NormalModuleType,
 } from 'webpack';
 import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
-import type { RuntimeSpec } from 'webpack/lib/util/runtime';
-import type ExportsInfo from 'webpack/lib/ExportsInfo';
-import ContainerEntryModule from './ContainerEntryModule';
-import { moduleFederationPlugin } from '@module-federation/sdk';
 import FederationModulesPlugin from './runtime/FederationModulesPlugin';
 import ContainerEntryDependency from './ContainerEntryDependency';
 import FederationRuntimeDependency from './runtime/FederationRuntimeDependency';
-import RemoteToExternalDependency from './RemoteToExternalDependency';
-import RemoteModule from './RemoteModule';
 
-const { NormalModule, AsyncDependenciesBlock, ExternalModule } = require(
+const { AsyncDependenciesBlock, ExternalModule } = require(
   normalizeWebpackPath('webpack'),
 ) as typeof import('webpack');
-const ConcatenatedModule = require(
-  normalizeWebpackPath('webpack/lib/optimize/ConcatenatedModule'),
-) as typeof import('webpack/lib/optimize/ConcatenatedModule');
 
 const PLUGIN_NAME = 'HoistContainerReferences';
 
 /**
  * This class is used to hoist container references in the code.
  */
 export class HoistContainerReferences implements WebpackPluginInstance {
-  private readonly containerName: string;
-  private readonly entryFilePath?: string;
-  private readonly bundlerRuntimeDep?: string;
-  private readonly explanation: string;
-  private readonly experiments: moduleFederationPlugin.ModuleFederationPluginOptions['experiments'];
-
-  constructor(
-    name?: string,
-    entryFilePath?: string,
-    bundlerRuntimeDep?: string,
-    experiments?: moduleFederationPlugin.ModuleFederationPluginOptions['experiments'],
-  ) {
-    this.containerName = name || 'no known chunk name';
-    this.entryFilePath = entryFilePath;
-    this.bundlerRuntimeDep = bundlerRuntimeDep;
-    this.experiments = experiments;
-    this.explanation =
-      'Bundler runtime path module is required for proper functioning';
-  }
-
   apply(compiler: Compiler): void {
     compiler.hooks.thisCompilation.tap(
       PLUGIN_NAME,
       (compilation: Compilation) => {
         const logger = compilation.getLogger(PLUGIN_NAME);
-        const { chunkGraph, moduleGraph } = compilation;
         const hooks = FederationModulesPlugin.getCompilationHooks(compilation);
         const containerEntryDependencies = new Set<Dependency>();
         hooks.addContainerEntryModule.tap(
diff --git a/packages/enhanced/src/lib/container/RemoteModule.ts b/packages/enhanced/src/lib/container/RemoteModule.ts
@@ -161,8 +161,7 @@ class RemoteModule extends Module {
   override codeGeneration(
     context: CodeGenerationContext,
   ): CodeGenerationResult {
-    const { runtimeTemplate, moduleGraph, chunkGraph } = context;
-    // @ts-ignore
+    const { moduleGraph, chunkGraph } = context;
     const module = moduleGraph.getModule(this.dependencies[0]);
     const id = module && chunkGraph.getModuleId(module);
     const sources = new Map();
diff --git a/packages/enhanced/src/lib/container/RemoteRuntimeModule.ts b/packages/enhanced/src/lib/container/RemoteRuntimeModule.ts
@@ -3,13 +3,12 @@
 	Author Tobias Koppers @sokra, Zackary Jackson @ScriptedAlchemy
 */
 import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
-import type { Compilation, Chunk } from 'webpack';
+import type { Compilation } from 'webpack';
 import RemoteModule from './RemoteModule';
 import { getFederationGlobalScope } from './runtime/utils';
 import type ExternalModule from 'webpack/lib/ExternalModule';
 import type FallbackModule from './FallbackModule';
 import type { RemotesOptions } from '@module-federation/webpack-bundler-runtime';
-import { FEDERATION_SUPPORTED_TYPES } from '@module-federation/webpack-bundler-runtime/constant';
 
 const extractUrlAndGlobal = require(
   normalizeWebpackPath('webpack/lib/util/extractUrlAndGlobal'),
diff --git a/packages/enhanced/src/lib/container/runtime/ChildCompilationRuntimePlugin.ts b/packages/enhanced/src/lib/container/runtime/ChildCompilationRuntimePlugin.ts
@@ -59,7 +59,7 @@ class RuntimeModuleChunkPlugin {
               chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk),
             );
             for (let i = 0; i < entries.length; i++) {
-              const [module, entrypoint] = entries[i];
+              const [module, _entrypoint] = entries[i];
               const final = i + 1 === entries.length;
               const moduleId = chunkGraph.getModuleId(module);
               source.add('\n');
@@ -244,7 +244,6 @@ class CustomRuntimePlugin {
 }
 
 class CustomRuntimeModule extends RuntimeModule {
-  private bundledCode: string | null = null;
   private entryModuleId: string | number | undefined;
 
   constructor(
diff --git a/packages/enhanced/src/lib/container/runtime/EmbedFederationRuntimeModule.ts b/packages/enhanced/src/lib/container/runtime/EmbedFederationRuntimeModule.ts
@@ -9,18 +9,15 @@ const { RuntimeModule, Template } = require(
 ) as typeof import('webpack');
 
 class EmbedFederationRuntimeModule extends RuntimeModule {
-  private bundlerRuntimePath: string;
   private containerEntrySet: Set<
     ContainerEntryDependency | FederationRuntimeDependency
   >;
   constructor(
-    bundlerRuntimePath: string,
     containerEntrySet: Set<
       ContainerEntryDependency | FederationRuntimeDependency
     >,
   ) {
     super('embed federation', RuntimeModule.STAGE_ATTACH);
-    this.bundlerRuntimePath = bundlerRuntimePath;
     this.containerEntrySet = containerEntrySet;
   }
   override identifier() {
diff --git a/packages/enhanced/src/lib/container/runtime/EmbedFederationRuntimePlugin.ts b/packages/enhanced/src/lib/container/runtime/EmbedFederationRuntimePlugin.ts
@@ -13,12 +13,6 @@ const { RuntimeGlobals } = require(
 const federationGlobal = getFederationGlobalScope(RuntimeGlobals);
 
 class EmbedFederationRuntimePlugin {
-  private bundlerRuntimePath: string;
-
-  constructor(path: string) {
-    this.bundlerRuntimePath = path;
-  }
-
   apply(compiler: Compiler): void {
     compiler.hooks.thisCompilation.tap(
       'EmbedFederationRuntimePlugin',
@@ -48,7 +42,6 @@ class EmbedFederationRuntimePlugin {
           }
           runtimeRequirements.add('embeddedFederationRuntime');
           const runtimeModule = new EmbedFederationRuntimeModule(
-            this.bundlerRuntimePath,
             containerEntrySet,
           );
           compilation.addRuntimeModule(chunk, runtimeModule);
diff --git a/packages/enhanced/src/lib/container/runtime/FederationModulesPlugin.ts b/packages/enhanced/src/lib/container/runtime/FederationModulesPlugin.ts
@@ -55,6 +55,7 @@ class FederationModulesPlugin {
     compiler.hooks.compilation.tap(
       PLUGIN_NAME,
       (compilation: CompilationType, { normalModuleFactory }) => {
+        //@ts-ignore
         const hooks = FederationModulesPlugin.getCompilationHooks(compilation);
       },
     );
diff --git a/packages/enhanced/src/lib/container/runtime/FederationRuntimePlugin.ts b/packages/enhanced/src/lib/container/runtime/FederationRuntimePlugin.ts
@@ -22,7 +22,6 @@ import EmbedFederationRuntimePlugin from './EmbedFederationRuntimePlugin';
 import FederationModulesPlugin from './FederationModulesPlugin';
 import HoistContainerReferences from '../HoistContainerReferencesPlugin';
 import pBtoa from 'btoa';
-import ContainerEntryDependency from '../ContainerEntryDependency';
 import FederationRuntimeDependency from './FederationRuntimeDependency';
 
 const ModuleDependency = require(
@@ -249,7 +248,6 @@ class FederationRuntimePlugin {
         this.constructor.name,
         (compilation: Compilation, callback) => {
           const federationRuntimeDependency = this.getDependency(compiler);
-          const logger = compilation.getLogger('FederationRuntimePlugin');
           const hooks =
             FederationModulesPlugin.getCompilationHooks(compilation);
           compilation.addInclude(
@@ -302,7 +300,7 @@ class FederationRuntimePlugin {
 
     compiler.hooks.thisCompilation.tap(
       this.constructor.name,
-      (compilation: Compilation, { normalModuleFactory }) => {
+      (compilation: Compilation) => {
         const handler = (chunk: Chunk, runtimeRequirements: Set<string>) => {
           if (runtimeRequirements.has(federationGlobal)) return;
           runtimeRequirements.add(federationGlobal);
@@ -437,15 +435,9 @@ class FederationRuntimePlugin {
         '.esm.js',
       );
 
-      new EmbedFederationRuntimePlugin(this.bundlerRuntimePath).apply(compiler);
+      new EmbedFederationRuntimePlugin().apply(compiler);
 
-      new HoistContainerReferences(
-        this.options.name ? this.options.name + '_partial' : undefined,
-        // hoist all modules of federation entry
-        this.getFilePath(compiler),
-        this.bundlerRuntimePath,
-        this.options.experiments,
-      ).apply(compiler);
+      new HoistContainerReferences().apply(compiler);
 
       new compiler.webpack.NormalModuleReplacementPlugin(
         /@module-federation\/runtime/,
diff --git a/packages/enhanced/src/lib/sharing/ConsumeSharedPlugin.ts b/packages/enhanced/src/lib/sharing/ConsumeSharedPlugin.ts
@@ -30,9 +30,6 @@ import FederationRuntimePlugin from '../container/runtime/FederationRuntimePlugi
 import ShareRuntimeModule from './ShareRuntimeModule';
 import type { SemVerRange } from 'webpack/lib/util/semver';
 
-const { parseRange } = require(
-  normalizeWebpackPath('webpack/lib/util/semver'),
-) as typeof import('webpack/lib/util/semver');
 const ModuleNotFoundError = require(
   normalizeWebpackPath('webpack/lib/ModuleNotFoundError'),
 ) as typeof import('webpack/lib/ModuleNotFoundError');
diff --git a/packages/enhanced/src/lib/sharing/ConsumeSharedRuntimeModule.ts b/packages/enhanced/src/lib/sharing/ConsumeSharedRuntimeModule.ts
@@ -11,14 +11,6 @@ import { getFederationGlobalScope } from '../container/runtime/utils';
 const { Template, RuntimeGlobals, RuntimeModule } = require(
   normalizeWebpackPath('webpack'),
 ) as typeof import('webpack');
-const {
-  parseVersionRuntimeCode,
-  versionLtRuntimeCode,
-  rangeToStringRuntimeCode,
-  satisfyRuntimeCode,
-} = require(
-  normalizeWebpackPath('webpack/lib/util/semver'),
-) as typeof import('webpack/lib/util/semver');
 
 class ConsumeSharedRuntimeModule extends RuntimeModule {
   private _runtimeRequirements: ReadonlySet<string>;
diff --git a/packages/enhanced/src/lib/sharing/ShareRuntimeModule.ts b/packages/enhanced/src/lib/sharing/ShareRuntimeModule.ts
@@ -11,7 +11,7 @@ import { getFederationGlobalScope } from '../container/runtime/utils';
 const { Template, RuntimeGlobals, RuntimeModule } = require(
   normalizeWebpackPath('webpack'),
 ) as typeof import('webpack');
-const { compareModulesByIdentifier, compareStrings } = require(
+const { compareModulesByIdentifier } = require(
   normalizeWebpackPath('webpack/lib/util/comparators'),
 ) as typeof import('webpack/lib/util/comparators');
 
@@ -29,11 +29,7 @@ class ShareRuntimeModule extends RuntimeModule {
     if (!compilation) {
       throw new Error('Compilation is undefined');
     }
-    const {
-      runtimeTemplate,
-      codeGenerationResults,
-      outputOptions: { uniqueName, ignoreBrowserWarnings },
-    } = compilation;
+    const { runtimeTemplate, codeGenerationResults } = compilation;
     const chunkGraph: ChunkGraph | undefined = this.chunkGraph;
     if (!chunkGraph) {
       throw new Error('ChunkGraph is undefined');
@@ -48,7 +44,6 @@ class ShareRuntimeModule extends RuntimeModule {
       const modules = chunkGraph.getOrderedChunkModulesIterableBySourceType(
         chunk,
         'share-init',
-        // @ts-ignore
         compareModulesByIdentifier,
       );
       if (!modules) continue;
diff --git a/packages/enhanced/src/lib/startup/MfStartupChunkDependenciesPlugin.ts b/packages/enhanced/src/lib/startup/MfStartupChunkDependenciesPlugin.ts
@@ -16,9 +16,6 @@ const { RuntimeGlobals } = require(
 const StartupEntrypointRuntimeModule = require(
   normalizeWebpackPath('webpack/lib/runtime/StartupEntrypointRuntimeModule'),
 ) as typeof import('webpack/lib/runtime/StartupEntrypointRuntimeModule');
-const ConcatenatedModule = require(
-  normalizeWebpackPath('webpack/lib/optimize/ConcatenatedModule'),
-) as typeof import('webpack/lib/optimize/ConcatenatedModule');
 
 interface Options {
   asyncChunkLoading?: boolean;
diff --git a/packages/enhanced/src/lib/startup/StartupHelpers.ts b/packages/enhanced/src/lib/startup/StartupHelpers.ts
diff --git a/packages/enhanced/src/wrapper/HoistContainerReferencesPlugin.ts b/packages/enhanced/src/wrapper/HoistContainerReferencesPlugin.ts
diff --git a/packages/enhanced/test/script-experiments.js b/packages/enhanced/test/script-experiments.js
diff --git a/packages/enhanced/test/script.js b/packages/enhanced/test/script.js

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,11 @@`
`26`	`26`	`}`
`27`	`27`	`]`
`28`	`28`	`}`
`29`		`- ]`
	`29`	`+ ],`
	`30`	`+ "no-unused-vars": "off",`
	`31`	`+ "no-unused-expressions": "off",`
	`32`	`+ "@typescript-eslint/no-unused-vars": "warn",`
	`33`	`+ "@typescript-eslint/no-unused-expressions": "warn"`
`30`	`34`	`}`
`31`	`35`	`},`
`32`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`"commands": [`
`43`	`43`	`{`
`44`	`44`	`"command": "node packages/enhanced/test/script.js",`
`45`		`- "forwardAllArgs": true`
	`45`	`+ "forwardAllArgs": false`
`46`	`46`	`}`
`47`	`47`	`]`
`48`	`48`	`}`
`@@ -54,7 +54,7 @@`
`54`	`54`	`"commands": [`
`55`	`55`	`{`
`56`	`56`	`"command": "node packages/enhanced/test/script-experiments.js",`
`57`		`- "forwardAllArgs": true`
	`57`	`+ "forwardAllArgs": false`
`58`	`58`	`}`
`59`	`59`	`]`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,6 @@ class ContainerEntryModule extends Module {`
`141`	`141`	`arg1: boolean \| undefined,`
`142`	`142`	`) => void,`
`143`	`143`	`): void {`
`144`		`- const baseContext = context as NeedBuildContext;`
`145`	`144`	`callback(null, !this.buildMeta);`
`146`	`145`	`}`
`147`	`146`	`/**`