Skip to content

Commit

Permalink
Merge pull request #5 from cstorey/dependabot/npm_and_yarn/prettier-1…
Browse files Browse the repository at this point in the history
….17.1

Bump prettier from 1.14.2 to 1.17.1
  • Loading branch information
cstorey committed Jun 7, 2019
2 parents 546ff41 + 60a379b commit 91e8a48
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -24,7 +24,7 @@
"postcss-preset-env": "^5.3.0",
"postcss-simple-vars": "^4.1.0",
"postcss-url": "^8.0.0",
"prettier": "^1.14.2",
"prettier": "^1.17.1",
"style-loader": "^0.19.0",
"sugarss": "^2.0.0",
"webpack": "^4.19.1",
Expand All @@ -35,7 +35,7 @@
"@typopro/web-iosevka": "^3.7.5",
"katex": "^0.10.0-rc.1",
"postcss-loader": "^3.0.0",
"prettier": "^1.14.2",
"prettier": "^1.17.1",
"prettify": "^0.1.7",
"source-sans-pro": "^2.20.2",
"source-serif-pro": "^2.0.7"
Expand Down
16 changes: 6 additions & 10 deletions webpack.config.js
Expand Up @@ -12,23 +12,19 @@ const plugins = [
];

module.exports = {
entry: [
path.resolve(__dirname, "css/default.css"),
],
entry: [path.resolve(__dirname, "css/default.css")],
optimization: {
minimizer: [
new OptimizeCSSAssetsPlugin({})
]
minimizer: [new OptimizeCSSAssetsPlugin({})]
},
module: {
rules: [
{
test: /\.css$/,
use: [
MiniCssExtractPlugin.loader,
{ loader: "css-loader", options: { importLoaders: 0 } },
"postcss-loader"
]
{ loader: "css-loader", options: { importLoaders: 0 } },
"postcss-loader"
]
},
{
test: /\.woff2?$|\.ttf$|\.otf$|\.svg$|\.eot$/,
Expand All @@ -42,7 +38,7 @@ module.exports = {
},
output: {
path: path.join(__dirname, "out"),
filename: "[name].[chunkhash].js",
filename: "[name].[chunkhash].js"
},
plugins: plugins
};
6 changes: 3 additions & 3 deletions yarn.lock
Expand Up @@ -3433,9 +3433,9 @@ prepend-http@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"

prettier@^1.14.2:
version "1.14.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.2.tgz#0ac1c6e1a90baa22a62925f41963c841983282f9"
prettier@^1.17.1:
version "1.17.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.1.tgz#ed64b4e93e370cb8a25b9ef7fef3e4fd1c0995db"

prettify@^0.1.7:
version "0.1.7"
Expand Down

0 comments on commit 91e8a48

Please sign in to comment.