Permalink
Browse files

Update to webpack 3.

  • Loading branch information...
jbub committed Jun 24, 2017
1 parent bfaa2aa commit f808d39849ee3bffd9eeddd72fe0dbe3be9aa2bb
Showing with 294 additions and 112 deletions.
  1. +9 −9 package.json
  2. +3 −4 static/dist/styles.css
  3. +1 −1 webpack.config.js
  4. +281 −98 yarn.lock
View
@@ -10,15 +10,15 @@
"watch": "webpack --progress --colors --watch"
},
"devDependencies": {
"css-loader": "^0.26.1",
"extract-text-webpack-plugin": "^v2.0.0-rc.3",
"node-sass": "^4.5.0",
"normalize.css": "^5.0.0",
"optimize-css-assets-webpack-plugin": "^1.3.0",
"css-loader": "^0.28.4",
"extract-text-webpack-plugin": "^2.1.2",
"node-sass": "^4.5.3",
"normalize.css": "^7.0.0",
"optimize-css-assets-webpack-plugin": "^2.0.0",
"perfectionist": "^2.4.0",
"postcss-discard-comments": "^2.0.4",
"sass-loader": "^4.1.1",
"style-loader": "^0.13.1",
"webpack": "^2.2.1"
"sass-loader": "^6.0.6",
"style-loader": "^0.18.2",
"webpack": "^3.0.0"
}
}
}
View
@@ -1,5 +1,5 @@
/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
html { font-family: sans-serif; line-height: 1.15; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; }
/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
html { line-height: 1.15; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; }
body { margin: 0; }
article, aside, footer, header, nav, section { display: block; }
h1 { font-size: 2em; margin: .67em 0; }
@@ -8,7 +8,6 @@ figure { margin: 1em 40px; }
hr { box-sizing: content-box; height: 0; overflow: visible; }
pre { font-family: monospace, monospace; font-size: 1em; }
a { background-color: transparent; -webkit-text-decoration-skip: objects; }
a:active, a:hover { outline-width: 0; }
abbr[title] { border-bottom: none; text-decoration: underline; text-decoration: underline dotted; }
b, strong { font-weight: inherit; }
b, strong { font-weight: bolder; }
@@ -31,7 +30,7 @@ button::-moz-focus-inner, [type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner { border-style: none; padding: 0; }
button:-moz-focusring, [type="button"]:-moz-focusring,
[type="reset"]:-moz-focusring, [type="submit"]:-moz-focusring { outline: 1px dotted ButtonText; }
fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: .35em .625em .75em; }
fieldset { padding: .35em .75em .625em; }
legend { box-sizing: border-box; color: inherit; display: table; max-width: 100%; padding: 0; white-space: normal; }
progress { display: inline-block; vertical-align: baseline; }
textarea { overflow: auto; }
View
@@ -12,7 +12,7 @@ module.exports = {
modules: [
'node_modules'
],
extensions: ['.scss'],
extensions: ['.js', '.scss'],
},
output: {
path: path.join(__dirname, 'static', 'dist'),
Oops, something went wrong.

0 comments on commit f808d39

Please sign in to comment.