diff --git a/karma.conf.js b/karma.conf.js index a5f9c9022..46d4ef112 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,9 +1,8 @@ -import { puppeteer } from 'puppeteer/package.json' -import ChromiumDownloader from 'puppeteer/utils/ChromiumDownloader' +import puppeteer from 'puppeteer' import { jsConfig } from './webpack.config.base' -process.env.CHROMIUM_BIN = ChromiumDownloader.revisionInfo(ChromiumDownloader.currentPlatform(), puppeteer.chromium_revision).executablePath +process.env.CHROME_BIN = puppeteer.executablePath() const webpackConfig = jsConfig() @@ -53,7 +52,7 @@ export default function (config) { // start these browsers // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['ChromiumHeadless'], + browsers: ['ChromeHeadless'], // Continuous Integration mode // if true, Karma captures browsers, runs the tests and exits diff --git a/package.json b/package.json index 18bf8fa6f..4ac9a5419 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "build": "webpack --progress --colors", "build:watch": "yarn build --watch", "release": "yarn build -p --config webpack.config.prod.babel.js", - "upgrade": "yarn-upgrade-all && yarn remove d3 && yarn add d3@3.5.17 && yarn remove dagre-d3-renderer && yarn add dagre-d3-renderer@0.4.25 && yarn remove dagre-layout && yarn add dagre-layout@0.8.0 && yarn remove less && yarn add --dev less@2.7.3 && yarn remove puppeteer && yarn add --dev puppeteer@0.13.0 && yarn remove karma jasmine && yarn add --dev karma@1.7.1 jasmine@2.8.0", + "upgrade": "yarn-upgrade-all && yarn remove d3 dagre-d3-renderer dagre-layout less karma jasmine && yarn add d3@3.5.17 dagre-d3-renderer@0.4.25 dagre-layout@0.8.0 && yarn add --dev less@2.7.3 karma@1.7.1 jasmine@2.8.0", "lint": "standard", "karma": "node -r babel-register node_modules/.bin/karma start karma.conf.js", "test": "yarn lint && yarn karma", @@ -66,7 +66,7 @@ "karma-webpack": "^2.0.13", "less": "2.7.3", "less-loader": "^4.0.6", - "puppeteer": "0.13.0", + "puppeteer": "^1.1.1", "standard": "^11.0.0", "style-loader": "^0.20.2", "webpack": "^4.1.0", diff --git a/yarn.lock b/yarn.lock index 03042c961..9fa7b7b15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -70,16 +70,7 @@ ajv@^4.9.1: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^5.0.0: - version "5.2.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39" - dependencies: - co "^4.6.0" - fast-deep-equal "^1.0.0" - json-schema-traverse "^0.3.0" - json-stable-stringify "^1.0.1" - -ajv@^5.2.3, ajv@^5.3.0: +ajv@^5.0.0, ajv@^5.2.3, ajv@^5.3.0: version "5.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" dependencies: @@ -1462,8 +1453,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.30000812" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000812.tgz#29c28dd6927ee43e8c2ab648e5236ac916c97d69" + version "1.0.30000813" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000813.tgz#e0a1c603f8880ad787b2a35652b2733f32a5e29a" caniuse-lite@^1.0.30000792: version "1.0.30000812" @@ -6120,9 +6111,9 @@ punycode@^1.2.4, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" -puppeteer@0.13.0: - version "0.13.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-0.13.0.tgz#2e6956205f2c640964c2107f620ae1eef8bde8fd" +puppeteer@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.1.1.tgz#adbf25e49f5ef03443c10ab8e09a954ca0c7bfee" dependencies: debug "^2.6.8" extract-zip "^1.6.5" @@ -6524,13 +6515,13 @@ resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" -resolve@^1.1.6, resolve@^1.1.7: +resolve@^1.1.6: version "1.4.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86" dependencies: path-parse "^1.0.5" -resolve@^1.3.3, resolve@^1.5.0: +resolve@^1.1.7, resolve@^1.3.3, resolve@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" dependencies: