Skip to content

Commit

Permalink
Merge pull request #8319 from webpack/update-dev-tools
Browse files Browse the repository at this point in the history
Update development tools
  • Loading branch information
sokra committed Nov 2, 2018
2 parents c832cb7 + 2a440fe commit 56846fb
Show file tree
Hide file tree
Showing 6 changed files with 285 additions and 232 deletions.
15 changes: 5 additions & 10 deletions .travis.yml
Expand Up @@ -21,23 +21,19 @@ matrix:
include:
- os: linux
node_js: "10"
env:
NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=basic
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=basic
stage: basic
- os: linux
node_js: "10"
env:
NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=lint-unit
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=lint-unit
stage: advanced
- os: linux
node_js: "10"
env:
NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
stage: advanced
- os: linux
node_js: "10"
env:
NO_WATCH_TESTS=1 ALTERNATIVE_SORT=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
env: NO_WATCH_TESTS=1 ALTERNATIVE_SORT=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
stage: advanced
- os: linux
node_js: "10"
Expand Down Expand Up @@ -74,5 +70,4 @@ after_success:

notifications:
slack:
secure:
JduSdKWwbnLCwo7Z4E59SGE+Uw832UwnXzQiKEpg1BV45MYDPRiGltly1tRHmPh9OGjvGx3XSkC2tNGOBLtL4UL2SCkf012x0t7jDutKRfcv/njynl8jk8l+UhPmaWiHXDQAgGiiKdL4RfzPLW3HeVHCOWm0LKMzcarTa8tw+rE=
secure: JduSdKWwbnLCwo7Z4E59SGE+Uw832UwnXzQiKEpg1BV45MYDPRiGltly1tRHmPh9OGjvGx3XSkC2tNGOBLtL4UL2SCkf012x0t7jDutKRfcv/njynl8jk8l+UhPmaWiHXDQAgGiiKdL4RfzPLW3HeVHCOWm0LKMzcarTa8tw+rE=
3 changes: 1 addition & 2 deletions appveyor.yml
Expand Up @@ -32,5 +32,4 @@ test_script:
- cmd: yarn istanbul report --report lcovonly
- cmd: yarn unlink webpack
- cmd: yarn global add codecov && codecov -F %job_part% --disable=gcov
- cmd:
del /F /Q .jest-cache\\haste-map* .jest-cache\\perf-cache* 2> null || Ver > null
- cmd: del /F /Q .jest-cache\\haste-map* .jest-cache\\perf-cache* 2> null || Ver > null
2 changes: 1 addition & 1 deletion lib/node/NodeTargetPlugin.js
Expand Up @@ -7,7 +7,7 @@
const ExternalsPlugin = require("../ExternalsPlugin");

const builtins =
// eslint-disable-next-line node/no-unsupported-features/node-builtins
// eslint-disable-next-line node/no-unsupported-features/node-builtins,node/no-deprecated-api
require("module").builtinModules || Object.keys(process.binding("natives"));

class NodeTargetPlugin {
Expand Down
3 changes: 1 addition & 2 deletions open-bot.yaml
Expand Up @@ -504,8 +504,7 @@ rules:
# Move issue task
- filters:
open: true
comment:
"\\s*@webpack-bot\\s+move\\s+(?:to\\s+)?([a-z0-9_\\-\\.]+/[a-z0-9_\\-\\.]+)\\s*([\\s\\S]*)$"
comment: "\\s*@webpack-bot\\s+move\\s+(?:to\\s+)?([a-z0-9_\\-\\.]+/[a-z0-9_\\-\\.]+)\\s*([\\s\\S]*)$"
not:
comment_1:
matching: "moved\\-by\\-bot"
Expand Down
18 changes: 9 additions & 9 deletions package.json
Expand Up @@ -42,15 +42,15 @@
"coveralls": "^3.0.2",
"css-loader": "^0.28.3",
"es6-promise-polyfill": "^1.1.1",
"eslint": "^5.2.0",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-jest": "^21.18.0",
"eslint-plugin-node": "^7.0.1",
"eslint-plugin-prettier": "^2.6.2",
"eslint": "^5.8.0",
"eslint-config-prettier": "^3.1.0",
"eslint-plugin-jest": "^21.26.2",
"eslint-plugin-node": "^8.0.0",
"eslint-plugin-prettier": "^3.0.0",
"express": "~4.13.1",
"file-loader": "^1.1.6",
"glob": "^7.1.2",
"husky": "^1.0.0-rc.6",
"glob": "^7.1.3",
"husky": "^1.1.3",
"i18n-webpack-plugin": "^1.0.0",
"istanbul": "^0.4.5",
"jade": "^1.11.0",
Expand All @@ -60,9 +60,9 @@
"json-schema-to-typescript": "^6.0.1",
"less": "^2.5.1",
"less-loader": "^4.0.3",
"lint-staged": "^7.2.0",
"lint-staged": "^8.0.4",
"lodash": "^4.17.4",
"prettier": "^1.14.0",
"prettier": "^1.14.3",
"pug": "^2.0.3",
"pug-loader": "^2.4.0",
"raw-loader": "~0.5.0",
Expand Down

0 comments on commit 56846fb

Please sign in to comment.