Skip to content

Commit 29c17ed

Browse files
Merge pull request #249 from Unikka/tasks/upgrade-dependencies
Upgrade: Updates dependencies and build tools
2 parents 0cb173c + 5263d93 commit 29c17ed

7 files changed

+2964
-2175
lines changed

Resources/Public/main.min.js

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Resources/Public/main.min.js.LICENSE

-28
This file was deleted.
+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/*!
2-
* Sizzle CSS Selector Engine v2.3.4
2+
* Sizzle CSS Selector Engine v2.3.5
33
* https://sizzlejs.com/
44
*
55
* Copyright JS Foundation and other contributors
66
* Released under the MIT license
77
* https://js.foundation/
88
*
9-
* Date: 2019-04-08
9+
* Date: 2020-03-14
1010
*/
1111

1212
/*!
13-
* jQuery JavaScript Library v3.4.1
13+
* jQuery JavaScript Library v3.5.1
1414
* https://jquery.com/
1515
*
1616
* Includes Sizzle.js
@@ -20,9 +20,9 @@
2020
* Released under the MIT license
2121
* https://jquery.org/license
2222
*
23-
* Date: 2019-05-01T21:04Z
23+
* Date: 2020-05-04T22:49Z
2424
*/
2525

26-
/*! lozad.js - v1.14.0 - 2019-10-19
26+
/*! lozad.js - v1.16.0 - 2020-09-06
2727
* https://github.com/ApoorvSaxena/lozad.js
28-
* Copyright (c) 2019 Apoorv Saxena; Licensed MIT */
28+
* Copyright (c) 2020 Apoorv Saxena; Licensed MIT */

package.json

+23-21
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"repository": "[email protected]:unikka/neos-slick.git",
55
"license": "MIT",
66
"dependencies": {
7-
"jquery": "^3.4.1",
8-
"lozad": "^1.14.0",
7+
"jquery": "^3.5.1",
8+
"lozad": "^1.16.0",
99
"slick-carousel": "^1.8.1"
1010
},
1111
"scripts": {
@@ -21,28 +21,30 @@
2121
"build:production": "yarn build-styles:production && yarn build-js:production"
2222
},
2323
"devDependencies": {
24-
"@babel/cli": "^7.7.7",
25-
"@babel/core": "^7.8.4",
26-
"@babel/plugin-proposal-class-properties": "^7.7.4",
27-
"@babel/plugin-transform-runtime": "^7.6.2",
28-
"@babel/preset-env": "^7.8.4",
29-
"@semantic-release/changelog": "^5.0.0",
24+
"@babel/cli": "^7.12.10",
25+
"@babel/core": "^7.12.10",
26+
"@babel/plugin-proposal-class-properties": "^7.12.1",
27+
"@babel/plugin-transform-runtime": "^7.12.10",
28+
"@babel/preset-env": "^7.12.10",
29+
"@semantic-release/changelog": "^5.0.1",
3030
"@semantic-release/git": "^9.0.0",
3131
"@semantic-release/release-notes-generator": "^9.0.1",
32-
"babel-loader": "^8.0.6",
33-
"commitizen": "^4.0.0",
34-
"conventional-changelog-eslint": "^3.0.4",
35-
"css-loader": "^3.4.2",
32+
"@webpack-cli/migrate": "^1.1.0",
33+
"babel-loader": "^8.2.2",
34+
"clean-webpack-plugin": "^3.0.0",
35+
"commitizen": "^4.2.2",
36+
"conventional-changelog-eslint": "^3.0.9",
37+
"css-loader": "^5.0.1",
3638
"cz-adapter-eslint": "^0.3.0",
37-
"mini-css-extract-plugin": "^0.9.0",
38-
"file-loader": "^5.1.0",
39-
"node-sass": "^4.13.0",
40-
"sass-loader": "^8.0.0",
41-
"semantic-release": "^17.2.3",
42-
"style-loader": "^1.1.3",
43-
"terser-webpack-plugin": "^2.3.5",
44-
"webpack": "^4.41.6",
45-
"webpack-cli": "^3.3.10"
39+
"file-loader": "^6.2.0",
40+
"mini-css-extract-plugin": "^1.3.3",
41+
"node-sass": "^5.0.0",
42+
"sass-loader": "^10.1.0",
43+
"semantic-release": "^17.3.0",
44+
"style-loader": "^2.0.0",
45+
"terser-webpack-plugin": "^5.0.3",
46+
"webpack": "^5.10.1",
47+
"webpack-cli": "^4.2.0"
4648
},
4749
"config": {
4850
"commitizen": {

webpack.config.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
const debug = process.env.NODE_ENV !== 'production';
22
const TerserPlugin = require('terser-webpack-plugin');
3+
const {CleanWebpackPlugin} = require('clean-webpack-plugin')
34
const webpack = require('webpack');
45

56
const webpackConfig = {
67
context: __dirname,
7-
devtool: debug ? 'inline-sourcemap' : false,
88
entry: {
99
main: ['./Resources/Private/JavaScripts/index.js']
1010
},
@@ -37,7 +37,8 @@ const webpackConfig = {
3737
new webpack.ProvidePlugin({
3838
$: 'jquery',
3939
jQuery: 'jquery'
40-
})
40+
}),
41+
new CleanWebpackPlugin(),
4142
],
4243
optimization: {
4344
minimizer: []
@@ -48,6 +49,7 @@ const webpackConfig = {
4849
};
4950

5051
if (!debug) {
52+
webpackConfig.devtool = 'cheap-source-map';
5153
webpackConfig.optimization.minimizer.push(
5254
new TerserPlugin({
5355
terserOptions: {

webpack.styles.config.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
const debug = process.env.NODE_ENV !== 'production';
22
const TerserPlugin = require('terser-webpack-plugin');
33
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
4+
const {CleanWebpackPlugin} = require('clean-webpack-plugin')
45
const webpack = require('webpack');
56

67
const webpackConfig = {
78
context: __dirname,
8-
devtool: debug ? 'inline-sourcemap' : false,
9+
devtool: false,
910
entry: {
1011
main: ['./Resources/Private/Stylesheets/style.scss'],
1112
theme: ['./Resources/Private/Stylesheets/theme.scss']
1213
},
1314
output: {
15+
publicPath: '',
1416
path: __dirname + '/Resources/Public',
15-
filename: '[name].css'
17+
filename: '[name][chunkhash].css',
1618
},
1719
module: {
1820
rules: [
@@ -46,7 +48,7 @@ const webpackConfig = {
4648
}
4749
]
4850
},
49-
plugins: [new MiniCssExtractPlugin({ filename: './[name].css' })],
51+
plugins: [new MiniCssExtractPlugin({ filename: '[name].css' })],
5052
optimization: {
5153
minimizer: []
5254
},
@@ -56,6 +58,7 @@ const webpackConfig = {
5658
};
5759

5860
if (!debug) {
61+
webpackConfig.devtool = 'cheap-source-map';
5962
webpackConfig.optimization.minimizer.push(
6063
new TerserPlugin({
6164
terserOptions: {

0 commit comments

Comments
 (0)