Skip to content
This repository was archived by the owner on Mar 17, 2021. It is now read-only.

Commit cf7c85a

Browse files
michael-ciniawskyjoshwiens
authored andcommitted
fix(schema): allow additionalProperties (#207)
* fix(schema): allow `additionalProperties` * chore(package): update `webpack-defaults` v1.3.0...1.6.0
1 parent abe91a8 commit cf7c85a

File tree

6 files changed

+287
-1234
lines changed

6 files changed

+287
-1234
lines changed

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": "webpack",
3-
"rules": {
3+
"rules": {
44
"no-undefined": 0
55
}
66
}

.travis.yml

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,37 @@
11
sudo: false
2+
dist: trusty
23
language: node_js
34
branches:
45
only:
56
- master
6-
matrix:
7+
jobs:
78
fast_finish: true
9+
allow_failures:
10+
- env: WEBPACK_VERSION=canary
811
include:
9-
- os: linux
10-
node_js: '8'
11-
env: WEBPACK_VERSION="2.6.0" JOB_PART=lint
12-
- os: linux
13-
node_js: '4.3'
14-
env: WEBPACK_VERSION="2.6.0" JOB_PART=test
15-
- os: linux
16-
node_js: '6'
17-
env: WEBPACK_VERSION="2.6.0" JOB_PART=test
18-
- os: linux
19-
node_js: '8'
20-
env: WEBPACK_VERSION="2.6.0" JOB_PART=coverage
12+
- &test-latest
13+
stage: Webpack latest
14+
node_js: 6
15+
env: WEBPACK_VERSION=latest JOB_PART=test
16+
script: npm run travis:$JOB_PART
17+
- <<: *test-latest
18+
node_js: 4.8
19+
env: WEBPACK_VERSION=latest JOB_PART=test
20+
script: npm run travis:$JOB_PART
21+
- <<: *test-latest
22+
node_js: 8
23+
env: WEBPACK_VERSION=latest JOB_PART=lint
24+
script: npm run travis:$JOB_PART
25+
- <<: *test-latest
26+
node_js: 8
27+
env: WEBPACK_VERSION=latest JOB_PART=coverage
28+
script: npm run travis:$JOB_PART
29+
after_success: 'bash <(curl -s https://codecov.io/bash)'
30+
- stage: Webpack canary
31+
before_script: npm i --no-save git://github.com/webpack/webpack.git#master
32+
script: npm run travis:$JOB_PART
33+
node_js: 8
34+
env: WEBPACK_VERSION=canary JOB_PART=test
2135
before_install:
2236
- 'if [[ `npm -v` != 5* ]]; then npm i -g npm@^5.0.0; fi'
2337
- nvm --version
@@ -26,7 +40,7 @@ before_install:
2640
before_script:
2741
- |-
2842
if [ "$WEBPACK_VERSION" ]; then
29-
npm i --no-save webpack@^$WEBPACK_VERSION
43+
npm i --no-save webpack@$WEBPACK_VERSION
3044
fi
3145
script:
3246
- 'npm run travis:$JOB_PART'

appveyor.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,23 @@ init:
66
environment:
77
matrix:
88
- nodejs_version: '8'
9-
webpack_version: 2.6.0
9+
webpack_version: latest
1010
job_part: test
1111
- nodejs_version: '6'
12-
webpack_version: 2.6.0
12+
webpack_version: latest
1313
job_part: test
14-
- nodejs_version: '4.3'
15-
webpack_version: 2.6.0
14+
- nodejs_version: '4.8'
15+
webpack_version: latest
1616
job_part: test
1717
build: 'off'
1818
matrix:
1919
fast_finish: true
2020
install:
2121
- ps: Install-Product node $env:nodejs_version x64
22+
- npm i -g npm@latest
2223
- npm install
2324
before_test:
24-
- cmd: npm install webpack@^%webpack_version%
25+
- cmd: npm install webpack@%webpack_version%
2526
test_script:
2627
- node --version
2728
- npm --version

0 commit comments

Comments
 (0)