Skip to content

Commit 547fe6c

Browse files
committed
Merge branch 'master' into better-timings
* master: (71 commits) 6.13.3 Revert init order change Add browser tests (choojs#696) 6.13.2 Fix location missing on store init (choojs#695) Typo Fix in Readme (choojs#693) 6.13.1 Fix wrong this usage in nanohref integration (choojs#689) Some spelling & typo fixes in readme (choojs#688) Fix inspect script (choojs#654) Add v6 tests (choojs#674) Remove references to bel (choojs#678) 6.13.0 Add hash option (choojs#667) Add documentation on components (choojs#673) Update README.md (choojs#669) 6.12.1 6.12.0 typings: add app to app.use cb (choojs#665) update dependencies (choojs#663) ...
2 parents 236e73f + 3d3b228 commit 547fe6c

File tree

27 files changed

+1293
-547
lines changed

27 files changed

+1293
-547
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ coverage.json
1111
.zuulrc
1212
package-lock.json
1313
yarn.lock
14+
.idea

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
node_js:
22
- '6'
3-
- '7'
43
- '8'
4+
- '10'
55
sudo: false
66
language: node_js
77
env:
@@ -21,5 +21,10 @@ addons:
2121
- ubuntu-toolchain-r-test
2222
packages:
2323
- g++-4.8
24+
- xvfb
25+
install:
26+
- export DISPLAY=':99.0'
27+
- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
28+
- npm install
2429
script: npm run test
2530
# after_script: npm i -g codecov.io && cat ./coverage/lcov.info | codecov

0 commit comments

Comments
 (0)