diff --git a/assets/app.js b/assets/app.js
index b5af402d6574bc6860b2adf36e01e71e6212cb07..acfc62b133e5866ecb2f84684c692914dcd7edd3 100644
--- a/assets/app.js
+++ b/assets/app.js
@@ -1,5 +1,2 @@
-require('./app.scss');
-
+import './app.scss';
import './theme.js';
-import $ from "jquery";
-import 'bootstrap';
diff --git a/assets/vendor.js b/assets/vendor.js
index 8e554a3ce6a43381863ee14c7d6ef6639d4fbab7..3c4cc5a775851ad69e62e0ac703f1e0d7a0ca1ca 100644
--- a/assets/vendor.js
+++ b/assets/vendor.js
@@ -1,6 +1,3 @@
-// jQuery
-import jQuery from 'jquery';
-
// FA
import 'admin-lte/plugins/fontawesome-free/css/all.min.css';
diff --git a/webpack.config.js b/webpack.config.js
index ca3e66987d594807426ec33c808dbe4961f2e104..4bb9a9c0f09423828ee12f2401601b2e66cdb3f2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,7 +3,7 @@ var webpack = require("webpack");
var css = require("mini-css-extract-plugin");
module.exports = {
- mode: "development",
+ mode: "production",
entry: {
app: "./assets/app.js",
vendor: "./assets/vendor.js"
@@ -33,13 +33,6 @@ module.exports = {
{
test: /\.woff($|\?)|\.woff2($|\?)|\.ttf($|\?)|\.eot($|\?)|\.svg($|\?)/,
use: ['url-loader']
- },
- {
- test: require.resolve("jquery"),
- loader: "expose-loader",
- options: {
- exposes: ["$", "jquery"],
- },
}
]
},
@@ -47,10 +40,6 @@ module.exports = {
new css({
filename: "[name].css",
chunkFilename: "[id].css"
- }),
- new webpack.ProvidePlugin({
- $: "jquery",
- jQuery: "jquery"
- })
+ })
]
}
diff --git a/yarn.lock b/yarn.lock
index 187b0fe64e7f9274aadb575efc039f195aa6ec14..923c562f946366d9a47da777108e6203661f9109 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1978,7 +1978,12 @@
dependencies:
"estraverse" "^5.2.0"
-"estraverse@^4.1.1", "estraverse@^4.2.0":
+"estraverse@^4.1.1":
+ "integrity" "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+ "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
+ "version" "4.3.0"
+
+"estraverse@^4.2.0":
"integrity" "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
"resolved" "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
"version" "4.3.0"
@@ -2419,7 +2424,7 @@
"resolved" "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.19.3.tgz"
"version" "1.19.3"
-"jquery@^1.7 || ^2.0 || ^3.1", "jquery@^3.0 || ^2.0 || ^1.0", "jquery@^3.4.0", "jquery@^3.5.1", "jquery@^3.6.0", "jquery@>=1.10", "jquery@>=1.12.0", "jquery@>=1.7", "jquery@>=1.8", "jquery@>=1.9.0", "jquery@>=2.1.0", "jquery@1.9.1 - 3":
+"jquery@^1.7 || ^2.0 || ^3.1", "jquery@^3.0 || ^2.0 || ^1.0", "jquery@^3.4.0", "jquery@^3.5.0", "jquery@^3.5.1", "jquery@^3.6.0", "jquery@>=1.10", "jquery@>=1.12.0", "jquery@>=1.7", "jquery@>=1.8", "jquery@>=1.9.0", "jquery@>=2.1.0", "jquery@1.9.1 - 3":
"integrity" "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
"resolved" "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz"
"version" "3.6.0"
@@ -2627,7 +2632,7 @@
"resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"
"version" "1.2.5"
-"moment-timezone@^0.5.31":
+"moment-timezone@^0.5.28", "moment-timezone@^0.5.31":
"integrity" "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w=="
"resolved" "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz"
"version" "0.5.33"
@@ -2639,6 +2644,11 @@
"resolved" "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"
"version" "2.29.1"
+"moment@~2.24.0":
+ "integrity" "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+ "resolved" "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"
+ "version" "2.24.0"
+
"ms@2.1.2":
"integrity" "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
"resolved" "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
@@ -3179,17 +3189,17 @@
"buffer-from" "^1.0.0"
"source-map" "^0.6.0"
-"source-map@^0.5.0":
+"source-map@^0.5.0", "source-map@^0.5.6":
"integrity" "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
"resolved" "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
"version" "0.5.7"
-"source-map@^0.5.6":
- "integrity" "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
- "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
- "version" "0.5.7"
+"source-map@^0.6.0":
+ "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+ "version" "0.6.1"
-"source-map@^0.6.0", "source-map@^0.6.1", "source-map@~0.6.1":
+"source-map@^0.6.1":
"integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
"resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
"version" "0.6.1"
@@ -3201,6 +3211,11 @@
dependencies:
"amdefine" ">=0.0.4"
+"source-map@~0.6.1":
+ "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+ "version" "0.6.1"
+
"source-map@~0.7.2":
"integrity" "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
"resolved" "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"
@@ -3302,6 +3317,15 @@
"moment-timezone" "^0.5.31"
"popper.js" "^1.16.1"
+"tempusdominus-core@5.19.0":
+ "integrity" "sha512-7a4oBQw4cjz6C87BLRg3KHVvzpnPlnRTkuDZ7SwcJayQQ4QgOryX5u6wj0q07TXhgtMQLCntZO6nVhHIKPaeUw=="
+ "resolved" "https://registry.npmjs.org/tempusdominus-core/-/tempusdominus-core-5.19.0.tgz"
+ "version" "5.19.0"
+ dependencies:
+ "jquery" "^3.5.0"
+ "moment" "~2.24.0"
+ "moment-timezone" "^0.5.28"
+
"terser-webpack-plugin@^5.1.1":
"integrity" "sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q=="
"resolved" "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz"