Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enhanced - remove import require statements for swc interop #1474

Merged
merged 2 commits into from
Oct 2, 2023
Merged

Enhanced - remove import require statements for swc interop #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e16fa1
Change swc interop to false so it defaults to swc interop helper (imp…
RussellCanfield Sep 30, 2023
180cb8f
Fix remaining import requires
RussellCanfield Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/enhanced/.swcrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"module": {
"type": "commonjs",
"strict": true,
"noInterop": true
"noInterop": false,
"importInterop": "swc"
},
"sourceMaps": true,
"exclude": [
Expand Down
6 changes: 2 additions & 4 deletions packages/enhanced/src/lib/container/ContainerEntryDependency.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
*/

import { ExposeOptions } from './ContainerEntryModule';
//@ts-ignore
import makeSerializable = require('webpack/lib/util/makeSerializable');
//@ts-ignore
import Dependency = require('webpack/lib/Dependency');
import makeSerializable from 'webpack/lib/util/makeSerializable';
import Dependency from 'webpack/lib/Dependency';

class ContainerEntryDependency extends Dependency {
public name: string;
Expand Down
18 changes: 6 additions & 12 deletions packages/enhanced/src/lib/container/ContainerEntryModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,15 @@
*/

'use strict';
//@ts-ignore
import AsyncDependenciesBlock = require('webpack/lib/AsyncDependenciesBlock');
//@ts-ignore
import Dependency = require('webpack/lib/Dependency');
//@ts-ignore
import Template = require('webpack/lib/Template');
//@ts-ignore
import Module = require('webpack/lib/Module');
import AsyncDependenciesBlock from 'webpack/lib/AsyncDependenciesBlock';
import Dependency from 'webpack/lib/Dependency';
import Template from 'webpack/lib/Template';
import Module from 'webpack/lib/Module';
import * as RuntimeGlobals from 'webpack/lib/RuntimeGlobals';
import { OriginalSource, RawSource } from 'webpack-sources';
import { JAVASCRIPT_MODULE_TYPE_DYNAMIC } from 'webpack/lib/ModuleTypeConstants';
import ContainerExposedDependency from './ContainerExposedDependency';
//@ts-ignore
import StaticExportsDependency = require('webpack/lib/dependencies/StaticExportsDependency');
import StaticExportsDependency from 'webpack/lib/dependencies/StaticExportsDependency';
import type Compilation from 'webpack/lib/Compilation';
import type {
LibIdentOptions,
Expand All @@ -30,8 +25,7 @@ import type {
ResolverWithOptions,
} from 'webpack/lib/Module';
import type WebpackError from 'webpack/lib/WebpackError';
//@ts-ignore
import makeSerializable = require('webpack/lib/util/makeSerializable');
import makeSerializable from 'webpack/lib/util/makeSerializable';

const SOURCE_TYPES = new Set(['javascript']);

Expand Down
3 changes: 1 addition & 2 deletions packages/enhanced/src/lib/container/ContainerEntryModuleFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

import ContainerEntryModule from './ContainerEntryModule';
import ContainerEntryDependency from './ContainerEntryDependency';
//@ts-ignore
import ModuleFactory = require('webpack/lib/ModuleFactory');
import ModuleFactory from 'webpack/lib/ModuleFactory';
import type {
ModuleFactoryCreateData,
ModuleFactoryResult,
Expand Down
6 changes: 2 additions & 4 deletions packages/enhanced/src/lib/container/ContainerExposedDependency.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ import type {
ObjectDeserializerContext,
ObjectSerializerContext,
} from 'webpack/lib/dependencies/ModuleDependency';
//@ts-ignore
import ModuleDependency = require('webpack/lib/dependencies/ModuleDependency');
//@ts-ignore
import makeSerializable = require('webpack/lib/util/makeSerializable');
import ModuleDependency from 'webpack/lib/dependencies/ModuleDependency';
import makeSerializable from 'webpack/lib/util/makeSerializable';

class ContainerExposedDependency extends ModuleDependency {
exposedName: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/enhanced/src/lib/container/ContainerPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Author Tobias Koppers @sokra, Zackary Jackson @ScriptedAlchemy, Marais Rossouw @maraisr
*/
//@ts-ignore
import createSchemaValidation = require('webpack/lib/util/create-schema-validation');
import createSchemaValidation from 'webpack/lib/util/create-schema-validation';
import ContainerEntryDependency from './ContainerEntryDependency';
import ContainerEntryModuleFactory from './ContainerEntryModuleFactory';
import ContainerExposedDependency from './ContainerExposedDependency';
Expand Down
10 changes: 3 additions & 7 deletions packages/enhanced/src/lib/container/ContainerReferencePlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,18 @@

import type Compiler from 'webpack/lib/Compiler';
import * as RuntimeGlobals from 'webpack/lib/RuntimeGlobals';
//@ts-ignore
import createSchemaValidation = require('webpack/lib/util/create-schema-validation');
import createSchemaValidation from 'webpack/lib/util/create-schema-validation';
import FallbackDependency from './FallbackDependency';
import FallbackItemDependency from './FallbackItemDependency';
import FallbackModuleFactory from './FallbackModuleFactory';
import RemoteModule from './RemoteModule';
import RemoteRuntimeModule from './RemoteRuntimeModule';
import RemoteToExternalDependency from './RemoteToExternalDependency';
import { parseOptions } from './options';
//@ts-ignore
import ExternalsPlugin = require('webpack/lib/ExternalsPlugin');

import ExternalsPlugin from 'webpack/lib/ExternalsPlugin';
import type Compilation from 'webpack/lib/Compilation';
import type { ResolveData } from 'webpack/lib/NormalModuleFactory';
//@ts-ignore
import NormalModuleFactory = require('webpack/lib/NormalModuleFactory');
import NormalModuleFactory from 'webpack/lib/NormalModuleFactory';
import {
ExternalsType,
ContainerReferencePluginOptions,
Expand Down
9 changes: 2 additions & 7 deletions packages/enhanced/src/lib/container/FallbackDependency.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ import type {
ObjectDeserializerContext,
ObjectSerializerContext,
} from 'webpack/lib/Dependency';
//@ts-ignore
import Dependency = require('webpack/lib/Dependency');
//@ts-ignore
import makeSerializable = require('webpack/lib/util/makeSerializable');

/** @typedef {import("webpack/lib/serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
/** @typedef {import("webpack/lib/serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
import Dependency from 'webpack/lib/Dependency';
import makeSerializable from 'webpack/lib/util/makeSerializable';

class FallbackDependency extends Dependency {
requests: string[];
Expand Down
6 changes: 2 additions & 4 deletions packages/enhanced/src/lib/container/FallbackItemDependency.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
MIT License http://www.opensource.org/licenses/mit-license.php
Author Tobias Koppers @sokra, Zackary Jackson @ScriptedAlchemy
*/
//@ts-ignore
import ModuleDependency = require('webpack/lib/dependencies/ModuleDependency');
//@ts-ignore
import makeSerializable = require('webpack/lib/util/makeSerializable');
import ModuleDependency from 'webpack/lib/dependencies/ModuleDependency';
import makeSerializable from 'webpack/lib/util/makeSerializable';

class FallbackItemDependency extends ModuleDependency {
/**
Expand Down
29 changes: 4 additions & 25 deletions packages/enhanced/src/lib/container/FallbackModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,15 @@ import type {
ObjectDeserializerContext,
ObjectSerializerContext,
} from 'webpack/lib/Module';
//@ts-ignore
import Module = require('webpack/lib/Module');
import Module from 'webpack/lib/Module';
import type ChunkGraph from 'webpack/lib/ChunkGraph';
import Chunk from 'webpack/lib/Chunk';
import { WEBPACK_MODULE_TYPE_FALLBACK } from 'webpack/lib/ModuleTypeConstants';
//@ts-ignore
import RuntimeGlobals = require('webpack/lib/RuntimeGlobals');
//@ts-ignore
import Template = require('webpack/lib/Template');
//@ts-ignore
import makeSerializable = require('webpack/lib/util/makeSerializable');
import RuntimeGlobals from 'webpack/lib/RuntimeGlobals';
import Template from 'webpack/lib/Template';
import makeSerializable from 'webpack/lib/util/makeSerializable';
import FallbackItemDependency from './FallbackItemDependency';

/** @typedef {import("webpack/lib/webpack/lib/declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
/** @typedef {import("webpack/lib/Chunk")} Chunk */
/** @typedef {import("webpack/lib/ChunkGraph")} ChunkGraph */
/** @typedef {import("webpack/lib/ChunkGroup")} ChunkGroup */
/** @typedef {import("webpack/lib/Compilation")} Compilation */
/** @typedef {import("webpack/lib/Module").CodeGenerationContext} CodeGenerationContext */
/** @typedef {import("webpack/lib/Module").CodeGenerationResult} CodeGenerationResult */
/** @typedef {import("webpack/lib/Module").LibIdentOptions} LibIdentOptions */
/** @typedef {import("webpack/lib/Module").NeedBuildContext} NeedBuildContext */
/** @typedef {import("webpack/lib/RequestShortener")} RequestShortener */
/** @typedef {import("webpack/lib/ResolverFactory").ResolverWithOptions} ResolverWithOptions */
/** @typedef {import("webpack/lib/WebpackError")} WebpackError */
/** @typedef {import("webpack/lib/serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
/** @typedef {import("webpack/lib/serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
/** @typedef {import("webpack/lib/util/Hash")} Hash */
/** @typedef {import("webpack/lib/util/fs").InputFileSystem} InputFileSystem */

const TYPES = new Set(['javascript']);
const RUNTIME_REQUIREMENTS = new Set([RuntimeGlobals.module]);

Expand Down
7 changes: 1 addition & 6 deletions packages/enhanced/src/lib/container/FallbackModuleFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,10 @@ import {
ModuleFactoryCreateData,
ModuleFactoryResult,
} from 'webpack/lib/ModuleFactory';
//@ts-ignore
import ModuleFactory = require('webpack/lib/ModuleFactory');
import ModuleFactory from 'webpack/lib/ModuleFactory';
import FallbackModule from './FallbackModule';
import FallbackDependency from './FallbackDependency';

/** @typedef {import("webpack/lib/ModuleFactory").ModuleFactoryCreateData} ModuleFactoryCreateData */
/** @typedef {import("webpack/lib/ModuleFactory").ModuleFactoryResult} ModuleFactoryResult */
/** @typedef {import("./FallbackDependency")} FallbackDependency */

export default class FallbackModuleFactory extends ModuleFactory {
/**
* @param {ModuleFactoryCreateData} data data object
Expand Down
11 changes: 2 additions & 9 deletions packages/enhanced/src/lib/container/ModuleFederationPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,13 @@
'use strict';

import type Compiler from 'webpack/lib/Compiler';
//@ts-ignore
import isValidExternalsType = require('webpack/schemas/plugins/container/ExternalsType.check.js');
import isValidExternalsType from 'webpack/schemas/plugins/container/ExternalsType.check.js';
import type { ModuleFederationPluginOptions } from './ModuleFederationPluginTypes';
import SharePlugin from '../sharing/SharePlugin';
//@ts-ignore
import createSchemaValidation = require('webpack/lib/util/create-schema-validation');
import createSchemaValidation from 'webpack/lib/util/create-schema-validation';
import ContainerPlugin from './ContainerPlugin';
import ContainerReferencePlugin from './ContainerReferencePlugin';

/** @typedef {import("./ModuleFederationPluginTypes").ExternalsType} ExternalsType */
/** @typedef {import("./ModuleFederationPluginTypes").ModuleFederationPluginOptions} ModuleFederationPluginOptions */
/** @typedef {import("./ModuleFederationPluginTypes").Shared} Shared */
/** @typedef {import("webpack/lib/Compiler")} Compiler */

const validate = createSchemaValidation(
//eslint-disable-next-line
require('webpack/schemas/plugins/container/ModuleFederationPlugin.check.js'),
Expand Down
9 changes: 3 additions & 6 deletions packages/enhanced/src/lib/container/RemoteModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,9 @@ import type {
NeedBuildContext,
WebpackError,
} from 'webpack/lib/Module';
//@ts-ignore
import Module = require('webpack/lib/Module');
//@ts-ignore
import RuntimeGlobals = require('webpack/lib/RuntimeGlobals');
//@ts-ignore
import makeSerializable = require('webpack/lib/util/makeSerializable');
import Module from 'webpack/lib/Module';
import RuntimeGlobals from 'webpack/lib/RuntimeGlobals';
import makeSerializable from 'webpack/lib/util/makeSerializable';
import FallbackDependency from './FallbackDependency';
import RemoteToExternalDependency from './RemoteToExternalDependency';
import type Compilation from 'webpack/lib/Compilation';
Expand Down
12 changes: 3 additions & 9 deletions packages/enhanced/src/lib/container/RemoteRuntimeModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,11 @@
MIT License http://www.opensource.org/licenses/mit-license.php
Author Tobias Koppers @sokra, Zackary Jackson @ScriptedAlchemy
*/
//@ts-ignore
import RuntimeGlobals = require('webpack/lib/RuntimeGlobals');
import RuntimeGlobals from 'webpack/lib/RuntimeGlobals';
import type Compilation from 'webpack/lib/Compilation';
import RemoteModule from './RemoteModule';
//@ts-ignore
import RuntimeModule = require('webpack/lib/RuntimeModule');
//@ts-ignore
import Template = require('webpack/lib/Template');

/** @typedef {import("webpack/lib/Chunk")} Chunk */
/** @typedef {import("./RemoteModule")} RemoteModule */
import RuntimeModule from 'webpack/lib/RuntimeModule';
import Template from 'webpack/lib/Template';

class RemoteRuntimeModule extends RuntimeModule {
constructor() {
Expand Down
7 changes: 3 additions & 4 deletions packages/enhanced/src/lib/container/RemoteToExternalDependency.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
*/

'use strict';
//@ts-ignore
import ModuleDependency = require('webpack/lib/dependencies/ModuleDependency');
//@ts-ignore
import makeSerializable = require('webpack/lib/util/makeSerializable');

import ModuleDependency from 'webpack/lib/dependencies/ModuleDependency';
import makeSerializable from 'webpack/lib/util/makeSerializable';

class RemoteToExternalDependency extends ModuleDependency {
/**
Expand Down
7 changes: 3 additions & 4 deletions packages/enhanced/src/lib/sharing/ConsumeSharedFallbackDependency.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
*/

'use strict';
//@ts-ignore
import ModuleDependency = require('webpack/lib/dependencies/ModuleDependency');
//@ts-ignore
import makeSerializable = require('webpack/lib/util/makeSerializable');

import ModuleDependency from 'webpack/lib/dependencies/ModuleDependency';
import makeSerializable from 'webpack/lib/util/makeSerializable';

class ConsumeSharedFallbackDependency extends ModuleDependency {
/**
Expand Down
24 changes: 3 additions & 21 deletions packages/enhanced/src/lib/sharing/ConsumeSharedModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { RawSource } from 'webpack-sources';
//@ts-ignore
import AsyncDependenciesBlock = require('webpack/lib/AsyncDependenciesBlock');
import AsyncDependenciesBlock from 'webpack/lib/AsyncDependenciesBlock';
import type {
WebpackOptions,
Compilation,
Expand All @@ -25,11 +25,11 @@ import type {
InputFileSystem,
} from 'webpack/lib/Module';
//@ts-ignore
import Module = require('webpack/lib/Module');
import Module from 'webpack/lib/Module';
import { WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE } from 'webpack/lib/ModuleTypeConstants';
import * as RuntimeGlobals from 'webpack/lib/RuntimeGlobals';
//@ts-ignore
import makeSerializable = require('webpack/lib/util/makeSerializable');
import makeSerializable from 'webpack/lib/util/makeSerializable';
import { rangeToString, stringifyHoley } from 'webpack/lib/util/semver';
import ConsumeSharedFallbackDependency from './ConsumeSharedFallbackDependency';
export type ConsumeOptions = {
Expand Down Expand Up @@ -74,24 +74,6 @@ export type ConsumeOptions = {
eager: boolean;
};

/** @typedef {import("webpack/declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
/** @typedef {import("webpack/lib/ChunkGraph")} ChunkGraph */
/** @typedef {import("webpack/lib/ChunkGroup")} ChunkGroup */
/** @typedef {import("webpack/lib/Compilation")} Compilation */
/** @typedef {import("webpack/lib/Dependency").UpdateHashContext} UpdateHashContext */
/** @typedef {import("webpack/lib/Module").CodeGenerationContext} CodeGenerationContext */
/** @typedef {import("webpack/lib/Module").CodeGenerationResult} CodeGenerationResult */
/** @typedef {import("webpack/lib/Module").LibIdentOptions} LibIdentOptions */
/** @typedef {import("webpack/lib/Module").NeedBuildContext} NeedBuildContext */
/** @typedef {import("webpack/lib/RequestShortener")} RequestShortener */
/** @typedef {import("webpack/lib/ResolverFactory").ResolverWithOptions} ResolverWithOptions */
/** @typedef {import("webpack/lib/WebpackError")} WebpackError */
/** @typedef {import("webpack/lib/serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
/** @typedef {import("webpack/lib/serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
/** @typedef {import("webpack/lib/util/Hash")} Hash */
/** @typedef {import("webpack/lib/util/fs").InputFileSystem} InputFileSystem */
/** @typedef {import("webpack/lib/util/semver").SemVerRange} SemVerRange */

/**
* @typedef {Object} ConsumeOptions
* @property {string=} import fallback request
Expand Down
16 changes: 5 additions & 11 deletions packages/enhanced/src/lib/sharing/ConsumeSharedPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,18 @@ import ConsumeSharedModule from './ConsumeSharedModule';
import ConsumeSharedRuntimeModule from './ConsumeSharedRuntimeModule';
import ProvideForSharedDependency from './ProvideForSharedDependency';
//@ts-ignore
import ModuleNotFoundError = require('webpack/lib/ModuleNotFoundError');
import ModuleNotFoundError from 'webpack/lib/ModuleNotFoundError';
import * as RuntimeGlobals from 'webpack/lib/RuntimeGlobals';
//@ts-ignore
import WebpackError = require('webpack/lib/WebpackError');
import WebpackError from 'webpack/lib/WebpackError';
//@ts-ignore
import Compiler = require('webpack/lib/Compiler');
import Compiler from 'webpack/lib/Compiler';
//@ts-ignore
import LazySet = require('webpack/lib/util/LazySet');
import LazySet from 'webpack/lib/util/LazySet';
//@ts-ignore
import createSchemaValidation = require('webpack/lib/util/create-schema-validation');
import createSchemaValidation from 'webpack/lib/util/create-schema-validation';
import { SemVerRange } from 'webpack/lib/util/semver';

/** @typedef {import("../../declarations/plugins/sharing/ConsumeSharedPlugin").ConsumeSharedPluginOptions} ConsumeSharedPluginOptions */
/** @typedef {import("../../declarations/plugins/sharing/ConsumeSharedPlugin").ConsumesConfig} ConsumesConfig */
/** @typedef {import("webpack/lib/Compiler")} Compiler */
/** @typedef {import("webpack/lib/ResolverFactory").ResolveOptionsWithDependencyType} ResolveOptionsWithDependencyType */
/** @typedef {import("./ConsumeSharedModule").ConsumeOptions} ConsumeOptions */

const validate = createSchemaValidation(
//eslint-disable-next-line
require('webpack/schemas/plugins/sharing/ConsumeSharedPlugin.check.js'),
Expand Down
Loading
Loading