Skip to content

Commit 5430aa2

Browse files
authored
Merge pull request #27 from waysact/travis-webpack-2.2.0-rc
Run Travis against webpack 2.2.0-rc
2 parents 7bddf1f + 5fe8988 commit 5430aa2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ node_js:
44
addons:
55
firefox: latest
66
env:
7-
- WEBPACK_SUFFIX=
8-
- WEBPACK_SUFFIX=@beta
7+
- WEBPACK_SUFFIX="@1" ETWP_SUFFIX="@1"
8+
- WEBPACK_SUFFIX="@>=2.2.0-rc <3.0" ETWP_SUFFIX="@>=2.0.0-beta <3.0"
99
install:
1010
- npm install --ignore-scripts
1111
- npm rm webpack
1212
- npm rm extract-text-webpack-plugin
1313
- npm install "webpack""$WEBPACK_SUFFIX" --ignore-scripts || true
14-
- npm install "extract-text-webpack-plugin""$WEBPACK_SUFFIX" --ignore-scripts || true
14+
- npm install "extract-text-webpack-plugin""$ETWP_SUFFIX" --ignore-scripts || true
1515
before_script:
1616
- export DISPLAY=:99.0
1717
- sh -e /etc/init.d/xvfb start

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"webpack": "^1.12.11"
5353
},
5454
"peerDependencies": {
55-
"webpack": "^1.12.11 || >=2.1.0-beta || 2.2.0-rc.0 <3.0"
55+
"webpack": "^1.12.11 || >=2.1.0-beta || >=2.2.0-rc <3.0"
5656
},
5757
"files": [
5858
"LICENSE",

0 commit comments

Comments
 (0)