Squashing asset pipeline bugs and other stuff
1. Update dependencies - Add font-awesome as dependency - Switch to Bootstrap 4 dev branch - Remove eslint airbnb style (we're not using it) 2. Imported images and fonts should go into dist/images and dist/fonts, respectively 3. Only lint our own code, not external code (fixes #1633)
This commit is contained in:
14
package.json
14
package.json
@@ -21,8 +21,7 @@
|
||||
"build:production": "webpack -p --progress --release",
|
||||
"build": "webpack -d --progress",
|
||||
"watch": "node watch.js --watch",
|
||||
"lint": "eslint -c .eslintrc assets/scripts watch.js webpack.config.js",
|
||||
"install": "composer install"
|
||||
"lint": "eslint -c .eslintrc assets/scripts watch.js webpack.config.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
@@ -34,15 +33,15 @@
|
||||
"babel-core": "^6.7.4",
|
||||
"babel-eslint": "^6.0.0",
|
||||
"babel-loader": "^6.2.4",
|
||||
"babel-preset-es2015": "^6.1.18",
|
||||
"babel-preset-es2015": "^6.13.2",
|
||||
"babel-register": "^6.5.2",
|
||||
"babel-runtime": "^6.5.0",
|
||||
"body-parser": "^1.14.1",
|
||||
"browser-sync": "^2.11.2",
|
||||
"clean-webpack-plugin": "^0.1.8",
|
||||
"css-loader": "^0.23.1",
|
||||
"cssnano": "^3.5.2",
|
||||
"eslint": "^3.2.2",
|
||||
"eslint-config-airbnb": "^10.0.0",
|
||||
"eslint-loader": "^1.3.0",
|
||||
"eslint-plugin-react": "^6.0.0",
|
||||
"extract-text-webpack-plugin": "^1.0.1",
|
||||
@@ -66,9 +65,8 @@
|
||||
"webpack-hot-middleware": "^2.10.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"babel-runtime": "^6.5.0",
|
||||
"bootstrap": "^4.0.0-alpha.3",
|
||||
"jquery": "^2.1.4",
|
||||
"tether": "^1.2.0"
|
||||
"bootstrap": "github:twbs/bootstrap#v4-dev",
|
||||
"font-awesome": "^4.6.3",
|
||||
"jquery": "^1.12.4"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user