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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(types): regression with unknown types #17266

Merged
merged 1 commit into from
May 31, 2023
Merged

fix(types): regression with unknown types #17266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/Module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@ const deprecatedNeedRebuild = util.deprecate(

class Module extends DependenciesBlock {
/**
* @param {ModuleTypes | ""} type the module type, when deserializing the type is not known and is an empty string
* @param {ModuleTypes} type the module type, when deserializing the type is not known and is an empty string
* @param {string=} context an optional context
* @param {string=} layer an optional layer in which the module is
*/
constructor(type, context = null, layer = null) {
super();

/** @type {ModuleTypes | ""} */
/** @type {ModuleTypes} */
this.type = type;
/** @type {string | null} */
this.context = context;
Expand Down
3 changes: 2 additions & 1 deletion lib/ModuleTypeConstants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ const WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY = "lazy-compilation-proxy";
/** @typedef {"css" | "css/global" | "css/module"} CSSModuleTypes */
/** @typedef {"asset" | "asset/inline" | "asset/resource" | "asset/source" | "asset/raw-data-url"} AssetModuleTypes */
/** @typedef {"runtime" | "fallback-module" | "remote-module" | "provide-module" | "consume-shared-module" | "lazy-compilation-proxy"} WebpackModuleTypes */
/** @typedef {JavaScriptModuleTypes | JSONModuleType | WebAssemblyModuleTypes | CSSModuleTypes | AssetModuleTypes | WebpackModuleTypes} ModuleTypes */
/** @typedef {string} UnknownModuleTypes */
/** @typedef {JavaScriptModuleTypes | JSONModuleType | WebAssemblyModuleTypes | CSSModuleTypes | AssetModuleTypes | WebpackModuleTypes | UnknownModuleTypes} ModuleTypes */

exports.ASSET_MODULE_TYPE = ASSET_MODULE_TYPE;
exports.ASSET_MODULE_TYPE_RAW_DATA_URL = ASSET_MODULE_TYPE_RAW_DATA_URL;
Expand Down
5 changes: 3 additions & 2 deletions lib/config/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ const {
JAVASCRIPT_MODULE_TYPE_ESM,
JAVASCRIPT_MODULE_TYPE_DYNAMIC,
WEBASSEMBLY_MODULE_TYPE_SYNC,
ASSET_MODULE_TYPE
ASSET_MODULE_TYPE,
CSS_MODULE_TYPE
} = require("../ModuleTypeConstants");
const Template = require("../Template");
const { cleverMerge } = require("../util/cleverMerge");
Expand Down Expand Up @@ -703,7 +704,7 @@ const applyModuleDefaults = (
}
if (css) {
const cssRule = {
type: "css",
type: CSS_MODULE_TYPE,
resolve: {
fullySpecified: true,
preferRelative: true
Expand Down
50 changes: 2 additions & 48 deletions types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7191,54 +7191,8 @@ declare interface MinChunkSizePluginOptions {
minChunkSize: number;
}
declare class Module extends DependenciesBlock {
constructor(
type:
| ""
| "runtime"
| "javascript/auto"
| "javascript/dynamic"
| "javascript/esm"
| "json"
| "webassembly/async"
| "webassembly/sync"
| "css"
| "css/global"
| "css/module"
| "asset"
| "asset/inline"
| "asset/resource"
| "asset/source"
| "asset/raw-data-url"
| "fallback-module"
| "remote-module"
| "provide-module"
| "consume-shared-module"
| "lazy-compilation-proxy",
context?: string,
layer?: string
);
type:
| ""
| "runtime"
| "javascript/auto"
| "javascript/dynamic"
| "javascript/esm"
| "json"
| "webassembly/async"
| "webassembly/sync"
| "css"
| "css/global"
| "css/module"
| "asset"
| "asset/inline"
| "asset/resource"
| "asset/source"
| "asset/raw-data-url"
| "fallback-module"
| "remote-module"
| "provide-module"
| "consume-shared-module"
| "lazy-compilation-proxy";
constructor(type: string, context?: string, layer?: string);
type: string;
context: null | string;
layer: null | string;
needId: boolean;
Expand Down