Merge branch 'dev' into eslint

This commit is contained in:
Steven Evans
2018-06-26 22:04:45 -04:00
82 changed files with 29953 additions and 26201 deletions

View File

@@ -62,6 +62,9 @@
"sinon": "^2.3.2",
"source-map": "^0.7.3",
"style-loader": "^0.21.0",
"stylelint": "^9.2.1",
"stylelint-declaration-use-variable": "^1.6.1",
"stylelint-order": "^0.8.1",
"ts-loader": "^4.4.1",
"tslint": "^5.10.0",
"typescript": "^2.9.2",
@@ -84,11 +87,11 @@
"url": "git+https://github.com/danielyxie/bitburner.git"
},
"scripts": {
"lint:js": "eslint *.js src utils tests",
"start:dev": "webpack-dev-server",
"build": "webpack --mode production",
"build:dev": "webpack --mode development",
"lint:javascript": "eslint ./src/**/*.js ./tests/**/*.js ./utils/**/*.js",
"lint:javascript": "eslint *.js ./src/**/*.js ./tests/**/*.js ./utils/**/*.js",
"lint:style": "stylelint ./css/*",
"lint:typescript": "tslint --project . --exclude **/*.d.ts --format stylish src/**/*.ts utils/**/*.ts",
"watch": "webpack --watch --mode production",
"watch:dev": "webpack --watch --mode development"