chore: rebase against origin

Author: evenstensberg

.appveyor.yml

@@ -22,6 +22,7 @@ test_script:
   - node --version
   - npm --version
   - which npm
+  - npm run appveyor:build
   - npm run appveyor:lint
   - npm run appveyor:test
 

.eslintignore

@@ -1,5 +1,11 @@
 **/__testfixtures__/*
 coverage
-test
 docs
-node_modules
+node_modules
+test/binCases/errors/parse/index.js
+test/**/bundle.js
+test/**/*.bundle.js
+test/**/null.js
+test/**/main.js
+test/**/cliEntry.js
+test/**/foo.js

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -25,7 +25,7 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Please paste the results of `webpack-cli info` here, and mention other relevant information*
+**Please paste the results of `webpack-cli info` here, and mention other relevant information**
 
 **Additional context**
 Add any other context about the problem here like linking to an similar issue you might think is the cause.

package-lock.json

@@ -25,7 +25,8 @@
     "bin"
   ],
   "scripts": {
-    "appveyor:lint": "lerna bootstrap && npm run lint",
+    "appveyor:build": "lerna bootstrap && npm run build",
+    "appveyor:lint": "npm run lint && npm run tslint",
     "appveyor:test": "npm run test",
     "bootstrap": "npm run clean:all && npm install && lerna bootstrap",
     "build": "tsc",
@@ -35,13 +36,13 @@
     "format": "prettier-eslint ./bin/*.js ./test/**/*.js ./packages/**/*.js --write",
     "jsdoc": "jsdoc -c jsdoc.json -r -d docs",
     "lint:codeOnly": "eslint \"{bin}/**/!(__testfixtures__)/*.js\" \"{bin}/**.js\"",
-    "lint": "eslint \"./bin/*.js\" \"./test/**/*.js\" \"{packages}/**/!(node_modules)/*.test.js\"",
+    "lint": "eslint \"./bin/*.js\" \"./test/**/*.js\" \"packages/**/!(node_modules)/*.test.js\"",
     "precommit": "lint-staged",
-    "pretest": "npm run lint && npm run build && npm run tslint",
+    "pretest": "npm run build && npm run lint && npm run tslint",
     "reportCoverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json --disable=gcov",
     "test": "nyc jest",
-    "travis:integration": "npm run test && npm run reportCoverage",
-    "travis:lint": "lerna bootstrap && npm run lint && npm run bundlesize",
+    "travis:integration": "npm run build && npm run test && npm run reportCoverage",
+    "travis:lint": "lerna bootstrap && npm run build && npm run lint && npm run tslint && npm run bundlesize",
     "tslint": "tslint -c tslint.json \"packages/**/*.ts\"",
     "watch": "tsc -w"
   },
@@ -102,7 +103,7 @@
     "loader-utils": "^1.1.0",
     "supports-color": "^5.4.0",
     "v8-compile-cache": "^2.0.0",
-    "yargs": "^11.1.0"
+    "yargs": "^12.0.1"
   },
   "peerDependencies": {
     "webpack": "^4.x.x"
@@ -120,7 +121,7 @@
     "conventional-changelog-cli": "^2.0.0",
     "conventional-changelog-lint-config-cz": "^0.3.0",
     "cz-customizable": "^5.2.0",
-    "eslint": "^4.19.1",
+    "eslint": "^5.0.1",
     "eslint-plugin-node": "^6.0.1",
     "husky": "^0.14.3",
     "jest": "^22.4.4",

package.json

@@ -0,0 +1,4 @@
+*.js
+**/*.js
+!*.test.js
+!/**/*.test.js

packages/add/package-lock.json

@@ -1 +1,4 @@
+**/*.ts
+*.ts
 *.test.*
+tsconfig.json