Skip to content

Commit 24facb0

Browse files
author
Matt Lewis
committed
feat: allow webpack3 peer dependency
1 parent 83837f7 commit 24facb0

File tree

7 files changed

+5948
-5220
lines changed

7 files changed

+5948
-5220
lines changed

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
yarn.lock -diff
22

33
* text=auto
4-
bin/* eol=lf
4+
bin/* eol=lf
5+
package-lock.json -diff

.travis.yml

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,48 @@
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: '7'
11-
env: WEBPACK_VERSION="2.2.0" JOB_PART=lint
12-
- os: linux
13-
node_js: '4.3'
14-
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
15-
- os: linux
16-
node_js: '6'
17-
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
18-
- os: linux
19-
node_js: '7'
20-
env: WEBPACK_VERSION="2.2.0" JOB_PART=coverage
12+
- &test-latest
13+
stage: Webpack latest
14+
nodejs: 6
15+
env: WEBPACK_VERSION=latest JOB_PART=test
16+
script: npm run travis:$JOB_PART
17+
- <<: *test-latest
18+
nodejs: 4.3
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:
36+
- 'if [[ `npm -v` != 5* ]]; then npm i -g npm@^5.0.0; fi'
2237
- nvm --version
2338
- node --version
39+
- npm --version
2440
before_script:
2541
- |-
2642
if [ "$WEBPACK_VERSION" ]; then
27-
yarn add webpack@^$WEBPACK_VERSION
43+
npm i --no-save webpack@$WEBPACK_VERSION
2844
fi
2945
script:
30-
- 'yarn run pretest'
31-
- 'yarn run travis:$JOB_PART'
46+
- 'npm run travis:$JOB_PART'
3247
after_success:
3348
- 'bash <(curl -s https://codecov.io/bash)'

appveyor.yml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,28 @@
1-
# appveyor file
2-
# http://www.appveyor.com/docs/appveyor-yml
3-
4-
init:
5-
- git config --global core.autocrlf input
6-
71
branches:
82
only:
93
- master
10-
11-
# what combinations to test
4+
init:
5+
- git config --global core.autocrlf input
126
environment:
137
matrix:
14-
- nodejs_version: 7
8+
- nodejs_version: '8'
9+
webpack_version: 2.6.0
1510
job_part: test
16-
- nodejs_version: 6
11+
- nodejs_version: '6'
12+
webpack_version: 2.6.0
1713
job_part: test
18-
- nodejs_version: 4
14+
- nodejs_version: '4.3'
15+
webpack_version: 2.6.0
1916
job_part: test
20-
21-
install:
22-
- ps: Install-Product node $env:nodejs_version x64
23-
- yarn install
24-
25-
build: off
26-
17+
build: 'off'
2718
matrix:
2819
fast_finish: true
29-
20+
install:
21+
- 'ps: Install-Product node $env:nodejs_version x64'
22+
- npm install
23+
before_test:
24+
- 'cmd: npm install webpack@^%webpack_version%'
3025
test_script:
3126
- node --version
3227
- npm --version
33-
- cmd: yarn run appveyor:%job_part%
28+
- 'cmd: npm run appveyor:%job_part%'

0 commit comments

Comments
 (0)