Patternslib · thet · Dec 7, 2022 · Dec 7, 2022 · Dec 7, 2022 · Dec 7, 2022
diff --git a/.modernizrrc.js b/.modernizrrc.js
@@ -1,167 +1,166 @@
 module.exports = {
-  "classPrefix": "",
-  "options": [
-    "addTest",
-    "atRule",
-    "domPrefixes",
-    "hasEvent",
-    "html5shiv",
-    "html5printshiv",
-    "load",
-    "mq",
-    "prefixed",
-    "prefixes",
-    "prefixedCSS",
-    "setClasses",
-    "testAllProps",
-    "testProp",
-    "testStyles"
-  ],
-  "feature-detects": [
-    "a/download",
-    "applicationcache",
-    "blob",
-    "canvas",
-    "canvas/blending",
-    "canvas/todataurl",
-    "canvas/winding",
-    "canvastext",
-    "contenteditable",
-    "contextmenu",
-    "cookies",
-    "cors",
-    "custom-elements",
-    "css/all",
-    "css/animations",
-    "css/appearance",
-    "css/backdropfilter",
-    "css/backgroundblendmode",
-    "css/backgroundcliptext",
-    "css/backgroundposition-shorthand",
-    "css/backgroundposition-xy",
-    "css/backgroundrepeat",
-    "css/backgroundsize",
-    "css/backgroundsizecover",
-    "css/borderimage",
-    "css/borderradius",
-    "css/boxshadow",
-    "css/boxsizing",
-    "css/calc",
-    "css/checked",
-    "css/chunit",
-    "css/columns",
-    "css/cssgrid",
-    "css/cubicbezierrange",
-    "css/displayrunin",
-    "css/displaytable",
-    "css/ellipsis",
-    "css/escape",
-    "css/exunit",
-    "css/filters",
-    "css/flexbox",
-    "css/flexboxlegacy",
-    "css/flexboxtweener",
-    "css/flexwrap",
-    "css/fontface",
-    "css/generatedcontent",
-    "css/gradients",
-    "css/hairline",
-    "css/hsla",
-    "css/invalid",
-    "css/lastchild",
-    "css/mask",
-    "css/mediaqueries",
-    "css/multiplebgs",
-    "css/nthchild",
-    "css/objectfit",
-    "css/opacity",
-    "css/overflow-scrolling",
-    "css/pointerevents",
-    "css/positionsticky",
-    "css/pseudoanimations",
-    "css/pseudotransitions",
-    "css/reflections",
-    "css/regions",
-    "css/remunit",
-    "css/resize",
-    "css/rgba",
-    "css/scrollbars",
-    "css/scrollsnappoints",
-    "css/shapes",
-    "css/siblinggeneral",
-    "css/subpixelfont",
-    "css/supports",
-    "css/target",
-    "css/textalignlast",
-    "css/textshadow",
-    "css/transforms",
-    "css/transformslevel2",
-    "css/transforms3d",
-    "css/transformstylepreserve3d",
-    "css/transitions",
-    "css/userselect",
-    "css/valid",
-    "css/vhunit",
-    "css/vmaxunit",
-    "css/vminunit",
-    "css/vwunit",
-    "css/will-change",
-    "css/wrapflow",
-    "dom/classlist",
-    "dom/createElement-attrs",
-    "dom/dataset",
-    "dom/documentfragment",
-    "dom/hidden",
-    "dom/microdata",
-    "dom/mutationObserver",
-    "dom/passiveeventlisteners",
-    "event/deviceorientation-motion",
-    "event/oninput",
-    "eventlistener",
-    "exif-orientation",
-    "forms/capture",
-    "forms/fileinput",
-    "forms/fileinputdirectory",
-    "forms/formattribute",
-    "forms/placeholder",
-    "forms/requestautocomplete",
-    "forms/validation",
-    "inputtypes",
-    "fullscreen-api",
-    "hashchange",
-    "hiddenscroll",
-    "history",
-    "htmlimports",
-    "iframe/sandbox",
-    "iframe/seamless",
-    "iframe/srcdoc",
-    "json",
-    "mediaquery/hovermq",
-    "mediaquery/pointermq",
-    "notification",
-    "pagevisibility-api",
-    "performance",
-    "postmessage",
-    "proximity",
-    "queryselector",
-    "requestanimationframe",
-    "storage/localstorage",
-    "storage/sessionstorage",
-    "storage/websqldatabase",
-    "touchevents",
-    "unicode",
-    "unicode-range",
-    "url/bloburls",
-    "url/data-uri",
-    "url/parser",
-    "url/urlsearchparams",
-    "userdata",
-    "vibration",
-    "video",
-    "video/autoplay",
-    "video/crossorigin",
-    "video/loop",
-    "video/preload",
-    "xdomainrequest"
-  ]
+    "classPrefix": "",
+    "enableClasses": true,
+    "enableJSClass": true,
+    "options": [
+        "addTest",
+        "atRule",
+        "domPrefixes",
+        "hasEvent",
+        "html5shiv",
+        "html5printshiv",
+        "load",
+        "mq",
+        "prefixed",
+        "prefixes",
+        "prefixedCSS",
+        "setClasses",
+    ],
+    "feature-detects": [
+        "a/download",
+        "applicationcache",
+        "blob",
+        "canvas",
+        "canvas/blending",
+        "canvas/todataurl",
+        "canvas/winding",
+        "canvastext",
+        "contenteditable",
+        "contextmenu",
+        "cookies",
+        "cors",
+        "custom-elements",
+        "css/all",
+        "css/animations",
+        "css/appearance",
+        "css/backdropfilter",
+        "css/backgroundblendmode",
+        "css/backgroundcliptext",
+        "css/backgroundposition-shorthand",
+        "css/backgroundposition-xy",
+        "css/backgroundrepeat",
+        "css/backgroundsize",
+        "css/backgroundsizecover",
+        "css/borderimage",
+        "css/borderradius",
+        "css/boxshadow",
+        "css/boxsizing",
+        "css/calc",
+        "css/checked",
+        "css/chunit",
+        "css/columns",
+        "css/cssgrid",
+        "css/cubicbezierrange",
+        "css/displayrunin",
+        "css/displaytable",
+        "css/ellipsis",
+        "css/escape",
+        "css/exunit",
+        "css/filters",
+        "css/flexbox",
+        "css/flexboxlegacy",
+        "css/flexboxtweener",
+        "css/flexwrap",
+        "css/fontface",
+        "css/generatedcontent",
+        "css/gradients",
+        "css/hairline",
+        "css/hsla",
+        "css/invalid",
+        "css/lastchild",
+        "css/mask",
+        "css/mediaqueries",
+        "css/multiplebgs",
+        "css/nthchild",
+        "css/objectfit",
+        "css/opacity",
+        "css/overflow-scrolling",
+        "css/pointerevents",
+        "css/positionsticky",
+        "css/pseudoanimations",
+        "css/pseudotransitions",
+        "css/reflections",
+        "css/regions",
+        "css/remunit",
+        "css/resize",
+        "css/rgba",
+        "css/scrollbars",
+        "css/scrollsnappoints",
+        "css/shapes",
+        "css/siblinggeneral",
+        "css/subpixelfont",
+        "css/supports",
+        "css/target",
+        "css/textalignlast",
+        "css/textshadow",
+        "css/transforms",
+        "css/transformslevel2",
+        "css/transforms3d",
+        "css/transformstylepreserve3d",
+        "css/transitions",
+        "css/userselect",
+        "css/valid",
+        "css/vhunit",
+        "css/vmaxunit",
+        "css/vminunit",
+        "css/vwunit",
+        "css/will-change",
+        "css/wrapflow",
+        "dom/classlist",
+        "dom/createElement-attrs",
+        "dom/dataset",
+        "dom/documentfragment",
+        "dom/hidden",
+        "dom/microdata",
+        "dom/mutationObserver",
+        "dom/passiveeventlisteners",
+        "event/deviceorientation-motion",
+        "event/oninput",
+        "eventlistener",
+        "exif-orientation",
+        "forms/capture",
+        "forms/fileinput",
+        "forms/fileinputdirectory",
+        "forms/formattribute",
+        "forms/placeholder",
+        "forms/requestautocomplete",
+        "forms/validation",
+        "inputtypes",
+        "fullscreen-api",
+        "hashchange",
+        "hiddenscroll",
+        "history",
+        "htmlimports",
+        "iframe/sandbox",
+        "iframe/seamless",
+        "iframe/srcdoc",
+        "json",
+        "mediaquery/hovermq",
+        "mediaquery/pointermq",
+        "notification",
+        "pagevisibility-api",
+        "performance",
+        "postmessage",
+        "proximity",
+        "queryselector",
+        "requestanimationframe",
+        "storage/localstorage",
+        "storage/sessionstorage",
+        "storage/websqldatabase",
+        "touchevents",
+        "unicode",
+        "unicode-range",
+        "url/bloburls",
+        "url/data-uri",
+        "url/parser",
+        "url/urlsearchparams",
+        "userdata",
+        "vibration",
+        "video",
+        "video/autoplay",
+        "video/crossorigin",
+        "video/loop",
+        "video/preload",
+        "xdomainrequest",
+    ],
 };
