Skip to content

Commit

Permalink
feat: allow webpack3 peer dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Lewis committed Jun 20, 2017
1 parent 83837f7 commit de843fe
Show file tree
Hide file tree
Showing 7 changed files with 5,950 additions and 5,220 deletions.
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
yarn.lock -diff

* text=auto
bin/* eol=lf
bin/* eol=lf
package-lock.json -diff
47 changes: 31 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,48 @@
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: '7'
env: WEBPACK_VERSION="2.2.0" JOB_PART=lint
- os: linux
node_js: '4.3'
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
- os: linux
node_js: '6'
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
- os: linux
node_js: '7'
env: WEBPACK_VERSION="2.2.0" JOB_PART=coverage
- &test-latest
stage: Webpack latest
nodejs: 6
env: WEBPACK_VERSION=latest JOB_PART=test
script: npm run travis:$JOB_PART
- <<: *test-latest
nodejs: 4.3
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
- node --version
- npm --version
before_script:
- |-
if [ "$WEBPACK_VERSION" ]; then
yarn add webpack@^$WEBPACK_VERSION
npm i --no-save webpack@$WEBPACK_VERSION
fi
script:
- 'yarn run pretest'
- 'yarn run travis:$JOB_PART'
- 'npm run travis:$JOB_PART'
after_success:
- 'bash <(curl -s https://codecov.io/bash)'
36 changes: 16 additions & 20 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@
# appveyor file
# http://www.appveyor.com/docs/appveyor-yml

init:
- git config --global core.autocrlf input

branches:
only:
- master

# what combinations to test
init:
- git config --global core.autocrlf input
environment:
matrix:
- nodejs_version: 7
- nodejs_version: '8'
webpack_version: 3.0.0
job_part: test
- nodejs_version: 6
- nodejs_version: '6'
webpack_version: 3.0.0
job_part: test
- nodejs_version: 4
- nodejs_version: '4.3'
webpack_version: 3.0.0
job_part: test

install:
- ps: Install-Product node $env:nodejs_version x64
- yarn install

build: off

build: 'off'
matrix:
fast_finish: true

install:
- ps: Install-Product node $env:nodejs_version x64
- npm i -g npm@^5.0.0
- npm install
before_test:
- cmd: npm install webpack@^%webpack_version%
test_script:
- node --version
- npm --version
- cmd: yarn run appveyor:%job_part%
- cmd: npm run appveyor:%job_part%
Loading

0 comments on commit de843fe

Please sign in to comment.