Skip to content

Commit 6c86a82

Browse files
sokrasokra
committed
Merge branch 'main' into fix-space-limited
2 parents 616251c + 951dac6 commit 6c86a82

164 files changed

Lines changed: 6222 additions & 437 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ test/statsCases/** eol=lf
33
examples/* eol=lf
44
bin/* eol=lf
55
*.svg eol=lf
6+
*.css eol=lf
67
**/*webpack.lock.data/** -text

‎declarations/WebpackOptions.d.ts‎

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export type LibraryExport = string[] | string;
9595
*/
9696
export type LibraryName = string[] | string | LibraryCustomUmdObject;
9797
/**
98-
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
98+
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'commonjs-static', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
9999
*/
100100
export type LibraryType =
101101
| (
@@ -110,6 +110,7 @@ export type LibraryType =
110110
| "commonjs"
111111
| "commonjs2"
112112
| "commonjs-module"
113+
| "commonjs-static"
113114
| "amd"
114115
| "amd-require"
115116
| "umd"
@@ -189,6 +190,7 @@ export type ExternalsType =
189190
| "commonjs"
190191
| "commonjs2"
191192
| "commonjs-module"
193+
| "commonjs-static"
192194
| "amd"
193195
| "amd-require"
194196
| "umd"
@@ -443,6 +445,14 @@ export type CompareBeforeEmit = boolean;
443445
* This option enables cross-origin loading of chunks.
444446
*/
445447
export type CrossOriginLoading = false | "anonymous" | "use-credentials";
448+
/**
449+
* Specifies the filename template of non-initial output css files on disk. You must **not** specify an absolute path here, but the path may contain folders separated by '/'! The specified path is joined with the value of the 'output.path' option to determine the location on disk.
450+
*/
451+
export type CssChunkFilename = FilenameTemplate;
452+
/**
453+
* Specifies the filename template of output css files on disk. You must **not** specify an absolute path here, but the path may contain folders separated by '/'! The specified path is joined with the value of the 'output.path' option to determine the location on disk.
454+
*/
455+
export type CssFilename = FilenameTemplate;
446456
/**
447457
* Similar to `output.devtoolModuleFilenameTemplate`, but used in the case of duplicate module identifiers.
448458
*/
@@ -1077,7 +1087,7 @@ export interface LibraryOptions {
10771087
*/
10781088
name?: LibraryName;
10791089
/**
1080-
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
1090+
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'commonjs-static', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
10811091
*/
10821092
type: LibraryType;
10831093
/**
@@ -1976,6 +1986,14 @@ export interface Output {
19761986
* This option enables cross-origin loading of chunks.
19771987
*/
19781988
crossOriginLoading?: CrossOriginLoading;
1989+
/**
1990+
* Specifies the filename template of non-initial output css files on disk. You must **not** specify an absolute path here, but the path may contain folders separated by '/'! The specified path is joined with the value of the 'output.path' option to determine the location on disk.
1991+
*/
1992+
cssChunkFilename?: CssChunkFilename;
1993+
/**
1994+
* Specifies the filename template of output css files on disk. You must **not** specify an absolute path here, but the path may contain folders separated by '/'! The specified path is joined with the value of the 'output.path' option to determine the location on disk.
1995+
*/
1996+
cssFilename?: CssFilename;
19791997
/**
19801998
* Similar to `output.devtoolModuleFilenameTemplate`, but used in the case of duplicate module identifiers.
19811999
*/
@@ -2061,7 +2079,7 @@ export interface Output {
20612079
*/
20622080
libraryExport?: LibraryExport;
20632081
/**
2064-
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
2082+
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'commonjs-static', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
20652083
*/
20662084
libraryTarget?: LibraryType;
20672085
/**
@@ -2692,6 +2710,14 @@ export interface AssetResourceGeneratorOptions {
26922710
*/
26932711
publicPath?: RawPublicPath;
26942712
}
2713+
/**
2714+
* Generator options for css modules.
2715+
*/
2716+
export interface CssGeneratorOptions {}
2717+
/**
2718+
* Parser options for css modules.
2719+
*/
2720+
export interface CssParserOptions {}
26952721
/**
26962722
* No generator options are supported for this module type.
26972723
*/
@@ -2770,6 +2796,10 @@ export interface ExperimentsCommon {
27702796
* Enable additional in memory caching of modules that are unchanged and reference only unchanged modules.
27712797
*/
27722798
cacheUnaffected?: boolean;
2799+
/**
2800+
* Enable css support.
2801+
*/
2802+
css?: boolean;
27732803
/**
27742804
* Apply defaults of next major version.
27752805
*/
@@ -3112,6 +3142,14 @@ export interface OutputNormalized {
31123142
* This option enables cross-origin loading of chunks.
31133143
*/
31143144
crossOriginLoading?: CrossOriginLoading;
3145+
/**
3146+
* Specifies the filename template of non-initial output css files on disk. You must **not** specify an absolute path here, but the path may contain folders separated by '/'! The specified path is joined with the value of the 'output.path' option to determine the location on disk.
3147+
*/
3148+
cssChunkFilename?: CssChunkFilename;
3149+
/**
3150+
* Specifies the filename template of output css files on disk. You must **not** specify an absolute path here, but the path may contain folders separated by '/'! The specified path is joined with the value of the 'output.path' option to determine the location on disk.
3151+
*/
3152+
cssFilename?: CssFilename;
31153153
/**
31163154
* Similar to `output.devtoolModuleFilenameTemplate`, but used in the case of duplicate module identifiers.
31173155
*/

‎declarations/plugins/container/ContainerPlugin.d.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export type LibraryExport = string[] | string;
2929
*/
3030
export type LibraryName = string[] | string | LibraryCustomUmdObject;
3131
/**
32-
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
32+
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'commonjs-static', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
3333
*/
3434
export type LibraryType =
3535
| (
@@ -44,6 +44,7 @@ export type LibraryType =
4444
| "commonjs"
4545
| "commonjs2"
4646
| "commonjs-module"
47+
| "commonjs-static"
4748
| "amd"
4849
| "amd-require"
4950
| "umd"
@@ -126,7 +127,7 @@ export interface LibraryOptions {
126127
*/
127128
name?: LibraryName;
128129
/**
129-
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
130+
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'commonjs-static', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
130131
*/
131132
type: LibraryType;
132133
/**

‎declarations/plugins/container/ContainerReferencePlugin.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export type ExternalsType =
1818
| "commonjs"
1919
| "commonjs2"
2020
| "commonjs-module"
21+
| "commonjs-static"
2122
| "amd"
2223
| "amd-require"
2324
| "umd"

‎declarations/plugins/container/ModuleFederationPlugin.d.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export type LibraryExport = string[] | string;
2929
*/
3030
export type LibraryName = string[] | string | LibraryCustomUmdObject;
3131
/**
32-
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
32+
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'commonjs-static', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
3333
*/
3434
export type LibraryType =
3535
| (
@@ -44,6 +44,7 @@ export type LibraryType =
4444
| "commonjs"
4545
| "commonjs2"
4646
| "commonjs-module"
47+
| "commonjs-static"
4748
| "amd"
4849
| "amd-require"
4950
| "umd"
@@ -70,6 +71,7 @@ export type ExternalsType =
7071
| "commonjs"
7172
| "commonjs2"
7273
| "commonjs-module"
74+
| "commonjs-static"
7375
| "amd"
7476
| "amd-require"
7577
| "umd"
@@ -182,7 +184,7 @@ export interface LibraryOptions {
182184
*/
183185
name?: LibraryName;
184186
/**
185-
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
187+
* Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'commonjs-static', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
186188
*/
187189
type: LibraryType;
188190
/**

0 commit comments

Comments
 (0)