Updated outdates packages.

Also includes updating webpack configs to support newer versions.
This commit is contained in:
2020-12-06 21:38:37 +01:00
parent a1a14b5361
commit 37f41ff894
8 changed files with 604 additions and 599 deletions

View File

@@ -2,7 +2,7 @@ try {
module.exports = require("../env/lottery.config"); module.exports = require("../env/lottery.config");
} catch (e) { } catch (e) {
console.error( console.error(
"You haven't defined lottery-configs, you sure you want to continue without them?" "⚠️ You haven't defined lottery-configs, you sure you want to continue without them?\n"
); );
module.exports = { module.exports = {
name: "NAME MISSING", name: "NAME MISSING",

View File

@@ -2,7 +2,7 @@ try {
module.exports = require("../env/push.config"); module.exports = require("../env/push.config");
} catch (e) { } catch (e) {
console.error( console.error(
"You haven't defined push-parameters, you sure you want to continue without them?" "⚠️ You haven't defined push-parameters, you sure you want to continue without them?\n"
); );
module.exports = { publicKey: false, privateKey: false, mailto: false }; module.exports = { publicKey: false, privateKey: false, mailto: false };
} }

View File

@@ -57,14 +57,6 @@ const webpackConfig = function(isDev) {
{ loader: "sass-loader", options: { sourceMap: isDev } } { loader: "sass-loader", options: { sourceMap: isDev } }
] ]
}, },
{
test: /\.sass$/,
use: [
isDev ? "vue-style-loader" : MiniCSSExtractPlugin.loader,
{ loader: "css-loader", options: { sourceMap: isDev } },
{ loader: "sass-loader", options: { sourceMap: isDev } }
]
},
{ {
test: /\.woff(2)?(\?[a-z0-9]+)?$/, test: /\.woff(2)?(\?[a-z0-9]+)?$/,
loader: "url-loader", loader: "url-loader",

View File

@@ -3,7 +3,7 @@
const { CleanWebpackPlugin } = require("clean-webpack-plugin"); const { CleanWebpackPlugin } = require("clean-webpack-plugin");
const path = require("path"); const path = require("path");
const webpack = require("webpack"); const webpack = require("webpack");
const merge = require("webpack-merge"); const { merge } = require("webpack-merge");
const HtmlWebpackPlugin = require("html-webpack-plugin"); const HtmlWebpackPlugin = require("html-webpack-plugin");
const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin"); const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
const MiniCSSExtractPlugin = require("mini-css-extract-plugin"); const MiniCSSExtractPlugin = require("mini-css-extract-plugin");
@@ -23,7 +23,7 @@ const webpackConfig = merge(commonConfig(false), {
output: { output: {
path: helpers.root("public/dist"), path: helpers.root("public/dist"),
publicPath: "/public/dist/", publicPath: "/public/dist/",
filename: "js/[name].bundle.[hash:7].js" filename: "js/[name].bundle.[fullhash:7].js"
}, },
optimization: { optimization: {
splitChunks: { splitChunks: {
@@ -64,7 +64,7 @@ const webpackConfig = merge(commonConfig(false), {
new CleanWebpackPlugin(), // clean output folder new CleanWebpackPlugin(), // clean output folder
new webpack.EnvironmentPlugin(environment), new webpack.EnvironmentPlugin(environment),
new MiniCSSExtractPlugin({ new MiniCSSExtractPlugin({
filename: "css/[name].[hash:7].css" filename: "css/[name].[fullhash:7].css"
}) })
] ]
}); });

View File

@@ -14,43 +14,43 @@
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@sentry/browser": "^5.27.4", "@sentry/browser": "^5.28.0",
"@sentry/integrations": "^5.27.4", "@sentry/integrations": "^5.28.0",
"@zxing/library": "^0.15.2", "@zxing/library": "^0.18.3",
"canvas-confetti": "^1.2.0", "canvas-confetti": "^1.2.0",
"cross-env": "^7.0.3",
"chart.js": "^2.9.3", "chart.js": "^2.9.3",
"connect-mongo": "^3.2.0", "connect-mongo": "^3.2.0",
"express": "^4.17.1", "express": "^4.17.1",
"express-session": "^1.17.0", "express-session": "^1.17.0",
"moment": "^2.24.0", "moment": "^2.24.0",
"mongoose": "^5.10.9", "mongoose": "^5.11.4",
"node-fetch": "^2.6.0", "node-fetch": "^2.6.0",
"node-sass": "^4.13.0", "node-sass": "^5.0.0",
"node-schedule": "^1.3.2", "node-schedule": "^1.3.2",
"passport": "^0.4.1", "passport": "^0.4.1",
"passport-local": "^1.0.0", "passport-local": "^1.0.0",
"passport-local-mongoose": "^6.0.1", "passport-local-mongoose": "^6.0.1",
"qrcode": "^1.4.4", "qrcode": "^1.4.4",
"socket.io": "^2.3.0", "socket.io": "^3.0.3",
"socket.io-client": "^2.3.0", "socket.io-client": "^3.0.3",
"vue": "~2.6", "vue": "~2.6",
"vue-router": "~3.0", "vue-router": "~3.4.9",
"vuex": "^3.1.1", "vuex": "^3.6.0",
"web-push": "^3.4.3" "web-push": "^3.4.3"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "~7.12", "@babel/core": "~7.12",
"@babel/preset-env": "~7.12", "@babel/preset-env": "~7.12",
"babel-loader": "~8.0", "babel-loader": "~8.2.2",
"clean-webpack-plugin": "^3.0.0", "clean-webpack-plugin": "^3.0.0",
"core-js": "3", "core-js": "3.8.1",
"cross-env": "^6.0.3", "css-loader": "^5.0.1",
"css-loader": "^3.2.0",
"file-loader": "^6.2.0", "file-loader": "^6.2.0",
"friendly-errors-webpack-plugin": "~1.7", "friendly-errors-webpack-plugin": "~1.7",
"google-maps-api-loader": "^1.1.1", "google-maps-api-loader": "^1.1.1",
"html-webpack-plugin": "~4.5", "html-webpack-plugin": "5.0.0-alpha.15",
"mini-css-extract-plugin": "~1.3.1", "mini-css-extract-plugin": "~1.3.2",
"optimize-css-assets-webpack-plugin": "~5.0.4", "optimize-css-assets-webpack-plugin": "~5.0.4",
"redis": "^3.0.2", "redis": "^3.0.2",
"sass-loader": "~10.1.0", "sass-loader": "~10.1.0",
@@ -58,10 +58,10 @@
"vue-loader": "~15.9.5", "vue-loader": "~15.9.5",
"vue-style-loader": "~4.1", "vue-style-loader": "~4.1",
"vue-template-compiler": "^2.6.12", "vue-template-compiler": "^2.6.12",
"webpack": "~5.6.0", "webpack": "~5.10.0",
"webpack-bundle-analyzer": "^3.6.0", "webpack-bundle-analyzer": "^4.2.0",
"webpack-cli": "~4.2.0", "webpack-cli": "~4.2.0",
"webpack-dev-server": "~3.11", "webpack-dev-server": "~3.11",
"webpack-merge": "~4.2" "webpack-merge": "~5.4"
} }
} }

View File

@@ -83,22 +83,6 @@ export default {
@import "styles/positioning.scss"; @import "styles/positioning.scss";
@import "styles/vinlottis-icons"; @import "styles/vinlottis-icons";
@font-face {
font-family: "knowit";
font-weight: 600;
src: url("/public/assets/fonts/bold.woff"),
url("/public/assets/fonts/bold.woff") format("woff"), local("Arial");
font-display: swap;
}
@font-face {
font-family: "knowit";
font-weight: 300;
src: url("/public/assets/fonts/regular.eot"),
url("/public/assets/fonts/regular.woff") format("woff"), local("Arial");
font-display: swap;
}
body { body {
background-color: $primary; background-color: $primary;
} }

View File

@@ -10,7 +10,7 @@
@font-face { @font-face {
font-family: "knowit"; font-family: "knowit";
font-weight: 300; font-weight: 300;
src: url("/public/assets/fonts/regular.eot"); src: url("/public/assets/fonts/regular.woff");
} }
body { body {

1131
yarn.lock

File diff suppressed because it is too large Load Diff