diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-07-11 13:16:16 +0200 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-07-11 13:16:16 +0200 |
| commit | 7e2962899ba67c124e9d3384b4b28f6e01258268 (patch) | |
| tree | 7c86b3366d9ed5bd2738b8ad119ef9d0b23bd4fc | |
| parent | dcd2b3e13e43e1fe6a81d7e0472b0bcc2677763b (diff) | |
| download | gitlab-ce-winh-karma-jsdom.tar.gz | |
Resolve jsdom dependencywinh-karma-jsdom
| -rw-r--r-- | package.json | 5 | ||||
| -rw-r--r-- | yarn.lock | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/package.json b/package.json index 69de39caec5..ce763630532 100644 --- a/package.json +++ b/package.json @@ -61,10 +61,8 @@ "jquery-ujs": "1.2.2", "jquery.waitforimages": "^2.2.0", "js-cookie": "^2.1.3", - "jsdom": "^11.11.0", "jszip": "^3.1.3", "jszip-utils": "^0.0.2", - "karma-jsdom-launcher": "^6.1.3", "katex": "^0.8.3", "marked": "^0.3.12", "monaco-editor": "0.13.1", @@ -126,15 +124,18 @@ "istanbul": "^0.4.5", "jasmine-core": "^2.9.0", "jasmine-jquery": "^2.1.1", + "jsdom": "^11.11.0", "karma": "^2.0.2", "karma-chrome-launcher": "^2.2.0", "karma-coverage-istanbul-reporter": "^1.4.2", "karma-jasmine": "^1.1.1", + "karma-jsdom-launcher": "^6.1.3", "karma-mocha-reporter": "^2.2.5", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "3.0.0", "nodemon": "^1.17.3", "prettier": "1.12.1", + "request": "2.83.0", "webpack-dev-server": "^3.1.4" } } diff --git a/yarn.lock b/yarn.lock index 1ded3f47acd..84622fbc72a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6827,7 +6827,7 @@ request@2.75.x: tough-cookie "~2.3.0" tunnel-agent "~0.4.1" -request@^2.0.0, request@^2.74.0: +request@2.83.0, request@^2.0.0, request@^2.74.0: version "2.83.0" resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" dependencies: |