From 1dcb6cd39059a38b468f743616e5cb1a81bae477 Mon Sep 17 00:00:00 2001 From: Tyler Long Date: Mon, 24 Apr 2017 22:42:07 +0800 Subject: [PATCH] Update travis config --- .travis.yml | 32 ++++++++------- karma.conf.js | 1 + package.json | 4 +- todo.md | 2 +- yarn.lock | 108 +++++++++++++++++++++++++++++++++++++++----------- 5 files changed, 105 insertions(+), 42 deletions(-) diff --git a/.travis.yml b/.travis.yml index d9fd78ef9..13aa73f0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,23 @@ -language: node_js -osx_image: xcode8.1 -os: - - linux - - osx -sudo: false -node_js: - - "6.9" - - "7.9" -env: - - CXX=g++-4.8 +sudo: required +dist: xenial addons: - code_climate: - repo_token: e87e6bf1c253e0555437ebd23235fdfe2749b889358e7c6d100e4ea5b4f2e091 apt: sources: - - ubuntu-toolchain-r-test + - google-chrome packages: - - g++-4.8 + - google-chrome + code_climate: + repo_token: e87e6bf1c253e0555437ebd23235fdfe2749b889358e7c6d100e4ea5b4f2e091 +language: node_js +node_js: + - "6" + - "7" +before_install: + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start +before_script: + - yarn build +script: + - yarn test after_script: - cat coverage/lcov.info | codeclimate diff --git a/karma.conf.js b/karma.conf.js index 291c304bc..3af36973f 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -74,6 +74,7 @@ module.exports = function (config) { ChromeHeadless: { base: 'Chrome', flags: [ + '--incognito', '--headless', '--disable-gpu', // Without a remote debugging port, Google Chrome exits immediately. diff --git a/package.json b/package.json index 3b373998b..95c89f47e 100644 --- a/package.json +++ b/package.json @@ -99,10 +99,10 @@ "gulp-vartree": "^2.0.1", "hogan.js": "^3.0.2", "inject-loader": "^3.0.0", - "jasmine": "2.5.3", + "jasmine": "2.6.0", "jasmine-es6": "0.4.0", "jison": "^0.4.17", - "jsdom": "^9.12.0", + "jsdom": "^10.0.0", "karma": "^1.6.0", "karma-chrome-launcher": "^2.0.0", "karma-jasmine": "^1.1.0", diff --git a/todo.md b/todo.md index d47a93149..958ed701e 100644 --- a/todo.md +++ b/todo.md @@ -10,9 +10,9 @@ - babel-plugin-transform-remove-strict-mode - need to remove it after upgrading to d3 v4 - rewrite live editor -- Fix Travis CI - Fix CodeClimate - What is live-server ? - Get familar with jison - How to generate doc? - webpack warning: lodash too big +- add converalls diff --git a/yarn.lock b/yarn.lock index 7885fc23d..6b607e90f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1394,8 +1394,8 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000657" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000657.tgz#8192aec745019cc050217ad049c60dad21e3d1bc" + version "1.0.30000660" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000660.tgz#d2d57b309dc5a11bb5b46018f51855f7a41efee5" capture-stack-trace@^1.0.0: version "1.0.0" @@ -2055,7 +2055,7 @@ debug@2.6.3: dependencies: ms "0.7.2" -debug@^2.1.0, debug@^2.1.1, debug@^2.2.0: +debug@2.6.4, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0: version "2.6.4" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.4.tgz#7586a9b3c39741c0282ae33445c4e8ac74734fe0" dependencies: @@ -2293,8 +2293,8 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" electron-to-chromium@^1.2.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.7.tgz#9fb75a2417f28114425d364de118d1cfd681432b" + version "1.3.8" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.8.tgz#b2c8a2c79bb89fbbfd3724d9555e15095b5f5fb6" elliptic@^6.0.0: version "6.4.0" @@ -2942,7 +2942,7 @@ finalhandler@0.5.1: statuses "~1.3.1" unpipe "~1.0.0" -finalhandler@1.0.1, finalhandler@~1.0.0: +finalhandler@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.1.tgz#bcd15d1689c0e5ed729b6f7f541a6df984117db8" dependencies: @@ -2954,6 +2954,18 @@ finalhandler@1.0.1, finalhandler@~1.0.0: statuses "~1.3.1" unpipe "~1.0.0" +finalhandler@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.2.tgz#d0e36f9dbc557f2de14423df6261889e9d60c93a" + dependencies: + debug "2.6.4" + encodeurl "~1.0.1" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.1" + statuses "~1.3.1" + unpipe "~1.0.0" + find-cache-dir@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9" @@ -4140,7 +4152,7 @@ is-binary-path@^1.0.0: dependencies: binary-extensions "^1.0.0" -is-buffer@^1.0.2: +is-buffer@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc" @@ -4394,9 +4406,9 @@ istanbul@^0.4.0: which "^1.1.1" wordwrap "^1.0.0" -jasmine-core@^2.4.1, jasmine-core@~2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.5.2.tgz#6f61bd79061e27f43e6f9355e44b3c6cab6ff297" +jasmine-core@^2.4.1, jasmine-core@~2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.6.0.tgz#95e80740cc4d2c16741750e8b79e53c7ee15056a" jasmine-es6@0.4.0: version "0.4.0" @@ -4427,13 +4439,13 @@ jasmine-terminal-reporter@^1.0.0, jasmine-terminal-reporter@^1.0.2: indent-string "^2.1.0" pluralize "^1.2.1" -jasmine@2.5.3, jasmine@^2.3.0, jasmine@^2.5.2: - version "2.5.3" - resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.5.3.tgz#5441f254e1fc2269deb1dfd93e0e57d565ff4d22" +jasmine@2.6.0, jasmine@^2.3.0, jasmine@^2.5.2: + version "2.6.0" + resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.6.0.tgz#6b22e70883e8e589d456346153b4d206ddbe217f" dependencies: exit "^0.1.2" glob "^7.0.6" - jasmine-core "~2.5.2" + jasmine-core "~2.6.0" jison-lex@0.3.x: version "0.3.4" @@ -4497,6 +4509,32 @@ jsdoctypeparser@^1.2.0: dependencies: lodash "^3.7.0" +jsdom@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-10.0.0.tgz#3dda0b760aa248dd9b1392f8bb82e93ad70377b4" + dependencies: + abab "^1.0.3" + acorn "^4.0.4" + acorn-globals "^3.1.0" + array-equal "^1.0.0" + content-type-parser "^1.0.1" + cssom ">= 0.3.2 < 0.4.0" + cssstyle ">= 0.2.37 < 0.3.0" + escodegen "^1.6.1" + html-encoding-sniffer "^1.0.1" + nwmatcher ">= 1.3.9 < 2.0.0" + parse5 "^1.5.1" + pn "^1.0.0" + request "^2.79.0" + request-promise-native "^1.0.3" + sax "^1.2.1" + symbol-tree "^3.2.1" + tough-cookie "^2.3.2" + webidl-conversions "^4.0.0" + whatwg-encoding "^1.0.1" + whatwg-url "^4.3.0" + xml-name-validator "^2.0.1" + jsdom@^9.12.0: version "9.12.0" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4" @@ -4657,10 +4695,10 @@ kind-of@^1.1.0: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44" kind-of@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47" + version "3.2.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.0.tgz#b58abe4d5c044ad33726a8c1525b48cf891bff07" dependencies: - is-buffer "^1.0.2" + is-buffer "^1.1.5" klaw@^1.0.0: version "1.3.1" @@ -5150,7 +5188,7 @@ lodash@^3.10.0, lodash@^3.3.1, lodash@^3.7.0, lodash@^3.8.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5, lodash@^4.5.0: +lodash@^4.0.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5, lodash@^4.5.0: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -6217,6 +6255,10 @@ pluralize@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45" +pn@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/pn/-/pn-1.0.0.tgz#1cf5a30b0d806cd18f88fc41a6b5d4ad615b3ba9" + portfinder@^1.0.7: version "1.0.13" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9" @@ -6869,10 +6911,11 @@ register-module@^0.0.2: resolved "https://registry.yarnpkg.com/register-module/-/register-module-0.0.2.tgz#8b6f363ec604f86ba6df20eeb4bda8cc9787c89d" registry-auth-token@^3.0.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.2.0.tgz#5bf3bd4608a2dd9242542c44d66ad8a5f9cdd3b0" + version "3.3.0" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.0.tgz#57ae67347e73d96345ed1bc01294c7237c02aa63" dependencies: rc "^1.1.6" + safe-buffer "^5.0.1" registry-url@^3.0.0, registry-url@^3.0.3: version "3.1.0" @@ -6932,6 +6975,19 @@ request-progress@~2.0.1: dependencies: throttleit "^1.0.0" +request-promise-core@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6" + dependencies: + lodash "^4.13.1" + +request-promise-native@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.3.tgz#9cb2b2f69f137e4acf35116a08a441cbfd0c0134" + dependencies: + request-promise-core "1.1.1" + stealthy-require "^1.0.0" + request@2, request@^2.72.0, request@^2.74.0, request@^2.79.0, request@^2.81.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" @@ -7566,6 +7622,10 @@ statuses@1, "statuses@>= 1.3.1 < 2", statuses@~1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" +stealthy-require@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.0.tgz#ca61cf38766158ea819a0a1b0070b35de957f9b0" + stream-browserify@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" @@ -8285,8 +8345,8 @@ webidl-conversions@^4.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0" webpack-dev-middleware@^1.0.11: - version "1.10.1" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz#c6b4cf428139cf1aefbe06a0c00fdb4f8da2f893" + version "1.10.2" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1" dependencies: memory-fs "~0.4.1" mime "^1.3.4" @@ -8354,8 +8414,8 @@ whatwg-encoding@^1.0.1: iconv-lite "0.4.13" whatwg-url@^4.3.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.7.0.tgz#202035ac1955b087cdd20fa8b58ded3ab1cd2af5" + version "4.7.1" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.7.1.tgz#df4dc2e3f25a63b1fa5b32ed6d6c139577d690de" dependencies: tr46 "~0.0.3" webidl-conversions "^3.0.0"