Update dependencies, upgrade build utils

Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2021-09-06 21:05:48 +02:00
parent 28668d767b
commit c36cc34805
Signed by: luzifer
GPG Key ID: 0066F03ED215AD7D
6 changed files with 10070 additions and 5785 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
frontend/app.js.LICENSE.txt
frontend/css frontend/css
frontend/js frontend/js
frontend/locale/*.untranslated.json frontend/locale/*.untranslated.json

View File

@ -11,7 +11,7 @@ VER_VUE_I18N=8.12.0
default: generate default: generate
generate: download_libs generate: download_libs
docker run --rm -ti -v $(CURDIR):$(CURDIR) -w $(CURDIR)/src node:10-alpine \ docker run --rm -ti -v $(CURDIR):$(CURDIR) -w $(CURDIR)/src node:14-alpine \
sh -exc "npx npm@lts ci && npx npm@lts run build && chown -R $(shell id -u) ../frontend node_modules" sh -exc "npx npm@lts ci && npx npm@lts run build && chown -R $(shell id -u) ../frontend node_modules"
publish: publish:
@ -23,16 +23,8 @@ publish:
clean_libs: clean_libs:
rm -rf frontend/css frontend/webfonts frontend/js rm -rf frontend/css frontend/webfonts frontend/js
download_libs: clean_libs fontawesome #libs_js libs_css download_libs: clean_libs fontawesome
fontawesome: fontawesome:
curl -sSfL https://github.com/FortAwesome/Font-Awesome/archive/$(VER_FONTAWESOME).tar.gz | \ curl -sSfL https://github.com/FortAwesome/Font-Awesome/archive/$(VER_FONTAWESOME).tar.gz | \
tar -vC frontend -xz --strip-components=1 --wildcards --exclude='*/js-packages' '*/css' '*/webfonts' tar -vC frontend -xz --strip-components=1 --wildcards --exclude='*/js-packages' '*/css' '*/webfonts'
libs_css:
mkdir -p frontend/css
curl -sSfLo frontend/css/bundle.css "https://cdn.jsdelivr.net/combine/npm/bootstrap@$(VER_BOOTSTRAP)/dist/css/bootstrap.min.css,npm/bootswatch@$(VER_BOOTSWATCH)/dist/flatly/bootstrap.min.css"
libs_js:
mkdir -p frontend/js
curl -sSfLo frontend/js/bundle.js "https://cdn.jsdelivr.net/combine/npm/jquery@$(VER_JQUERY),npm/popper.js@$(VER_POPPER),npm/bootstrap@$(VER_BOOTSTRAP)/dist/js/bootstrap.min.js,npm/gibberish-aes@$(VER_GIBBERISH_AES)/dist/gibberish-aes-$(VER_GIBBERISH_AES).min.js,npm/vue@$(VER_VUE),npm/vue-i18n@$(VER_VUE_I18N)/dist/vue-i18n.min.js"

File diff suppressed because one or more lines are too long

15713
src/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,42 +1,35 @@
{ {
"devDependencies": { "devDependencies": {
"babel-core": "^6.26.3", "@babel/core": "^7.15.5",
"@babel/preset-env": "^7.15.4",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"babel-loader": "^7.1.5", "babel-loader": "^8.2.2",
"babel-preset-env": "^1.7.0", "css-loader": "^6.2.0",
"css-loader": "^1.0.0", "eslint": "^6.0.0",
"eslint": "^5.13.0", "eslint-plugin-vue": "^7.17.0",
"eslint-config-standard": "^12.0.0", "node-sass": "^6.0.1",
"eslint-friendly-formatter": "^4.0.1", "sass-loader": "^12.1.0",
"eslint-loader": "^2.1.1", "style-loader": "^3.2.1",
"eslint-plugin-import": "^2.22.0", "vue-loader": "^15.9.8",
"eslint-plugin-node": "^8.0.1", "vue-template-compiler": "^2.6.14",
"eslint-plugin-promise": "^4.0.1", "webpack": "^5.52.0",
"eslint-plugin-standard": "^4.0.1", "webpack-cli": "^4.8.0",
"eslint-plugin-vue": "^5.2.3", "webpack-dev-middleware": "^5.0.0",
"node-sass": "^4.14.1",
"sass-loader": "^7.3.1",
"style-loader": "^0.21.0",
"vue-loader": "^15.9.3",
"vue-template-compiler": "^2.6.11",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",
"webpack-dev-middleware": "^1.4.0",
"webpack-hot-middleware": "^2.25.0" "webpack-hot-middleware": "^2.25.0"
}, },
"name": "ots", "name": "ots",
"private": true, "private": true,
"scripts": { "scripts": {
"build": "webpack -p" "build": "webpack --mode=production"
}, },
"dependencies": { "dependencies": {
"axios": "^0.19.2", "axios": "^0.21.4",
"bootstrap": "^4.5.0", "bootstrap": "^4.0.0",
"bootstrap-vue": "^2.16.0", "bootstrap-vue": "^2.21.2",
"bootswatch": "^4.5.0", "bootswatch": "^4.0.0",
"gibberish-aes": "^1.0.0", "gibberish-aes": "^1.0.0",
"popper.js": "^1.16.1", "popper.js": "^1.16.1",
"vue": "^2.6.11", "vue": "^2.6.14",
"vue-i18n": "^8.20.0" "vue-i18n": "^8.25.0"
} }
} }

View File

@ -10,7 +10,6 @@ module.exports = {
path: path.resolve(__dirname, '..', 'frontend'), path: path.resolve(__dirname, '..', 'frontend'),
}, },
plugins: [ plugins: [
new webpack.optimize.OccurrenceOrderPlugin(),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { 'process.env': {
NODE_ENV: JSON.stringify('production'), NODE_ENV: JSON.stringify('production'),
@ -39,7 +38,7 @@ module.exports = {
use: { use: {
loader: 'babel-loader', loader: 'babel-loader',
options: { options: {
presets: [['env', { targets: { browsers: ['>0.25%', 'not ie 11', 'not op_mini all'] } }]], presets: [['@babel/preset-env', { targets: { browsers: ['>0.25%', 'not ie 11', 'not op_mini all'] } }]],
}, },
}, },
}, },