Skip to content

Commit 110cc11

Browse files
committed
Upgrade dependency versions
1 parent 5cdda05 commit 110cc11

File tree

14 files changed

+6043
-6369
lines changed

14 files changed

+6043
-6369
lines changed

package-lock.json

Lines changed: 5990 additions & 6276 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@
3030
]
3131
},
3232
"dependencies": {
33-
"cssnano": "^4.1.0",
33+
"cssnano": "^4.1.10",
3434
"last-call-webpack-plugin": "^3.0.0"
3535
},
3636
"devDependencies": {
37-
"babel-core": "^6.26.0",
37+
"babel-core": "^6.26.3",
3838
"babel-jest": "^22.1.0",
3939
"babel-plugin-transform-object-rest-spread": "^6.26.0",
4040
"babel-polyfill": "^6.26.0",
41-
"babel-preset-env": "^1.6.1",
42-
"css-loader": "^0.28.9",
41+
"babel-preset-env": "^1.7.0",
42+
"css-loader": "^3.0.0",
4343
"extract-text-webpack-plugin": "next",
44-
"jest": "^22.1.4",
44+
"jest": "^24.8.0",
4545
"style-loader": "^0.20.1",
4646
"webpack": "^4.9.1"
4747
},

test/__snapshots__/webpack-integration.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ p {
1717
"
1818
`;
1919

20-
exports[`Webpack Integration Tests only-assetNameRegExp-processed 2`] = `"a{color:#00f}body{color:red;margin:0}p{margin:1000px}"`;
20+
exports[`Webpack Integration Tests only-assetNameRegExp-processed 2`] = `"a{color:#00f}body{margin:0;color:red}p{margin:1000px}"`;
2121

2222
exports[`Webpack Integration Tests removes-duplicate-css 1`] = `"a{color:#00f}body{color:red}p{color:green}"`;
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
body {
2-
color: red;
3-
}
4-
a {
5-
color: blue;
6-
}
1+
body{color:red}a{color:blue}
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
body {
2-
margin: 0;
3-
color: red;
4-
}
5-
p {
6-
margin: 1000px;
7-
}
1+
body{margin:0;color:red}p{margin:1000px}
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1 @@
1-
body {
2-
color: red;
3-
padding: 0;
4-
margin: 0;
5-
}
6-
p {
7-
padding: 500px;
8-
padding: 1000px;
9-
}
1+
body{color:red;padding:0;margin:0}p{padding:500px;padding:1000px}

test/cases/assetNameRegExp-no-source/webpack.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ module.exports = {
1010
use: ExtractTextPlugin.extract({
1111
fallback: { loader: 'style-loader' },
1212
use: {
13-
loader: 'css-loader',
14-
options: { minimize: true }
13+
loader: 'css-loader'
1514
}
1615
})
1716
},
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
body {
2-
color: red;
3-
}
4-
a {
5-
color: blue;
6-
}
1+
body{color:red}a{color:blue}
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
body {
2-
color: red;
3-
}
4-
p {
5-
color: green;
6-
}
1+
body{color:red}p{color:green}
Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
1-
import ExtractTextPlugin from 'extract-text-webpack-plugin';
2-
import OptimizeCssAssetsPlugin from '../../../src/';
1+
import ExtractTextPlugin from "extract-text-webpack-plugin";
2+
import OptimizeCssAssetsPlugin from "../../../src/";
33

44
module.exports = {
5-
entry: './index',
5+
entry: "./index",
66
module: {
77
rules: [
88
{
99
test: /\.css$/,
1010
use: ExtractTextPlugin.extract({
11-
fallback: { loader: 'style-loader' },
11+
fallback: { loader: "style-loader" },
1212
use: {
13-
loader: 'css-loader',
14-
options: { minimize: true }
13+
loader: "css-loader"
1514
}
1615
})
17-
},
18-
],
16+
}
17+
]
1918
},
20-
plugins: [
21-
new ExtractTextPlugin('file.css')
22-
],
19+
plugins: [new ExtractTextPlugin("file.css")]
2320
};

0 commit comments

Comments
 (0)