Merge pull request #33 from LukeLin/v4

fix: 修复link标签和script标签中间有换行符匹配不到的问题

Author: lcxfs1991

.eslintrc.js

@@ -15,6 +15,7 @@ module.exports = {
         "no-mixed-spaces-and-tabs": 0,
         "semi": 2,
         "no-useless-escape": 0,
+        "no-control-regex": 0
     },
     "globals": {
         "describe": true,

CHANGELOG.md

@@ -79,4 +79,5 @@
 - v4.0.1 支持 webpack4.x
 - v4.0.2 修复 watch 模式下资源重复的问题
 - v4.0.3 修复外链 favico 的问题
-- v4.0.4 修复 favico 文件不存在报错
+- v4.0.4 修复 favico 文件不存在报错
+- v4.0.5 修复link标签和script标签中间有换行符匹配不到的问题

index.js

@@ -400,9 +400,9 @@ HtmlResWebpackPlugin.prototype.checkResource = function(
   compilation
 ) {
   let isProduction = this.options.env === "production",
-    linkRegex = new RegExp("(<link[^>]*href=(['\"]*)(.*?)(['\"]*).*?>)", "ig"),
+    linkRegex = new RegExp("(<link(?:[^>]|\n)*href=(['\"]*)(.*?)(['\"]*).*?>)", "ig"),
     scriptRegex = new RegExp(
-      "(<script[^>]*src=(['\"]*)(.*?)(['\"]*).*?>(</script>)?)",
+      "(<script(?:[^>]|\n)*src=(['\"]*)(.*?)(['\"]*).*?>(</script>)?)",
       "ig"
     );
 
@@ -425,7 +425,7 @@ HtmlResWebpackPlugin.prototype.checkResource = function(
     if (!!~route.indexOf("__inline")) {
       // css inline
       let styleInlineRegex = new RegExp(
-        "<link.*href=(s*?)*(.+)[?]__inline.*?(s*?)>",
+        "<link(?:[^>]|\n)*href=(s*?)*(.+)[?]__inline.*?(s*?)>",
         "ig"
       );
       route = this.inlineHtmlRes(
@@ -436,7 +436,7 @@ HtmlResWebpackPlugin.prototype.checkResource = function(
       );
     } else {
       // css md5
-      let styleMd5Regex = new RegExp("<link.*href=(s*?)*(.+).*?(s*?)>", "ig");
+      let styleMd5Regex = new RegExp("<link(?:[^>]|\n)*href=(s*?)*(.+).*?(s*?)>", "ig");
       let cssPublicPath = this.options.cssPublicPath || publicPath;
       route = this.md5HtmlRes(route, styleMd5Regex, cssPublicPath);
     }
@@ -462,7 +462,7 @@ HtmlResWebpackPlugin.prototype.checkResource = function(
     if (!!~route.indexOf("__inline")) {
       // js inline
       let scriptInlineRegex = new RegExp(
-        "<script.*src=(s*?)*(.+)[?]__inline.*?(s*?)></script>",
+        "<script(?:[^>]|\n)*src=(s*?)*(.+)[?]__inline.*?(s*?)></script>",
         "ig"
       );
       route = this.inlineHtmlRes(
@@ -474,7 +474,7 @@ HtmlResWebpackPlugin.prototype.checkResource = function(
     } else {
       // js md5
       let scriptMd5Regex = new RegExp(
-        "<script.*src=(s*?)*(.+).*?(s*?)></script>",
+        "<script(?:[^>]|\n)*src=(s*?)*(.+).*?(s*?)></script>",
         "ig"
       );
       route = this.md5HtmlRes(route, scriptMd5Regex, publicPath);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-res-webpack-plugin",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "html generation and resource inline or md5 for webpack",
   "keywords": [
     "front-end",