refactor: dropped webpack@4 (#339)

BREAKING CHANGE: minimum supported `webpack` version is `5`

Author: cap-Bernardito

.github/workflows/nodejs.yml

@@ -56,7 +56,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         node-version: [10.x, 12.x, 14.x]
-        webpack-version: [4, latest]
+        webpack-version: [latest]
 
     runs-on: ${{ matrix.os }}
 

package-lock.json

@@ -40,44 +40,43 @@
     "dist"
   ],
   "peerDependencies": {
-    "webpack": "^4.0.0 || ^5.0.0"
+    "webpack": "^5.0.0"
   },
   "dependencies": {
     "html-minifier-terser": "^5.1.1",
     "loader-utils": "^2.0.0",
-    "parse5-sax-parser": "^6.0.1",
-    "schema-utils": "^3.0.0"
+    "parse5-sax-parser": "^6.0.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.1",
-    "@babel/core": "^7.12.3",
-    "@babel/preset-env": "^7.12.1",
+    "@babel/cli": "^7.12.10",
+    "@babel/core": "^7.12.10",
+    "@babel/preset-env": "^7.12.11",
     "@commitlint/cli": "^11.0.0",
     "@commitlint/config-conventional": "^11.0.0",
     "@webpack-contrib/defaults": "^6.3.0",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
     "babel-jest": "^26.6.3",
-    "cross-env": "^7.0.2",
+    "cross-env": "^7.0.3",
     "del": "^6.0.0",
     "del-cli": "^3.0.1",
-    "es-check": "^5.1.2",
-    "eslint": "^7.13.0",
-    "eslint-config-prettier": "^6.15.0",
+    "es-check": "^5.2.0",
+    "eslint": "^7.19.0",
+    "eslint-config-prettier": "^7.2.0",
     "eslint-plugin-import": "^2.22.1",
     "file-loader": "^6.2.0",
     "handlebars": "^4.7.6",
-    "husky": "^4.3.0",
+    "husky": "^4.3.8",
     "jest": "^26.6.3",
-    "lint-staged": "^10.5.1",
+    "lint-staged": "^10.5.3",
     "memfs": "^3.2.0",
     "npm-run-all": "^4.1.5",
-    "posthtml": "^0.14.0",
+    "posthtml": "^0.15.1",
     "posthtml-webp": "^2.1.0",
     "prettier": "^2.1.2",
     "standard-version": "^9.0.0",
     "unescape-unicode": "^0.2.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.5.0"
+    "webpack": "^5.19.0"
   },
   "keywords": [
     "webpack",

package.json

@@ -1,5 +1,4 @@
-import { getOptions, stringifyRequest } from 'loader-utils';
-import { validate } from 'schema-utils';
+import { stringifyRequest } from 'loader-utils';
 
 import { sourcePlugin, minimizerPlugin } from './plugins';
 import {
@@ -13,13 +12,7 @@ import {
 import schema from './options.json';
 
 export default async function loader(content) {
-  const rawOptions = getOptions(this);
-
-  validate(schema, rawOptions, {
-    name: 'HTML Loader',
-    baseDataPath: 'options',
-  });
-
+  const rawOptions = this.getOptions(schema);
   const options = normalizeOptions(rawOptions, this);
 
   if (options.preprocessor) {

src/index.js

@@ -1,4 +1,5 @@
 {
+  "title": "HTML Loader options",
   "type": "object",
   "definitions": {
     "Attribute": {

src/options.json

@@ -19,8 +19,8 @@ export default (options) =>
     const urlFilter = getFilter(maybeUrlFilter, (value) =>
       isUrlRequest(value, root)
     );
-    const getAttribute = (tag, attribute, attributes, resourcePath) => {
-      return list.find((element) => {
+    const getAttribute = (tag, attribute, attributes, resourcePath) =>
+      list.find((element) => {
         const foundTag =
           typeof element.tag === 'undefined' ||
           (typeof element.tag !== 'undefined' &&
@@ -47,7 +47,6 @@ export default (options) =>
           ? element.filter(tag, attribute, adaptedAttributes, resourcePath)
           : true;
       });
-    };
 
     const { resourcePath } = options;
     const parser5 = new SAXParser({ sourceCodeLocationInfo: true });
@@ -141,9 +140,11 @@ export default (options) =>
               return;
             }
 
-            sourceSet = sourceSet.map((item) => ({
-              source: c0ControlCodesExclude(item.source),
-            }));
+            sourceSet = sourceSet.map((item) => {
+              return {
+                source: c0ControlCodesExclude(item.source),
+              };
+            });
 
             let searchFrom = name.length;
 
@@ -213,7 +214,6 @@ export default (options) =>
       const request = requestify(normalizedUrl, root);
       const newUrl = prefix ? `${prefix}!${request}` : request;
       const importKey = newUrl;
-
       let importName = imports.get(importKey);
 
       if (!importName) {

src/plugins/source-plugin.js

@@ -246,9 +246,7 @@ describe("'attributes' option", () => {
             attribute: 'src',
             type: 'src',
             // eslint-disable-next-line no-unused-vars
-            filter: (tag, attribute, attributes) => {
-              return tag.toLowerCase() !== 'img';
-            },
+            filter: (tag, attribute, attributes) => tag.toLowerCase() !== 'img',
           },
         ],
       },