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

Commit

Permalink
fix(schema): allow additionalProperties (#207)
Browse files Browse the repository at this point in the history
* fix(schema): allow `additionalProperties`

* chore(package): update `webpack-defaults` v1.3.0...1.6.0
  • Loading branch information
michael-ciniawsky authored and joshwiens committed Sep 30, 2017
1 parent abe91a8 commit cf7c85a
Show file tree
Hide file tree
Showing 6 changed files with 287 additions and 1,234 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "webpack",
"rules": {
"rules": {
"no-undefined": 0
}
}
42 changes: 28 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,37 @@
sudo: false
dist: trusty
language: node_js
branches:
only:
- master
matrix:
jobs:
fast_finish: true
allow_failures:
- env: WEBPACK_VERSION=canary
include:
- os: linux
node_js: '8'
env: WEBPACK_VERSION="2.6.0" JOB_PART=lint
- os: linux
node_js: '4.3'
env: WEBPACK_VERSION="2.6.0" JOB_PART=test
- os: linux
node_js: '6'
env: WEBPACK_VERSION="2.6.0" JOB_PART=test
- os: linux
node_js: '8'
env: WEBPACK_VERSION="2.6.0" JOB_PART=coverage
- &test-latest
stage: Webpack latest
node_js: 6
env: WEBPACK_VERSION=latest JOB_PART=test
script: npm run travis:$JOB_PART
- <<: *test-latest
node_js: 4.8
env: WEBPACK_VERSION=latest JOB_PART=test
script: npm run travis:$JOB_PART
- <<: *test-latest
node_js: 8
env: WEBPACK_VERSION=latest JOB_PART=lint
script: npm run travis:$JOB_PART
- <<: *test-latest
node_js: 8
env: WEBPACK_VERSION=latest JOB_PART=coverage
script: npm run travis:$JOB_PART
after_success: 'bash <(curl -s https://codecov.io/bash)'
- stage: Webpack canary
before_script: npm i --no-save git://github.com/webpack/webpack.git#master
script: npm run travis:$JOB_PART
node_js: 8
env: WEBPACK_VERSION=canary JOB_PART=test
before_install:
- 'if [[ `npm -v` != 5* ]]; then npm i -g npm@^5.0.0; fi'
- nvm --version
Expand All @@ -26,7 +40,7 @@ before_install:
before_script:
- |-
if [ "$WEBPACK_VERSION" ]; then
npm i --no-save webpack@^$WEBPACK_VERSION
npm i --no-save webpack@$WEBPACK_VERSION
fi
script:
- 'npm run travis:$JOB_PART'
Expand Down
11 changes: 6 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,23 @@ init:
environment:
matrix:
- nodejs_version: '8'
webpack_version: 2.6.0
webpack_version: latest
job_part: test
- nodejs_version: '6'
webpack_version: 2.6.0
webpack_version: latest
job_part: test
- nodejs_version: '4.3'
webpack_version: 2.6.0
- nodejs_version: '4.8'
webpack_version: latest
job_part: test
build: 'off'
matrix:
fast_finish: true
install:
- ps: Install-Product node $env:nodejs_version x64
- npm i -g npm@latest
- npm install
before_test:
- cmd: npm install webpack@^%webpack_version%
- cmd: npm install webpack@%webpack_version%
test_script:
- node --version
- npm --version
Expand Down
Loading

0 comments on commit cf7c85a

Please sign in to comment.