Skip to content

Commit c6aaf3f

Browse files
authored
Merge pull request runjuu#26 from mixueXiang/xmx_dev
Xmx dev
2 parents 9ffc73a + ef962fa commit c6aaf3f

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

src/core/v3.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ export class PluginForHtmlWebpackPluginV3 extends BasePlugin {
1717
private process(data: HtmlWebpackPluginData) {
1818
// check if current html needs to be inlined
1919
if (this.isCurrentFileNeedsToBeInlined(data.outputName)) {
20-
data.assets.css.forEach((cssLink, index) => {
20+
const [...cssAssets] = data.assets.css
21+
cssAssets.forEach(cssLink => {
2122
const style = this.getCSSStyle({
2223
cssLink,
2324
publicPath: data.assets.publicPath,
@@ -30,8 +31,11 @@ export class PluginForHtmlWebpackPluginV3 extends BasePlugin {
3031
style: style,
3132
})
3233

34+
const cssLinkIndex = data.assets.css.indexOf(cssLink)
3335
// prevent generate <link /> tag
34-
data.assets.css.splice(index, 1)
36+
if (cssLinkIndex !== -1) {
37+
data.assets.css.splice(cssLinkIndex, 1)
38+
}
3539
}
3640
})
3741

src/core/v4.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ export class PluginForHtmlWebpackPluginV4 extends BasePlugin {
3232
private cssStyleMap: Map<HTMLWebpackPlugin, CSSStyle[]> = new Map()
3333

3434
private prepareCSSStyle(data: BeforeAssetTagGenerationData) {
35-
data.assets.css.forEach((cssLink, index) => {
35+
const [...cssAssets] = data.assets.css
36+
cssAssets.forEach(cssLink => {
3637
if (this.isCurrentFileNeedsToBeInlined(cssLink)) {
3738
const style = this.getCSSStyle({
3839
cssLink,
@@ -45,9 +46,11 @@ export class PluginForHtmlWebpackPluginV4 extends BasePlugin {
4546
} else {
4647
this.cssStyleMap.set(data.plugin, [style])
4748
}
48-
49+
const cssLinkIndex = data.assets.css.indexOf(cssLink)
4950
// prevent generate <link /> tag
50-
data.assets.css.splice(index, 1)
51+
if (cssLinkIndex !== -1) {
52+
data.assets.css.splice(cssLinkIndex, 1)
53+
}
5154
}
5255
}
5356
})

0 commit comments

Comments
 (0)