diff --git a/package.json b/package.json
@@ -44,8 +44,9 @@
         "@patternslib/pat-tiptap": "^4.7.2",
         "@patternslib/pat-upload": "^3.1.1",
         "copy-webpack-plugin": "^11.0.0",
+        "modernizr": "^3.12.0",
         "pegjs": "0.11.0-master.b7b87ea",
-        "webpack-modernizr-loader": "^5.0.0"
+        "val-loader": "^5.0.1"
     },
     "resolutions": {
         "jquery": "3.6.2"

diff --git a/src/modernizr.js b/src/modernizr.js
@@ -0,0 +1,14 @@
+// From: https://github.com/webpack-contrib/val-loader#modernizr
+const modernizr = require("modernizr");
+
+module.exports = function (options) {
+    return new Promise(function (resolve) {
+        // It is impossible to throw an error because modernizr causes the process.exit(1)
+        modernizr.build(options, function (output) {
+            resolve({
+                cacheable: true,
+                code: `var modernizr; var hadGlobal = 'Modernizr' in window; var oldGlobal = window.Modernizr; ${output} modernizr = window.Modernizr; if (hadGlobal) { window.Modernizr = oldGlobal; } else { delete window.Modernizr; } export default modernizr;`,
+            });
+        });
+    });
+};
diff --git a/src/patterns.js b/src/patterns.js
@@ -79,7 +79,7 @@ import "@patternslib/pat-upload";
 // You might want to disable it for your project by setting:
 // window.__patternslib_disable_modernizr = true;
 if (!window.__patternslib_disable_modernizr) {
-    import("modernizr");
+    import("./modernizr");
 }
 
 registry.init();
diff --git a/webpack/webpack.config.js b/webpack/webpack.config.js
@@ -5,6 +5,7 @@ const mf_config = require("@patternslib/dev/webpack/webpack.mf");
 const package_json = require("../package.json");
 const path = require("path");
 const webpack_config = require("@patternslib/dev/webpack/webpack.config").config;
+const modernizr_config = require("../.modernizrrc.js");
 
 module.exports = () => {
     let config = {
@@ -22,12 +23,14 @@ module.exports = () => {
 
     // Modernizr
     config.module.rules.push({
-        test: /\.modernizrrc\.js$/,
-        loader: "webpack-modernizr-loader",
+        test: path.resolve(__dirname, "../src/modernizr.js"),
+        use: [
+            {
+                loader: "val-loader",
+                options: modernizr_config,
+            },
+        ],
     });
-    config.resolve.alias = {
-        modernizr$: path.resolve(__dirname, "../.modernizrrc.js"),
-    };
 
     // Module federation
     config.plugins.push(