Skip to content

Commit 12b9c19

Browse files
chore(deps): update webpack-defaults
1 parent 124ada5 commit 12b9c19

File tree

4 files changed

+224
-12
lines changed

4 files changed

+224
-12
lines changed

.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ insert_final_newline = true
99
trim_trailing_whitespace = true
1010

1111
[*.md]
12-
insert_final_newline = false
12+
insert_final_newline = true
1313
trim_trailing_whitespace = false

appveyor.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ environment:
2222
webpack_version: latest
2323
job_part: test
2424
- nodejs_version: '6'
25-
webpack_version: latest
25+
webpack_version: next
2626
job_part: next
2727
build: 'off'
2828
matrix:
@@ -35,8 +35,7 @@ install:
3535
before_test:
3636
- cmd: npm install webpack@%webpack_version%
3737
test_script:
38-
- node --version
3938
- node --version
4039
- npm --version
4140
- cmd: FOR /F %%I in ('compver --name webpack --gte %webpack_version% --lt latest') do SET COMPARED_VERSION_RESULT=%%I
42-
- cmd: IF %COMPARED_VERSION_RESULT% NEQ -1 (npm run ci:test) ELSE (ECHO "Next is older than Latest - Skipping Canary Suite")
41+
- cmd: IF %COMPARED_VERSION_RESULT% NEQ -1 (npm run ci:%job_part%) ELSE (ECHO "Next is older than Latest - Skipping Canary Suite")

package-lock.json

+216-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
"start": "npm run build -- -w",
1616
"build": "cross-env NODE_ENV=production babel src -d dist --ignore 'src/**/*.test.js' --copy-files",
1717
"clean": "del-cli dist",
18+
"commitlint": "commitlint",
19+
"commitmsg": "commitlint -e $GIT_PARAMS",
1820
"lint": "eslint --cache src test",
1921
"prebuild": "npm run clean",
2022
"prepublish": "npm run build",
@@ -24,9 +26,9 @@
2426
"test:watch": "jest --watch",
2527
"test:coverage": "jest --collectCoverageFrom='src/**/*.js' --coverage",
2628
"ci:lint": "npm run lint && npm run security",
27-
"ci:lint:commits": "commitlint --from=origin/master --to=${CIRCLE_SHA1}",
2829
"ci:test": "npm run test -- --runInBand",
2930
"ci:coverage": "npm run test:coverage -- --runInBand",
31+
"ci:lint:commits": "commitlint --from=origin/master --to=${CIRCLE_SHA1}",
3032
"defaults": "webpack-defaults"
3133
},
3234
"files": [
@@ -56,6 +58,7 @@
5658
"@babel/preset-env": "^7.1.6",
5759
"@commitlint/cli": "^7.2.1",
5860
"@commitlint/config-conventional": "^7.1.2",
61+
"@webpack-contrib/defaults": "^3.0.0",
5962
"@webpack-contrib/eslint-config-webpack": "^3.0.0",
6063
"babel-core": "^7.0.0-bridge.0",
6164
"babel-jest": "^23.6.0",
@@ -77,8 +80,7 @@
7780
"sass-loader": "^7.1.0",
7881
"standard-version": "^4.0.0",
7982
"strip-ansi": "^5.0.0",
80-
"webpack": "^4.26.1",
81-
"webpack-defaults": "^2.3.0"
83+
"webpack": "^4.26.1"
8284
},
8385
"keywords": [
8486
"webpack",

0 commit comments

Comments
 (0)