test: fix regexp for asset resource

webdiscus · webdiscus · commit 13168f6d2936 · 2025-01-17T01:04:59.000+01:00
diff --git a/README.md b/README.md
@@ -164,7 +164,7 @@ module.exports = {
           use: ['css-loader', 'sass-loader'],
         },
         {
-          test: /\.(ico|png|jp?g|svg)/,
+          test: /\.(ico|png|jpe?g|svg)/,
           type: 'asset/resource',
         },
       ],
@@ -403,7 +403,7 @@ module.exports = {
         use: ['css-loader', 'sass-loader'],
       },
       {
-        test: /\.(ico|png|jp?g|webp|svg)$/,
+        test: /\.(ico|png|jpe?g|webp|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/examples/bootstrap/webpack.config.js b/examples/bootstrap/webpack.config.js
@@ -53,7 +53,7 @@ module.exports = {
         ],
       },
       {
-        test: /\.(ico|png|jp?g|svg)/,
+        test: /\.(ico|png|jpe?g|svg)/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext]',
diff --git a/examples/favicons/webpack.config.js b/examples/favicons/webpack.config.js
@@ -52,7 +52,7 @@ module.exports = {
         use: ['css-loader', 'sass-loader'],
       },
       {
-        test: /\.(ico|png|jp?g|svg)/,
+        test: /\.(ico|png|jpe?g|svg)/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext]',
diff --git a/examples/hello-world-pug/webpack.config.js b/examples/hello-world-pug/webpack.config.js
@@ -33,7 +33,7 @@ module.exports = {
         use: ['css-loader', 'sass-loader'],
       },
       {
-        test: /\.(ico|png|jp?g|svg)/,
+        test: /\.(ico|png|jpe?g|svg)/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext]',
diff --git a/examples/hello-world/webpack.config.js b/examples/hello-world/webpack.config.js
@@ -31,7 +31,7 @@ module.exports = {
         use: ['css-loader', 'sass-loader'],
       },
       {
-        test: /\.(ico|png|jp?g|svg)/,
+        test: /\.(ico|png|jpe?g|svg)/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext]',
diff --git a/examples/integrity/webpack.config.js b/examples/integrity/webpack.config.js
@@ -38,7 +38,7 @@ module.exports = {
         use: ['css-loader', 'sass-loader'],
       },
       {
-        test: /\.(ico|png|jp?g|svg)/,
+        test: /\.(ico|png|jpe?g|svg)/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext]',
diff --git a/examples/purgecss-postcss/webpack.config.js b/examples/purgecss-postcss/webpack.config.js
@@ -54,7 +54,7 @@ module.exports = {
         ],
       },
       {
-        test: /\.(ico|png|jp?g|svg)/,
+        test: /\.(ico|png|jpe?g|svg)/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext]',
diff --git a/examples/purgecss/webpack.config.js b/examples/purgecss/webpack.config.js
@@ -41,7 +41,7 @@ module.exports = {
         use: ['css-loader', 'sass-loader'],
       },
       {
-        test: /\.(ico|png|jp?g|svg)/,
+        test: /\.(ico|png|jpe?g|svg)/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext]',
diff --git a/examples/simple-site/webpack.config.js b/examples/simple-site/webpack.config.js
@@ -39,7 +39,7 @@ module.exports = {
         use: ['css-loader', 'sass-loader'],
       },
       {
-        test: /\.(ico|png|jp?g|svg)/,
+        test: /\.(ico|png|jpe?g|svg)/,
         type: 'asset',
         generator: {
           filename: 'img/[name].[hash:8][ext]', // save to file images >= 2 KB
diff --git a/examples/tailwindcss/webpack.config.js b/examples/tailwindcss/webpack.config.js
@@ -39,7 +39,7 @@ module.exports = {
         use: ['css-loader', 'postcss-loader', 'sass-loader'],
       },
       {
-        test: /\.(ico|png|jp?g|svg)$/,
+        test: /\.(ico|png|jpe?g|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext]',
diff --git a/examples/vue-bundle-inlined-assets/webpack.config.js b/examples/vue-bundle-inlined-assets/webpack.config.js
@@ -48,7 +48,7 @@ module.exports = {
         use: ['css-loader', 'sass-loader'],
       },
       {
-        test: /\.(ico|png|jp?g|svg)$/,
+        test: /\.(ico|png|jpe?g|svg)$/,
         type: 'asset/inline', // inline all images into HTML/CSS
       },
     ],
diff --git a/test/cases/_preprocessor/handlebars-custom-runtime/webpack.config.js b/test/cases/_preprocessor/handlebars-custom-runtime/webpack.config.js
@@ -33,7 +33,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|svg)$/,
+        test: /\.(ico|png|jpe?g|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/test/cases/_preprocessor/handlebars-helper-block-buildIn/webpack.config.js b/test/cases/_preprocessor/handlebars-helper-block-buildIn/webpack.config.js
@@ -25,7 +25,7 @@ const config = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|webp|svg)$/,
+        test: /\.(ico|png|jpe?g|webp|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/test/cases/_preprocessor/js-tmpl-default/webpack.config.js b/test/cases/_preprocessor/js-tmpl-default/webpack.config.js
@@ -31,7 +31,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|svg)$/,
+        test: /\.(ico|png|jpe?g|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/test/cases/_preprocessor/js-tmpl-ejs-compile/webpack.config.js b/test/cases/_preprocessor/js-tmpl-ejs-compile/webpack.config.js
@@ -34,7 +34,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|svg)$/,
+        test: /\.(ico|png|jpe?g|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/test/cases/_preprocessor/js-tmpl-eta-compile-data-external/webpack.config.js b/test/cases/_preprocessor/js-tmpl-eta-compile-data-external/webpack.config.js
@@ -37,7 +37,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|svg)$/,
+        test: /\.(ico|png|jpe?g|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/test/cases/_preprocessor/js-tmpl-eta-compile/webpack.config.js b/test/cases/_preprocessor/js-tmpl-eta-compile/webpack.config.js
@@ -25,7 +25,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|svg)$/,
+        test: /\.(ico|png|jpe?g|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/test/cases/_preprocessor/js-tmpl-eta-render-many-pages/webpack.config.js b/test/cases/_preprocessor/js-tmpl-eta-render-many-pages/webpack.config.js
@@ -45,7 +45,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|svg)$/,
+        test: /\.(ico|png|jpe?g|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/test/cases/_preprocessor/js-tmpl-eta-render/webpack.config.js b/test/cases/_preprocessor/js-tmpl-eta-render/webpack.config.js
@@ -37,7 +37,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|svg)$/,
+        test: /\.(ico|png|jpe?g|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/test/cases/_preprocessor/js-tmpl-hbs-compile-partials/webpack.config.js b/test/cases/_preprocessor/js-tmpl-hbs-compile-partials/webpack.config.js
@@ -33,7 +33,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|svg)$/,
+        test: /\.(ico|png|jpe?g|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/test/cases/_preprocessor/js-tmpl-hbs-compile/webpack.config.js b/test/cases/_preprocessor/js-tmpl-hbs-compile/webpack.config.js
@@ -32,7 +32,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|svg)$/,
+        test: /\.(ico|png|jpe?g|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/test/cases/_preprocessor/js-tmpl-njk-compile/webpack.config.js b/test/cases/_preprocessor/js-tmpl-njk-compile/webpack.config.js
@@ -43,7 +43,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|webp|svg)$/,
+        test: /\.(ico|png|jpe?g|webp|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/test/cases/_preprocessor/js-tmpl-tmpr-compile/webpack.config.js b/test/cases/_preprocessor/js-tmpl-tmpr-compile/webpack.config.js
@@ -38,7 +38,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|svg)$/,
+        test: /\.(ico|png|jpe?g|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/test/cases/_preprocessor/preprocessor-disabled-ftl/webpack.config.js b/test/cases/_preprocessor/preprocessor-disabled-ftl/webpack.config.js
@@ -38,7 +38,7 @@ module.exports = {
         use: ['css-loader', 'sass-loader'],
       },
       {
-        test: /\.(ico|png|jp?g|svg)/,
+        test: /\.(ico|png|jpe?g|svg)/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext]',
diff --git a/test/cases/_pug/resolve-attr-images/webpack.config.js b/test/cases/_pug/resolve-attr-images/webpack.config.js
@@ -20,7 +20,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|webp|svg)$/,
+        test: /\.(ico|png|jpe?g|webp|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: '[name].[hash:8][ext][query]',
diff --git a/test/cases/_pug/resolve-attr-styles/webpack.config.js b/test/cases/_pug/resolve-attr-styles/webpack.config.js
@@ -32,7 +32,7 @@ module.exports = {
         use: ['css-loader', 'sass-loader'],
       },
       {
-        test: /\.(ico|png|jp?g|webp|svg)$/,
+        test: /\.(ico|png|jpe?g|webp|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: '[name].[hash:8][ext][query]',
diff --git a/test/cases/_pug/resolve-img-attributes-require/webpack.config.js b/test/cases/_pug/resolve-img-attributes-require/webpack.config.js
@@ -28,7 +28,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|webp|svg)$/,
+        test: /\.(ico|png|jpe?g|webp|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: '[name].[hash:8][ext][query]',
diff --git a/test/cases/_pug/resolve-img-attributes/webpack.config.js b/test/cases/_pug/resolve-img-attributes/webpack.config.js
@@ -28,7 +28,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(ico|png|jp?g|webp|svg)$/,
+        test: /\.(ico|png|jpe?g|webp|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: '[name].[hash:8][ext][query]',
diff --git a/test/cases/ignore-webpack-entry/webpack.config.js b/test/cases/ignore-webpack-entry/webpack.config.js
@@ -41,7 +41,7 @@ module.exports = {
         use: ['css-loader'],
       },
       {
-        test: /\.(ico|png|jp?g|svg)$/,
+        test: /\.(ico|png|jpe?g|svg)$/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext][query]',
diff --git a/test/cases/issue-mui-css/webpack.config.js b/test/cases/issue-mui-css/webpack.config.js
@@ -48,7 +48,7 @@ module.exports = {
         exclude: /node_modules/,
       },
       {
-        test: /\.(ico|png|jp?g|svg)/,
+        test: /\.(ico|png|jpe?g|svg)/,
         type: 'asset/resource',
         include: path.resolve(__dirname, 'src'),
         exclude: /node_modules/,
diff --git a/test/cases/option-renderStage-default/webpack.config.js b/test/cases/option-renderStage-default/webpack.config.js
@@ -42,7 +42,7 @@ module.exports = {
         use: ['css-loader'],
       },
       {
-        test: /\.(ico|png|jp?g|svg)/,
+        test: /\.(ico|png|jpe?g|svg)/,
         type: 'asset/resource',
         generator: {
           filename: 'img/[name].[hash:8][ext]',
diff --git a/test/cases/resolve-asset-filenames-in-relative-entry/expected/css/style.7947baa4.css b/test/cases/resolve-asset-filenames-in-relative-entry/expected/css/style.7947baa4.css
@@ -0,0 +1,3 @@
+h1 {
+  color: orangered;
+}
diff --git a/test/cases/resolve-asset-filenames-in-relative-entry/expected/home/index.html b/test/cases/resolve-asset-filenames-in-relative-entry/expected/home/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Test</title>
+    <link href="../css/style.7947baa4.css" rel="stylesheet">
+    <script src="../js/main.7693a3d5.js" defer="defer"></script>
+  </head>
+  <body>
+    <h1>Hello World!</h1>
+  </body>
+</html>
diff --git a/test/cases/resolve-asset-filenames-in-relative-entry/expected/js/main.7693a3d5.js b/test/cases/resolve-asset-filenames-in-relative-entry/expected/js/main.7693a3d5.js
@@ -0,0 +1 @@
+console.log(">> main.js");
diff --git a/test/cases/resolve-asset-filenames-in-relative-entry/expected/news/sport/index.html b/test/cases/resolve-asset-filenames-in-relative-entry/expected/news/sport/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Test</title>
+    <link href="../../css/style.7947baa4.css" rel="stylesheet">
+    <script src="../../js/main.7693a3d5.js" defer="defer"></script>
+  </head>
+  <body>
+    <h1>Hello World!</h1>
+  </body>
+</html>
diff --git a/test/cases/resolve-asset-filenames-in-relative-entry/src/main.js b/test/cases/resolve-asset-filenames-in-relative-entry/src/main.js
@@ -0,0 +1 @@
+console.log('>> main.js');
diff --git a/test/cases/resolve-asset-filenames-in-relative-entry/src/style.css b/test/cases/resolve-asset-filenames-in-relative-entry/src/style.css
@@ -0,0 +1,3 @@
+h1 {
+  color: orangered;
+}
diff --git a/test/cases/resolve-asset-filenames-in-relative-entry/src/views/index.html b/test/cases/resolve-asset-filenames-in-relative-entry/src/views/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Test</title>
+    <link href="@src/style.css" rel="stylesheet">
+    <script src="@src/main.js" defer="defer"></script>
+  </head>
+  <body>
+    <h1>Hello World!</h1>
+  </body>
+</html>
diff --git a/test/cases/resolve-asset-filenames-in-relative-entry/webpack.config.js b/test/cases/resolve-asset-filenames-in-relative-entry/webpack.config.js
@@ -0,0 +1,55 @@
+const path = require('path');
+const HtmlBundlerPlugin = require('@test/html-bundler-webpack-plugin');
+
+module.exports = {
+  mode: 'production',
+
+  output: {
+    path: path.join(__dirname, 'dist/'),
+  },
+
+  resolve: {
+    alias: {
+      //'@src': './src',
+      '@src': path.join(__dirname, 'src'),
+    },
+  },
+
+  plugins: [
+    new HtmlBundlerPlugin({
+      entry: {
+        'home/index': './src/views/index.html',
+        about: {
+          import: './src/views/index.html',
+          filename: 'news/sport/index.html',
+        },
+      },
+      js: {
+        filename: 'js/[name].[contenthash:8].js',
+      },
+      css: {
+        filename: 'css/[name].[contenthash:8].css',
+      },
+    }),
+  ],
+
+  module: {
+    rules: [
+      {
+        test: /\.(css)$/,
+        use: [
+          {
+            loader: 'css-loader',
+          },
+        ],
+      },
+      {
+        test: /\.(ico|png|jpe?g|svg)/,
+        type: 'asset/resource',
+        generator: {
+          filename: 'img/[name].[hash:8][ext]',
+        },
+      },
+    ],
+  },
+};
diff --git a/test/cases/resolve-js-css-assets/webpack.config.js b/test/cases/resolve-js-css-assets/webpack.config.js
diff --git a/test/cases/resolve-relative-paths/webpack.config.js b/test/cases/resolve-relative-paths/webpack.config.js
diff --git a/test/integration.test.js b/test/integration.test.js
diff --git a/test/manual/cache-filesystem-react/webpack.config.js b/test/manual/cache-filesystem-react/webpack.config.js
diff --git a/test/manual/hello-world/webpack.config.js b/test/manual/hello-world/webpack.config.js

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ module.exports = {`
`53`	`53`	`],`
`54`	`54`	`},`
`55`	`55`	`{`
`56`		`- test: /\.(ico\|png\|jp?g\|svg)/,`
	`56`	`+ test: /\.(ico\|png\|jpe?g\|svg)/,`
`57`	`57`	`type: 'asset/resource',`
`58`	`58`	`generator: {`
`59`	`59`	`filename: 'img/[name].[hash:8][ext]',`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ module.exports = {`
`52`	`52`	`use: ['css-loader', 'sass-loader'],`
`53`	`53`	`},`
`54`	`54`	`{`
`55`		`- test: /\.(ico\|png\|jp?g\|svg)/,`
	`55`	`+ test: /\.(ico\|png\|jpe?g\|svg)/,`
`56`	`56`	`type: 'asset/resource',`
`57`	`57`	`generator: {`
`58`	`58`	`filename: 'img/[name].[hash:8][ext]',`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ module.exports = {`
`33`	`33`	`use: ['css-loader', 'sass-loader'],`
`34`	`34`	`},`
`35`	`35`	`{`
`36`		`- test: /\.(ico\|png\|jp?g\|svg)/,`
	`36`	`+ test: /\.(ico\|png\|jpe?g\|svg)/,`
`37`	`37`	`type: 'asset/resource',`
`38`	`38`	`generator: {`
`39`	`39`	`filename: 'img/[name].[hash:8][ext]',`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ module.exports = {`
`31`	`31`	`use: ['css-loader', 'sass-loader'],`
`32`	`32`	`},`
`33`	`33`	`{`
`34`		`- test: /\.(ico\|png\|jp?g\|svg)/,`
	`34`	`+ test: /\.(ico\|png\|jpe?g\|svg)/,`
`35`	`35`	`type: 'asset/resource',`
`36`	`36`	`generator: {`
`37`	`37`	`filename: 'img/[name].[hash:8][ext]',`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ module.exports = {`
`38`	`38`	`use: ['css-loader', 'sass-loader'],`
`39`	`39`	`},`
`40`	`40`	`{`
`41`		`- test: /\.(ico\|png\|jp?g\|svg)/,`
	`41`	`+ test: /\.(ico\|png\|jpe?g\|svg)/,`
`42`	`42`	`type: 'asset/resource',`
`43`	`43`	`generator: {`
`44`	`44`	`filename: 'img/[name].[hash:8][ext]',`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ module.exports = {`
`54`	`54`	`],`
`55`	`55`	`},`
`56`	`56`	`{`
`57`		`- test: /\.(ico\|png\|jp?g\|svg)/,`
	`57`	`+ test: /\.(ico\|png\|jpe?g\|svg)/,`
`58`	`58`	`type: 'asset/resource',`
`59`	`59`	`generator: {`
`60`	`60`	`filename: 'img/[name].[hash:8][ext]',`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ module.exports = {`
`41`	`41`	`use: ['css-loader', 'sass-loader'],`
`42`	`42`	`},`
`43`	`43`	`{`
`44`		`- test: /\.(ico\|png\|jp?g\|svg)/,`
	`44`	`+ test: /\.(ico\|png\|jpe?g\|svg)/,`
`45`	`45`	`type: 'asset/resource',`
`46`	`46`	`generator: {`
`47`	`47`	`filename: 'img/[name].[hash:8][ext]',`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ module.exports = {`
`39`	`39`	`use: ['css-loader', 'sass-loader'],`
`40`	`40`	`},`
`41`	`41`	`{`
`42`		`- test: /\.(ico\|png\|jp?g\|svg)/,`
	`42`	`+ test: /\.(ico\|png\|jpe?g\|svg)/,`
`43`	`43`	`type: 'asset',`
`44`	`44`	`generator: {`
`45`	`45`	`filename: 'img/[name].[hash:8][ext]', // save to file images >= 2 KB`