From 9e243a469ae6544e8cf523ad09b959f541c3f565 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Wed, 11 Mar 2020 16:18:17 +0100
Subject: Upgrade to Kotlin 1.3.70 + other dependencies (Coroutinse,
 Serialization, Spring Boot) Major refactoring of build architecture.

---
 webpack.config.d/bootstrap.js |  1 -
 webpack.config.d/file.js      |  9 ++++++---
 webpack.config.d/jed.js       | 10 +++++++---
 webpack.config.d/jquery.js    | 14 +++++++++-----
 webpack.config.d/moment.js    | 16 ++++++++++++----
 webpack.config.d/webpack.js   |  1 +
 6 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 webpack.config.d/webpack.js

(limited to 'webpack.config.d')

diff --git a/webpack.config.d/bootstrap.js b/webpack.config.d/bootstrap.js
index 32a7c4d0..35b28e6a 100644
--- a/webpack.config.d/bootstrap.js
+++ b/webpack.config.d/bootstrap.js
@@ -1,4 +1,3 @@
 config.module.rules.push({test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'});
 config.module.rules.push({test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'});
 config.module.rules.push({test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'});
-config.module.rules.push({test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml'});
diff --git a/webpack.config.d/file.js b/webpack.config.d/file.js
index a5c7b5da..653ca21f 100644
--- a/webpack.config.d/file.js
+++ b/webpack.config.d/file.js
@@ -1,6 +1,9 @@
 config.module.rules.push(
     {
-        test: /\.(jpe?g|png|gif)$/i,
-        loader: 'file-loader'
+        test: /\.(jpe?g|png|gif|svg)$/i,
+        loader: 'file-loader',
+        options: {
+              esModule: false,
+        },
     }
-);
\ No newline at end of file
+);
diff --git a/webpack.config.d/jed.js b/webpack.config.d/jed.js
index a6d18464..9a970dd0 100644
--- a/webpack.config.d/jed.js
+++ b/webpack.config.d/jed.js
@@ -1,3 +1,7 @@
-config.plugins.push(new webpack.ProvidePlugin({
-    Jed: "jed"
-}));
+;(function() {
+    const webpack = require('webpack')
+
+    config.plugins.push(new webpack.ProvidePlugin({
+	Jed: "jed"
+    }));
+})();
diff --git a/webpack.config.d/jquery.js b/webpack.config.d/jquery.js
index bf5a1a20..e6c6b219 100644
--- a/webpack.config.d/jquery.js
+++ b/webpack.config.d/jquery.js
@@ -1,5 +1,9 @@
-config.plugins.push(new webpack.ProvidePlugin({
-    $: "jquery",
-    jQuery: "jquery",
-    "window.jQuery": "jquery"
-}));
+;(function() {
+    const webpack = require('webpack')
+
+    config.plugins.push(new webpack.ProvidePlugin({
+	$: "jquery",
+	jQuery: "jquery",
+	"window.jQuery": "jquery"
+    }));
+})();
diff --git a/webpack.config.d/moment.js b/webpack.config.d/moment.js
index e8db2ea0..94d91914 100644
--- a/webpack.config.d/moment.js
+++ b/webpack.config.d/moment.js
@@ -1,4 +1,12 @@
-config.plugins.push(new webpack.ProvidePlugin({
-    moment: "moment",
-    "window.moment": "moment"
-}));
+;(function() {
+    const webpack = require('webpack')
+    try {
+    	const moment = require("moment");
+
+        config.plugins.push(new webpack.ProvidePlugin({
+            moment: "moment",
+            "window.moment": "moment"
+        }));
+    } catch (e) {
+    }
+})();
diff --git a/webpack.config.d/webpack.js b/webpack.config.d/webpack.js
new file mode 100644
index 00000000..d627c368
--- /dev/null
+++ b/webpack.config.d/webpack.js
@@ -0,0 +1 @@
+config.resolve.modules.push("../../processedResources/Js/main");
-- 
cgit