Skip to content

Commit

Permalink
Merge branch 'master' into better-timings
Browse files Browse the repository at this point in the history
* 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)
  ...
  • Loading branch information
tornqvist committed Jun 8, 2019
2 parents 236e73f + 3d3b228 commit 547fe6c
Show file tree
Hide file tree
Showing 27 changed files with 1,293 additions and 547 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ coverage.json
.zuulrc
package-lock.json
yarn.lock
.idea
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
node_js:
- '6'
- '7'
- '8'
- '10'
sudo: false
language: node_js
env:
Expand All @@ -21,5 +21,10 @@ addons:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- xvfb
install:
- export DISPLAY=':99.0'
- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
- npm install
script: npm run test
# after_script: npm i -g codecov.io && cat ./coverage/lcov.info | codecov
Loading

0 comments on commit 547fe6c

Please sign in to comment.