diff --git a/.travis.yml b/.travis.yml index 0ebbd2cff6..c057aaae5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ addons: apt: packages: - libgnome-keyring-dev - - icnsutils + # - openjpeg-tools # or libopenjp2-tools - graphicsmagick - libreadline6 - xz-utils diff --git a/package.json b/package.json index 7b36999c32..8e601ddd8d 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "css-loader": "~0.28.9", "devtron": "^1.4.0", "electron": "~1.8.2", - "electron-builder": "~19.56.0", + "electron-builder": "~20.0.7", "extract-text-webpack-plugin": "~3.0.2", "file-loader": "~1.1.5", "html-webpack-plugin": "^2.28.0", @@ -117,18 +117,18 @@ "yesno": "~0.0.1" }, "dependencies": { - "@angular/animations": "5.2.1", + "@angular/animations": "5.2.5", "@angular/cdk": "5.1.0", - "@angular/common": "5.2.1", - "@angular/compiler": "5.2.1", - "@angular/compiler-cli": "5.2.1", - "@angular/core": "5.2.1", - "@angular/forms": "5.2.1", - "@angular/http": "5.2.1", + "@angular/common": "5.2.5", + "@angular/compiler": "5.2.5", + "@angular/compiler-cli": "5.2.5", + "@angular/core": "5.2.5", + "@angular/forms": "5.2.5", + "@angular/http": "5.2.5", "@angular/material": "5.1.0", - "@angular/platform-browser": "5.2.1", - "@angular/platform-browser-dynamic": "5.2.1", - "@angular/router": "5.2.1", + "@angular/platform-browser": "5.2.5", + "@angular/platform-browser-dynamic": "5.2.5", + "@angular/router": "5.2.5", "@tweenjs/tween.js": "~17.1.1", "azure-batch": "git://github.com/amarzavery/azure-batch-ts#fae8b77267b013711be52c1ff5efba7c5eefa092", "azure-batch-js": "git://github.com/amarzavery/azure-batch-ts#fae8b77267b013711be52c1ff5efba7c5eefa092", diff --git a/scripts/travis/build-and-test.sh b/scripts/travis/build-and-test.sh index cbec76caf5..9a92cde7f0 100755 --- a/scripts/travis/build-and-test.sh +++ b/scripts/travis/build-and-test.sh @@ -31,7 +31,7 @@ if [ "${TRAVIS_PULL_REQUEST}" = "false" ] || [ "${TRAVIS_BRANCH}" = "stable" ]; if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "stable" ]; then npm run package -- --publish always --draft else - npm run package -- --publish never # TODO replace with this + npm run package -- --publish never fi ls release else diff --git a/test/app/spec-controls.ts b/test/app/spec-controls.ts index 59c48da147..b3388db389 100644 --- a/test/app/spec-controls.ts +++ b/test/app/spec-controls.ts @@ -2,6 +2,7 @@ // tslint:disable:no-console import { DataCacheTracker } from "app/services/core"; import { GenericView } from "app/services/core/data/generic-view"; +import { Observable, Subscription } from "rxjs"; import { MockEntityView, MockListView } from "test/utils/mocks"; /** @@ -13,9 +14,14 @@ afterEach(() => { DataCacheTracker.disposeAll(); }); -const viewCreated = {}; +// Generic view +let viewCreated = {}; let lastInit; let lastDispose; + +// Observable +let subscriptionCreated = {}; +let lastSubscribe; let counter = 0; jasmine.getEnv().addReporter({ @@ -35,11 +41,13 @@ jasmine.getEnv().addReporter({ dispose.bind(this)(); } }; + }, specDone: (result) => { GenericView.prototype.init = lastInit; GenericView.prototype.dispose = lastDispose; if (result.status === "disabled") { return; } + }, jasmineDone: () => { @@ -55,5 +63,33 @@ jasmine.getEnv().addReporter({ } console.warn("=".repeat(100)); } + + viewCreated = {}; }, }); + +beforeEach(() => { + const subscribe = Observable.prototype.subscribe; + lastSubscribe = subscribe; + + Observable.prototype.subscribe = function (this: any, ...args) { + const sub = subscribe.bind(this)(...args); + sub.id = counter++; + subscriptionCreated[sub.id] = { + sub: sub, + }; + return sub; + }; +}); + +afterEach(() => { + Observable.prototype.subscribe = lastSubscribe; + const subIds = Object.keys(subscriptionCreated); + if (subIds.length > 0) { + for (const value of Object.values(subscriptionCreated) as any) { + value.sub.unsubscribe(); + } + } + + subscriptionCreated = {}; +}); diff --git a/yarn.lock b/yarn.lock index b5bad50edb..f3d9ed6e1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,25 +10,21 @@ version "1.0.1" resolved "https://registry.yarnpkg.com/7zip-bin-mac/-/7zip-bin-mac-1.0.1.tgz#3e68778bbf0926adc68159427074505d47555c02" -"7zip-bin-win@~2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/7zip-bin-win/-/7zip-bin-win-2.1.1.tgz#8acfc28bb34e53a9476b46ae85a97418e6035c20" +"7zip-bin-win@~2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/7zip-bin-win/-/7zip-bin-win-2.2.0.tgz#0b81c43e911100f3ece2ebac4f414ca95a572d5b" -"7zip-bin@^2.4.1": - version "2.4.1" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-2.4.1.tgz#88cf99736d35b104dab1d430c4edd1d51e58aade" +"7zip-bin@~3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-3.1.0.tgz#70814c6b6d44fef8b74be6fc64d3977a2eff59a5" optionalDependencies: "7zip-bin-linux" "~1.3.1" "7zip-bin-mac" "~1.0.1" - "7zip-bin-win" "~2.1.1" + "7zip-bin-win" "~2.2.0" -"7zip-bin@~3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-3.0.0.tgz#17416dc542f41511b26a9667b92847d75ef150fe" - -"@angular/animations@5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.2.1.tgz#cc325c23db98c13539cbedf9405bc068bd3041cd" +"@angular/animations@5.2.5": + version "5.2.5" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.2.5.tgz#3e72184321c4979305619c74902b8be92d76db70" dependencies: tslib "^1.7.1" @@ -38,42 +34,42 @@ dependencies: tslib "^1.7.1" -"@angular/common@5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.2.1.tgz#a6f2d349f6102e6be7cc488899578a0dc327b755" +"@angular/common@5.2.5": + version "5.2.5" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.2.5.tgz#08dd636fa46077d047066b13a1aae494066f6c55" dependencies: tslib "^1.7.1" -"@angular/compiler-cli@5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.2.1.tgz#9ee3431d937767a4f4ae401f172b507b5db6456e" +"@angular/compiler-cli@5.2.5": + version "5.2.5" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.2.5.tgz#b1988bb2c0a956e7fc163acf8c7d794a07a88d08" dependencies: chokidar "^1.4.2" minimist "^1.2.0" reflect-metadata "^0.1.2" tsickle "^0.26.0" -"@angular/compiler@5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.1.tgz#758ed236c361cff018699e041fabbc4bcb7cdc72" +"@angular/compiler@5.2.5": + version "5.2.5" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.5.tgz#5e3b511906048a579fcd007aba72911472e5aa28" dependencies: tslib "^1.7.1" -"@angular/core@5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.1.tgz#47347e4098b0e997220d77652f4d9ca44dda8923" +"@angular/core@5.2.5": + version "5.2.5" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.5.tgz#24f9cd75c5b2728f2ddd1869777590ea7177bca9" dependencies: tslib "^1.7.1" -"@angular/forms@5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.2.1.tgz#530f1249bc71d9560297be642d55a5a6c439d920" +"@angular/forms@5.2.5": + version "5.2.5" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.2.5.tgz#2ad7a420c6ef6cd87a34071c5319ec83f7ed56aa" dependencies: tslib "^1.7.1" -"@angular/http@5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.2.1.tgz#dd847fb8aa0972b1906df5376307354b818ef4be" +"@angular/http@5.2.5": + version "5.2.5" + resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.2.5.tgz#1208256e36f0e486d96d10a733fdc8424ffa16bf" dependencies: tslib "^1.7.1" @@ -83,21 +79,21 @@ dependencies: tslib "^1.7.1" -"@angular/platform-browser-dynamic@5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.1.tgz#df073c48f5b90e8c5d5b0774aa2bef49f288989c" +"@angular/platform-browser-dynamic@5.2.5": + version "5.2.5" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.5.tgz#b89df410bd953e2a6843325f9ac3c09a10eadaf0" dependencies: tslib "^1.7.1" -"@angular/platform-browser@5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.2.1.tgz#0d05a4ba107e7ad8241a862683c83193c26b3c5e" +"@angular/platform-browser@5.2.5": + version "5.2.5" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.2.5.tgz#eae4af2b742fb901d84d6367cd99f9e88102151f" dependencies: tslib "^1.7.1" -"@angular/router@5.2.1": - version "5.2.1" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.2.1.tgz#fbb3a2d644e854bca25d075e506d25f3c670f8d2" +"@angular/router@5.2.5": + version "5.2.5" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.2.5.tgz#f8f220d5fb85fc10d60fe606b0f2a64732265142" dependencies: tslib "^1.7.1" @@ -496,6 +492,10 @@ ajv-keywords@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" +ajv-keywords@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be" + ajv@^4.7.0, ajv@^4.9.1: version "4.11.8" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" @@ -512,7 +512,7 @@ ajv@^5.0.0, ajv@^5.1.5: json-schema-traverse "^0.3.0" json-stable-stringify "^1.0.1" -ajv@^5.1.0, ajv@^5.5.0: +ajv@^5.1.0: version "5.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" dependencies: @@ -521,6 +521,14 @@ ajv@^5.1.0, ajv@^5.5.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" +ajv@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e" + dependencies: + fast-deep-equal "^1.0.0" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.3.0" + align-text@^0.1.1, align-text@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" @@ -619,6 +627,26 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" +app-builder-bin-linux@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.3.6.tgz#45344c4b09b3c2febc3a452e8916fa00aa645b62" + +app-builder-bin-mac@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.3.6.tgz#c7df8f4c349292c789e557a285df2279d05b8201" + +app-builder-bin-win@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.3.6.tgz#b492c0573cfa4206fb9f33756d6ab844e04ce0b8" + +app-builder-bin@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.3.6.tgz#fbc49a3b74917f5e23632c71ea1a3ea9b083424e" + optionalDependencies: + app-builder-bin-linux "1.3.6" + app-builder-bin-mac "1.3.6" + app-builder-bin-win "1.3.6" + app-root-path@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46" @@ -738,13 +766,6 @@ arrify@^1.0.0, arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" -asar-integrity@0.2.4: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asar-integrity/-/asar-integrity-0.2.4.tgz#b7867c9720e08c461d12bc42f005c239af701733" - dependencies: - bluebird-lst "^1.0.5" - fs-extra-p "^4.5.0" - asn1.js@^4.0.0: version "4.9.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40" @@ -1410,16 +1431,7 @@ buffer@^5.0.2: base64-js "^1.0.2" ieee754 "^1.1.4" -builder-util-runtime@4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.4.tgz#c92c352097006a07f3324ea200fa815440cba198" - dependencies: - bluebird-lst "^1.0.5" - debug "^3.1.0" - fs-extra-p "^4.5.0" - sax "^1.2.4" - -builder-util-runtime@^4.0.4, builder-util-runtime@^4.0.5: +builder-util-runtime@4.0.5, builder-util-runtime@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.5.tgz#5340cf9886b9283ea6e5b20dc09b5e3e461aef62" dependencies: @@ -1437,37 +1449,17 @@ builder-util-runtime@~4.0.3: fs-extra-p "^4.5.0" sax "^1.2.4" -builder-util@4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-4.2.2.tgz#366b2bc32324bfe5565a7e4f13f86238fef5e92b" - dependencies: - "7zip-bin" "^2.4.1" - bluebird-lst "^1.0.5" - builder-util-runtime "^4.0.4" - chalk "^2.3.0" - debug "^3.1.0" - fs-extra-p "^4.5.0" - ini "^1.3.5" - is-ci "^1.1.0" - js-yaml "^3.10.0" - lazy-val "^1.0.3" - semver "^5.5.0" - source-map-support "^0.5.3" - stat-mode "^0.2.2" - temp-file "^3.1.1" - tunnel-agent "^0.6.0" - -builder-util@^4.2.2: - version "4.2.5" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-4.2.5.tgz#babc190e2f2c3681497632b5cc274f1543aa9264" +builder-util@5.3.1, builder-util@^5.3.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.3.1.tgz#e90831153268803962b2a96afcba31dfa4223c39" dependencies: - "7zip-bin" "~3.0.0" + "7zip-bin" "~3.1.0" + app-builder-bin "1.3.6" bluebird-lst "^1.0.5" builder-util-runtime "^4.0.5" chalk "^2.3.0" debug "^3.1.0" - fs-extra-p "^4.5.0" - ini "^1.3.5" + fs-extra-p "^4.5.2" is-ci "^1.1.0" js-yaml "^3.10.0" lazy-val "^1.0.3" @@ -1475,7 +1467,6 @@ builder-util@^4.2.2: source-map-support "^0.5.3" stat-mode "^0.2.2" temp-file "^3.1.1" - tunnel-agent "^0.6.0" buildmail@4.0.1: version "4.0.1" @@ -2972,16 +2963,18 @@ dir-glob@^2.0.0: arrify "^1.0.1" path-type "^3.0.0" -dmg-builder@3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-3.1.4.tgz#57c53a2b5a1e28526a837430b6ecc7110cadcf63" +dmg-builder@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.1.0.tgz#40b6ce05b59a3baebd69680a1f2875b1ff475e24" dependencies: bluebird-lst "^1.0.5" - builder-util "^4.2.2" + builder-util "^5.3.0" + electron-builder-lib "~20.0.5" fs-extra-p "^4.5.0" iconv-lite "^0.4.19" js-yaml "^3.10.0" parse-color "^1.0.0" + sanitize-filename "^1.6.1" dns-equal@^1.0.0: version "1.0.0" @@ -3076,9 +3069,9 @@ dotenv-expand@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.0.1.tgz#68fddc1561814e0a10964111057ff138ced7d7a8" -dotenv@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d" +dotenv@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.0.tgz#0206eb5b336639bf377618a2a304ff00c6a1fddb" double-ended-queue@^2.1.0-0: version "2.1.0-0" @@ -3139,23 +3132,22 @@ ejs@^2.5.7: version "2.5.7" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a" -electron-builder-lib@19.56.0: - version "19.56.0" - resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-19.56.0.tgz#26a6754f89c3e732afbd97868f1fc3f666884149" +electron-builder-lib@20.0.7, electron-builder-lib@~20.0.5: + version "20.0.7" + resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.0.7.tgz#d9925bb326f9db081586058bc4ff78bf2145b4be" dependencies: - "7zip-bin" "^2.4.1" - asar-integrity "0.2.4" + "7zip-bin" "~3.1.0" + app-builder-bin "1.3.6" async-exit-hook "^2.0.1" bluebird-lst "^1.0.5" - builder-util "4.2.2" - builder-util-runtime "4.0.4" + builder-util "5.3.1" + builder-util-runtime "4.0.5" chromium-pickle-js "^0.2.0" debug "^3.1.0" - dmg-builder "3.1.4" ejs "^2.5.7" electron-osx-sign "0.4.8" - electron-publish "19.56.0" - fs-extra-p "^4.5.0" + electron-publish "20.0.6" + fs-extra-p "^4.5.2" hosted-git-info "^2.5.0" is-ci "^1.1.0" isbinaryfile "^3.0.2" @@ -3164,25 +3156,26 @@ electron-builder-lib@19.56.0: minimatch "^3.0.4" normalize-package-data "^2.4.0" plist "^2.1.0" - read-config-file "2.1.1" + read-config-file "3.0.0" sanitize-filename "^1.6.1" semver "^5.5.0" temp-file "^3.1.1" -electron-builder@~19.56.0: - version "19.56.0" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.56.0.tgz#ad5a64c73ce50b561fc8e2bcf9309de0f6ad4e5e" +electron-builder@~20.0.7: + version "20.0.7" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.0.7.tgz#daaa45efb7eeff77a76362671e1dc359d9d931c1" dependencies: bluebird-lst "^1.0.5" - builder-util "4.2.2" - builder-util-runtime "4.0.4" + builder-util "5.3.1" + builder-util-runtime "4.0.5" chalk "^2.3.0" - electron-builder-lib "19.56.0" + dmg-builder "4.1.0" + electron-builder-lib "20.0.7" electron-download-tf "4.3.4" - fs-extra-p "^4.5.0" + fs-extra-p "^4.5.2" is-ci "^1.1.0" lazy-val "^1.0.3" - read-config-file "2.1.1" + read-config-file "3.0.0" sanitize-filename "^1.6.1" update-notifier "^2.3.0" yargs "^11.0.0" @@ -3230,15 +3223,16 @@ electron-osx-sign@0.4.8: minimist "^1.2.0" plist "^2.1.0" -electron-publish@19.56.0: - version "19.56.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.56.0.tgz#1a0446e69b3085a905c0abdf16125c1c97d108d9" +electron-publish@20.0.6: + version "20.0.6" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.0.6.tgz#24a3c508428eea31813e064f80468f626dff1d87" dependencies: bluebird-lst "^1.0.5" - builder-util "^4.2.2" - builder-util-runtime "^4.0.4" + builder-util "^5.3.0" + builder-util-runtime "^4.0.5" chalk "^2.3.0" - fs-extra-p "^4.5.0" + fs-extra-p "^4.5.2" + lazy-val "^1.0.3" mime "^2.2.0" electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.18: @@ -4051,6 +4045,13 @@ fs-extra-p@^4.5.0: bluebird-lst "^1.0.5" fs-extra "^5.0.0" +fs-extra-p@^4.5.2: + version "4.5.2" + resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.5.2.tgz#0a22aba489284d17f375d5dc5139aa777fe2df51" + dependencies: + bluebird-lst "^1.0.5" + fs-extra "^5.0.0" + fs-extra@^0.30.0: version "0.30.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0" @@ -4822,7 +4823,7 @@ inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" -ini@^1.3.4, ini@^1.3.5: +ini@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -7614,14 +7615,14 @@ rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1: minimist "^1.2.0" strip-json-comments "~2.0.1" -read-config-file@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-2.1.1.tgz#bd6c2b93e97a82a35f71a3c9eb43161e16692054" +read-config-file@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.0.0.tgz#771def5184a7f76abaf6b2c82f20cb983775b8ea" dependencies: - ajv "^5.5.0" - ajv-keywords "^2.1.0" + ajv "^6.1.1" + ajv-keywords "^3.1.0" bluebird-lst "^1.0.5" - dotenv "^4.0.0" + dotenv "^5.0.0" dotenv-expand "^4.0.1" fs-extra-p "^4.5.0" js-yaml "^3.10.0"