diff options
| author | Marius David Wieschollek <marius-david.wieschollek@intellishop.ag> | 2021-01-12 13:12:15 +0300 |
|---|---|---|
| committer | Marius David Wieschollek <marius-david.wieschollek@intellishop.ag> | 2021-01-12 13:12:15 +0300 |
| commit | b359236801b910fd7961645faf9fd22612533dcf (patch) | |
| tree | 30ce2d09546e73b3f937365925086981d29ca8cf /package-lock.json | |
| parent | 7f40cba4501c4b065bd2b894f2416c54e63e7f76 (diff) | |
| parent | ae9be3ea349d87c472cea683528b62cd1ffb7e97 (diff) | |
Merge branch '2.0.1'
# Conflicts:
# src/js/Controller/Client/Debug/ShowFields.js
Diffstat (limited to 'package-lock.json')
| -rw-r--r-- | package-lock.json | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/package-lock.json b/package-lock.json index 431cdb6..1c9d81b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4613,9 +4613,9 @@ } }, "sass-loader": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.0.tgz", - "integrity": "sha512-ZCKAlczLBbFd3aGAhowpYEy69Te3Z68cg8bnHHl6WnSCvnKpbM6pQrz957HWMa8LKVuhnD9uMplmMAHwGQtHeg==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.1.tgz", + "integrity": "sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw==", "dev": true, "requires": { "klona": "^2.0.4", @@ -5922,9 +5922,9 @@ "dev": true }, "webpack": { - "version": "4.45.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.45.0.tgz", - "integrity": "sha512-JhDaVi4CbRcwLLAoqC7eugMSMJnZbIfE2AyjaZ19pnOIh/R2O/lXOiXA2tQFN0iXEcxgpPJsPJHW2wOWqiTLcw==", + "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "dev": true, "requires": { "@webassemblyjs/ast": "1.9.0", @@ -5935,7 +5935,7 @@ "ajv": "^6.10.2", "ajv-keywords": "^3.4.1", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.3.0", + "enhanced-resolve": "^4.5.0", "eslint-scope": "^4.0.3", "json-parse-better-errors": "^1.0.2", "loader-runner": "^2.4.0", @@ -5950,6 +5950,31 @@ "terser-webpack-plugin": "^1.4.3", "watchpack": "^1.7.4", "webpack-sources": "^1.4.1" + }, + "dependencies": { + "enhanced-resolve": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz", + "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "memory-fs": "^0.5.0", + "tapable": "^1.0.0" + }, + "dependencies": { + "memory-fs": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", + "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", + "dev": true, + "requires": { + "errno": "^0.1.3", + "readable-stream": "^2.0.1" + } + } + } + } } }, "webpack-cli": { |