rayelliott
/
victor-hugo
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #28 from kahwee/master 

Upgraded to Webpack 2
This commit is contained in:
David Calavera 2017-05-30 11:43:28 -07:00 committed by GitHub
parent c271e7bc4c 419a7da48c
commit 37c5e0fde6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package.json
View File

@ -15,7 +15,7 @@
"dependencies": { "dependencies": {
"autoprefixer": "^6.3.7", "autoprefixer": "^6.3.7",
"babel-eslint": "^6.1.2", "babel-eslint": "^6.1.2",
"babel-loader": "^6.2.4", "babel-loader": "^7.0.0",
"babel-plugin-syntax-object-rest-spread": "^6.13.0", "babel-plugin-syntax-object-rest-spread": "^6.13.0",
"babel-plugin-transform-class-properties": "^6.10.2", "babel-plugin-transform-class-properties": "^6.10.2",
"babel-plugin-transform-object-assign": "^6.8.0", "babel-plugin-transform-object-assign": "^6.8.0",
@ -23,21 +23,21 @@
"babel-preset-es2015": "^6.9.0", "babel-preset-es2015": "^6.9.0",
"babel-register": "^6.11.6", "babel-register": "^6.11.6",
"browser-sync": "^2.13.0", "browser-sync": "^2.13.0",
"css-loader": "^0.23.1", "css-loader": "^0.28.2",
"eslint": "^3.1.1", "eslint": "^3.1.1",
"eslint-plugin-import": "^1.11.1", "eslint-plugin-import": "^1.11.1",
"exports-loader": "^0.6.3", "exports-loader": "^0.6.3",
"file-loader": "^0.9.0", "file-loader": "^0.11.1",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-babel": "^6.1.2", "gulp-babel": "^6.1.2",
"gulp-postcss": "^6.1.1", "gulp-postcss": "^6.1.1",
"gulp-util": "^3.0.7", "gulp-util": "^3.0.7",
"imports-loader": "^0.6.5", "imports-loader": "^0.7.1",
"postcss-cssnext": "^2.7.0", "postcss-cssnext": "^2.7.0",
"postcss-import": "^8.1.2", "postcss-import": "^10.0.0",
"postcss-loader": "^0.9.1", "postcss-loader": "^2.0.5",
"url-loader": "^0.5.7", "url-loader": "^0.5.7",
"webpack": "^1.13.1", "webpack": "^2.6.0",
"whatwg-fetch": "^1.0.0" "whatwg-fetch": "^1.0.0"
} }
} }

8
webpack.conf.js
View File

@ -3,14 +3,14 @@ import path from "path";
export default { export default {
module: { module: {
loaders: [ rules: [
{ {
test: /\.((png)|(eot)|(woff)|(woff2)|(ttf)|(svg)|(gif))(\?v=\d+\.\d+\.\d+)?$/, test: /\.((png)|(eot)|(woff)|(woff2)|(ttf)|(svg)|(gif))(\?v=\d+\.\d+\.\d+)?$/,
loader: "file?name=/[hash].[ext]" loader: "file-loader?name=/[hash].[ext]"
}, },
{test: /\.json$/, loader: "json-loader"}, {test: /\.json$/, loader: "json-loader"},
{ {
loader: "babel", loader: "babel-loader",
test: /\.js?$/, test: /\.js?$/,
exclude: /node_modules/, exclude: /node_modules/,
query: {cacheDirectory: true} query: {cacheDirectory: true}
@ -20,7 +20,7 @@ export default {
plugins: [ plugins: [
new webpack.ProvidePlugin({ new webpack.ProvidePlugin({
"fetch": "imports?this=>global!exports?global.fetch!whatwg-fetch" "fetch": "imports-loader?this=>global!exports?global.fetch!whatwg-fetch"
}) })
], ],