Merge branch 'master' into dependabot/npm_and_yarn/css-loader-6.7.1dependabot/npm_and_yarn/css-loader-6.7.1

4 files changed, 24 insertions, 27 deletions

diff --git a/app.js b/app.js
index f89ac5ab1..b1ddaada9 100644
--- a/app.js
+++ b/app.js
@@ -64,7 +64,7 @@ app.use(require('webpack-dev-middleware')(
     compiler,
     {
         publicPath: '/dist',
-        logLevel: 'warn'
+        stats: 'errors-warnings'
     }
 ));
 
diff --git a/karma.conf.js b/karma.conf.js
index 789e85c84..e5fbe40ab 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -96,8 +96,7 @@ module.exports = (config) => {
         },
         webpack: webpackConfig,
         webpackMiddleware: {
-            stats: 'errors-only',
-            logLevel: 'warn'
+            stats: 'errors-warnings'
         },
         concurrency: 1,
         singleRun: true,
diff --git a/package.json b/package.json
index cd5a1629f..ee052ddef 100644
--- a/package.json
+++ b/package.json
@@ -32,10 +32,8 @@
     "eventemitter3": "1.2.0",
     "exports-loader": "0.7.0",
     "express": "4.13.1",
-    "file-loader": "6.2.0",
     "file-saver": "2.0.5",
     "git-rev-sync": "3.0.2",
-    "html-loader": "0.5.5",
     "html2canvas": "1.4.1",
     "imports-loader": "0.8.0",
     "jasmine-core": "4.0.1",
@@ -76,13 +74,13 @@
     "vue-template-compiler": "2.6.14",
     "webpack": "5.68.0",
     "webpack-cli": "4.9.2",
-    "webpack-dev-middleware": "3.7.3",
+    "webpack-dev-middleware": "5.3.1",
     "webpack-hot-middleware": "2.25.1",
     "webpack-merge": "5.8.0",
     "zepto": "1.2.0"
   },
   "scripts": {
-    "clean": "rm -rf ./dist ./node_modules; rm package-lock.json",
+    "clean": "rm -rf ./dist ./node_modules ./package-lock.json",
     "clean-test-lint": "npm run clean; npm install; npm run test; npm run lint",
     "start": "node app.js",
     "lint": "eslint example src --ext .js,.vue openmct.js",
diff --git a/webpack.common.js b/webpack.common.js
index 9eb980b11..a508c7572 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -99,7 +99,7 @@ const config = {
             },
             {
                 test: /\.html$/,
-                use: 'html-loader'
+                type: 'asset/source'
             },
             {
                 test: /zepto/,
@@ -109,25 +109,24 @@ const config = {
                 ]
             },
             {
-                test: /\.(jpg|jpeg|png|svg|ico|woff|woff2?|eot|ttf)$/,
-                loader: 'file-loader',
-                options: {
-                    name: '[name].[ext]',
-                    outputPath(url, resourcePath, context) {
-                        if (/\.(jpg|jpeg|png|svg)$/.test(url)) {
-                            return `images/${url}`;
-                        }
-
-                        if (/\.ico$/.test(url)) {
-                            return `icons/${url}`;
-                        }
-
-                        if (/\.(woff|woff2?|eot|ttf)$/.test(url)) {
-                            return `fonts/${url}`;
-                        } else {
-                            return `${url}`;
-                        }
-                    }
+                test: /\.(jpg|jpeg|png|svg)$/,
+                type: 'asset/resource',
+                generator: {
+                    filename: 'images/[name][ext]'
+                }
+            },
+            {
+                test: /\.ico$/,
+                type: 'asset/resource',
+                generator: {
+                    filename: 'icons/[name][ext]'
+                }
+            },
+            {
+                test: /\.(woff|woff2?|eot|ttf)$/,
+                type: 'asset/resource',
+                generator: {
+                    filename: 'fonts/[name][ext]'
                 }
             }
         ]
@@ -135,4 +134,5 @@ const config = {
     stats: 'errors-warnings'
 };
 
+// eslint-disable-next-line no-undef
 module.exports = config;