Merge pull request #617 from CourseOrchestra/webpack

webpack4 -> webpack5

Author: anlug1

src/main/javascript/lyra/.babelrc.js

@@ -2,8 +2,6 @@ module.exports = {
     presets: [['@babel/env']],
     plugins: [
         'rewire',
-        ['babel-plugin-istanbul', {
-            extension: ['.js', '.vue']
-        }]
+        ['istanbul', {extension: ['.js', '.vue']}]
     ]
 };

src/main/javascript/lyra/karma.conf.js

@@ -1,10 +1,9 @@
-process.env.CHROME_BIN = require('puppeteer')
-  .executablePath();
+process.env.CHROME_BIN = require('puppeteer').executablePath();
 const webpackConfig = require('./webpack.config');
 
 module.exports = function setConfig(config) {
   config.set({
-    frameworks: ['mocha', 'sinon-chai'],
+    frameworks: ['mocha', 'sinon-chai', 'webpack'],
 
     preprocessors: {
       '**/*.spec.js': ['webpack'],
@@ -46,10 +45,9 @@ module.exports = function setConfig(config) {
       ],
     },
 
-    singleRun: true,
-
     browserNoActivityTimeout: 900000,
 
+    singleRun: true,
     browsers: ['ChromeHeadless'],
     // browsers: ['Chrome'],
 

src/main/javascript/lyra/package.json

@@ -47,14 +47,13 @@
     "babel-plugin-rewire": "^1.2.0",
     "chai": "^4.3.4",
     "css-loader": "^5.2.6",
-    "dojo-webpack-plugin": "^2.8.19",
+    "dojo-webpack-plugin": "^3.0.1",
     "eslint": "^7.29.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-plugin-chai-expect": "^2.2.0",
     "eslint-plugin-chai-friendly": "^0.7.1",
     "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-vue": "^7.12.1",
-    "file-loader": "^6.2.0",
     "karma": "^6.3.4",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^3.1.0",
@@ -63,15 +62,16 @@
     "karma-sinon": "^1.0.5",
     "karma-sinon-chai": "^2.0.2",
     "karma-spec-reporter": "^0.0.32",
-    "karma-webpack": "^4.0.2",
+    "karma-webpack": "^5.0.0",
     "mocha": "^9.0.1",
     "puppeteer": "^10.1.0",
     "sinon": "^11.1.1",
     "sinon-chai": "^3.7.0",
-    "style-loader": "^2.0.0",
+    "style-loader": "^3.0.0",
+    "url-loader": "^4.1.1",
     "vue-loader": "^15.9.7",
     "vue-template-compiler": "^2.6.14",
-    "webpack": "^4.46.0"
+    "webpack": "^5.41.1"
   },
   "directories": {
     "lib": "."

src/main/javascript/lyra/test/unit/LyraGrid.spec.js

@@ -38,7 +38,7 @@ describe('LyraGrid.vue', () => {
         },
       });
 
-      setImmediate(() => {
+      setTimeout(() => {
         wrapper.vm.grid.startup();
         req.respond(200,
           {
@@ -47,7 +47,7 @@ describe('LyraGrid.vue', () => {
           },
           JSON.stringify(mockData));
         done();
-      });
+      }, 0);
     });
     after(() => {
       sinon.useFakeXMLHttpRequest()
@@ -224,7 +224,7 @@ describe('LyraGrid.vue', () => {
         },
       });
 
-      setImmediate(() => {
+      setTimeout(() => {
         wrapper.vm.grid.startup();
         req.respond(200,
           {
@@ -233,7 +233,7 @@ describe('LyraGrid.vue', () => {
           },
           JSON.stringify(mockData));
         done();
-      });
+      }, 0);
     });
     after(() => {
       sinon.useFakeXMLHttpRequest()
@@ -318,7 +318,7 @@ describe('LyraGrid.vue', () => {
         },
       });
 
-      setImmediate(() => {
+      setTimeout(() => {
         wrapper.vm.grid.startup();
         req.respond(200,
           {
@@ -327,7 +327,7 @@ describe('LyraGrid.vue', () => {
           },
           JSON.stringify(mockData));
         done();
-      });
+      }, 0);
     });
     afterEach(() => {
       sinon.useFakeXMLHttpRequest()
@@ -568,10 +568,10 @@ describe('LyraGrid.vue', () => {
     });
 
     it('lyra grid div not found', (done) => {
-      setImmediate(() => {
+      setTimeout(() => {
         expect(wrapper.vm.grid).to.be.undefined;
         done();
-      });
+      }, 0);
     });
   });
 
@@ -614,7 +614,7 @@ describe('LyraGrid.vue', () => {
         },
       });
 
-      setImmediate(() => {
+      setTimeout(() => {
         wrapper.vm.grid.startup();
         req.respond(200,
           {
@@ -623,7 +623,7 @@ describe('LyraGrid.vue', () => {
           },
           JSON.stringify(mockData));
         done();
-      });
+      }, 0);
     });
     after(() => {
       sinon.useFakeXMLHttpRequest()
@@ -740,10 +740,10 @@ describe('LyraGrid.vue', () => {
         },
       });
 
-      setImmediate(() => {
+      setTimeout(() => {
         showMessage.should.have.been.calledOnceWith(requestError);
         done();
-      });
+      }, 0);
     });
   });
 
@@ -783,7 +783,7 @@ describe('LyraGrid.vue', () => {
         },
       });
 
-      setImmediate(() => {
+      setTimeout(() => {
         wrapper.vm.grid.startup();
         req.respond(200,
           {
@@ -792,7 +792,7 @@ describe('LyraGrid.vue', () => {
           },
           JSON.stringify(mockData));
         done();
-      });
+      }, 0);
     });
     afterEach(() => {
       sinon.useFakeXMLHttpRequest()

src/main/javascript/lyra/webpack.config.js

@@ -24,10 +24,7 @@ module.exports = {
       },
       {
         test: /\.(png|jpg|gif|svg)$/,
-        loader: 'file-loader',
-        options: {
-          name: '[name].[ext]?[hash]',
-        },
+        loader: 'url-loader',
       },
     ],
   },
@@ -42,4 +39,8 @@ module.exports = {
     }),
   ],
 
+  optimization: {
+    splitChunks: false,
+  },
+
 };