Skip to content
This repository was archived by the owner on Oct 27, 2020. It is now read-only.

Commit 5025869

Browse files
committed
fix: upgrade webpack-defaults, add missing dependency
1 parent 5b0cffa commit 5025869

File tree

5 files changed

+2715
-2177
lines changed

5 files changed

+2715
-2177
lines changed

.babelrc

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,19 @@
1212
"transform-regenerator"
1313
]
1414
}
15+
],
16+
[
17+
"env",
18+
{
19+
"useBuiltIns": true,
20+
"targets": {
21+
"node": "4.3"
22+
},
23+
"exclude": [
24+
"transform-async-to-generator",
25+
"transform-regenerator"
26+
]
27+
}
1528
]
1629
],
1730
"plugins": [
@@ -32,4 +45,4 @@
3245
]
3346
}
3447
}
35-
}
48+
}

.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.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:
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: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
branches:
2+
only:
3+
- master
4+
init:
5+
- git config --global core.autocrlf input
6+
environment:
7+
matrix:
8+
- nodejs_version: '8'
9+
webpack_version: latest
10+
job_part: test
11+
- nodejs_version: '6'
12+
webpack_version: latest
13+
job_part: test
14+
- nodejs_version: '4.3'
15+
webpack_version: latest
16+
job_part: test
17+
build: 'off'
18+
matrix:
19+
fast_finish: true
20+
install:
21+
- 'ps: Install-Product node $env:nodejs_version x64'
22+
- npm install
23+
before_test:
24+
- 'cmd: npm install webpack@%webpack_version%'
25+
test_script:
26+
- node --version
27+
- npm --version
28+
- 'cmd: npm run appveyor:%job_part%'

0 commit comments

Comments
 (0)