chore: update dependencies, remove imports-loader

This commit is contained in:
marudor 2020-09-01 11:10:40 +02:00
parent 2a49aa4716
commit dae856e87e
No known key found for this signature in database
GPG Key ID: 914085684F88D2C1
4 changed files with 1223 additions and 1409 deletions

View File

@ -7,7 +7,7 @@ COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf
FROM node:14-alpine as themes FROM node:14-alpine as themes
WORKDIR /app WORKDIR /app
COPY .babelrc .browserslistrc package.json webpack.config.js yarn.lock /app/ COPY .babelrc .browserslistrc package.json webpack.config.js yarn.lock /app/
RUN yarn install RUN yarn --frozen-lockfile
COPY resources/assets/ /app/resources/assets COPY resources/assets/ /app/resources/assets
RUN yarn build RUN yarn build

View File

@ -6,7 +6,7 @@
"author": "https://github.com/engelsystem/engelsystem/contributors", "author": "https://github.com/engelsystem/engelsystem/contributors",
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
"scripts": { "scripts": {
"build": "npm run -s build:clean && NODE_ENV=production run-p build:webpack", "build": "NODE_ENV=production run-s build:clean build:webpack",
"build:clean": "rimraf public/assets", "build:clean": "rimraf public/assets",
"build:webpack": "webpack", "build:webpack": "webpack",
"build:watch": "webpack --watch" "build:watch": "webpack --watch"
@ -14,32 +14,31 @@
"dependencies": { "dependencies": {
"bootstrap": "^3", "bootstrap": "^3",
"chart.js": "^2.9.3", "chart.js": "^2.9.3",
"core-js": "^3.6.4", "core-js": "^3.6.5",
"eonasdan-bootstrap-datetimepicker": "^4.17.47", "eonasdan-bootstrap-datetimepicker": "^4.17.47",
"jquery": "^3.5.1", "jquery": "^3.5.1",
"jquery-ui": "^1.11.2", "jquery-ui": "^1.11.2",
"moment": "^2.12.0", "moment": "^2.27.0",
"moment-timezone": "^0.4.0", "moment-timezone": "^0.5.31",
"select2": "^4.0.13", "select2": "^4.0.13",
"select2-bootstrap-theme": "0.1.0-beta.10" "select2-bootstrap-theme": "0.1.0-beta.10"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.9.0", "@babel/core": "^7.11.5",
"@babel/preset-env": "^7.9.0", "@babel/preset-env": "^7.11.5",
"babel-loader": "^8.1.0", "babel-loader": "^8.1.0",
"css-loader": "^3.4.2", "css-loader": "^4.2.2",
"file-loader": "^6.0.0", "file-loader": "^6.1.0",
"imports-loader": "^0.8.0", "less": "^3.12.2",
"less": "^3.11.1", "less-loader": "^7.0.0",
"less-loader": "^5", "mini-css-extract-plugin": "^0.11.0",
"mini-css-extract-plugin": "^0.9.0",
"mkdirp": "^1.0.4", "mkdirp": "^1.0.4",
"npm-run-all": "^4.1.3", "npm-run-all": "^4.1.3",
"optimize-css-assets-webpack-plugin": "^5.0.1", "optimize-css-assets-webpack-plugin": "^5.0.4",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"style-loader": "^1.1.3", "style-loader": "^1.2.1",
"terser-webpack-plugin": "^2.3.5", "terser-webpack-plugin": "^4.1.0",
"webpack": "^4.42.1", "webpack": "^4.44.1",
"webpack-cli": "^3.3.11" "webpack-cli": "^3.3.12"
} }
} }

View File

@ -1,11 +1,11 @@
require('core-js/stable'); require('core-js/stable');
window.$ = window.jQuery = require('jquery'); window.$ = window.jQuery = require('jquery');
require('imports-loader?define=>false!jquery-ui'); require('jquery-ui');
require('bootstrap'); require('bootstrap');
require('imports-loader?this=>window&define=>false&exports=>false!moment'); window.moment = require('moment');
require('imports-loader?this=>window&define=>false&exports=>false!moment/locale/de'); require('moment/locale/de');
require('imports-loader?define=>false&exports=>false!eonasdan-bootstrap-datetimepicker'); require('eonasdan-bootstrap-datetimepicker');
require('imports-loader?this=>window!chart.js'); require('chart.js');
require('./offcanvas'); require('./offcanvas');
require('./forms'); require('./forms');
require('./sticky-headers'); require('./sticky-headers');

2587
yarn.lock

File diff suppressed because it is too large Load Diff