diff --git a/filenames.gni b/filenames.gni index 8eec52480b9..ef18228df67 100644 --- a/filenames.gni +++ b/filenames.gni @@ -14,12 +14,12 @@ filenames = { ] default_app_octicon_sources = [ - "node_modules/octicons/build/build.css", - "node_modules/octicons/build/svg/gist.svg", - "node_modules/octicons/build/svg/mark-github.svg", - "node_modules/octicons/build/svg/gear.svg", - "node_modules/octicons/build/svg/star.svg", - "node_modules/octicons/build/svg/gift.svg", + "node_modules/@primer/octicons/build/build.css", + "node_modules/@primer/octicons/build/svg/gist.svg", + "node_modules/@primer/octicons/build/svg/mark-github.svg", + "node_modules/@primer/octicons/build/svg/gear.svg", + "node_modules/@primer/octicons/build/svg/star.svg", + "node_modules/@primer/octicons/build/svg/gift.svg", ] lib_sources = [ diff --git a/package.json b/package.json index ba603c0b26a..c2bd5da80fb 100644 --- a/package.json +++ b/package.json @@ -7,19 +7,20 @@ "@electron/docs-parser": "^0.3.0", "@electron/typescript-definitions": "^8.3.1", "@octokit/rest": "^16.3.2", + "@primer/octicons": "^9.1.1", "@types/chai": "^4.1.7", "@types/chai-as-promised": "^7.1.0", "@types/express": "^4.16.1", "@types/fs-extra": "^5.0.5", "@types/mocha": "^5.2.6", - "@types/node": "^10.12.21", + "@types/node": "^12.0.10", "@types/split": "^1.0.0", "@types/webpack": "^4.4.32", "@types/webpack-env": "^1.13.9", "@typescript-eslint/eslint-plugin": "^1.4.2", "@typescript-eslint/parser": "^1.4.2", "asar": "^1.0.0", - "check-for-leaks": "^1.0.2", + "check-for-leaks": "^1.2.1", "clang-format": "^1.2.3", "colors": "^1.1.2", "dotenv-safe": "^4.0.4", @@ -40,7 +41,6 @@ "lint-staged": "^8.1.0", "minimist": "^1.2.0", "nugget": "^2.0.1", - "octicons": "^7.3.0", "pre-flight": "^1.1.0", "remark-cli": "^4.0.0", "remark-preset-lint-markdown-style-guide": "^2.1.1", diff --git a/spec-main/api-app-spec.ts b/spec-main/api-app-spec.ts index 59b686ff9bd..e042ee1a11b 100644 --- a/spec-main/api-app-spec.ts +++ b/spec-main/api-app-spec.ts @@ -164,7 +164,9 @@ describe('app module', () => { let output = '' appProcess = cp.spawn(electronPath, [appPath]) - appProcess.stdout.on('data', data => { output += data }) + if (appProcess && appProcess.stdout) { + appProcess.stdout.on('data', data => { output += data }) + } const [code] = await emittedOnce(appProcess, 'close') if (process.platform !== 'win32') { @@ -196,7 +198,9 @@ describe('app module', () => { // Singleton will send us greeting data to let us know it's running. // After that, ask it to exit gracefully and confirm that it does. - appProcess.stdout.on('data', data => appProcess!.kill()) + if (appProcess && appProcess.stdout) { + appProcess.stdout.on('data', data => appProcess!.kill()) + } const [code, signal] = await emittedOnce(appProcess, 'close') const message = `code:\n${code}\nsignal:\n${signal}` diff --git a/yarn.lock b/yarn.lock index 72d36a47761..eda1f0bac7a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -120,6 +120,13 @@ universal-user-agent "^2.0.0" url-template "^2.0.8" +"@primer/octicons@^9.1.1": + version "9.1.1" + resolved "https://registry.yarnpkg.com/@primer/octicons/-/octicons-9.1.1.tgz#a72a59e8ec77521cc2eefb36c345f780a61c79fb" + integrity sha512-7EGM0+Kx39bIgaYr9bTCzFvBCxm+fqh/YJIoSns8zfCwss32ZJ2GDP3024UH709VQtM5cKFU4JcIYPHyGdSfIg== + dependencies: + object-assign "^4.1.1" + "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -199,15 +206,16 @@ version "11.13.8" resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.8.tgz#e5d71173c95533be9842b2c798978f095f912aab" -"@types/node@^10.12.21": - version "10.14.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.6.tgz#9cbfcb62c50947217f4d88d4d274cc40c22625a9" - "@types/node@^11.13.7": version "11.13.14" resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.14.tgz#03e9416f7d699d71742e5a1e455def7bd55f8fb9" integrity sha512-9NjFOB6UUGjJLNANmyIouuaN8YPsPgC4DCOd5lU+DL7HSX/RCfzz0JOtHlspEJq1Ll/JUu/8Cm4wzxpZ8w5sjQ== +"@types/node@^12.0.10": + version "12.0.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.10.tgz#51babf9c7deadd5343620055fc8aff7995c8b031" + integrity sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ== + "@types/normalize-package-data@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" @@ -537,6 +545,14 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" +anymatch@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.2.tgz#ddb3a8495d44875423af7b919aace11e91732a41" + integrity sha512-rUe9SxpRQlVg4EM8It7JMNWWYHAirTPpbTuvaSKybb5IejNgWB3PGBBX9rrPKDx2pM/p3Wh+7+ASaWRyyAbxmQ== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -1089,11 +1105,12 @@ check-error@^1.0.2: resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= -check-for-leaks@^1.0.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/check-for-leaks/-/check-for-leaks-1.2.0.tgz#ea3b50164e975779332c62813195ff8c6af826cc" +check-for-leaks@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/check-for-leaks/-/check-for-leaks-1.2.1.tgz#4ac108ee3f8e6b99f5ad36f6b98cba1d7f4816d0" + integrity sha512-9OdOSRZY6N0w5JCdJpqsC5MkD6EPGYpHmhtf4l5nl3DRETDZshP6C1EGN/vVhHDTY6AsOK3NhdFfrMe3NWZl7g== dependencies: - anymatch "^1.3.0" + anymatch "^3.0.2" minimist "^1.2.0" parse-gitignore "^0.4.0" walk-sync "^0.3.2" @@ -4215,12 +4232,6 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -octicons@^7.3.0: - version "7.4.0" - resolved "https://registry.yarnpkg.com/octicons/-/octicons-7.4.0.tgz#0be0082ed75b81e680800ef978bf47078b670091" - dependencies: - object-assign "^4.1.1" - octokit-pagination-methods@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4" @@ -4563,7 +4574,7 @@ performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" -picomatch@^2.0.5: +picomatch@^2.0.4, picomatch@^2.0.5: version "2.0.7" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6" integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==