chore: removed ts-ignore on ContainerEntryModule (#2542)

ilteoood · ScriptedAlchemy · web-flow · commit e6c477b74b6b · 2024-05-28T22:09:36.000+02:00
Co-authored-by: Zack Jackson &lt;zackary.l.jackson@gmail.com&gt;
diff --git a/packages/enhanced/src/lib/container/ContainerEntryModule.ts b/packages/enhanced/src/lib/container/ContainerEntryModule.ts
@@ -5,31 +5,32 @@
 
 'use strict';
 import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
-import type { Dependency, Compilation } from 'webpack';
-import ContainerExposedDependency from './ContainerExposedDependency';
+import type { Compilation, Dependency } from 'webpack';
 import type {
+  InputFileSystem,
   LibIdentOptions,
   NeedBuildContext,
-  RequestShortener,
   ObjectDeserializerContext,
   ObjectSerializerContext,
-  WebpackOptions,
-  InputFileSystem,
+  RequestShortener,
   ResolverWithOptions,
+  WebpackOptions,
 } from 'webpack/lib/Module';
 import type WebpackError from 'webpack/lib/WebpackError';
-import { getFederationGlobalScope } from './runtime/utils';
 import { JAVASCRIPT_MODULE_TYPE_DYNAMIC } from '../Constants';
+import ContainerExposedDependency from './ContainerExposedDependency';
+import { getFederationGlobalScope } from './runtime/utils';
 
 const makeSerializable = require(
   normalizeWebpackPath('webpack/lib/util/makeSerializable'),
 ) as typeof import('webpack/lib/util/makeSerializable');
-const { sources: webpackSources } = require(
-  normalizeWebpackPath('webpack'),
-) as typeof import('webpack');
-const { AsyncDependenciesBlock, Template, Module, RuntimeGlobals } = require(
-  normalizeWebpackPath('webpack'),
-) as typeof import('webpack');
+const {
+  sources: webpackSources,
+  AsyncDependenciesBlock,
+  Template,
+  Module,
+  RuntimeGlobals,
+} = require(normalizeWebpackPath('webpack')) as typeof import('webpack');
 const StaticExportsDependency = require(
   normalizeWebpackPath('webpack/lib/dependencies/StaticExportsDependency'),
 ) as typeof import('webpack/lib/dependencies/StaticExportsDependency');
@@ -79,7 +80,6 @@ class ContainerEntryModule extends Module {
   static deserialize(context: ObjectDeserializerContext): ContainerEntryModule {
     const { read } = context;
     const obj = new ContainerEntryModule(read(), read(), read(), read());
-    //@ts-ignore
     obj.deserialize(context);
     return obj;
   }
@@ -119,7 +119,7 @@ class ContainerEntryModule extends Module {
    * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
    * @returns {void}
    */
-  // @ts-ignore typeof webpack/lib !== typeof webpack/types
+  // @ts-expect-error typeof webpack/lib !== typeof webpack/types
   override needBuild(
     context: NeedBuildContext,
     callback: (
@@ -138,7 +138,7 @@ class ContainerEntryModule extends Module {
    * @param {function(WebpackError): void} callback callback function
    * @returns {void}
    */
-  // @ts-ignore typeof webpack/lib !== typeof webpack/types
+  // @ts-expect-error typeof webpack/lib !== typeof webpack/types
   override build(
     options: WebpackOptions,
     compilation: Compilation,
@@ -152,7 +152,6 @@ class ContainerEntryModule extends Module {
       topLevelDeclarations: new Set(['moduleMap', 'get', 'init']),
     };
     this.buildMeta.exportsType = 'namespace';
-    //@ts-ignore
     this.clearDependenciesAndBlocks();
 
     for (const [name, options] of this._exposes) {
@@ -170,23 +169,19 @@ class ContainerEntryModule extends Module {
           name,
           index: idx++,
         };
-        //@ts-ignore
         block.addDependency(dep);
       }
-      //@ts-ignore
       this.addBlock(block);
     }
-    //@ts-ignore
     this.addDependency(
-      //@ts-ignore
       new StaticExportsDependency(
         ['get', 'init'],
         false,
       ) as unknown as Dependency,
     );
 
     this.addDependency(
-      // @ts-ignore
+      // @ts-expect-error flaky type for EntryDependency
       new EntryDependency(this._injectRuntimeEntry),
     );
 
@@ -197,8 +192,7 @@ class ContainerEntryModule extends Module {
    * @param {CodeGenerationContext} context context for code generation
    * @returns {CodeGenerationResult} result
    */
-  //@ts-ignore
-  override codeGeneration({ moduleGraph, chunkGraph, runtimeTemplate }) {
+  override codeGeneration({ moduleGraph, chunkGraph, runtimeTemplate }: any) {
     const sources = new Map();
     const runtimeRequirements = new Set([
       RuntimeGlobals.definePropertyGetters,
@@ -232,7 +226,6 @@ class ContainerEntryModule extends Module {
         })}.then(${runtimeTemplate.returningFunction(
           runtimeTemplate.returningFunction(
             `(${modules
-              //@ts-ignore
               .map(({ module, request }) =>
                 runtimeTemplate.moduleRaw({
                   module,
@@ -259,7 +252,7 @@ class ContainerEntryModule extends Module {
     const initRuntimeModuleGetter = runtimeTemplate.moduleRaw({
       module: moduleGraph.getModule(initRuntimeDep),
       chunkGraph,
-      // @ts-expect-error
+      // @ts-expect-error flaky type definition for Dependency
       request: initRuntimeDep.userRequest,
       weak: false,
       runtimeRequirements,
diff --git a/packages/enhanced/src/lib/container/ContainerEntryModuleFactory.ts b/packages/enhanced/src/lib/container/ContainerEntryModuleFactory.ts
@@ -33,7 +33,7 @@ export default class ContainerEntryModuleFactory extends ModuleFactory {
     const dep = containerDependencies[0];
 
     callback(null, {
-      // @ts-ignore
+      // @ts-expect-error missing some deps
       module: new ContainerEntryModule(
         dep.name,
         dep.exposes,
diff --git a/packages/enhanced/src/lib/container/FallbackModule.ts b/packages/enhanced/src/lib/container/FallbackModule.ts
@@ -6,23 +6,23 @@
 'use strict';
 
 import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
-import type { ChunkGraph, Chunk } from 'webpack';
+import type { Chunk, ChunkGraph } from 'webpack';
 import type {
-  RequestShortener,
-  LibIdentOptions,
   CodeGenerationContext,
   CodeGenerationResult,
-  NeedBuildContext,
-  WebpackError,
-  ResolverWithOptions,
-  InputFileSystem,
   Compilation,
-  WebpackOptions,
+  InputFileSystem,
+  LibIdentOptions,
+  NeedBuildContext,
   ObjectDeserializerContext,
   ObjectSerializerContext,
+  RequestShortener,
+  ResolverWithOptions,
+  WebpackError,
+  WebpackOptions,
 } from 'webpack/lib/Module';
-import FallbackItemDependency from './FallbackItemDependency';
 import { WEBPACK_MODULE_TYPE_FALLBACK } from '../Constants';
+import FallbackItemDependency from './FallbackItemDependency';
 
 const { sources: webpackSources } = require(
   normalizeWebpackPath('webpack'),
@@ -92,7 +92,7 @@ class FallbackModule extends Module {
    * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
    * @returns {void}
    */
-  // @ts-ignore
+  // @ts-expect-error incompatible context types
   override needBuild(
     context: NeedBuildContext,
     callback: (error: WebpackError | null, result?: boolean) => void,
@@ -108,7 +108,7 @@ class FallbackModule extends Module {
    * @param {function(WebpackError=): void} callback callback function
    * @returns {void}
    */
-  // @ts-ignore
+  // @ts-expect-error incompatible option types
   override build(
     options: WebpackOptions,
     compilation: Compilation,
@@ -147,14 +147,14 @@ class FallbackModule extends Module {
    * @param {CodeGenerationContext} context context for code generation
    * @returns {CodeGenerationResult} result
    */
-  // @ts-ignore
+  // @ts-expect-error incompatible CodeGenerationContext
   override codeGeneration({
     runtimeTemplate,
     moduleGraph,
     chunkGraph,
   }: CodeGenerationContext): CodeGenerationResult {
     const ids = this.dependencies.map((dep) =>
-      //@ts-ignore
+      // @ts-expect-error incompatible dependency type
       chunkGraph.getModuleId(moduleGraph.getModule(dep)),
     );
     const code = Template.asString([
diff --git a/packages/enhanced/src/lib/container/FallbackModuleFactory.ts b/packages/enhanced/src/lib/container/FallbackModuleFactory.ts
@@ -4,11 +4,11 @@
 */
 
 'use strict';
+import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
 import type {
   ModuleFactoryCreateData,
   ModuleFactoryResult,
 } from 'webpack/lib/ModuleFactory';
-import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
 import FallbackModule from './FallbackModule';
 
 const ModuleFactory = require(
@@ -27,7 +27,7 @@ export default class FallbackModuleFactory extends ModuleFactory {
   ): void {
     const dependency = data.dependencies[0];
     callback(null, {
-      // @ts-ignore
+      // @ts-expect-error Module !== FallbackModule
       module: new FallbackModule(dependency.requests),
     });
   }
diff --git a/packages/enhanced/src/lib/container/ModuleFederationPlugin.ts b/packages/enhanced/src/lib/container/ModuleFederationPlugin.ts
@@ -4,21 +4,20 @@
 */
 
 'use strict';
-import type { Compiler, WebpackPluginInstance } from 'webpack';
-import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
+import { DtsPlugin } from '@module-federation/dts-plugin';
+import { ContainerManager, utils } from '@module-federation/managers';
+import { StatsPlugin } from '@module-federation/manifest';
 import {
   composeKeyWithSeparator,
   type moduleFederationPlugin,
 } from '@module-federation/sdk';
-import { StatsPlugin } from '@module-federation/manifest';
-import { ContainerManager, utils } from '@module-federation/managers';
-import { DtsPlugin } from '@module-federation/dts-plugin';
+import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
+import type { Compiler, WebpackPluginInstance } from 'webpack';
+import schema from '../../schemas/container/ModuleFederationPlugin';
 import SharePlugin from '../sharing/SharePlugin';
 import ContainerPlugin from './ContainerPlugin';
 import ContainerReferencePlugin from './ContainerReferencePlugin';
-import schema from '../../schemas/container/ModuleFederationPlugin';
 import FederationRuntimePlugin from './runtime/FederationRuntimePlugin';
-import HoistContainerReferencesPlugin from './HoistContainerReferencesPlugin';
 
 const isValidExternalsType = require(
   normalizeWebpackPath(
@@ -70,7 +69,6 @@ class ModuleFederationPlugin implements WebpackPluginInstance {
    */
   apply(compiler: Compiler): void {
     const { _options: options } = this;
-    // @ts-ignore
     new FederationRuntimePlugin(options).apply(compiler);
     const library = options.library || { type: 'var', name: options.name };
     const remoteType =
@@ -87,8 +85,7 @@ class ModuleFederationPlugin implements WebpackPluginInstance {
 
     let disableManifest = options.manifest === false;
     if (useContainerPlugin) {
-      // @ts-ignore
-      ContainerPlugin.patchChunkSplit(compiler, this._options.name);
+      ContainerPlugin.patchChunkSplit(compiler, this._options.name!);
     }
     this._patchBundlerConfig(compiler);
     if (!disableManifest && useContainerPlugin) {
@@ -118,16 +115,13 @@ class ModuleFederationPlugin implements WebpackPluginInstance {
     compiler.hooks.afterPlugins.tap('ModuleFederationPlugin', () => {
       if (useContainerPlugin) {
         new ContainerPlugin({
-          //@ts-ignore
-          name: options.name,
+          name: options.name!,
           library,
           filename: options.filename,
           runtime: options.runtime,
           shareScope: options.shareScope,
-          //@ts-ignore
-          exposes: options.exposes,
+          exposes: options.exposes!,
           runtimePlugins: options.runtimePlugins,
-          //@ts-ignore
         }).apply(compiler);
       }
       if (
@@ -137,7 +131,7 @@ class ModuleFederationPlugin implements WebpackPluginInstance {
           : Object.keys(options.remotes).length > 0)
       ) {
         new ContainerReferencePlugin({
-          //@ts-ignore
+          // @ts-expect-error this should not be a string
           remoteType,
           shareScope: options.shareScope,
           remotes: options.remotes,
