From 1d263e26b3812915700d1b8d1b415a552757a0b6 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 07:19:05 -0500 Subject: [PATCH 001/119] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20electron@6.1.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 20 +++++++++++--------- package.json | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6cff6fb36..ce86f4e89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1273,11 +1273,11 @@ "dependencies": { "etch": { "version": "0.9.0", - "bundled": true + "resolved": false }, "semver": { "version": "5.7.1", - "bundled": true + "resolved": false } } }, @@ -1842,6 +1842,7 @@ "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "optional": true, "requires": { "hoek": "2.x.x" } @@ -2418,7 +2419,7 @@ "dependencies": { "grim": { "version": "2.0.2", - "bundled": true, + "resolved": false, "requires": { "event-kit": "^2.0.0" } @@ -2584,11 +2585,11 @@ "dependencies": { "etch": { "version": "0.9.0", - "bundled": true + "resolved": false }, "grim": { "version": "2.0.2", - "bundled": true, + "resolved": false, "requires": { "event-kit": "^2.0.0" } @@ -3532,14 +3533,14 @@ "dependencies": { "rimraf": { "version": "2.6.3", - "bundled": true, + "resolved": false, "requires": { "glob": "^7.1.3" } }, "temp": { "version": "0.8.4", - "bundled": true, + "resolved": false, "requires": { "rimraf": "~2.6.2" } @@ -3761,7 +3762,8 @@ "hoek": { "version": "2.16.3", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", + "optional": true }, "home-or-tmp": { "version": "1.0.0", @@ -7476,7 +7478,7 @@ "dependencies": { "etch": { "version": "0.9.0", - "bundled": true + "resolved": false } } }, diff --git a/package.json b/package.json index e3510c839..50899b176 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "url": "https://github.com/atom/atom/issues" }, "license": "MIT", - "electronVersion": "5.0.13", + "electronVersion": "6.1.12", "dependencies": { "@atom/nsfw": "1.0.26", "@atom/source-map-support": "^0.3.4", From c8ad0e71ee4fcf0c1640c31e8c0bff3ff73edc1b Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 07:45:05 -0500 Subject: [PATCH 002/119] electron-chromedriver@6.0.0 --- package-lock.json | 24 ++++++++++++++++-------- script/package-lock.json | 6 +++--- script/package.json | 2 +- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index ce86f4e89..b0a210de4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1273,11 +1273,13 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": false + "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", + "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" }, "semver": { "version": "5.7.1", - "resolved": false + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" } } }, @@ -2419,7 +2421,8 @@ "dependencies": { "grim": { "version": "2.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.2.tgz", + "integrity": "sha512-Qj7hTJRfd87E/gUgfvM0YIH/g2UA2SV6niv6BYXk1o6w4mhgv+QyYM1EjOJQljvzgEj4SqSsRWldXIeKHz3e3Q==", "requires": { "event-kit": "^2.0.0" } @@ -2585,11 +2588,13 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": false + "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", + "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" }, "grim": { "version": "2.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.2.tgz", + "integrity": "sha512-Qj7hTJRfd87E/gUgfvM0YIH/g2UA2SV6niv6BYXk1o6w4mhgv+QyYM1EjOJQljvzgEj4SqSsRWldXIeKHz3e3Q==", "requires": { "event-kit": "^2.0.0" } @@ -3533,14 +3538,16 @@ "dependencies": { "rimraf": { "version": "2.6.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "requires": { "glob": "^7.1.3" } }, "temp": { "version": "0.8.4", - "resolved": false, + "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz", + "integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==", "requires": { "rimraf": "~2.6.2" } @@ -7478,7 +7485,8 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": false + "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", + "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" } } }, diff --git a/script/package-lock.json b/script/package-lock.json index ff43cae33..b82ec8d48 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -2003,9 +2003,9 @@ } }, "electron-chromedriver": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-5.0.1.tgz", - "integrity": "sha512-w82q6KkIsKjzhcucllpxeulIxYn5rccNw43rpbMuZcgMQ0EPsckoYwUt7Gadmdi14xniZ+debN9SM8V1EUyaBQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-6.0.0.tgz", + "integrity": "sha512-UIhRl0sN5flfUjqActXsFrZQU1NmBObvlxzPnyeud8vhR67TllXCoqfvhQJmIrJAJJK+5M1DFhJ5iTGT++dvkg==", "requires": { "electron-download": "^4.1.1", "extract-zip": "^1.6.7" diff --git a/script/package.json b/script/package.json index 755791276..207991cc2 100644 --- a/script/package.json +++ b/script/package.json @@ -10,7 +10,7 @@ "coffeelint": "1.15.7", "colors": "1.1.2", "donna": "1.0.16", - "electron-chromedriver": "^5.0.0", + "electron-chromedriver": "^6.0.0", "electron-link": "0.4.1", "electron-mksnapshot": "^5.0.0", "electron-packager": "12.2.0", From a16d2d1cd32dba88b8a371e3d2768fa97e6e9a92 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 07:50:17 -0500 Subject: [PATCH 003/119] electron-mksnapshot@6.0.0 --- script/package-lock.json | 6 +++--- script/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/script/package-lock.json b/script/package-lock.json index b82ec8d48..f2332f749 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -2122,9 +2122,9 @@ } }, "electron-mksnapshot": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/electron-mksnapshot/-/electron-mksnapshot-5.0.0.tgz", - "integrity": "sha512-hmpBodQ9N6vgQI0Nhr8YuTIovZG9+bgbqVLYKS0LzuW1QtwSego9/+rP0afWvxcH/SnwTF3TbsQF6ecscZYK3w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/electron-mksnapshot/-/electron-mksnapshot-6.0.0.tgz", + "integrity": "sha512-wj0Yr4i6XwqhRsaLN1id4OK0qTpjgZv/KbPo0Rk4cOGaSSCf4mPa3WJ8cpMHyT9UFDxSmvcyEfGKb4bgfW/ooQ==", "requires": { "electron-download": "^4.1.0", "extract-zip": "^1.6.5", diff --git a/script/package.json b/script/package.json index 207991cc2..8845739cd 100644 --- a/script/package.json +++ b/script/package.json @@ -12,7 +12,7 @@ "donna": "1.0.16", "electron-chromedriver": "^6.0.0", "electron-link": "0.4.1", - "electron-mksnapshot": "^5.0.0", + "electron-mksnapshot": "^6.0.0", "electron-packager": "12.2.0", "@atom/electron-winstaller": "0.0.1", "eslint": "^5.16.0", From e4a1a8e85064325d309988b043d31bea576ae54b Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 09:15:00 -0500 Subject: [PATCH 004/119] scrollbar-style@3.2.1 --- package-lock.json | 34 ++++++++++++---------------------- package.json | 2 +- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index b0a210de4..09c893d30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1273,13 +1273,11 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", - "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" + "bundled": true }, "semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "bundled": true } } }, @@ -1844,7 +1842,6 @@ "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "optional": true, "requires": { "hoek": "2.x.x" } @@ -2421,8 +2418,7 @@ "dependencies": { "grim": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.2.tgz", - "integrity": "sha512-Qj7hTJRfd87E/gUgfvM0YIH/g2UA2SV6niv6BYXk1o6w4mhgv+QyYM1EjOJQljvzgEj4SqSsRWldXIeKHz3e3Q==", + "bundled": true, "requires": { "event-kit": "^2.0.0" } @@ -2588,13 +2584,11 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", - "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" + "bundled": true }, "grim": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.2.tgz", - "integrity": "sha512-Qj7hTJRfd87E/gUgfvM0YIH/g2UA2SV6niv6BYXk1o6w4mhgv+QyYM1EjOJQljvzgEj4SqSsRWldXIeKHz3e3Q==", + "bundled": true, "requires": { "event-kit": "^2.0.0" } @@ -3538,16 +3532,14 @@ "dependencies": { "rimraf": { "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "bundled": true, "requires": { "glob": "^7.1.3" } }, "temp": { "version": "0.8.4", - "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz", - "integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==", + "bundled": true, "requires": { "rimraf": "~2.6.2" } @@ -3769,8 +3761,7 @@ "hoek": { "version": "2.16.3", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "optional": true + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" }, "home-or-tmp": { "version": "1.0.0", @@ -6264,9 +6255,9 @@ } }, "scrollbar-style": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz", - "integrity": "sha1-BmK2GJM2QWDLtbDEZxmAmwKHGKE=", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.1.tgz", + "integrity": "sha512-suqwmmczpwidfoq+csq/e9KGopUbnKMJj6Pj+F+IqGl5Olt/khOkj/MjPrB3t+8QtipJ+APg92C1XcjzrNFtfQ==", "requires": { "event-kit": "^1.1.0", "nan": "^2.0.0" @@ -7485,8 +7476,7 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", - "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" + "bundled": true } } }, diff --git a/package.json b/package.json index 50899b176..35bf92f09 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "resolve": "^1.1.6", "scandal": "^3.2.0", "scoped-property-store": "^0.17.0", - "scrollbar-style": "^3.2", + "scrollbar-style": "^3.2.1", "season": "^6.0.2", "semver": "^4.3.3", "service-hub": "^0.7.4", From b516f6071cea33d66367b5fb583bf059a3cc77ca Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 13:34:18 -0500 Subject: [PATCH 005/119] watcher@1.3.3 --- package-lock.json | 42 ++++++++++++++++++++++-------------------- package.json | 2 +- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 09c893d30..96d1fddb8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,25 +53,25 @@ } }, "@atom/watcher": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@atom/watcher/-/watcher-1.3.1.tgz", - "integrity": "sha512-UjGisruWlcRLMzddE3pwvOx6wQCFN/+gg6Z4cJZvH1kjT5QT5eA04hUDs8QXF/QH8ZxMiOtP8x9SWTw0hCNelg==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@atom/watcher/-/watcher-1.3.3.tgz", + "integrity": "sha512-RA99yGBsppOpC1QDTXKLLyQYRWcwuiHPxNqGgrnS/O79FcXGMJdqOhGyW+5wiRtikbg3mLk5pr0XDLCp9syX6Q==", "requires": { "event-kit": "2.5.3", "fs-extra": "7.0.1", - "nan": "2.12.1", - "prebuild-install": "5.2.4" + "nan": "2.14.1", + "prebuild-install": "5.2.5" }, "dependencies": { "nan": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", - "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==" + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==" }, "prebuild-install": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.4.tgz", - "integrity": "sha512-CG3JnpTZXdmr92GW4zbcba4jkDha6uHraJ7hW4Fn8j0mExxwOKK20hqho8ZuBDCKYCHYIkFM1P2jhtG+KpP4fg==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.5.tgz", + "integrity": "sha512-6uZgMVg7yDfqlP5CPurVhtq3hUKBFNufiar4J5hZrlHTo59DDBEtyxw01xCdFss9j0Zb9+qzFVf/s4niayba3w==", "requires": { "detect-libc": "^1.0.3", "expand-template": "^2.0.3", @@ -1273,11 +1273,11 @@ "dependencies": { "etch": { "version": "0.9.0", - "bundled": true + "resolved": false }, "semver": { "version": "5.7.1", - "bundled": true + "resolved": false } } }, @@ -1842,6 +1842,7 @@ "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "optional": true, "requires": { "hoek": "2.x.x" } @@ -2418,7 +2419,7 @@ "dependencies": { "grim": { "version": "2.0.2", - "bundled": true, + "resolved": false, "requires": { "event-kit": "^2.0.0" } @@ -2584,11 +2585,11 @@ "dependencies": { "etch": { "version": "0.9.0", - "bundled": true + "resolved": false }, "grim": { "version": "2.0.2", - "bundled": true, + "resolved": false, "requires": { "event-kit": "^2.0.0" } @@ -3532,14 +3533,14 @@ "dependencies": { "rimraf": { "version": "2.6.3", - "bundled": true, + "resolved": false, "requires": { "glob": "^7.1.3" } }, "temp": { "version": "0.8.4", - "bundled": true, + "resolved": false, "requires": { "rimraf": "~2.6.2" } @@ -3761,7 +3762,8 @@ "hoek": { "version": "2.16.3", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", + "optional": true }, "home-or-tmp": { "version": "1.0.0", @@ -7476,7 +7478,7 @@ "dependencies": { "etch": { "version": "0.9.0", - "bundled": true + "resolved": false } } }, diff --git a/package.json b/package.json index 35bf92f09..638e11b05 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "dependencies": { "@atom/nsfw": "1.0.26", "@atom/source-map-support": "^0.3.4", - "@atom/watcher": "1.3.1", + "@atom/watcher": "1.3.3", "about": "file:packages/about", "archive-view": "https://www.atom.io/api/packages/archive-view/versions/0.65.2/tarball", "async": "0.2.6", From b0669ecc316a9d76b159c8e8df9bb4a4c552ea64 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 15:41:00 -0500 Subject: [PATCH 006/119] Upgrade scrollbar-style without electron --- package-lock.json | 42 +++++++++++++++++++--------------------- package.json | 6 +++--- script/package-lock.json | 12 ++++++------ script/package.json | 4 ++-- 4 files changed, 31 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index 96d1fddb8..09c893d30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,25 +53,25 @@ } }, "@atom/watcher": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@atom/watcher/-/watcher-1.3.3.tgz", - "integrity": "sha512-RA99yGBsppOpC1QDTXKLLyQYRWcwuiHPxNqGgrnS/O79FcXGMJdqOhGyW+5wiRtikbg3mLk5pr0XDLCp9syX6Q==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@atom/watcher/-/watcher-1.3.1.tgz", + "integrity": "sha512-UjGisruWlcRLMzddE3pwvOx6wQCFN/+gg6Z4cJZvH1kjT5QT5eA04hUDs8QXF/QH8ZxMiOtP8x9SWTw0hCNelg==", "requires": { "event-kit": "2.5.3", "fs-extra": "7.0.1", - "nan": "2.14.1", - "prebuild-install": "5.2.5" + "nan": "2.12.1", + "prebuild-install": "5.2.4" }, "dependencies": { "nan": { - "version": "2.14.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", - "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==" + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", + "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==" }, "prebuild-install": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.5.tgz", - "integrity": "sha512-6uZgMVg7yDfqlP5CPurVhtq3hUKBFNufiar4J5hZrlHTo59DDBEtyxw01xCdFss9j0Zb9+qzFVf/s4niayba3w==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.4.tgz", + "integrity": "sha512-CG3JnpTZXdmr92GW4zbcba4jkDha6uHraJ7hW4Fn8j0mExxwOKK20hqho8ZuBDCKYCHYIkFM1P2jhtG+KpP4fg==", "requires": { "detect-libc": "^1.0.3", "expand-template": "^2.0.3", @@ -1273,11 +1273,11 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": false + "bundled": true }, "semver": { "version": "5.7.1", - "resolved": false + "bundled": true } } }, @@ -1842,7 +1842,6 @@ "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "optional": true, "requires": { "hoek": "2.x.x" } @@ -2419,7 +2418,7 @@ "dependencies": { "grim": { "version": "2.0.2", - "resolved": false, + "bundled": true, "requires": { "event-kit": "^2.0.0" } @@ -2585,11 +2584,11 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": false + "bundled": true }, "grim": { "version": "2.0.2", - "resolved": false, + "bundled": true, "requires": { "event-kit": "^2.0.0" } @@ -3533,14 +3532,14 @@ "dependencies": { "rimraf": { "version": "2.6.3", - "resolved": false, + "bundled": true, "requires": { "glob": "^7.1.3" } }, "temp": { "version": "0.8.4", - "resolved": false, + "bundled": true, "requires": { "rimraf": "~2.6.2" } @@ -3762,8 +3761,7 @@ "hoek": { "version": "2.16.3", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "optional": true + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" }, "home-or-tmp": { "version": "1.0.0", @@ -7478,7 +7476,7 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": false + "bundled": true } } }, diff --git a/package.json b/package.json index 638e11b05..a775c1b45 100644 --- a/package.json +++ b/package.json @@ -12,11 +12,11 @@ "url": "https://github.com/atom/atom/issues" }, "license": "MIT", - "electronVersion": "6.1.12", + "electronVersion": "5.0.13", "dependencies": { "@atom/nsfw": "1.0.26", "@atom/source-map-support": "^0.3.4", - "@atom/watcher": "1.3.3", + "@atom/watcher": "1.3.1", "about": "file:packages/about", "archive-view": "https://www.atom.io/api/packages/archive-view/versions/0.65.2/tarball", "async": "0.2.6", @@ -143,7 +143,7 @@ "resolve": "^1.1.6", "scandal": "^3.2.0", "scoped-property-store": "^0.17.0", - "scrollbar-style": "^3.2.1", + "scrollbar-style": "3.2.1", "season": "^6.0.2", "semver": "^4.3.3", "service-hub": "^0.7.4", diff --git a/script/package-lock.json b/script/package-lock.json index f2332f749..ff43cae33 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -2003,9 +2003,9 @@ } }, "electron-chromedriver": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-6.0.0.tgz", - "integrity": "sha512-UIhRl0sN5flfUjqActXsFrZQU1NmBObvlxzPnyeud8vhR67TllXCoqfvhQJmIrJAJJK+5M1DFhJ5iTGT++dvkg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-5.0.1.tgz", + "integrity": "sha512-w82q6KkIsKjzhcucllpxeulIxYn5rccNw43rpbMuZcgMQ0EPsckoYwUt7Gadmdi14xniZ+debN9SM8V1EUyaBQ==", "requires": { "electron-download": "^4.1.1", "extract-zip": "^1.6.7" @@ -2122,9 +2122,9 @@ } }, "electron-mksnapshot": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/electron-mksnapshot/-/electron-mksnapshot-6.0.0.tgz", - "integrity": "sha512-wj0Yr4i6XwqhRsaLN1id4OK0qTpjgZv/KbPo0Rk4cOGaSSCf4mPa3WJ8cpMHyT9UFDxSmvcyEfGKb4bgfW/ooQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/electron-mksnapshot/-/electron-mksnapshot-5.0.0.tgz", + "integrity": "sha512-hmpBodQ9N6vgQI0Nhr8YuTIovZG9+bgbqVLYKS0LzuW1QtwSego9/+rP0afWvxcH/SnwTF3TbsQF6ecscZYK3w==", "requires": { "electron-download": "^4.1.0", "extract-zip": "^1.6.5", diff --git a/script/package.json b/script/package.json index 8845739cd..755791276 100644 --- a/script/package.json +++ b/script/package.json @@ -10,9 +10,9 @@ "coffeelint": "1.15.7", "colors": "1.1.2", "donna": "1.0.16", - "electron-chromedriver": "^6.0.0", + "electron-chromedriver": "^5.0.0", "electron-link": "0.4.1", - "electron-mksnapshot": "^6.0.0", + "electron-mksnapshot": "^5.0.0", "electron-packager": "12.2.0", "@atom/electron-winstaller": "0.0.1", "eslint": "^5.16.0", From 9e01d5ac3bd2ac8bd8478770d7ed0975f2474f29 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 16:06:38 -0500 Subject: [PATCH 007/119] electron 6 again and bump node to 12.4.0 --- package.json | 2 +- script/package-lock.json | 12 ++++++------ script/package.json | 4 ++-- script/vsts/nightly-release.yml | 4 ++-- script/vsts/platforms/linux.yml | 4 ++-- script/vsts/platforms/macos.yml | 8 ++++---- script/vsts/platforms/windows.yml | 6 +++--- script/vsts/release-branch-build.yml | 4 ++-- script/vsts/windows-run.js | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index a775c1b45..5cda5435c 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "url": "https://github.com/atom/atom/issues" }, "license": "MIT", - "electronVersion": "5.0.13", + "electronVersion": "6.1.12", "dependencies": { "@atom/nsfw": "1.0.26", "@atom/source-map-support": "^0.3.4", diff --git a/script/package-lock.json b/script/package-lock.json index ff43cae33..f2332f749 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -2003,9 +2003,9 @@ } }, "electron-chromedriver": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-5.0.1.tgz", - "integrity": "sha512-w82q6KkIsKjzhcucllpxeulIxYn5rccNw43rpbMuZcgMQ0EPsckoYwUt7Gadmdi14xniZ+debN9SM8V1EUyaBQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-6.0.0.tgz", + "integrity": "sha512-UIhRl0sN5flfUjqActXsFrZQU1NmBObvlxzPnyeud8vhR67TllXCoqfvhQJmIrJAJJK+5M1DFhJ5iTGT++dvkg==", "requires": { "electron-download": "^4.1.1", "extract-zip": "^1.6.7" @@ -2122,9 +2122,9 @@ } }, "electron-mksnapshot": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/electron-mksnapshot/-/electron-mksnapshot-5.0.0.tgz", - "integrity": "sha512-hmpBodQ9N6vgQI0Nhr8YuTIovZG9+bgbqVLYKS0LzuW1QtwSego9/+rP0afWvxcH/SnwTF3TbsQF6ecscZYK3w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/electron-mksnapshot/-/electron-mksnapshot-6.0.0.tgz", + "integrity": "sha512-wj0Yr4i6XwqhRsaLN1id4OK0qTpjgZv/KbPo0Rk4cOGaSSCf4mPa3WJ8cpMHyT9UFDxSmvcyEfGKb4bgfW/ooQ==", "requires": { "electron-download": "^4.1.0", "extract-zip": "^1.6.5", diff --git a/script/package.json b/script/package.json index 755791276..8845739cd 100644 --- a/script/package.json +++ b/script/package.json @@ -10,9 +10,9 @@ "coffeelint": "1.15.7", "colors": "1.1.2", "donna": "1.0.16", - "electron-chromedriver": "^5.0.0", + "electron-chromedriver": "^6.0.0", "electron-link": "0.4.1", - "electron-mksnapshot": "^5.0.0", + "electron-mksnapshot": "^6.0.0", "electron-packager": "12.2.0", "@atom/electron-winstaller": "0.0.1", "eslint": "^5.16.0", diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 6b180b62c..a5049f2bf 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -32,8 +32,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 + versionSpec: 12.14.0 + displayName: Install Node.js 12.14.0 #This has to be done separately because VSTS inexplicably #exits the script block after `npm install` completes. diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 7342e3eee..3b8dfe5b9 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -24,8 +24,8 @@ jobs: - task: NodeTool@0 inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 + versionSpec: 12.14.0 + displayName: Install Node.js 12.14.0 - script: npm install --global npm@6.12.1 displayName: Update npm diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index a63faa770..ed17e2597 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -14,8 +14,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 + versionSpec: 12.14.0 + displayName: Install Node.js 12.14.0 - script: npm install --global npm@6.12.1 displayName: Update npm @@ -115,8 +115,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 + versionSpec: 12.14.0 + displayName: Install Node.js 12.14.0 - script: npm install --global npm@6.12.1 displayName: Update npm diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 23782335a..eb4aad163 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -26,8 +26,8 @@ jobs: - task: NodeTool@0 inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 + versionSpec: 12.14.0 + displayName: Install Node.js 12.14.0 - script: | ECHO Installing npm-windows-upgrade @@ -70,7 +70,7 @@ jobs: BUILD_ARCH: $(buildArch) CI: true CI_PROVIDER: VSTS - NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\12.13.1\\x64\\npm.cmd" + NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\12.14.0\\x64\\npm.cmd" npm_config_build_from_source: true displayName: Bootstrap build environment condition: ne(variables['CacheRestored'], 'true') diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index 58c132f7d..1a12038f5 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -38,8 +38,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 + versionSpec: 12.14.0 + displayName: Install Node.js 12.14.0 # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. diff --git a/script/vsts/windows-run.js b/script/vsts/windows-run.js index 6a226dbaa..3573001b8 100644 --- a/script/vsts/windows-run.js +++ b/script/vsts/windows-run.js @@ -5,7 +5,7 @@ const path = require('path'); const download = require('download'); const childProcess = require('child_process'); -const nodeVersion = '12.13.1'; +const nodeVersion = '12.14.0'; const nodeFileName = `node-v${nodeVersion}-win-x86`; const extractedNodePath = `c:\\tmp\\${nodeFileName}`; From ed8f4f9d513970b25a6bc765bc4524fe1b2500b4 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 16:28:35 -0500 Subject: [PATCH 008/119] Update npm version --- script/vsts/platforms/linux.yml | 2 +- script/vsts/platforms/macos.yml | 4 ++-- script/vsts/platforms/windows.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 3b8dfe5b9..c1714f5b0 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -27,7 +27,7 @@ jobs: versionSpec: 12.14.0 displayName: Install Node.js 12.14.0 - - script: npm install --global npm@6.12.1 + - script: npm install --global npm@6.13.4 displayName: Update npm - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index ed17e2597..575c8daed 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -17,7 +17,7 @@ jobs: versionSpec: 12.14.0 displayName: Install Node.js 12.14.0 - - script: npm install --global npm@6.12.1 + - script: npm install --global npm@6.13.4 displayName: Update npm - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 @@ -118,7 +118,7 @@ jobs: versionSpec: 12.14.0 displayName: Install Node.js 12.14.0 - - script: npm install --global npm@6.12.1 + - script: npm install --global npm@6.13.4 displayName: Update npm - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index eb4aad163..1c0769025 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -36,8 +36,8 @@ jobs: - script: | ECHO Upgrading npm - npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.12.1 - displayName: Install npm 6.12.1 + npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.13.4 + displayName: Install npm 6.13.4 - script: | npm install --global --production windows-build-tools@4.0 From 0c25fdeebf17fa68dad5e7330be913b763d717f7 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 16:47:53 -0500 Subject: [PATCH 009/119] try removing npm upgrade in mac job --- script/vsts/platforms/macos.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index 575c8daed..c99a20db2 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -17,9 +17,6 @@ jobs: versionSpec: 12.14.0 displayName: Install Node.js 12.14.0 - - script: npm install --global npm@6.13.4 - displayName: Update npm - - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 displayName: Restore node_modules cache inputs: From 237d3eec6dea0a7c95d0b98cb32d34eea9510a08 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 16:58:19 -0500 Subject: [PATCH 010/119] install npm --- script/vsts/platforms/macos.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index c99a20db2..575c8daed 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -17,6 +17,9 @@ jobs: versionSpec: 12.14.0 displayName: Install Node.js 12.14.0 + - script: npm install --global npm@6.13.4 + displayName: Update npm + - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 displayName: Restore node_modules cache inputs: From 5562f5f1aff91f2089c32ac2c8ae55d8c6f307a3 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 17:06:08 -0500 Subject: [PATCH 011/119] Update macos.yml --- script/vsts/platforms/macos.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index 575c8daed..2f8b53861 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -17,7 +17,11 @@ jobs: versionSpec: 12.14.0 displayName: Install Node.js 12.14.0 - - script: npm install --global npm@6.13.4 + - script: | + rm -r /usr/local/lib/node_modules/npm + /usr/bin/npm uninstall npm + npm install --global npm@6.13.4 + displayName: Update npm - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 From ad3c1fad11e7104401e899c8569484e13eb103f9 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 17:17:16 -0500 Subject: [PATCH 012/119] debug npm upgrade fail --- script/lib/verify-machine-requirements.js | 3 +++ script/vsts/platforms/macos.yml | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/script/lib/verify-machine-requirements.js b/script/lib/verify-machine-requirements.js index 51ca5a6cd..110b28ecc 100644 --- a/script/lib/verify-machine-requirements.js +++ b/script/lib/verify-machine-requirements.js @@ -7,6 +7,9 @@ const path = require('path'); const CONFIG = require('../config'); module.exports = function(ci) { + console.log('------') + console.log(ci) + console.log('------') verifyNode(); verifyNpm(ci); if (process.platform === 'win32') { diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index 2f8b53861..50636cb28 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -18,8 +18,12 @@ jobs: displayName: Install Node.js 12.14.0 - script: | - rm -r /usr/local/lib/node_modules/npm - /usr/bin/npm uninstall npm + npm -v + node -v + which npm + which node + grep \"version\" ~/.npm-packages/lib/node_modules/npm/package.json + grep \"version\" /usr/local/lib/node_modules/npm/package.json npm install --global npm@6.13.4 displayName: Update npm From 1c5bf90647261241c4fe004da1af50f8abb9803c Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 17:35:46 -0500 Subject: [PATCH 013/119] update npm path --- script/vsts/platforms/macos.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index 50636cb28..bac43c94e 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -17,17 +17,6 @@ jobs: versionSpec: 12.14.0 displayName: Install Node.js 12.14.0 - - script: | - npm -v - node -v - which npm - which node - grep \"version\" ~/.npm-packages/lib/node_modules/npm/package.json - grep \"version\" /usr/local/lib/node_modules/npm/package.json - npm install --global npm@6.13.4 - - displayName: Update npm - - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 displayName: Restore node_modules cache inputs: @@ -40,7 +29,7 @@ jobs: env: CI: true CI_PROVIDER: VSTS - NPM_BIN_PATH: /usr/local/bin/npm + NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.14.0/x64/bin/npm npm_config_build_from_source: true condition: ne(variables['CacheRestored'], 'true') @@ -126,9 +115,6 @@ jobs: versionSpec: 12.14.0 displayName: Install Node.js 12.14.0 - - script: npm install --global npm@6.13.4 - displayName: Update npm - - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 displayName: Restore node_modules cache inputs: @@ -143,7 +129,7 @@ jobs: env: CI: true CI_PROVIDER: VSTS - NPM_BIN_PATH: /usr/local/bin/npm + NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.14.0/x64/bin/npm npm_config_build_from_source: true condition: ne(variables['CacheRestored'], 'true') From 8914766597a15aad792350ce9124660c905fcea3 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 18:15:43 -0500 Subject: [PATCH 014/119] bump atom/watcher@1.3.3 --- package-lock.json | 50 ++++++++++++++++++++++++++++------------------- package.json | 2 +- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 09c893d30..93be83588 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,25 +53,25 @@ } }, "@atom/watcher": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@atom/watcher/-/watcher-1.3.1.tgz", - "integrity": "sha512-UjGisruWlcRLMzddE3pwvOx6wQCFN/+gg6Z4cJZvH1kjT5QT5eA04hUDs8QXF/QH8ZxMiOtP8x9SWTw0hCNelg==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@atom/watcher/-/watcher-1.3.3.tgz", + "integrity": "sha512-RA99yGBsppOpC1QDTXKLLyQYRWcwuiHPxNqGgrnS/O79FcXGMJdqOhGyW+5wiRtikbg3mLk5pr0XDLCp9syX6Q==", "requires": { "event-kit": "2.5.3", "fs-extra": "7.0.1", - "nan": "2.12.1", - "prebuild-install": "5.2.4" + "nan": "2.14.1", + "prebuild-install": "5.2.5" }, "dependencies": { "nan": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", - "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==" + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==" }, "prebuild-install": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.4.tgz", - "integrity": "sha512-CG3JnpTZXdmr92GW4zbcba4jkDha6uHraJ7hW4Fn8j0mExxwOKK20hqho8ZuBDCKYCHYIkFM1P2jhtG+KpP4fg==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.5.tgz", + "integrity": "sha512-6uZgMVg7yDfqlP5CPurVhtq3hUKBFNufiar4J5hZrlHTo59DDBEtyxw01xCdFss9j0Zb9+qzFVf/s4niayba3w==", "requires": { "detect-libc": "^1.0.3", "expand-template": "^2.0.3", @@ -1273,11 +1273,13 @@ "dependencies": { "etch": { "version": "0.9.0", - "bundled": true + "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", + "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" }, "semver": { "version": "5.7.1", - "bundled": true + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" } } }, @@ -1842,6 +1844,7 @@ "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "optional": true, "requires": { "hoek": "2.x.x" } @@ -2418,7 +2421,8 @@ "dependencies": { "grim": { "version": "2.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.2.tgz", + "integrity": "sha512-Qj7hTJRfd87E/gUgfvM0YIH/g2UA2SV6niv6BYXk1o6w4mhgv+QyYM1EjOJQljvzgEj4SqSsRWldXIeKHz3e3Q==", "requires": { "event-kit": "^2.0.0" } @@ -2584,11 +2588,13 @@ "dependencies": { "etch": { "version": "0.9.0", - "bundled": true + "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", + "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" }, "grim": { "version": "2.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.2.tgz", + "integrity": "sha512-Qj7hTJRfd87E/gUgfvM0YIH/g2UA2SV6niv6BYXk1o6w4mhgv+QyYM1EjOJQljvzgEj4SqSsRWldXIeKHz3e3Q==", "requires": { "event-kit": "^2.0.0" } @@ -3532,14 +3538,16 @@ "dependencies": { "rimraf": { "version": "2.6.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "requires": { "glob": "^7.1.3" } }, "temp": { "version": "0.8.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz", + "integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==", "requires": { "rimraf": "~2.6.2" } @@ -3761,7 +3769,8 @@ "hoek": { "version": "2.16.3", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", + "optional": true }, "home-or-tmp": { "version": "1.0.0", @@ -7476,7 +7485,8 @@ "dependencies": { "etch": { "version": "0.9.0", - "bundled": true + "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", + "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" } } }, diff --git a/package.json b/package.json index 5cda5435c..423ca898f 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "dependencies": { "@atom/nsfw": "1.0.26", "@atom/source-map-support": "^0.3.4", - "@atom/watcher": "1.3.1", + "@atom/watcher": "1.3.3", "about": "file:packages/about", "archive-view": "https://www.atom.io/api/packages/archive-view/versions/0.65.2/tarball", "async": "0.2.6", From 98bb0d40def09927fec538c8e282c564cf361954 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 18:39:47 -0500 Subject: [PATCH 015/119] remove log and verify lint --- script/lib/verify-machine-requirements.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/script/lib/verify-machine-requirements.js b/script/lib/verify-machine-requirements.js index 110b28ecc..51ca5a6cd 100644 --- a/script/lib/verify-machine-requirements.js +++ b/script/lib/verify-machine-requirements.js @@ -7,9 +7,6 @@ const path = require('path'); const CONFIG = require('../config'); module.exports = function(ci) { - console.log('------') - console.log(ci) - console.log('------') verifyNode(); verifyNpm(ci); if (process.platform === 'win32') { From ffb34f3d7e0d18f0be2f481817fc1a00b33cda9d Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 19:09:10 -0500 Subject: [PATCH 016/119] disable cache save --- script/vsts/platforms/macos.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index bac43c94e..888cb9c47 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -17,12 +17,12 @@ jobs: versionSpec: 12.14.0 displayName: Install Node.js 12.14.0 - - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - displayName: Restore node_modules cache - inputs: - keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2' + #- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 + # displayName: Restore node_modules cache + # inputs: + # keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json' + # targetfolder: '**/node_modules, !**/node_modules/**/node_modules' + # vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2' - script: script/bootstrap displayName: Bootstrap build environment From 00151d4c0562727c372c6e24f254294d59cd1b11 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 20:33:36 -0500 Subject: [PATCH 017/119] bump watcher to 1.3.4-0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 93be83588..cae03151b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,8 +53,8 @@ } }, "@atom/watcher": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@atom/watcher/-/watcher-1.3.3.tgz", + "version": "1.3.4-", + "resolved": "https://registry.npmjs.org/@atom/watcher/-/watcher-1.3.4-0.tgz", "integrity": "sha512-RA99yGBsppOpC1QDTXKLLyQYRWcwuiHPxNqGgrnS/O79FcXGMJdqOhGyW+5wiRtikbg3mLk5pr0XDLCp9syX6Q==", "requires": { "event-kit": "2.5.3", diff --git a/package.json b/package.json index 423ca898f..53d37ba52 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "dependencies": { "@atom/nsfw": "1.0.26", "@atom/source-map-support": "^0.3.4", - "@atom/watcher": "1.3.3", + "@atom/watcher": "1.3.4-0", "about": "file:packages/about", "archive-view": "https://www.atom.io/api/packages/archive-view/versions/0.65.2/tarball", "async": "0.2.6", From 1bf5f60459f634a8c18581c9bb93431089636337 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 20:46:59 -0500 Subject: [PATCH 018/119] correct @atom/watcher in package lock --- package-lock.json | 50 +++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index cae03151b..ceca46847 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,25 +53,25 @@ } }, "@atom/watcher": { - "version": "1.3.4-", - "resolved": "https://registry.npmjs.org/@atom/watcher/-/watcher-1.3.4-0.tgz", - "integrity": "sha512-RA99yGBsppOpC1QDTXKLLyQYRWcwuiHPxNqGgrnS/O79FcXGMJdqOhGyW+5wiRtikbg3mLk5pr0XDLCp9syX6Q==", + "version": "1.3.4-0", + "resolved": "https://registry.npmjs.org/@atom/watcher/-/watcher-1.3.1.tgz", + "integrity": "sha512-UjGisruWlcRLMzddE3pwvOx6wQCFN/+gg6Z4cJZvH1kjT5QT5eA04hUDs8QXF/QH8ZxMiOtP8x9SWTw0hCNelg==", "requires": { "event-kit": "2.5.3", "fs-extra": "7.0.1", - "nan": "2.14.1", - "prebuild-install": "5.2.5" + "nan": "2.12.1", + "prebuild-install": "5.2.4" }, "dependencies": { "nan": { - "version": "2.14.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", - "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==" + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", + "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==" }, "prebuild-install": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.5.tgz", - "integrity": "sha512-6uZgMVg7yDfqlP5CPurVhtq3hUKBFNufiar4J5hZrlHTo59DDBEtyxw01xCdFss9j0Zb9+qzFVf/s4niayba3w==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.4.tgz", + "integrity": "sha512-CG3JnpTZXdmr92GW4zbcba4jkDha6uHraJ7hW4Fn8j0mExxwOKK20hqho8ZuBDCKYCHYIkFM1P2jhtG+KpP4fg==", "requires": { "detect-libc": "^1.0.3", "expand-template": "^2.0.3", @@ -1273,13 +1273,11 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", - "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" + "bundled": true }, "semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "bundled": true } } }, @@ -1844,7 +1842,6 @@ "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "optional": true, "requires": { "hoek": "2.x.x" } @@ -2421,8 +2418,7 @@ "dependencies": { "grim": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.2.tgz", - "integrity": "sha512-Qj7hTJRfd87E/gUgfvM0YIH/g2UA2SV6niv6BYXk1o6w4mhgv+QyYM1EjOJQljvzgEj4SqSsRWldXIeKHz3e3Q==", + "bundled": true, "requires": { "event-kit": "^2.0.0" } @@ -2588,13 +2584,11 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", - "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" + "bundled": true }, "grim": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.2.tgz", - "integrity": "sha512-Qj7hTJRfd87E/gUgfvM0YIH/g2UA2SV6niv6BYXk1o6w4mhgv+QyYM1EjOJQljvzgEj4SqSsRWldXIeKHz3e3Q==", + "bundled": true, "requires": { "event-kit": "^2.0.0" } @@ -3538,16 +3532,14 @@ "dependencies": { "rimraf": { "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "bundled": true, "requires": { "glob": "^7.1.3" } }, "temp": { "version": "0.8.4", - "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz", - "integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==", + "bundled": true, "requires": { "rimraf": "~2.6.2" } @@ -3769,8 +3761,7 @@ "hoek": { "version": "2.16.3", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "optional": true + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" }, "home-or-tmp": { "version": "1.0.0", @@ -7485,8 +7476,7 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", - "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" + "bundled": true } } }, From 40cb84361f184bacc74507e77fd37bdbcbadba74 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 21:51:59 -0500 Subject: [PATCH 019/119] Update package-lock.json --- package-lock.json | 57 +++++++++++++++-------------------------------- 1 file changed, 18 insertions(+), 39 deletions(-) diff --git a/package-lock.json b/package-lock.json index ceca46847..7e2d25e2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -54,42 +54,19 @@ }, "@atom/watcher": { "version": "1.3.4-0", - "resolved": "https://registry.npmjs.org/@atom/watcher/-/watcher-1.3.1.tgz", - "integrity": "sha512-UjGisruWlcRLMzddE3pwvOx6wQCFN/+gg6Z4cJZvH1kjT5QT5eA04hUDs8QXF/QH8ZxMiOtP8x9SWTw0hCNelg==", + "resolved": "https://registry.npmjs.org/@atom/watcher/-/watcher-1.3.4-0.tgz", + "integrity": "sha512-sbS+yVf3BrB4gM7uZd/QEM8HpqyJh2hsbWy0z8eym7xhc09a4/uTRoq6Tl9CxQfGGXxtkNFs7qfOPUGKfYLnUg==", "requires": { "event-kit": "2.5.3", "fs-extra": "7.0.1", - "nan": "2.12.1", - "prebuild-install": "5.2.4" + "nan": "2.14.1", + "prebuild-install": "5.3.3" }, "dependencies": { "nan": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", - "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==" - }, - "prebuild-install": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.4.tgz", - "integrity": "sha512-CG3JnpTZXdmr92GW4zbcba4jkDha6uHraJ7hW4Fn8j0mExxwOKK20hqho8ZuBDCKYCHYIkFM1P2jhtG+KpP4fg==", - "requires": { - "detect-libc": "^1.0.3", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", - "napi-build-utils": "^1.0.1", - "node-abi": "^2.7.0", - "noop-logger": "^0.1.1", - "npmlog": "^4.0.1", - "os-homedir": "^1.0.1", - "pump": "^2.0.1", - "rc": "^1.2.7", - "simple-get": "^2.7.0", - "tar-fs": "^1.13.0", - "tunnel-agent": "^0.6.0", - "which-pm-runs": "^1.0.0" - } + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==" } } }, @@ -1273,11 +1250,11 @@ "dependencies": { "etch": { "version": "0.9.0", - "bundled": true + "resolved": false }, "semver": { "version": "5.7.1", - "bundled": true + "resolved": false } } }, @@ -1842,6 +1819,7 @@ "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "optional": true, "requires": { "hoek": "2.x.x" } @@ -2418,7 +2396,7 @@ "dependencies": { "grim": { "version": "2.0.2", - "bundled": true, + "resolved": false, "requires": { "event-kit": "^2.0.0" } @@ -2584,11 +2562,11 @@ "dependencies": { "etch": { "version": "0.9.0", - "bundled": true + "resolved": false }, "grim": { "version": "2.0.2", - "bundled": true, + "resolved": false, "requires": { "event-kit": "^2.0.0" } @@ -3532,14 +3510,14 @@ "dependencies": { "rimraf": { "version": "2.6.3", - "bundled": true, + "resolved": false, "requires": { "glob": "^7.1.3" } }, "temp": { "version": "0.8.4", - "bundled": true, + "resolved": false, "requires": { "rimraf": "~2.6.2" } @@ -3761,7 +3739,8 @@ "hoek": { "version": "2.16.3", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", + "optional": true }, "home-or-tmp": { "version": "1.0.0", @@ -7476,7 +7455,7 @@ "dependencies": { "etch": { "version": "0.9.0", - "bundled": true + "resolved": false } } }, From 29f184d6af4052af66b80b094c38f60cd1bcc7bd Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 23:27:48 -0500 Subject: [PATCH 020/119] Update electron dependencies --- package-lock.json | 46 +- package.json | 4 +- script/package-lock.json | 1020 ++++++++++++++++++++++++++------------ script/package.json | 4 +- 4 files changed, 722 insertions(+), 352 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7e2d25e2a..1b20cad7f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1250,11 +1250,13 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": false + "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", + "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" }, "semver": { "version": "5.7.1", - "resolved": false + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" } } }, @@ -2396,7 +2398,8 @@ "dependencies": { "grim": { "version": "2.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.2.tgz", + "integrity": "sha512-Qj7hTJRfd87E/gUgfvM0YIH/g2UA2SV6niv6BYXk1o6w4mhgv+QyYM1EjOJQljvzgEj4SqSsRWldXIeKHz3e3Q==", "requires": { "event-kit": "^2.0.0" } @@ -2562,11 +2565,13 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": false + "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", + "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" }, "grim": { "version": "2.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.2.tgz", + "integrity": "sha512-Qj7hTJRfd87E/gUgfvM0YIH/g2UA2SV6niv6BYXk1o6w4mhgv+QyYM1EjOJQljvzgEj4SqSsRWldXIeKHz3e3Q==", "requires": { "event-kit": "^2.0.0" } @@ -2686,9 +2691,9 @@ } }, "electron-notarize": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-0.2.1.tgz", - "integrity": "sha512-oZ6/NhKeXmEKNROiFmRNfytqu3cxqC95sjooG7kBXQVEUSQkZnbiAhxVh5jXngL881G197pbwpeVPJyM7Ikmxw==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-0.3.0.tgz", + "integrity": "sha512-tuDw8H0gcDOalNLv6RM2CwGvUXU60MPGZRDEmd0ppX+yP5XqL8Ec2DuXyz9J7WQSA3aRCfzIgH8C5CAivDYWMw==", "requires": { "debug": "^4.1.1", "fs-extra": "^8.1.0" @@ -2712,11 +2717,6 @@ "universalify": "^0.1.0" } }, - "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -2725,9 +2725,9 @@ } }, "electron-osx-sign": { - "version": "0.4.15", - "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.15.tgz", - "integrity": "sha512-1QtPNpjIji9bGZ0VRFwtJUyU1uHi7q3XUAOG0qFsvAUfs5H0T8hbgUfyg3xvPzmF1ruV8T8pQmQ86vNfLrcRiA==", + "version": "0.4.16", + "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.16.tgz", + "integrity": "sha512-ziMWfc3NmQlwnWLW6EaZq8nH2BWVng/atX5GWsGwhexJYpdW6hsg//MkAfRTRx1kR3Veiqkeiog1ibkbA4x0rg==", "requires": { "bluebird": "^3.5.0", "compare-version": "^0.1.2", @@ -2749,11 +2749,6 @@ "requires": { "buffer-alloc": "^1.2.0" } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" } } }, @@ -3510,14 +3505,16 @@ "dependencies": { "rimraf": { "version": "2.6.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "requires": { "glob": "^7.1.3" } }, "temp": { "version": "0.8.4", - "resolved": false, + "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz", + "integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==", "requires": { "rimraf": "~2.6.2" } @@ -7455,7 +7452,8 @@ "dependencies": { "etch": { "version": "0.9.0", - "resolved": false + "resolved": "https://registry.npmjs.org/etch/-/etch-0.9.0.tgz", + "integrity": "sha1-CSJpiPLO4GkL3yCMyyXkFNXfrV8=" } } }, diff --git a/package.json b/package.json index 53d37ba52..ab27ad1d1 100644 --- a/package.json +++ b/package.json @@ -50,8 +50,8 @@ "deprecation-cop": "file:packages/deprecation-cop", "dev-live-reload": "file:packages/dev-live-reload", "devtron": "1.3.0", - "electron-notarize": "0.2.1", - "electron-osx-sign": "0.4.15", + "electron-notarize": "0.3.0", + "electron-osx-sign": "0.4.16", "encoding-selector": "https://www.atom.io/api/packages/encoding-selector/versions/0.23.9/tarball", "etch": "^0.12.6", "event-kit": "^2.5.3", diff --git a/script/package-lock.json b/script/package-lock.json index f2332f749..91cab6367 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -260,6 +260,73 @@ } } }, + "@electron/get": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.12.2.tgz", + "integrity": "sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==", + "requires": { + "debug": "^4.1.1", + "env-paths": "^2.2.0", + "fs-extra": "^8.1.0", + "global-agent": "^2.0.2", + "global-tunnel-ng": "^2.7.1", + "got": "^9.6.0", + "progress": "^2.0.3", + "sanitize-filename": "^1.6.2", + "sumchecker": "^3.0.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "env-paths": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz", + "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==" + }, + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "sumchecker": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", + "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", + "requires": { + "debug": "^4.1.0" + } + } + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -274,6 +341,42 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz", "integrity": "sha512-LAQ1d4OPfSJ/BMbI2DuizmYrrkD9JMaTdi2hQTlI53lQ4kRQPyZQRS4CYQ7O66bnBBnP/oYdRxbk++X0xuFU6A==" }, + "@sindresorhus/is": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", + "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" + }, + "@szmarczak/http-timer": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", + "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", + "requires": { + "defer-to-connect": "^1.0.1" + } + }, + "@types/events": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", + "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", + "optional": true + }, + "@types/glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", + "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "optional": true, + "requires": { + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "@types/minimatch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "optional": true + }, "@types/node": { "version": "11.9.4", "resolved": "https://registry.npmjs.org/@types/node/-/node-11.9.4.tgz", @@ -377,11 +480,6 @@ "@wdio/config": "^5.9.1" } }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" - }, "abstract-leveldown": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz", @@ -970,9 +1068,9 @@ } }, "base64-js": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", - "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", + "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" }, "bcrypt-pbkdf": { "version": "1.0.2", @@ -983,15 +1081,6 @@ "tweetnacl": "^0.14.3" } }, - "binary": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", - "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=", - "requires": { - "buffers": "~0.1.1", - "chainsaw": "~0.1.0" - } - }, "bl": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz", @@ -1035,6 +1124,11 @@ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, + "boolean": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", + "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1068,6 +1162,15 @@ "electron-to-chromium": "^1.3.47" } }, + "buffer": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz", + "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" + } + }, "buffer-alloc": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", @@ -1092,11 +1195,6 @@ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz", "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==" }, - "buffers": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", - "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=" - }, "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", @@ -1130,6 +1228,35 @@ } } }, + "cacheable-request": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", + "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", + "requires": { + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^3.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^4.1.0", + "responselike": "^1.0.2" + }, + "dependencies": { + "get-stream": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", + "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "requires": { + "pump": "^3.0.0" + } + }, + "lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" + } + } + }, "call-me-maybe": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", @@ -1185,14 +1312,6 @@ "lazy-cache": "^1.0.3" } }, - "chainsaw": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", - "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=", - "requires": { - "traverse": ">=0.3.0 <0.4" - } - }, "chalk": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", @@ -1316,6 +1435,21 @@ "is-supported-regexp-flag": "^1.0.0" } }, + "clone-response": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", + "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", + "requires": { + "mimic-response": "^1.0.0" + }, + "dependencies": { + "mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" + } + } + }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -1503,6 +1637,16 @@ } } }, + "config-chain": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", + "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "optional": true, + "requires": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", @@ -1587,6 +1731,45 @@ "which": "^1.2.8" } }, + "cross-zip": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cross-zip/-/cross-zip-3.1.0.tgz", + "integrity": "sha512-aX02l0SD3KE27pMl69gkxDdDM5D3u9Ic4Je+2b1B2fP0dWnlWWY6ns2Vk5DEgCXJRhL3GasSpicNQRNbDkq0+w==", + "requires": { + "rimraf": "^3.0.0" + }, + "dependencies": { + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + } + } + }, "cson-parser": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-1.0.9.tgz", @@ -1695,20 +1878,6 @@ "mimic-response": "^2.0.0" } }, - "decompress-zip": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz", - "integrity": "sha1-rjvLfjTGWHmt/nfhnDD4ZgK0vbA=", - "requires": { - "binary": "^0.3.0", - "graceful-fs": "^4.1.3", - "mkpath": "^0.1.0", - "nopt": "^3.0.1", - "q": "^1.1.2", - "readable-stream": "^1.1.8", - "touch": "0.0.3" - } - }, "deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -1724,6 +1893,11 @@ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==" }, + "defer-to-connect": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", + "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" + }, "deferred-leveldown": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-4.0.2.tgz", @@ -1871,6 +2045,12 @@ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" }, + "detect-node": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", + "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", + "optional": true + }, "detective": { "version": "4.7.1", "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz", @@ -1993,6 +2173,11 @@ "is-obj": "^1.0.0" } }, + "duplexer3": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" + }, "ecc-jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", @@ -2071,25 +2256,25 @@ } }, "electron-link": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/electron-link/-/electron-link-0.4.1.tgz", - "integrity": "sha512-f0pcajkAedjwWmRxuXBn0nJvRO7jPX2qoxObvBl+OL0uK9O3lNr6LThRzJGhqnklJ1g3BuNonKTwQqGh9T0WTg==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/electron-link/-/electron-link-0.4.2.tgz", + "integrity": "sha512-WNnKqiI7+dV3faP4BZN3MEbbGp4SewHNJaIXzEPzROxwTV5tn6cLnKukfogiXOLbBZhzLfmqCd8H9Hy+Oc7IrQ==", "requires": { "acorn": "^6.1.1", "ast-util": "^0.6.0", - "encoding-down": "~5.0.0", + "encoding-down": "^5.0.4", "indent-string": "^3.2.0", "leveldown": "^5.4.1", "levelup": "~3.0.0", - "recast": "^0.17.5", - "resolve": "^1.5.0", + "recast": "^0.17.6", + "resolve": "^1.13.1", "source-map": "^0.5.6" }, "dependencies": { "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==" + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==" }, "ast-types": { "version": "0.12.4", @@ -2101,6 +2286,11 @@ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=" }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + }, "recast": { "version": "0.17.6", "resolved": "https://registry.npmjs.org/recast/-/recast-0.17.6.tgz", @@ -2118,6 +2308,14 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "requires": { + "path-parse": "^1.0.6" + } } } }, @@ -2152,10 +2350,57 @@ } } }, + "electron-notarize": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-0.2.1.tgz", + "integrity": "sha512-oZ6/NhKeXmEKNROiFmRNfytqu3cxqC95sjooG7kBXQVEUSQkZnbiAhxVh5jXngL881G197pbwpeVPJyM7Ikmxw==", + "requires": { + "debug": "^4.1.1", + "fs-extra": "^8.1.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "electron-osx-sign": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.11.tgz", - "integrity": "sha512-VVd40nrnVqymvFrY9ZkOYgHJOvexHHYTR3di/SN+mjJ0OWhR1I8BRVj3U+Yamw6hnkZZNKZp52rqL5EFAAPFkQ==", + "version": "0.4.16", + "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.16.tgz", + "integrity": "sha512-ziMWfc3NmQlwnWLW6EaZq8nH2BWVng/atX5GWsGwhexJYpdW6hsg//MkAfRTRx1kR3Veiqkeiog1ibkbA4x0rg==", "requires": { "bluebird": "^3.5.0", "compare-version": "^0.1.2", @@ -2166,155 +2411,105 @@ }, "dependencies": { "bluebird": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz", - "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==" - }, - "isbinaryfile": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", - "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", - "requires": { - "buffer-alloc": "^1.2.0" - } - }, - "plist": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz", - "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==", - "requires": { - "base64-js": "^1.2.3", - "xmlbuilder": "^9.0.7", - "xmldom": "0.1.x" - } + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" } } }, "electron-packager": { - "version": "12.2.0", - "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-12.2.0.tgz", - "integrity": "sha512-T5W/FIK4VXhYIOWxkehmz6zXt2S/sA9JZ3AL+/jeKCicQY6QVQ0K8B7W801L+GPTwbgTPycHjO+iqEf1BhZ+Iw==", + "version": "14.2.1", + "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-14.2.1.tgz", + "integrity": "sha512-g6y3BVrAOz/iavKD+VMFbehrQcwCWuA3CZvVbmmbQuCfegGA1ytwWn0BNIDDrEdbuz31Fti7mnNHhb5L+3Wq9A==", "requires": { - "asar": "^0.14.0", - "debug": "^3.0.0", - "electron-download": "^4.1.1", - "electron-osx-sign": "^0.4.1", - "extract-zip": "^1.0.3", - "fs-extra": "^5.0.0", + "@electron/get": "^1.6.0", + "asar": "^2.0.1", + "cross-zip": "^3.0.0", + "debug": "^4.0.1", + "electron-notarize": "^0.2.0", + "electron-osx-sign": "^0.4.11", + "fs-extra": "^8.1.0", "galactus": "^0.2.1", "get-package-info": "^1.0.0", - "nodeify": "^1.0.1", + "junk": "^3.1.0", "parse-author": "^2.0.0", - "pify": "^3.0.0", - "plist": "^2.0.0", - "rcedit": "^1.0.0", + "plist": "^3.0.0", + "rcedit": "^2.0.0", "resolve": "^1.1.6", "sanitize-filename": "^1.6.0", - "semver": "^5.3.0", - "yargs-parser": "^10.0.0" + "semver": "^6.0.0", + "yargs-parser": "^16.0.0" }, "dependencies": { "asar": { - "version": "0.14.6", - "resolved": "https://registry.npmjs.org/asar/-/asar-0.14.6.tgz", - "integrity": "sha512-ZqybKcdO5At6y3ge2RHxVImc6Eltb2t3sxT7lk4T4zjZBSFUuIGCIZY6f41dCjlvJSizN5QPRr8YTgMhpgBjLg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/asar/-/asar-2.1.0.tgz", + "integrity": "sha512-d2Ovma+bfqNpvBzY/KU8oPY67ZworixTpkjSx0PCXnQi67c2cXmssaTxpFDUM0ttopXoGx/KRxNg/GDThYbXQA==", "requires": { + "@types/glob": "^7.1.1", "chromium-pickle-js": "^0.2.0", - "commander": "^2.9.0", - "cuint": "^0.2.1", - "glob": "^6.0.4", - "minimatch": "^3.0.3", - "mkdirp": "^0.5.0", - "mksnapshot": "^0.3.4", - "tmp": "0.0.28" + "commander": "^2.20.0", + "cuint": "^0.2.2", + "glob": "^7.1.3", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "tmp-promise": "^1.0.5" } }, - "chromium-pickle-js": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", - "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=" + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + }, + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "requires": { "ms": "^2.1.1" } }, - "electron-download": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.1.tgz", - "integrity": "sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==", - "requires": { - "debug": "^3.0.0", - "env-paths": "^1.0.0", - "fs-extra": "^4.0.1", - "minimist": "^1.2.0", - "nugget": "^2.0.1", - "path-exists": "^3.0.0", - "rc": "^1.2.1", - "semver": "^5.4.1", - "sumchecker": "^2.0.2" - }, - "dependencies": { - "fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "semver": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" - } - } - }, "fs-extra": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", - "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "requires": { - "graceful-fs": "^4.1.2", + "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", "universalify": "^0.1.0" - }, - "dependencies": { - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "requires": { - "graceful-fs": "^4.1.6" - } - } } }, "glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "requires": { + "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "2 || 3", + "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "^4.1.6" + } + }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -2323,51 +2518,23 @@ "brace-expansion": "^1.1.7" } }, - "mksnapshot": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.5.tgz", - "integrity": "sha512-PSBoZaj9h9myC3uRRW62RxmX8mrN3XbOkMEyURUD7v5CeJgtYTar50XU738t7Q0LtG1pBPtp5n5QwDGggRnEvw==", - "requires": { - "decompress-zip": "0.3.x", - "fs-extra": "0.26.7", - "request": "2.x" - }, - "dependencies": { - "fs-extra": { - "version": "0.26.7", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz", - "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0", - "klaw": "^1.0.0", - "path-is-absolute": "^1.0.0", - "rimraf": "^2.2.8" - } - } - } - }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - }, - "tmp": { - "version": "0.0.28", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz", - "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=", + "yargs-parser": { + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz", + "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==", "requires": { - "os-tmpdir": "~1.0.1" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } @@ -2382,6 +2549,12 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "optional": true + }, "encoding-down": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-5.0.4.tgz", @@ -2465,6 +2638,12 @@ "is-symbol": "^1.0.2" } }, + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "optional": true + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -3469,26 +3648,26 @@ "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==" }, "flora-colossus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/flora-colossus/-/flora-colossus-1.0.0.tgz", - "integrity": "sha1-VHKcNh7ezuAU3UQWeeGjfB13OkU=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/flora-colossus/-/flora-colossus-1.0.1.tgz", + "integrity": "sha512-d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA==", "requires": { - "debug": "^3.1.0", - "fs-extra": "^4.0.0" + "debug": "^4.1.1", + "fs-extra": "^7.0.0" }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "requires": { "ms": "^2.1.1" } }, "fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "requires": { "graceful-fs": "^4.1.2", "jsonfile": "^4.0.0", @@ -3504,9 +3683,9 @@ } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" } } }, @@ -3647,9 +3826,9 @@ } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" } } }, @@ -3685,9 +3864,9 @@ }, "dependencies": { "bluebird": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz", - "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==" + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "find-up": { "version": "2.1.0", @@ -3747,6 +3926,14 @@ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=" }, + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "requires": { + "pump": "^3.0.0" + } + }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", @@ -3809,11 +3996,70 @@ "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=" }, + "global-agent": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.8.tgz", + "integrity": "sha512-VpBe/rhY6Rw2VDOTszAMNambg+4Qv8j0yiTNDYEXXXxkUNGWLHp8A3ztK4YDBbFNcWF4rgsec6/5gPyryya/+A==", + "optional": true, + "requires": { + "boolean": "^3.0.0", + "core-js": "^3.6.4", + "es6-error": "^4.1.1", + "matcher": "^2.1.0", + "roarr": "^2.15.2", + "semver": "^7.1.2", + "serialize-error": "^5.0.0" + }, + "dependencies": { + "core-js": { + "version": "3.6.5", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", + "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==", + "optional": true + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "optional": true + }, + "serialize-error": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-5.0.0.tgz", + "integrity": "sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA==", + "optional": true, + "requires": { + "type-fest": "^0.8.0" + } + } + } + }, + "global-tunnel-ng": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", + "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", + "optional": true, + "requires": { + "encodeurl": "^1.0.2", + "lodash": "^4.17.10", + "npm-conf": "^1.1.3", + "tunnel": "^0.0.6" + } + }, "globals": { "version": "6.4.1", "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz", "integrity": "sha1-hJgDKzttHMge68X3lpDY/in6v08=" }, + "globalthis": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz", + "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==", + "optional": true, + "requires": { + "define-properties": "^1.1.3" + } + }, "globby": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", @@ -3847,6 +4093,39 @@ } } }, + "got": { + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", + "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", + "requires": { + "@sindresorhus/is": "^0.14.0", + "@szmarczak/http-timer": "^1.1.2", + "cacheable-request": "^6.0.0", + "decompress-response": "^3.3.0", + "duplexer3": "^0.1.4", + "get-stream": "^4.1.0", + "lowercase-keys": "^1.0.1", + "mimic-response": "^1.0.1", + "p-cancelable": "^1.0.0", + "to-readable-stream": "^1.0.0", + "url-parse-lax": "^3.0.0" + }, + "dependencies": { + "decompress-response": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "requires": { + "mimic-response": "^1.0.0" + } + }, + "mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" + } + } + }, "graceful-fs": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", @@ -4029,6 +4308,11 @@ } } }, + "http-cache-semantics": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", + "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" + }, "http-response-object": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz", @@ -4052,11 +4336,21 @@ "safer-buffer": ">= 2.1.2 < 3" } }, + "ieee754": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + }, "ignore": { "version": "3.3.10", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==" }, + "immediate": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz", + "integrity": "sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw=" + }, "import-fresh": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz", @@ -4505,6 +4799,14 @@ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, + "isbinaryfile": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", + "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", + "requires": { + "buffer-alloc": "^1.2.0" + } + }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -4575,6 +4877,11 @@ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" }, + "json-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" + }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -4632,6 +4939,19 @@ "verror": "1.10.0" } }, + "junk": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", + "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==" + }, + "keyv": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", + "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", + "requires": { + "json-buffer": "3.0.0" + } + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -4720,9 +5040,9 @@ }, "dependencies": { "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -4764,9 +5084,9 @@ } }, "leveldown": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-5.4.1.tgz", - "integrity": "sha512-3lMPc7eU3yj5g+qF1qlALInzIYnkySIosR1AsUKFjL9D8fYbTLuENBAeDRZXIG4qeWOAyqRItOoLu2v2avWiMA==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-5.6.0.tgz", + "integrity": "sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ==", "requires": { "abstract-leveldown": "~6.2.1", "napi-macros": "~2.0.0", @@ -4774,10 +5094,12 @@ }, "dependencies": { "abstract-leveldown": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.2.tgz", - "integrity": "sha512-/a+Iwj0rn//CX0EJOasNyZJd2o8xur8Ce9C57Sznti/Ilt/cb6Qd8/k98A4ZOklXgTG+iAYYUs1OTG0s1eH+zQ==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz", + "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==", "requires": { + "buffer": "^5.5.0", + "immediate": "^3.2.3", "level-concat-iterator": "~2.0.0", "level-supports": "~1.0.0", "xtend": "~4.0.0" @@ -4982,6 +5304,11 @@ "signal-exit": "^3.0.0" } }, + "lowercase-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" + }, "lru-cache": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", @@ -5024,6 +5351,23 @@ "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz", "integrity": "sha512-Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ==" }, + "matcher": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-2.1.0.tgz", + "integrity": "sha512-o+nZr+vtJtgPNklyeUKkkH42OsK8WAfdgaJE2FNxcjLPg+5QbeEoT6vRj8Xq/iv18JlQ9cmKsEu0b94ixWf1YQ==", + "optional": true, + "requires": { + "escape-string-regexp": "^2.0.0" + }, + "dependencies": { + "escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "optional": true + } + } + }, "math-random": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", @@ -5169,11 +5513,6 @@ } } }, - "mkpath": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz", - "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=" - }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -5270,43 +5609,11 @@ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz", "integrity": "sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==" }, - "nodeify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz", - "integrity": "sha1-ZKtpp7268DzhB7TwM1yHwLnpGx0=", - "requires": { - "is-promise": "~1.0.0", - "promise": "~1.3.0" - }, - "dependencies": { - "is-promise": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz", - "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU=" - }, - "promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz", - "integrity": "sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU=", - "requires": { - "is-promise": "~1" - } - } - } - }, "noop-logger": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=" }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "requires": { - "abbrev": "1" - } - }, "normalize-package-data": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz", @@ -5336,6 +5643,11 @@ "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz", "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=" }, + "normalize-url": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", + "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" + }, "npm": { "version": "6.14.4", "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.4.tgz", @@ -8442,6 +8754,24 @@ } } }, + "npm-conf": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", + "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", + "optional": true, + "requires": { + "config-chain": "^1.1.11", + "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "optional": true + } + } + }, "npm-run-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz", @@ -8642,6 +8972,11 @@ "object-assign": "^4.1.0" } }, + "p-cancelable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", + "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" + }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -8825,25 +9160,13 @@ } }, "plist": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz", - "integrity": "sha1-V8zbeggh3yGDEhejytVOPhRqECU=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz", + "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==", "requires": { - "base64-js": "1.2.0", - "xmlbuilder": "8.2.2", + "base64-js": "^1.2.3", + "xmlbuilder": "^9.0.7", "xmldom": "0.1.x" - }, - "dependencies": { - "base64-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz", - "integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=" - }, - "xmlbuilder": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz", - "integrity": "sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=" - } } }, "posix-character-classes": { @@ -9119,6 +9442,11 @@ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" + }, "preserve": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", @@ -9178,6 +9506,12 @@ "asap": "~2.0.3" } }, + "proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", + "optional": true + }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -9261,9 +9595,9 @@ } }, "rcedit": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-1.1.2.tgz", - "integrity": "sha512-z2ypB4gbINhI6wVe0JJMmdpmOpmNc4g90sE6/6JSuch5kYnjfz9CxvVPqqhShgR6GIkmtW3W2UlfiXhWljA0Fw==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-2.2.0.tgz", + "integrity": "sha512-dhFtYmQS+V8qQIANyX6zDK+sO50ayDePKApi46ZPK8I6QeyyTDD6LManMa7a3p3c9mLM4zi9QBP41pfhQ9p7Sg==" }, "read-installed": { "version": "3.1.3", @@ -9646,6 +9980,14 @@ "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" }, + "responselike": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", + "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "requires": { + "lowercase-keys": "^1.0.0" + } + }, "resq": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/resq/-/resq-1.5.0.tgz", @@ -9719,6 +10061,28 @@ } } }, + "roarr": { + "version": "2.15.3", + "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz", + "integrity": "sha512-AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA==", + "optional": true, + "requires": { + "boolean": "^3.0.0", + "detect-node": "^2.0.4", + "globalthis": "^1.0.1", + "json-stringify-safe": "^5.0.1", + "semver-compare": "^1.0.0", + "sprintf-js": "^1.1.2" + }, + "dependencies": { + "sprintf-js": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", + "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "optional": true + } + } + }, "run-async": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", @@ -9754,9 +10118,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sanitize-filename": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz", - "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz", + "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==", "requires": { "truncate-utf8-bytes": "^1.0.0" } @@ -9786,6 +10150,12 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" }, + "semver-compare": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", + "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", + "optional": true + }, "serialize-error": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-3.0.0.tgz", @@ -10884,6 +11254,11 @@ "kind-of": "^3.0.2" } }, + "to-readable-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", + "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" + }, "to-regex": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", @@ -10914,24 +11289,6 @@ } } }, - "touch": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz", - "integrity": "sha1-Ua7z1ElXHU8oel2Hyci0kYGg2x0=", - "requires": { - "nopt": "~1.0.10" - }, - "dependencies": { - "nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", - "requires": { - "abbrev": "1" - } - } - } - }, "tough-cookie": { "version": "2.3.4", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", @@ -10947,11 +11304,6 @@ } } }, - "traverse": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", - "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=" - }, "trim": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz", @@ -11000,6 +11352,12 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" }, + "tunnel": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", + "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", + "optional": true + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -11022,6 +11380,12 @@ "prelude-ls": "~1.1.2" } }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "optional": true + }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -11230,6 +11594,14 @@ "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" }, + "url-parse-lax": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "requires": { + "prepend-http": "^2.0.0" + } + }, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -11409,9 +11781,9 @@ "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" }, "xmldom": { - "version": "0.1.27", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", - "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=" + "version": "0.1.31", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz", + "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==" }, "xtend": { "version": "2.1.2", diff --git a/script/package.json b/script/package.json index 8845739cd..f8e7d0646 100644 --- a/script/package.json +++ b/script/package.json @@ -11,9 +11,9 @@ "colors": "1.1.2", "donna": "1.0.16", "electron-chromedriver": "^6.0.0", - "electron-link": "0.4.1", + "electron-link": "0.4.2", "electron-mksnapshot": "^6.0.0", - "electron-packager": "12.2.0", + "electron-packager": "^14.2.1", "@atom/electron-winstaller": "0.0.1", "eslint": "^5.16.0", "eslint-config-prettier": "^4.2.0", From 397afdeca0dabfea554d844fca3bb9355da83f8d Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 23:37:57 -0500 Subject: [PATCH 021/119] Fix node versioin --- script/package.json | 2 +- script/vsts/nightly-release.yml | 4 ++-- script/vsts/platforms/linux.yml | 4 ++-- script/vsts/platforms/macos.yml | 12 ++++++------ script/vsts/platforms/windows.yml | 6 +++--- script/vsts/release-branch-build.yml | 4 ++-- script/vsts/windows-run.js | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/script/package.json b/script/package.json index f8e7d0646..e9e3ad96e 100644 --- a/script/package.json +++ b/script/package.json @@ -11,7 +11,7 @@ "colors": "1.1.2", "donna": "1.0.16", "electron-chromedriver": "^6.0.0", - "electron-link": "0.4.2", + "electron-link": "^0.4.2", "electron-mksnapshot": "^6.0.0", "electron-packager": "^14.2.1", "@atom/electron-winstaller": "0.0.1", diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index a5049f2bf..8dfc00bc6 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -32,8 +32,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.14.0 - displayName: Install Node.js 12.14.0 + versionSpec: 12.4.0 + displayName: Install Node.js 12.4.0 #This has to be done separately because VSTS inexplicably #exits the script block after `npm install` completes. diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index c1714f5b0..0717daf07 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -24,8 +24,8 @@ jobs: - task: NodeTool@0 inputs: - versionSpec: 12.14.0 - displayName: Install Node.js 12.14.0 + versionSpec: 12.4.0 + displayName: Install Node.js 12.4.0 - script: npm install --global npm@6.13.4 displayName: Update npm diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index 888cb9c47..28983fc74 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -14,8 +14,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.14.0 - displayName: Install Node.js 12.14.0 + versionSpec: 12.4.0 + displayName: Install Node.js 12.4.0 #- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 # displayName: Restore node_modules cache @@ -29,7 +29,7 @@ jobs: env: CI: true CI_PROVIDER: VSTS - NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.14.0/x64/bin/npm + NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.4.0/x64/bin/npm npm_config_build_from_source: true condition: ne(variables['CacheRestored'], 'true') @@ -112,8 +112,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.14.0 - displayName: Install Node.js 12.14.0 + versionSpec: 12.4.0 + displayName: Install Node.js 12.4.0 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 displayName: Restore node_modules cache @@ -129,7 +129,7 @@ jobs: env: CI: true CI_PROVIDER: VSTS - NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.14.0/x64/bin/npm + NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.4.0/x64/bin/npm npm_config_build_from_source: true condition: ne(variables['CacheRestored'], 'true') diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 1c0769025..2f6f31d41 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -26,8 +26,8 @@ jobs: - task: NodeTool@0 inputs: - versionSpec: 12.14.0 - displayName: Install Node.js 12.14.0 + versionSpec: 12.4.0 + displayName: Install Node.js 12.4.0 - script: | ECHO Installing npm-windows-upgrade @@ -70,7 +70,7 @@ jobs: BUILD_ARCH: $(buildArch) CI: true CI_PROVIDER: VSTS - NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\12.14.0\\x64\\npm.cmd" + NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\12.4.0\\x64\\npm.cmd" npm_config_build_from_source: true displayName: Bootstrap build environment condition: ne(variables['CacheRestored'], 'true') diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index 1a12038f5..69bffeae5 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -38,8 +38,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.14.0 - displayName: Install Node.js 12.14.0 + versionSpec: 12.4.0 + displayName: Install Node.js 12.4.0 # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. diff --git a/script/vsts/windows-run.js b/script/vsts/windows-run.js index 3573001b8..ef63cc6f1 100644 --- a/script/vsts/windows-run.js +++ b/script/vsts/windows-run.js @@ -5,7 +5,7 @@ const path = require('path'); const download = require('download'); const childProcess = require('child_process'); -const nodeVersion = '12.14.0'; +const nodeVersion = '12.4.0'; const nodeFileName = `node-v${nodeVersion}-win-x86`; const extractedNodePath = `c:\\tmp\\${nodeFileName}`; From c3f824a041d3bffb6e16943fa23a26f5c4f6bea2 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Tue, 19 May 2020 23:49:59 -0500 Subject: [PATCH 022/119] downgrade to electron 13 to get targets.hostArch --- script/package-lock.json | 595 +++------------------------------------ script/package.json | 2 +- 2 files changed, 36 insertions(+), 561 deletions(-) diff --git a/script/package-lock.json b/script/package-lock.json index 91cab6367..5b82d3ed9 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -260,73 +260,6 @@ } } }, - "@electron/get": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.12.2.tgz", - "integrity": "sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==", - "requires": { - "debug": "^4.1.1", - "env-paths": "^2.2.0", - "fs-extra": "^8.1.0", - "global-agent": "^2.0.2", - "global-tunnel-ng": "^2.7.1", - "got": "^9.6.0", - "progress": "^2.0.3", - "sanitize-filename": "^1.6.2", - "sumchecker": "^3.0.1" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "env-paths": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz", - "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==" - }, - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "sumchecker": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", - "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", - "requires": { - "debug": "^4.1.0" - } - } - } - }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -341,42 +274,6 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz", "integrity": "sha512-LAQ1d4OPfSJ/BMbI2DuizmYrrkD9JMaTdi2hQTlI53lQ4kRQPyZQRS4CYQ7O66bnBBnP/oYdRxbk++X0xuFU6A==" }, - "@sindresorhus/is": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", - "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" - }, - "@szmarczak/http-timer": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", - "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", - "requires": { - "defer-to-connect": "^1.0.1" - } - }, - "@types/events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", - "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", - "optional": true - }, - "@types/glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", - "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", - "optional": true, - "requires": { - "@types/events": "*", - "@types/minimatch": "*", - "@types/node": "*" - } - }, - "@types/minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", - "optional": true - }, "@types/node": { "version": "11.9.4", "resolved": "https://registry.npmjs.org/@types/node/-/node-11.9.4.tgz", @@ -1124,11 +1021,6 @@ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, - "boolean": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", - "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==" - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1228,35 +1120,6 @@ } } }, - "cacheable-request": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", - "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", - "requires": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^3.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^4.1.0", - "responselike": "^1.0.2" - }, - "dependencies": { - "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", - "requires": { - "pump": "^3.0.0" - } - }, - "lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" - } - } - }, "call-me-maybe": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", @@ -1435,21 +1298,6 @@ "is-supported-regexp-flag": "^1.0.0" } }, - "clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "requires": { - "mimic-response": "^1.0.0" - }, - "dependencies": { - "mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" - } - } - }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -1637,16 +1485,6 @@ } } }, - "config-chain": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", - "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", - "optional": true, - "requires": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } - }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", @@ -1731,45 +1569,6 @@ "which": "^1.2.8" } }, - "cross-zip": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cross-zip/-/cross-zip-3.1.0.tgz", - "integrity": "sha512-aX02l0SD3KE27pMl69gkxDdDM5D3u9Ic4Je+2b1B2fP0dWnlWWY6ns2Vk5DEgCXJRhL3GasSpicNQRNbDkq0+w==", - "requires": { - "rimraf": "^3.0.0" - }, - "dependencies": { - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "requires": { - "glob": "^7.1.3" - } - } - } - }, "cson-parser": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-1.0.9.tgz", @@ -1893,11 +1692,6 @@ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==" }, - "defer-to-connect": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", - "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" - }, "deferred-leveldown": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-4.0.2.tgz", @@ -2045,12 +1839,6 @@ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" }, - "detect-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", - "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", - "optional": true - }, "detective": { "version": "4.7.1", "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz", @@ -2173,11 +1961,6 @@ "is-obj": "^1.0.0" } }, - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" - }, "ecc-jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", @@ -2351,12 +2134,12 @@ } }, "electron-notarize": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-0.2.1.tgz", - "integrity": "sha512-oZ6/NhKeXmEKNROiFmRNfytqu3cxqC95sjooG7kBXQVEUSQkZnbiAhxVh5jXngL881G197pbwpeVPJyM7Ikmxw==", + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-0.0.5.tgz", + "integrity": "sha512-YzrqZ6RDQ7Wt2RWlxzRoQUuxnTeXrfp7laH7XKcmQqrZ6GaAr50DMPvFMpqDKdrZSHSbcgZgB7ktIQbjvITmCQ==", "requires": { - "debug": "^4.1.1", - "fs-extra": "^8.1.0" + "debug": "^4.1.0", + "fs-extra": "^7.0.0" }, "dependencies": { "debug": { @@ -2368,20 +2151,15 @@ } }, "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "requires": { - "graceful-fs": "^4.2.0", + "graceful-fs": "^4.1.2", "jsonfile": "^4.0.0", "universalify": "^0.1.0" } }, - "graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" - }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -2418,54 +2196,34 @@ } }, "electron-packager": { - "version": "14.2.1", - "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-14.2.1.tgz", - "integrity": "sha512-g6y3BVrAOz/iavKD+VMFbehrQcwCWuA3CZvVbmmbQuCfegGA1ytwWn0BNIDDrEdbuz31Fti7mnNHhb5L+3Wq9A==", + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-13.1.1.tgz", + "integrity": "sha512-3Drgcw8OEOP3Psw/PprloAFJSkSUSQgjUq3AmWffJGB3Kj5WXmZl6A3GOUs8aT7bP/8GWg4oYqSiCSnA5PQkdQ==", "requires": { - "@electron/get": "^1.6.0", - "asar": "^2.0.1", - "cross-zip": "^3.0.0", + "asar": "^1.0.0", "debug": "^4.0.1", - "electron-notarize": "^0.2.0", + "electron-download": "^4.1.1", + "electron-notarize": "^0.0.5", "electron-osx-sign": "^0.4.11", - "fs-extra": "^8.1.0", + "extract-zip": "^1.0.3", + "fs-extra": "^7.0.0", "galactus": "^0.2.1", "get-package-info": "^1.0.0", - "junk": "^3.1.0", "parse-author": "^2.0.0", + "pify": "^4.0.0", "plist": "^3.0.0", - "rcedit": "^2.0.0", + "rcedit": "^1.0.0", "resolve": "^1.1.6", "sanitize-filename": "^1.6.0", - "semver": "^6.0.0", - "yargs-parser": "^16.0.0" + "semver": "^5.3.0", + "yargs-parser": "^13.0.0" }, "dependencies": { - "asar": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/asar/-/asar-2.1.0.tgz", - "integrity": "sha512-d2Ovma+bfqNpvBzY/KU8oPY67ZworixTpkjSx0PCXnQi67c2cXmssaTxpFDUM0ttopXoGx/KRxNg/GDThYbXQA==", - "requires": { - "@types/glob": "^7.1.1", - "chromium-pickle-js": "^0.2.0", - "commander": "^2.20.0", - "cuint": "^0.2.2", - "glob": "^7.1.3", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "tmp-promise": "^1.0.5" - } - }, "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -2475,33 +2233,15 @@ } }, "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "requires": { - "graceful-fs": "^4.2.0", + "graceful-fs": "^4.1.2", "jsonfile": "^4.0.0", "universalify": "^0.1.0" } }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" - }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -2510,28 +2250,20 @@ "graceful-fs": "^4.1.6" } }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" }, "yargs-parser": { - "version": "16.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz", - "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==", + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "requires": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" @@ -2549,12 +2281,6 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "optional": true - }, "encoding-down": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-5.0.4.tgz", @@ -2638,12 +2364,6 @@ "is-symbol": "^1.0.2" } }, - "es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "optional": true - }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -3926,14 +3646,6 @@ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=" }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "requires": { - "pump": "^3.0.0" - } - }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", @@ -3996,70 +3708,11 @@ "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=" }, - "global-agent": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.8.tgz", - "integrity": "sha512-VpBe/rhY6Rw2VDOTszAMNambg+4Qv8j0yiTNDYEXXXxkUNGWLHp8A3ztK4YDBbFNcWF4rgsec6/5gPyryya/+A==", - "optional": true, - "requires": { - "boolean": "^3.0.0", - "core-js": "^3.6.4", - "es6-error": "^4.1.1", - "matcher": "^2.1.0", - "roarr": "^2.15.2", - "semver": "^7.1.2", - "serialize-error": "^5.0.0" - }, - "dependencies": { - "core-js": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", - "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==", - "optional": true - }, - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "optional": true - }, - "serialize-error": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-5.0.0.tgz", - "integrity": "sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA==", - "optional": true, - "requires": { - "type-fest": "^0.8.0" - } - } - } - }, - "global-tunnel-ng": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", - "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", - "optional": true, - "requires": { - "encodeurl": "^1.0.2", - "lodash": "^4.17.10", - "npm-conf": "^1.1.3", - "tunnel": "^0.0.6" - } - }, "globals": { "version": "6.4.1", "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz", "integrity": "sha1-hJgDKzttHMge68X3lpDY/in6v08=" }, - "globalthis": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz", - "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==", - "optional": true, - "requires": { - "define-properties": "^1.1.3" - } - }, "globby": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", @@ -4093,39 +3746,6 @@ } } }, - "got": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", - "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", - "requires": { - "@sindresorhus/is": "^0.14.0", - "@szmarczak/http-timer": "^1.1.2", - "cacheable-request": "^6.0.0", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^4.1.0", - "lowercase-keys": "^1.0.1", - "mimic-response": "^1.0.1", - "p-cancelable": "^1.0.0", - "to-readable-stream": "^1.0.0", - "url-parse-lax": "^3.0.0" - }, - "dependencies": { - "decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "requires": { - "mimic-response": "^1.0.0" - } - }, - "mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" - } - } - }, "graceful-fs": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", @@ -4308,11 +3928,6 @@ } } }, - "http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" - }, "http-response-object": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz", @@ -4877,11 +4492,6 @@ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" }, - "json-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" - }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -4939,19 +4549,6 @@ "verror": "1.10.0" } }, - "junk": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", - "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==" - }, - "keyv": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", - "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", - "requires": { - "json-buffer": "3.0.0" - } - }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -5304,11 +4901,6 @@ "signal-exit": "^3.0.0" } }, - "lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" - }, "lru-cache": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", @@ -5351,23 +4943,6 @@ "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz", "integrity": "sha512-Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ==" }, - "matcher": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-2.1.0.tgz", - "integrity": "sha512-o+nZr+vtJtgPNklyeUKkkH42OsK8WAfdgaJE2FNxcjLPg+5QbeEoT6vRj8Xq/iv18JlQ9cmKsEu0b94ixWf1YQ==", - "optional": true, - "requires": { - "escape-string-regexp": "^2.0.0" - }, - "dependencies": { - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "optional": true - } - } - }, "math-random": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", @@ -5643,11 +5218,6 @@ "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz", "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=" }, - "normalize-url": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", - "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" - }, "npm": { "version": "6.14.4", "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.4.tgz", @@ -8754,24 +8324,6 @@ } } }, - "npm-conf": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", - "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", - "optional": true, - "requires": { - "config-chain": "^1.1.11", - "pify": "^3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "optional": true - } - } - }, "npm-run-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz", @@ -8972,11 +8524,6 @@ "object-assign": "^4.1.0" } }, - "p-cancelable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", - "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" - }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -9442,11 +8989,6 @@ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" - }, "preserve": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", @@ -9506,12 +9048,6 @@ "asap": "~2.0.3" } }, - "proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", - "optional": true - }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -9595,9 +9131,9 @@ } }, "rcedit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-2.2.0.tgz", - "integrity": "sha512-dhFtYmQS+V8qQIANyX6zDK+sO50ayDePKApi46ZPK8I6QeyyTDD6LManMa7a3p3c9mLM4zi9QBP41pfhQ9p7Sg==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-1.1.2.tgz", + "integrity": "sha512-z2ypB4gbINhI6wVe0JJMmdpmOpmNc4g90sE6/6JSuch5kYnjfz9CxvVPqqhShgR6GIkmtW3W2UlfiXhWljA0Fw==" }, "read-installed": { "version": "3.1.3", @@ -9980,14 +9516,6 @@ "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" }, - "responselike": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", - "requires": { - "lowercase-keys": "^1.0.0" - } - }, "resq": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/resq/-/resq-1.5.0.tgz", @@ -10061,28 +9589,6 @@ } } }, - "roarr": { - "version": "2.15.3", - "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz", - "integrity": "sha512-AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA==", - "optional": true, - "requires": { - "boolean": "^3.0.0", - "detect-node": "^2.0.4", - "globalthis": "^1.0.1", - "json-stringify-safe": "^5.0.1", - "semver-compare": "^1.0.0", - "sprintf-js": "^1.1.2" - }, - "dependencies": { - "sprintf-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", - "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", - "optional": true - } - } - }, "run-async": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", @@ -10150,12 +9656,6 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" }, - "semver-compare": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", - "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", - "optional": true - }, "serialize-error": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-3.0.0.tgz", @@ -11254,11 +10754,6 @@ "kind-of": "^3.0.2" } }, - "to-readable-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", - "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" - }, "to-regex": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", @@ -11352,12 +10847,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" }, - "tunnel": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", - "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", - "optional": true - }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -11380,12 +10869,6 @@ "prelude-ls": "~1.1.2" } }, - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "optional": true - }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -11594,14 +11077,6 @@ "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "requires": { - "prepend-http": "^2.0.0" - } - }, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", diff --git a/script/package.json b/script/package.json index e9e3ad96e..d5cf849f8 100644 --- a/script/package.json +++ b/script/package.json @@ -13,7 +13,7 @@ "electron-chromedriver": "^6.0.0", "electron-link": "^0.4.2", "electron-mksnapshot": "^6.0.0", - "electron-packager": "^14.2.1", + "electron-packager": "^13.1.1", "@atom/electron-winstaller": "0.0.1", "eslint": "^5.16.0", "eslint-config-prettier": "^4.2.0", From 891c80a0e70278b54d0ca0b76d0537a0b29cd80d Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Wed, 20 May 2020 00:09:30 -0500 Subject: [PATCH 023/119] Update script to support electron-packager 14 --- script/lib/package-application.js | 2 +- script/package-lock.json | 595 ++++++++++++++++++++++++++++-- script/package.json | 2 +- 3 files changed, 562 insertions(+), 37 deletions(-) diff --git a/script/lib/package-application.js b/script/lib/package-application.js index 2de2af165..84a853aaa 100644 --- a/script/lib/package-application.js +++ b/script/lib/package-application.js @@ -4,7 +4,7 @@ const assert = require('assert'); const childProcess = require('child_process'); const electronPackager = require('electron-packager'); const fs = require('fs-extra'); -const hostArch = require('electron-packager/targets').hostArch; +const hostArch = require('@electron/get').getHostArch; const includePathInPackagedApp = require('./include-path-in-packaged-app'); const getLicenseText = require('./get-license-text'); const path = require('path'); diff --git a/script/package-lock.json b/script/package-lock.json index 5b82d3ed9..91cab6367 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -260,6 +260,73 @@ } } }, + "@electron/get": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.12.2.tgz", + "integrity": "sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==", + "requires": { + "debug": "^4.1.1", + "env-paths": "^2.2.0", + "fs-extra": "^8.1.0", + "global-agent": "^2.0.2", + "global-tunnel-ng": "^2.7.1", + "got": "^9.6.0", + "progress": "^2.0.3", + "sanitize-filename": "^1.6.2", + "sumchecker": "^3.0.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "env-paths": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz", + "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==" + }, + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "sumchecker": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", + "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", + "requires": { + "debug": "^4.1.0" + } + } + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -274,6 +341,42 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz", "integrity": "sha512-LAQ1d4OPfSJ/BMbI2DuizmYrrkD9JMaTdi2hQTlI53lQ4kRQPyZQRS4CYQ7O66bnBBnP/oYdRxbk++X0xuFU6A==" }, + "@sindresorhus/is": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", + "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" + }, + "@szmarczak/http-timer": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", + "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", + "requires": { + "defer-to-connect": "^1.0.1" + } + }, + "@types/events": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", + "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", + "optional": true + }, + "@types/glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", + "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "optional": true, + "requires": { + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "@types/minimatch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "optional": true + }, "@types/node": { "version": "11.9.4", "resolved": "https://registry.npmjs.org/@types/node/-/node-11.9.4.tgz", @@ -1021,6 +1124,11 @@ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, + "boolean": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", + "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1120,6 +1228,35 @@ } } }, + "cacheable-request": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", + "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", + "requires": { + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^3.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^4.1.0", + "responselike": "^1.0.2" + }, + "dependencies": { + "get-stream": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", + "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "requires": { + "pump": "^3.0.0" + } + }, + "lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" + } + } + }, "call-me-maybe": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", @@ -1298,6 +1435,21 @@ "is-supported-regexp-flag": "^1.0.0" } }, + "clone-response": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", + "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", + "requires": { + "mimic-response": "^1.0.0" + }, + "dependencies": { + "mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" + } + } + }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -1485,6 +1637,16 @@ } } }, + "config-chain": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", + "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "optional": true, + "requires": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", @@ -1569,6 +1731,45 @@ "which": "^1.2.8" } }, + "cross-zip": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cross-zip/-/cross-zip-3.1.0.tgz", + "integrity": "sha512-aX02l0SD3KE27pMl69gkxDdDM5D3u9Ic4Je+2b1B2fP0dWnlWWY6ns2Vk5DEgCXJRhL3GasSpicNQRNbDkq0+w==", + "requires": { + "rimraf": "^3.0.0" + }, + "dependencies": { + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + } + } + }, "cson-parser": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-1.0.9.tgz", @@ -1692,6 +1893,11 @@ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==" }, + "defer-to-connect": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", + "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" + }, "deferred-leveldown": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-4.0.2.tgz", @@ -1839,6 +2045,12 @@ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" }, + "detect-node": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", + "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", + "optional": true + }, "detective": { "version": "4.7.1", "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz", @@ -1961,6 +2173,11 @@ "is-obj": "^1.0.0" } }, + "duplexer3": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" + }, "ecc-jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", @@ -2134,12 +2351,12 @@ } }, "electron-notarize": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-0.0.5.tgz", - "integrity": "sha512-YzrqZ6RDQ7Wt2RWlxzRoQUuxnTeXrfp7laH7XKcmQqrZ6GaAr50DMPvFMpqDKdrZSHSbcgZgB7ktIQbjvITmCQ==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-0.2.1.tgz", + "integrity": "sha512-oZ6/NhKeXmEKNROiFmRNfytqu3cxqC95sjooG7kBXQVEUSQkZnbiAhxVh5jXngL881G197pbwpeVPJyM7Ikmxw==", "requires": { - "debug": "^4.1.0", - "fs-extra": "^7.0.0" + "debug": "^4.1.1", + "fs-extra": "^8.1.0" }, "dependencies": { "debug": { @@ -2151,15 +2368,20 @@ } }, "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "requires": { - "graceful-fs": "^4.1.2", + "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", "universalify": "^0.1.0" } }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -2196,34 +2418,54 @@ } }, "electron-packager": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-13.1.1.tgz", - "integrity": "sha512-3Drgcw8OEOP3Psw/PprloAFJSkSUSQgjUq3AmWffJGB3Kj5WXmZl6A3GOUs8aT7bP/8GWg4oYqSiCSnA5PQkdQ==", + "version": "14.2.1", + "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-14.2.1.tgz", + "integrity": "sha512-g6y3BVrAOz/iavKD+VMFbehrQcwCWuA3CZvVbmmbQuCfegGA1ytwWn0BNIDDrEdbuz31Fti7mnNHhb5L+3Wq9A==", "requires": { - "asar": "^1.0.0", + "@electron/get": "^1.6.0", + "asar": "^2.0.1", + "cross-zip": "^3.0.0", "debug": "^4.0.1", - "electron-download": "^4.1.1", - "electron-notarize": "^0.0.5", + "electron-notarize": "^0.2.0", "electron-osx-sign": "^0.4.11", - "extract-zip": "^1.0.3", - "fs-extra": "^7.0.0", + "fs-extra": "^8.1.0", "galactus": "^0.2.1", "get-package-info": "^1.0.0", + "junk": "^3.1.0", "parse-author": "^2.0.0", - "pify": "^4.0.0", "plist": "^3.0.0", - "rcedit": "^1.0.0", + "rcedit": "^2.0.0", "resolve": "^1.1.6", "sanitize-filename": "^1.6.0", - "semver": "^5.3.0", - "yargs-parser": "^13.0.0" + "semver": "^6.0.0", + "yargs-parser": "^16.0.0" }, "dependencies": { + "asar": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/asar/-/asar-2.1.0.tgz", + "integrity": "sha512-d2Ovma+bfqNpvBzY/KU8oPY67ZworixTpkjSx0PCXnQi67c2cXmssaTxpFDUM0ttopXoGx/KRxNg/GDThYbXQA==", + "requires": { + "@types/glob": "^7.1.1", + "chromium-pickle-js": "^0.2.0", + "commander": "^2.20.0", + "cuint": "^0.2.2", + "glob": "^7.1.3", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "tmp-promise": "^1.0.5" + } + }, "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -2233,15 +2475,33 @@ } }, "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "requires": { - "graceful-fs": "^4.1.2", + "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", "universalify": "^0.1.0" } }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -2250,20 +2510,28 @@ "graceful-fs": "^4.1.6" } }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz", + "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==", "requires": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" @@ -2281,6 +2549,12 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "optional": true + }, "encoding-down": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-5.0.4.tgz", @@ -2364,6 +2638,12 @@ "is-symbol": "^1.0.2" } }, + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "optional": true + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -3646,6 +3926,14 @@ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=" }, + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "requires": { + "pump": "^3.0.0" + } + }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", @@ -3708,11 +3996,70 @@ "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=" }, + "global-agent": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.8.tgz", + "integrity": "sha512-VpBe/rhY6Rw2VDOTszAMNambg+4Qv8j0yiTNDYEXXXxkUNGWLHp8A3ztK4YDBbFNcWF4rgsec6/5gPyryya/+A==", + "optional": true, + "requires": { + "boolean": "^3.0.0", + "core-js": "^3.6.4", + "es6-error": "^4.1.1", + "matcher": "^2.1.0", + "roarr": "^2.15.2", + "semver": "^7.1.2", + "serialize-error": "^5.0.0" + }, + "dependencies": { + "core-js": { + "version": "3.6.5", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", + "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==", + "optional": true + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "optional": true + }, + "serialize-error": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-5.0.0.tgz", + "integrity": "sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA==", + "optional": true, + "requires": { + "type-fest": "^0.8.0" + } + } + } + }, + "global-tunnel-ng": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", + "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", + "optional": true, + "requires": { + "encodeurl": "^1.0.2", + "lodash": "^4.17.10", + "npm-conf": "^1.1.3", + "tunnel": "^0.0.6" + } + }, "globals": { "version": "6.4.1", "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz", "integrity": "sha1-hJgDKzttHMge68X3lpDY/in6v08=" }, + "globalthis": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz", + "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==", + "optional": true, + "requires": { + "define-properties": "^1.1.3" + } + }, "globby": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", @@ -3746,6 +4093,39 @@ } } }, + "got": { + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", + "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", + "requires": { + "@sindresorhus/is": "^0.14.0", + "@szmarczak/http-timer": "^1.1.2", + "cacheable-request": "^6.0.0", + "decompress-response": "^3.3.0", + "duplexer3": "^0.1.4", + "get-stream": "^4.1.0", + "lowercase-keys": "^1.0.1", + "mimic-response": "^1.0.1", + "p-cancelable": "^1.0.0", + "to-readable-stream": "^1.0.0", + "url-parse-lax": "^3.0.0" + }, + "dependencies": { + "decompress-response": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "requires": { + "mimic-response": "^1.0.0" + } + }, + "mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" + } + } + }, "graceful-fs": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", @@ -3928,6 +4308,11 @@ } } }, + "http-cache-semantics": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", + "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" + }, "http-response-object": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz", @@ -4492,6 +4877,11 @@ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" }, + "json-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" + }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -4549,6 +4939,19 @@ "verror": "1.10.0" } }, + "junk": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", + "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==" + }, + "keyv": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", + "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", + "requires": { + "json-buffer": "3.0.0" + } + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -4901,6 +5304,11 @@ "signal-exit": "^3.0.0" } }, + "lowercase-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" + }, "lru-cache": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", @@ -4943,6 +5351,23 @@ "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz", "integrity": "sha512-Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ==" }, + "matcher": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-2.1.0.tgz", + "integrity": "sha512-o+nZr+vtJtgPNklyeUKkkH42OsK8WAfdgaJE2FNxcjLPg+5QbeEoT6vRj8Xq/iv18JlQ9cmKsEu0b94ixWf1YQ==", + "optional": true, + "requires": { + "escape-string-regexp": "^2.0.0" + }, + "dependencies": { + "escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "optional": true + } + } + }, "math-random": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", @@ -5218,6 +5643,11 @@ "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz", "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=" }, + "normalize-url": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", + "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" + }, "npm": { "version": "6.14.4", "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.4.tgz", @@ -8324,6 +8754,24 @@ } } }, + "npm-conf": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", + "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", + "optional": true, + "requires": { + "config-chain": "^1.1.11", + "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "optional": true + } + } + }, "npm-run-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz", @@ -8524,6 +8972,11 @@ "object-assign": "^4.1.0" } }, + "p-cancelable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", + "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" + }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -8989,6 +9442,11 @@ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" + }, "preserve": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", @@ -9048,6 +9506,12 @@ "asap": "~2.0.3" } }, + "proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", + "optional": true + }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -9131,9 +9595,9 @@ } }, "rcedit": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-1.1.2.tgz", - "integrity": "sha512-z2ypB4gbINhI6wVe0JJMmdpmOpmNc4g90sE6/6JSuch5kYnjfz9CxvVPqqhShgR6GIkmtW3W2UlfiXhWljA0Fw==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-2.2.0.tgz", + "integrity": "sha512-dhFtYmQS+V8qQIANyX6zDK+sO50ayDePKApi46ZPK8I6QeyyTDD6LManMa7a3p3c9mLM4zi9QBP41pfhQ9p7Sg==" }, "read-installed": { "version": "3.1.3", @@ -9516,6 +9980,14 @@ "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" }, + "responselike": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", + "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "requires": { + "lowercase-keys": "^1.0.0" + } + }, "resq": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/resq/-/resq-1.5.0.tgz", @@ -9589,6 +10061,28 @@ } } }, + "roarr": { + "version": "2.15.3", + "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz", + "integrity": "sha512-AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA==", + "optional": true, + "requires": { + "boolean": "^3.0.0", + "detect-node": "^2.0.4", + "globalthis": "^1.0.1", + "json-stringify-safe": "^5.0.1", + "semver-compare": "^1.0.0", + "sprintf-js": "^1.1.2" + }, + "dependencies": { + "sprintf-js": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", + "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "optional": true + } + } + }, "run-async": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", @@ -9656,6 +10150,12 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" }, + "semver-compare": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", + "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", + "optional": true + }, "serialize-error": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-3.0.0.tgz", @@ -10754,6 +11254,11 @@ "kind-of": "^3.0.2" } }, + "to-readable-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", + "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" + }, "to-regex": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", @@ -10847,6 +11352,12 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" }, + "tunnel": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", + "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", + "optional": true + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -10869,6 +11380,12 @@ "prelude-ls": "~1.1.2" } }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "optional": true + }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -11077,6 +11594,14 @@ "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" }, + "url-parse-lax": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "requires": { + "prepend-http": "^2.0.0" + } + }, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", diff --git a/script/package.json b/script/package.json index d5cf849f8..e9e3ad96e 100644 --- a/script/package.json +++ b/script/package.json @@ -13,7 +13,7 @@ "electron-chromedriver": "^6.0.0", "electron-link": "^0.4.2", "electron-mksnapshot": "^6.0.0", - "electron-packager": "^13.1.1", + "electron-packager": "^14.2.1", "@atom/electron-winstaller": "0.0.1", "eslint": "^5.16.0", "eslint-config-prettier": "^4.2.0", From 7389cff85c02cdcd36b251de651363295b01794e Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Wed, 20 May 2020 00:41:32 -0500 Subject: [PATCH 024/119] check out build on electron 7 --- package.json | 2 +- script/package-lock.json | 61 +++++++++++++++++++--------- script/package.json | 4 +- script/vsts/nightly-release.yml | 4 +- script/vsts/platforms/linux.yml | 4 +- script/vsts/platforms/macos.yml | 12 +++--- script/vsts/platforms/windows.yml | 6 +-- script/vsts/release-branch-build.yml | 4 +- script/vsts/windows-run.js | 2 +- 9 files changed, 60 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index ab27ad1d1..023c3ccad 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "url": "https://github.com/atom/atom/issues" }, "license": "MIT", - "electronVersion": "6.1.12", + "electronVersion": "7.3.0", "dependencies": { "@atom/nsfw": "1.0.26", "@atom/source-map-support": "^0.3.4", diff --git a/script/package-lock.json b/script/package-lock.json index 91cab6367..bb86f2fa6 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -1185,6 +1185,11 @@ "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" }, + "buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" + }, "buffer-fill": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", @@ -2188,9 +2193,9 @@ } }, "electron-chromedriver": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-6.0.0.tgz", - "integrity": "sha512-UIhRl0sN5flfUjqActXsFrZQU1NmBObvlxzPnyeud8vhR67TllXCoqfvhQJmIrJAJJK+5M1DFhJ5iTGT++dvkg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-7.0.0.tgz", + "integrity": "sha512-7qymT0fn3VTit0peym1iz4Y+fTwq9EPsv1V9Qh+vQdoVqP/4SM9lOHrsBeuFN1JJADZLu7R119ZvMkP6EnLYhw==", "requires": { "electron-download": "^4.1.1", "extract-zip": "^1.6.7" @@ -2320,9 +2325,9 @@ } }, "electron-mksnapshot": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/electron-mksnapshot/-/electron-mksnapshot-6.0.0.tgz", - "integrity": "sha512-wj0Yr4i6XwqhRsaLN1id4OK0qTpjgZv/KbPo0Rk4cOGaSSCf4mPa3WJ8cpMHyT9UFDxSmvcyEfGKb4bgfW/ooQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/electron-mksnapshot/-/electron-mksnapshot-7.0.0.tgz", + "integrity": "sha512-7EmppuO6zwSCioEXr5MrkVKY26rgSz/5Ldr2ALbJU8sWvbRQgKTzxR9437gyj+Rx22FfsEES2xSpKxyfulbJtA==", "requires": { "electron-download": "^4.1.0", "extract-zip": "^1.6.5", @@ -3240,14 +3245,29 @@ } }, "extract-zip": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", - "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", + "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", "requires": { - "concat-stream": "1.6.2", - "debug": "2.6.9", - "mkdirp": "0.5.1", - "yauzl": "2.4.1" + "concat-stream": "^1.6.2", + "debug": "^2.6.9", + "mkdirp": "^0.5.4", + "yauzl": "^2.10.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "requires": { + "minimist": "^1.2.5" + } + } } }, "extsprintf": { @@ -3571,9 +3591,9 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" }, "fd-slicer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", - "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", "requires": { "pend": "~1.2.0" } @@ -11871,11 +11891,12 @@ } }, "yauzl": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", - "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", "requires": { - "fd-slicer": "~1.0.1" + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" } } } diff --git a/script/package.json b/script/package.json index e9e3ad96e..072c23e0b 100644 --- a/script/package.json +++ b/script/package.json @@ -10,9 +10,9 @@ "coffeelint": "1.15.7", "colors": "1.1.2", "donna": "1.0.16", - "electron-chromedriver": "^6.0.0", + "electron-chromedriver": "^7.0.0", "electron-link": "^0.4.2", - "electron-mksnapshot": "^6.0.0", + "electron-mksnapshot": "^7.0.0", "electron-packager": "^14.2.1", "@atom/electron-winstaller": "0.0.1", "eslint": "^5.16.0", diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 8dfc00bc6..5cf15b080 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -32,8 +32,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.4.0 - displayName: Install Node.js 12.4.0 + versionSpec: 12.8.1 + displayName: Install Node.js 12.8.1 #This has to be done separately because VSTS inexplicably #exits the script block after `npm install` completes. diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 0717daf07..2c4d6f81c 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -24,8 +24,8 @@ jobs: - task: NodeTool@0 inputs: - versionSpec: 12.4.0 - displayName: Install Node.js 12.4.0 + versionSpec: 12.8.1 + displayName: Install Node.js 12.8.1 - script: npm install --global npm@6.13.4 displayName: Update npm diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index 28983fc74..e809e51e1 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -14,8 +14,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.4.0 - displayName: Install Node.js 12.4.0 + versionSpec: 12.8.1 + displayName: Install Node.js 12.8.1 #- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 # displayName: Restore node_modules cache @@ -29,7 +29,7 @@ jobs: env: CI: true CI_PROVIDER: VSTS - NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.4.0/x64/bin/npm + NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.8.1/x64/bin/npm npm_config_build_from_source: true condition: ne(variables['CacheRestored'], 'true') @@ -112,8 +112,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.4.0 - displayName: Install Node.js 12.4.0 + versionSpec: 12.8.1 + displayName: Install Node.js 12.8.1 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 displayName: Restore node_modules cache @@ -129,7 +129,7 @@ jobs: env: CI: true CI_PROVIDER: VSTS - NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.4.0/x64/bin/npm + NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.8.1/x64/bin/npm npm_config_build_from_source: true condition: ne(variables['CacheRestored'], 'true') diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 2f6f31d41..9486feae7 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -26,8 +26,8 @@ jobs: - task: NodeTool@0 inputs: - versionSpec: 12.4.0 - displayName: Install Node.js 12.4.0 + versionSpec: 12.8.1 + displayName: Install Node.js 12.8.1 - script: | ECHO Installing npm-windows-upgrade @@ -70,7 +70,7 @@ jobs: BUILD_ARCH: $(buildArch) CI: true CI_PROVIDER: VSTS - NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\12.4.0\\x64\\npm.cmd" + NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\12.8.1\\x64\\npm.cmd" npm_config_build_from_source: true displayName: Bootstrap build environment condition: ne(variables['CacheRestored'], 'true') diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index 69bffeae5..5b30683f1 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -38,8 +38,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.4.0 - displayName: Install Node.js 12.4.0 + versionSpec: 12.8.1 + displayName: Install Node.js 12.8.1 # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. diff --git a/script/vsts/windows-run.js b/script/vsts/windows-run.js index ef63cc6f1..63e65fe8c 100644 --- a/script/vsts/windows-run.js +++ b/script/vsts/windows-run.js @@ -5,7 +5,7 @@ const path = require('path'); const download = require('download'); const childProcess = require('child_process'); -const nodeVersion = '12.4.0'; +const nodeVersion = '12.8.1'; const nodeFileName = `node-v${nodeVersion}-win-x86`; const extractedNodePath = `c:\\tmp\\${nodeFileName}`; From 9dcac63419480efd063dd9c7562d1c0028a2a588 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Wed, 20 May 2020 00:44:18 -0500 Subject: [PATCH 025/119] Upgrade npm --- script/vsts/platforms/linux.yml | 2 +- script/vsts/platforms/windows.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 2c4d6f81c..d09561552 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -27,7 +27,7 @@ jobs: versionSpec: 12.8.1 displayName: Install Node.js 12.8.1 - - script: npm install --global npm@6.13.4 + - script: npm install --global npm@6.10.2 displayName: Update npm - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 9486feae7..cc9178f77 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -36,8 +36,8 @@ jobs: - script: | ECHO Upgrading npm - npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.13.4 - displayName: Install npm 6.13.4 + npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.10.2 + displayName: Install npm 6.10.2 - script: | npm install --global --production windows-build-tools@4.0 From a8047f889bb568802efaf6f99dd2c5ded9b188ed Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Wed, 20 May 2020 00:54:26 -0500 Subject: [PATCH 026/119] back to electron 6 --- package.json | 2 +- script/package.json | 4 ++-- script/vsts/nightly-release.yml | 4 ++-- script/vsts/platforms/linux.yml | 6 +++--- script/vsts/platforms/macos.yml | 12 ++++++------ script/vsts/platforms/windows.yml | 10 +++++----- script/vsts/release-branch-build.yml | 4 ++-- script/vsts/windows-run.js | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 023c3ccad..ab27ad1d1 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "url": "https://github.com/atom/atom/issues" }, "license": "MIT", - "electronVersion": "7.3.0", + "electronVersion": "6.1.12", "dependencies": { "@atom/nsfw": "1.0.26", "@atom/source-map-support": "^0.3.4", diff --git a/script/package.json b/script/package.json index 072c23e0b..e9e3ad96e 100644 --- a/script/package.json +++ b/script/package.json @@ -10,9 +10,9 @@ "coffeelint": "1.15.7", "colors": "1.1.2", "donna": "1.0.16", - "electron-chromedriver": "^7.0.0", + "electron-chromedriver": "^6.0.0", "electron-link": "^0.4.2", - "electron-mksnapshot": "^7.0.0", + "electron-mksnapshot": "^6.0.0", "electron-packager": "^14.2.1", "@atom/electron-winstaller": "0.0.1", "eslint": "^5.16.0", diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 5cf15b080..8dfc00bc6 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -32,8 +32,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.8.1 - displayName: Install Node.js 12.8.1 + versionSpec: 12.4.0 + displayName: Install Node.js 12.4.0 #This has to be done separately because VSTS inexplicably #exits the script block after `npm install` completes. diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index d09561552..2c5fdef3a 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -24,10 +24,10 @@ jobs: - task: NodeTool@0 inputs: - versionSpec: 12.8.1 - displayName: Install Node.js 12.8.1 + versionSpec: 12.4.0 + displayName: Install Node.js 12.4.0 - - script: npm install --global npm@6.10.2 + - script: npm install --global npm@6.9.0 displayName: Update npm - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index e809e51e1..28983fc74 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -14,8 +14,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.8.1 - displayName: Install Node.js 12.8.1 + versionSpec: 12.4.0 + displayName: Install Node.js 12.4.0 #- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 # displayName: Restore node_modules cache @@ -29,7 +29,7 @@ jobs: env: CI: true CI_PROVIDER: VSTS - NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.8.1/x64/bin/npm + NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.4.0/x64/bin/npm npm_config_build_from_source: true condition: ne(variables['CacheRestored'], 'true') @@ -112,8 +112,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.8.1 - displayName: Install Node.js 12.8.1 + versionSpec: 12.4.0 + displayName: Install Node.js 12.4.0 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 displayName: Restore node_modules cache @@ -129,7 +129,7 @@ jobs: env: CI: true CI_PROVIDER: VSTS - NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.8.1/x64/bin/npm + NPM_BIN_PATH: /Users/runner/hostedtoolcache/node/12.4.0/x64/bin/npm npm_config_build_from_source: true condition: ne(variables['CacheRestored'], 'true') diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index cc9178f77..95b891c4d 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -26,8 +26,8 @@ jobs: - task: NodeTool@0 inputs: - versionSpec: 12.8.1 - displayName: Install Node.js 12.8.1 + versionSpec: 12.4.0 + displayName: Install Node.js 12.4.0 - script: | ECHO Installing npm-windows-upgrade @@ -36,8 +36,8 @@ jobs: - script: | ECHO Upgrading npm - npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.10.2 - displayName: Install npm 6.10.2 + npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.9.0 + displayName: Install npm 6.9.0 - script: | npm install --global --production windows-build-tools@4.0 @@ -70,7 +70,7 @@ jobs: BUILD_ARCH: $(buildArch) CI: true CI_PROVIDER: VSTS - NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\12.8.1\\x64\\npm.cmd" + NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\12.4.0\\x64\\npm.cmd" npm_config_build_from_source: true displayName: Bootstrap build environment condition: ne(variables['CacheRestored'], 'true') diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index 5b30683f1..69bffeae5 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -38,8 +38,8 @@ jobs: steps: - task: NodeTool@0 inputs: - versionSpec: 12.8.1 - displayName: Install Node.js 12.8.1 + versionSpec: 12.4.0 + displayName: Install Node.js 12.4.0 # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. diff --git a/script/vsts/windows-run.js b/script/vsts/windows-run.js index 63e65fe8c..ef63cc6f1 100644 --- a/script/vsts/windows-run.js +++ b/script/vsts/windows-run.js @@ -5,7 +5,7 @@ const path = require('path'); const download = require('download'); const childProcess = require('child_process'); -const nodeVersion = '12.8.1'; +const nodeVersion = '12.4.0'; const nodeFileName = `node-v${nodeVersion}-win-x86`; const extractedNodePath = `c:\\tmp\\${nodeFileName}`; From 985dc66c8cfd407486d3ee564fb59892cebb1d3b Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Wed, 20 May 2020 00:58:00 -0500 Subject: [PATCH 027/119] Update package-lock.json --- script/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/package-lock.json b/script/package-lock.json index bb86f2fa6..7dbc7cee4 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -2193,9 +2193,9 @@ } }, "electron-chromedriver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-7.0.0.tgz", - "integrity": "sha512-7qymT0fn3VTit0peym1iz4Y+fTwq9EPsv1V9Qh+vQdoVqP/4SM9lOHrsBeuFN1JJADZLu7R119ZvMkP6EnLYhw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-6.0.0.tgz", + "integrity": "sha512-UIhRl0sN5flfUjqActXsFrZQU1NmBObvlxzPnyeud8vhR67TllXCoqfvhQJmIrJAJJK+5M1DFhJ5iTGT++dvkg==", "requires": { "electron-download": "^4.1.1", "extract-zip": "^1.6.7" @@ -2325,9 +2325,9 @@ } }, "electron-mksnapshot": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/electron-mksnapshot/-/electron-mksnapshot-7.0.0.tgz", - "integrity": "sha512-7EmppuO6zwSCioEXr5MrkVKY26rgSz/5Ldr2ALbJU8sWvbRQgKTzxR9437gyj+Rx22FfsEES2xSpKxyfulbJtA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/electron-mksnapshot/-/electron-mksnapshot-6.0.0.tgz", + "integrity": "sha512-wj0Yr4i6XwqhRsaLN1id4OK0qTpjgZv/KbPo0Rk4cOGaSSCf4mPa3WJ8cpMHyT9UFDxSmvcyEfGKb4bgfW/ooQ==", "requires": { "electron-download": "^4.1.0", "extract-zip": "^1.6.5", From 29a9d3218214219671b1408b725e66057db2d8f9 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Thu, 11 Jun 2020 21:24:55 -0500 Subject: [PATCH 028/119] Fix uploadToServer can't be null --- src/crash-reporter-start.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/crash-reporter-start.js b/src/crash-reporter-start.js index 5c44a34b5..efba0e853 100644 --- a/src/crash-reporter-start.js +++ b/src/crash-reporter-start.js @@ -5,11 +5,13 @@ module.exports = function(params) { const arch = os.arch(); const { uploadToServer, releaseChannel } = params; + const parsedUploadToServer = uploadToServer !== null? uploadToServer : false; + crashReporter.start({ productName: 'Atom', companyName: 'GitHub', submitURL: 'https://atom.io/crash_reports', - uploadToServer, + parsedUploadToServer, extra: { platformRelease, arch, releaseChannel } }); }; From ece51f97ac46086843b1a54f3802838a9d7de14c Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Thu, 11 Jun 2020 21:25:40 -0500 Subject: [PATCH 029/119] Update webdriverio config to match the new schema --- spec/integration/helpers/start-atom.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spec/integration/helpers/start-atom.js b/spec/integration/helpers/start-atom.js index 1fd72d22f..fc1091934 100644 --- a/spec/integration/helpers/start-atom.js +++ b/spec/integration/helpers/start-atom.js @@ -24,7 +24,7 @@ const ChromedriverPath = path.resolve( 'bin', 'chromedriver' ); -const ChromedriverPort = 9515; +const ChromedriverPort = 8082; const ChromedriverURLBase = '/wd/hub'; const ChromedriverStatusURL = `http://localhost:${ChromedriverPort}${ChromedriverURLBase}/status`; @@ -68,8 +68,8 @@ const buildAtomClient = async (args, env) => { host: 'localhost', port: ChromedriverPort, capabilities: { - browserName: 'atom', - chromeOptions: { + browserName: 'chrome', //Webdriverio will figure it out on it's own, but I will leave it in case it's helpful in the future https://webdriver.io/docs/configurationfile.html + 'goog:chromeOptions': { binary: AtomLauncherPath, args: [ `atom-path=${AtomPath}`, @@ -159,6 +159,7 @@ Logs:\n${chromedriverLogs.join('\n')}`); try { client = await buildAtomClient(args, env); } catch (error) { + console.log(error) jasmine .getEnv() .currentSpec.fail(`Unable to build Atom client.\n${error}`); From b2d3c569b6f11fb46d19750a0f02fb27141102f0 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Thu, 11 Jun 2020 22:09:00 -0500 Subject: [PATCH 030/119] Remove deprecated screen api from the cache --- src/module-cache.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/module-cache.js b/src/module-cache.js index f0a460dad..c4b81a3ae 100644 --- a/src/module-cache.js +++ b/src/module-cache.js @@ -295,7 +295,7 @@ function registerBuiltins(devMode) { 'crash-reporter', 'ipc-renderer', 'remote', - 'screen' + //'screen' Deprecated https://www.electronjs.org/docs/breaking-changes#api-changed-electronscreen-in-the-renderer-process-should-be-accessed-via-remote ]; for (const builtin of rendererBuiltins) { cache.builtins[builtin] = path.join(rendererRoot, `${builtin}.js`); From 9c16e5c67313077dd1b75ccfaf6e006e7c072dec Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Thu, 11 Jun 2020 22:23:00 -0500 Subject: [PATCH 031/119] Fix lint errors --- spec/integration/helpers/start-atom.js | 3 +-- src/crash-reporter-start.js | 2 +- src/module-cache.js | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spec/integration/helpers/start-atom.js b/spec/integration/helpers/start-atom.js index fc1091934..f8ae6dff1 100644 --- a/spec/integration/helpers/start-atom.js +++ b/spec/integration/helpers/start-atom.js @@ -68,7 +68,7 @@ const buildAtomClient = async (args, env) => { host: 'localhost', port: ChromedriverPort, capabilities: { - browserName: 'chrome', //Webdriverio will figure it out on it's own, but I will leave it in case it's helpful in the future https://webdriver.io/docs/configurationfile.html + browserName: 'chrome', // Webdriverio will figure it out on it's own, but I will leave it in case it's helpful in the future https://webdriver.io/docs/configurationfile.html 'goog:chromeOptions': { binary: AtomLauncherPath, args: [ @@ -159,7 +159,6 @@ Logs:\n${chromedriverLogs.join('\n')}`); try { client = await buildAtomClient(args, env); } catch (error) { - console.log(error) jasmine .getEnv() .currentSpec.fail(`Unable to build Atom client.\n${error}`); diff --git a/src/crash-reporter-start.js b/src/crash-reporter-start.js index efba0e853..d34fc664a 100644 --- a/src/crash-reporter-start.js +++ b/src/crash-reporter-start.js @@ -5,7 +5,7 @@ module.exports = function(params) { const arch = os.arch(); const { uploadToServer, releaseChannel } = params; - const parsedUploadToServer = uploadToServer !== null? uploadToServer : false; + const parsedUploadToServer = uploadToServer !== null ? uploadToServer : false; crashReporter.start({ productName: 'Atom', diff --git a/src/module-cache.js b/src/module-cache.js index c4b81a3ae..a63b3bbb3 100644 --- a/src/module-cache.js +++ b/src/module-cache.js @@ -294,8 +294,8 @@ function registerBuiltins(devMode) { const rendererBuiltins = [ 'crash-reporter', 'ipc-renderer', - 'remote', - //'screen' Deprecated https://www.electronjs.org/docs/breaking-changes#api-changed-electronscreen-in-the-renderer-process-should-be-accessed-via-remote + 'remote' + // 'screen' Deprecated https://www.electronjs.org/docs/breaking-changes#api-changed-electronscreen-in-the-renderer-process-should-be-accessed-via-remote ]; for (const builtin of rendererBuiltins) { cache.builtins[builtin] = path.join(rendererRoot, `${builtin}.js`); From 1cef4dd442ab11217b632ca67a11ea75fc7aeeb1 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Tue, 16 Jun 2020 14:27:31 -0400 Subject: [PATCH 032/119] :arrow_up: electron-packager to git master --- script/package-lock.json | 289 +++++++++++++-------------------------- script/package.json | 2 +- 2 files changed, 99 insertions(+), 192 deletions(-) diff --git a/script/package-lock.json b/script/package-lock.json index 43006fadf..0a0108db4 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -776,6 +776,11 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, + "at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==" + }, "atob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz", @@ -1718,45 +1723,6 @@ "which": "^1.2.8" } }, - "cross-zip": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cross-zip/-/cross-zip-3.1.0.tgz", - "integrity": "sha512-aX02l0SD3KE27pMl69gkxDdDM5D3u9Ic4Je+2b1B2fP0dWnlWWY6ns2Vk5DEgCXJRhL3GasSpicNQRNbDkq0+w==", - "requires": { - "rimraf": "^3.0.0" - }, - "dependencies": { - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "requires": { - "glob": "^7.1.3" - } - } - } - }, "cson-parser": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-1.0.9.tgz", @@ -2279,12 +2245,12 @@ } }, "electron-notarize": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-0.2.1.tgz", - "integrity": "sha512-oZ6/NhKeXmEKNROiFmRNfytqu3cxqC95sjooG7kBXQVEUSQkZnbiAhxVh5jXngL881G197pbwpeVPJyM7Ikmxw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.0.0.tgz", + "integrity": "sha512-dsib1IAquMn0onCrNMJ6gtEIZn/azG8hZMCYOuZIMVMUeRMgBYHK1s5TK9P8xAcrAjh/2aN5WYHzgVSWX314og==", "requires": { "debug": "^4.1.1", - "fs-extra": "^8.1.0" + "fs-extra": "^9.0.1" }, "dependencies": { "debug": { @@ -2296,13 +2262,14 @@ } }, "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", + "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", "requires": { + "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "jsonfile": "^6.0.1", + "universalify": "^1.0.0" } }, "graceful-fs": { @@ -2311,24 +2278,30 @@ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" }, "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", + "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "^4.1.6", + "universalify": "^1.0.0" } }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "universalify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", + "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==" } } }, "electron-osx-sign": { - "version": "0.4.16", - "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.16.tgz", - "integrity": "sha512-ziMWfc3NmQlwnWLW6EaZq8nH2BWVng/atX5GWsGwhexJYpdW6hsg//MkAfRTRx1kR3Veiqkeiog1ibkbA4x0rg==", + "version": "0.4.17", + "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.17.tgz", + "integrity": "sha512-wUJPmZJQCs1zgdlQgeIpRcvrf7M5/COQaOV68Va1J/SgmWx5KL2otgg+fAae7luw6qz9R8Gvu/Qpe9tAOu/3xQ==", "requires": { "bluebird": "^3.5.0", "compare-version": "^0.1.2", @@ -2346,17 +2319,17 @@ } }, "electron-packager": { - "version": "14.2.1", - "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-14.2.1.tgz", - "integrity": "sha512-g6y3BVrAOz/iavKD+VMFbehrQcwCWuA3CZvVbmmbQuCfegGA1ytwWn0BNIDDrEdbuz31Fti7mnNHhb5L+3Wq9A==", + "version": "github:electron/electron-packager#65ae3fe022789f2e1cd9d8ec7943bab476c394c0", + "from": "github:electron/electron-packager#65ae3fe", "requires": { "@electron/get": "^1.6.0", - "asar": "^2.0.1", - "cross-zip": "^3.0.0", + "asar": "^3.0.0", "debug": "^4.0.1", - "electron-notarize": "^0.2.0", + "electron-notarize": "^1.0.0", "electron-osx-sign": "^0.4.11", - "fs-extra": "^8.1.0", + "extract-zip": "^2.0.0", + "filenamify": "^4.1.0", + "fs-extra": "^9.0.0", "galactus": "^0.2.1", "get-package-info": "^1.0.0", "junk": "^3.1.0", @@ -2364,24 +2337,20 @@ "plist": "^3.0.0", "rcedit": "^2.0.0", "resolve": "^1.1.6", - "sanitize-filename": "^1.6.0", - "semver": "^6.0.0", - "yargs-parser": "^16.0.0" + "semver": "^7.1.3", + "yargs-parser": "^18.0.0" }, "dependencies": { "asar": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/asar/-/asar-2.1.0.tgz", - "integrity": "sha512-d2Ovma+bfqNpvBzY/KU8oPY67ZworixTpkjSx0PCXnQi67c2cXmssaTxpFDUM0ttopXoGx/KRxNg/GDThYbXQA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/asar/-/asar-3.0.3.tgz", + "integrity": "sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw==", "requires": { "@types/glob": "^7.1.1", "chromium-pickle-js": "^0.2.0", - "commander": "^2.20.0", - "cuint": "^0.2.2", - "glob": "^7.1.3", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "tmp-promise": "^1.0.5" + "commander": "^5.0.0", + "glob": "^7.1.6", + "minimatch": "^3.0.4" } }, "camelcase": { @@ -2390,9 +2359,9 @@ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", + "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" }, "debug": { "version": "4.1.1", @@ -2402,66 +2371,15 @@ "ms": "^2.1.1" } }, - "env-paths": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz", - "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=" - }, - "extract-zip": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", - "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", - "requires": { - "concat-stream": "^1.6.2", - "debug": "^2.6.9", - "mkdirp": "^0.5.4", - "yauzl": "^2.10.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "requires": { - "minimist": "^1.2.5" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", - "requires": { - "pend": "~1.2.0" - } - }, "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", + "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", "requires": { + "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "jsonfile": "^6.0.1", + "universalify": "^1.0.0" } }, "glob": { @@ -2483,11 +2401,12 @@ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" }, "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", + "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "^4.1.6", + "universalify": "^1.0.0" } }, "minimatch": { @@ -2504,58 +2423,23 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==" }, - "sumchecker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz", - "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=", - "requires": { - "debug": "^2.2.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "tmp": { - "version": "0.0.28", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz", - "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=", - "requires": { - "os-tmpdir": "~1.0.1" - } + "universalify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", + "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==" }, "yargs-parser": { - "version": "16.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz", - "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==", + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "requires": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" } - }, - "yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", - "requires": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } } } }, @@ -3652,6 +3536,21 @@ "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=" }, + "filename-reserved-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", + "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=" + }, + "filenamify": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.1.0.tgz", + "integrity": "sha512-KQV/uJDI9VQgN7sHH1Zbk6+42cD6mnQ2HONzkXUfPJ+K2FC8GZ1dpewbbHw0Sz8Tf5k3EVdHVayM4DoAwWlmtg==", + "requires": { + "filename-reserved-regex": "^2.0.0", + "strip-outer": "^1.0.1", + "trim-repeated": "^1.0.0" + } + }, "fill-range": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", @@ -10070,14 +9969,6 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, - "sanitize-filename": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz", - "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==", - "requires": { - "truncate-utf8-bytes": "^1.0.0" - } - }, "season": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/season/-/season-5.3.0.tgz", @@ -10503,6 +10394,14 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=" }, + "strip-outer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", + "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", + "requires": { + "escape-string-regexp": "^1.0.2" + } + }, "style-search": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", @@ -11237,6 +11136,14 @@ "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz", "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=" }, + "trim-repeated": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", + "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=", + "requires": { + "escape-string-regexp": "^1.0.2" + } + }, "trim-right": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", diff --git a/script/package.json b/script/package.json index 46d0cfb4f..3af52753c 100644 --- a/script/package.json +++ b/script/package.json @@ -13,7 +13,7 @@ "electron-chromedriver": "^9.0.0", "electron-link": "^0.4.2", "electron-mksnapshot": "^9.0.2", - "electron-packager": "^14.2.1", + "electron-packager": "github:electron/electron-packager#65ae3fe", "@atom/electron-winstaller": "0.0.1", "eslint": "^5.16.0", "eslint-config-prettier": "^4.2.0", From b23b30d395159376913449d9373dc83a40e515b0 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Fri, 3 Jul 2020 12:05:21 -0500 Subject: [PATCH 033/119] Bump electron-link@0.4.3 --- script/package-lock.json | 254 +++++++++++++++++++-------------------- script/package.json | 2 +- 2 files changed, 128 insertions(+), 128 deletions(-) diff --git a/script/package-lock.json b/script/package-lock.json index 0a0108db4..b359b4465 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -478,18 +478,15 @@ } }, "abstract-leveldown": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz", - "integrity": "sha512-5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz", + "integrity": "sha512-TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ==", "requires": { + "buffer": "^5.5.0", + "immediate": "^3.2.3", + "level-concat-iterator": "~2.0.0", + "level-supports": "~1.0.0", "xtend": "~4.0.0" - }, - "dependencies": { - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" - } } }, "acorn": { @@ -742,19 +739,19 @@ "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz", "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=" }, - "ast-util": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/ast-util/-/ast-util-0.6.0.tgz", - "integrity": "sha1-DZE9BPDpgx5T+ZkdyZAJ4tp3SBA=", + "ast-util-plus": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/ast-util-plus/-/ast-util-plus-0.6.2.tgz", + "integrity": "sha512-k7sWJ1B1PT/Mm5xTszBK9kxQYD15H1iSMqIkM/88qeGjNLgCEiZT5Has7L+dNtcMi3ed2iYiKy05jzQ/ZkB9DQ==", "requires": { - "ast-types": "~0.6.7", - "private": "~0.1.6" + "ast-types": "0.13.3", + "private": "0.1.8" }, "dependencies": { "ast-types": { - "version": "0.6.16", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.6.16.tgz", - "integrity": "sha1-BCBbcu3dGVqP6qCB8R0ClKJN7ZM=" + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.3.tgz", + "integrity": "sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==" } } }, @@ -1129,8 +1126,7 @@ "boolean": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", - "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==", - "optional": true + "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==" }, "brace-expansion": { "version": "1.1.11", @@ -1852,12 +1848,26 @@ "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==" }, "deferred-leveldown": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-4.0.2.tgz", - "integrity": "sha512-5fMC8ek8alH16QiV0lTCis610D1Zt1+LA4MS4d63JgS32lrCjTFDUFz2ao09/j2I4Bqb5jL4FZYwu7Jz0XO1ww==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz", + "integrity": "sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw==", "requires": { - "abstract-leveldown": "~5.0.0", + "abstract-leveldown": "~6.2.1", "inherits": "^2.0.3" + }, + "dependencies": { + "abstract-leveldown": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz", + "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==", + "requires": { + "buffer": "^5.5.0", + "immediate": "^3.2.3", + "level-concat-iterator": "~2.0.0", + "level-supports": "~1.0.0", + "xtend": "~4.0.0" + } + } } }, "define-properties": { @@ -2150,35 +2160,30 @@ } }, "electron-link": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/electron-link/-/electron-link-0.4.2.tgz", - "integrity": "sha512-WNnKqiI7+dV3faP4BZN3MEbbGp4SewHNJaIXzEPzROxwTV5tn6cLnKukfogiXOLbBZhzLfmqCd8H9Hy+Oc7IrQ==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/electron-link/-/electron-link-0.4.3.tgz", + "integrity": "sha512-rfJSTwJOZkU15mtNvAOaDNafS7I1Jse31rgbGQJ/mJ7ZGtxZJy7FdxiDkMfT/NmbS3qluK3tO5DIU6VrZnfQLw==", "requires": { - "acorn": "^6.1.1", - "ast-util": "^0.6.0", - "encoding-down": "^5.0.4", - "indent-string": "^3.2.0", - "leveldown": "^5.4.1", - "levelup": "~3.0.0", - "recast": "^0.17.6", - "resolve": "^1.13.1", - "source-map": "^0.5.6" + "acorn": "^7.3.1", + "ast-util-plus": "^0.6.2", + "encoding-down": "^6.3.0", + "indent-string": "^4.0.0", + "leveldown": "^5.6.0", + "levelup": "^4.4.0", + "recast": "^0.19.1", + "resolve": "^1.17.0", + "source-map": "^0.7.3" }, "dependencies": { "acorn": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", - "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==" + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz", + "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==" }, "ast-types": { - "version": "0.12.4", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.12.4.tgz", - "integrity": "sha512-ky/YVYCbtVAS8TdMIaTiPFHwEpRB5z1hctepJplTr3UW5q8TDrpIMCILyk8pmLxGtn2KCtC/lSn7zOsaI7nzDw==" - }, - "indent-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=" + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.3.tgz", + "integrity": "sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==" }, "path-parse": { "version": "1.0.6", @@ -2186,11 +2191,11 @@ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "recast": { - "version": "0.17.6", - "resolved": "https://registry.npmjs.org/recast/-/recast-0.17.6.tgz", - "integrity": "sha512-yoQRMRrK1lszNtbkGyM4kN45AwylV5hMiuEveUBlxytUViWevjvX6w+tzJt1LH4cfUhWt4NZvy3ThIhu6+m5wQ==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/recast/-/recast-0.19.1.tgz", + "integrity": "sha512-8FCjrBxjeEU2O6I+2hyHyBFH1siJbMBLwIRvVr1T3FD2cL754sOaJDsJ/8h3xYltasbJ8jqWRIhMuDGBSiSbjw==", "requires": { - "ast-types": "0.12.4", + "ast-types": "0.13.3", "esprima": "~4.0.0", "private": "^0.1.8", "source-map": "~0.6.1" @@ -2210,6 +2215,11 @@ "requires": { "path-parse": "^1.0.6" } + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" } } }, @@ -2460,22 +2470,14 @@ "optional": true }, "encoding-down": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-5.0.4.tgz", - "integrity": "sha512-8CIZLDcSKxgzT+zX8ZVfgNbu8Md2wq/iqa1Y7zyVR18QBEAc0Nmzuvj/N5ykSKpfGzjM8qxbaFntLPwnVoUhZw==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-6.3.0.tgz", + "integrity": "sha512-QKrV0iKR6MZVJV08QY0wp1e7vF6QbhnbQhb07bwpEyuz4uZiZgPlEGdkCROuFkUwdxlFaiPIhjyarH1ee/3vhw==", "requires": { - "abstract-leveldown": "^5.0.0", + "abstract-leveldown": "^6.2.1", "inherits": "^2.0.3", "level-codec": "^9.0.0", - "level-errors": "^2.0.0", - "xtend": "^4.0.1" - }, - "dependencies": { - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" - } + "level-errors": "^2.0.0" } }, "end-of-stream": { @@ -4298,9 +4300,9 @@ "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==" }, "immediate": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz", - "integrity": "sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw=" + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz", + "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==" }, "import-fresh": { "version": "3.0.0", @@ -4321,6 +4323,11 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + }, "indexes-of": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", @@ -4945,9 +4952,12 @@ } }, "level-codec": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.1.tgz", - "integrity": "sha512-ajFP0kJ+nyq4i6kptSM+mAvJKLOg1X5FiFPtLG9M5gCEZyBmgDi3FkDrvlMkEzrUn1cWxtvVmrvoS4ASyO/q+Q==" + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz", + "integrity": "sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ==", + "requires": { + "buffer": "^5.6.0" + } }, "level-concat-iterator": { "version": "2.0.1", @@ -4963,41 +4973,19 @@ } }, "level-iterator-stream": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-2.0.3.tgz", - "integrity": "sha512-I6Heg70nfF+e5Y3/qfthJFexhRw/Gi3bIymCoXAlijZdAcLaPuWSJs3KXyTYf23ID6g0o2QF62Yh+grOXY3Rig==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz", + "integrity": "sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==", "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.5", - "xtend": "^4.0.0" + "inherits": "^2.0.4", + "readable-stream": "^3.4.0", + "xtend": "^4.0.2" }, "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" } } }, @@ -5007,13 +4995,6 @@ "integrity": "sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==", "requires": { "xtend": "^4.0.2" - }, - "dependencies": { - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" - } } }, "leveldown": { @@ -5037,30 +5018,19 @@ "level-supports": "~1.0.0", "xtend": "~4.0.0" } - }, - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" } } }, "levelup": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/levelup/-/levelup-3.0.1.tgz", - "integrity": "sha512-TrrLDPC/BfP35ei2uK+L6Cc7kpI1NxIChwp+BUB6jrHG3A8gtrr9jx1UZ9bi2w1O6VN7jYO4LUoq1iKRP5AREg==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz", + "integrity": "sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==", "requires": { - "deferred-leveldown": "~4.0.0", + "deferred-leveldown": "~5.3.0", "level-errors": "~2.0.0", - "level-iterator-stream": "~2.0.0", + "level-iterator-stream": "~4.0.0", + "level-supports": "~1.0.0", "xtend": "~4.0.0" - }, - "dependencies": { - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" - } } }, "leven": { @@ -9576,6 +9546,16 @@ "read-pkg": "^1.0.0" } }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, "readdir-scoped-modules": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz", @@ -10347,6 +10327,21 @@ "strip-ansi": "^3.0.0" } }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "requires": { + "safe-buffer": "~5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } + } + }, "stringify-entities": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz", @@ -11615,6 +11610,11 @@ "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz", "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==" }, + "xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" + }, "y18n": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", diff --git a/script/package.json b/script/package.json index 3af52753c..e38dc11db 100644 --- a/script/package.json +++ b/script/package.json @@ -11,7 +11,7 @@ "colors": "1.1.2", "donna": "1.0.16", "electron-chromedriver": "^9.0.0", - "electron-link": "^0.4.2", + "electron-link": "^0.4.3", "electron-mksnapshot": "^9.0.2", "electron-packager": "github:electron/electron-packager#65ae3fe", "@atom/electron-winstaller": "0.0.1", From bc952d5a3ff053bf5b9d42708fc3d794e34b4173 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Fri, 3 Jul 2020 12:09:24 -0500 Subject: [PATCH 034/119] Bump electron-packager@15.0.0 --- script/package-lock.json | 5 +++-- script/package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/script/package-lock.json b/script/package-lock.json index b359b4465..d28d5f99d 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -2329,8 +2329,9 @@ } }, "electron-packager": { - "version": "github:electron/electron-packager#65ae3fe022789f2e1cd9d8ec7943bab476c394c0", - "from": "github:electron/electron-packager#65ae3fe", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-15.0.0.tgz", + "integrity": "sha512-J0yQP7/fKPkjxo9Yz5+vsQVig0dBbSXW8LQYA1pvNMvi+bL00hfI2SAyORP6EU7XaeiXGUIBSG2Px01EkKfGCw==", "requires": { "@electron/get": "^1.6.0", "asar": "^3.0.0", diff --git a/script/package.json b/script/package.json index e38dc11db..9eab6ad86 100644 --- a/script/package.json +++ b/script/package.json @@ -13,7 +13,7 @@ "electron-chromedriver": "^9.0.0", "electron-link": "^0.4.3", "electron-mksnapshot": "^9.0.2", - "electron-packager": "github:electron/electron-packager#65ae3fe", + "electron-packager": "^15.0.0", "@atom/electron-winstaller": "0.0.1", "eslint": "^5.16.0", "eslint-config-prettier": "^4.2.0", From 217cee16a895eaf8ec8043a4343b6aa68f8c8214 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Fri, 3 Jul 2020 00:04:46 -0500 Subject: [PATCH 035/119] Using windows-latest for vmImage --- script/vsts/nightly-release.yml | 2 ++ script/vsts/pull-requests.yml | 2 ++ script/vsts/release-branch-build.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 9e26a05ae..632238e9e 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -1,5 +1,7 @@ jobs: - job: GetReleaseVersion + pool: + vmImage: 'windows-latest' steps: # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. diff --git a/script/vsts/pull-requests.yml b/script/vsts/pull-requests.yml index a21f7d75a..c23df7095 100644 --- a/script/vsts/pull-requests.yml +++ b/script/vsts/pull-requests.yml @@ -2,6 +2,8 @@ trigger: none # No CI builds, only PR builds jobs: - job: GetReleaseVersion + pool: + vmImage: 'windows-latest' steps: # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index 24635821d..f53ffd2c1 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -6,6 +6,8 @@ pr: none # no PR triggers jobs: - job: GetReleaseVersion + pool: + vmImage: 'windows-latest' steps: # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. From fa7dddabb3c6c3e0e329c866cade0eb721e9ddad Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sun, 5 Jul 2020 10:19:06 -0500 Subject: [PATCH 036/119] make code-signing conditional --- script/vsts/get-release-version.js | 4 ++++ script/vsts/platforms/macos.yml | 2 +- script/vsts/platforms/windows.yml | 10 +++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/script/vsts/get-release-version.js b/script/vsts/get-release-version.js index 159128eed..4e8999d72 100644 --- a/script/vsts/get-release-version.js +++ b/script/vsts/get-release-version.js @@ -78,6 +78,7 @@ async function getReleaseVersion() { buildBranch.startsWith('electron-') || (buildBranch === 'master' && !process.env.SYSTEM_PULLREQUEST_PULLREQUESTNUMBER)); + const SHOULD_SIGN = process.env.SHOULD_SIGN; console.log( `##vso[task.setvariable variable=AppName;isOutput=true]${getAppName( @@ -90,6 +91,9 @@ async function getReleaseVersion() { console.log( `##vso[task.setvariable variable=IsSignedZipBranch;isOutput=true]${isSignedZipBranch}` ); + console.log( + `##vso[task.setvariable variable=SHOULD_SIGN;isOutput=true]${SHOULD_SIGN}` + ); } getReleaseVersion(); diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index a63faa770..fe03dce7d 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -47,7 +47,7 @@ jobs: displayName: Run linter - script: | - if [ $IS_RELEASE_BRANCH == "true" ] || [ $IS_SIGNED_ZIP_BRANCH == "true" ]; then + if [ $SHOULD_SIGN == "true" ] && ([ $IS_RELEASE_BRANCH == "true" ] || [ $IS_SIGNED_ZIP_BRANCH == "true" ]); then script/build --no-bootstrap --code-sign --compress-artifacts else script/build --no-bootstrap --compress-artifacts diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index d1035135d..b0ec07cc4 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -101,11 +101,19 @@ jobs: SET SQUIRREL_TEMP=C:\tmp IF [%IS_RELEASE_BRANCH%]==[true] ( ECHO Creating production artifacts for release branch %BUILD_SOURCEBRANCHNAME% - node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts --create-windows-installer + IF [%SHOULD_SIGN%]==[true] ( + node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts --create-windows-installer + ) ELSE ( + node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts --create-windows-installer + ) ) ELSE ( IF [%IS_SIGNED_ZIP_BRANCH%]==[true] ( ECHO Creating signed CI artifacts for branch %BUILD_SOURCEBRANCHNAME% + IF [%SHOULD_SIGN%]==[true] ( node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts + ) ELSE ( + node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts + ) ) ELSE ( ECHO Pull request build, no code signing will be performed node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts From d0f0f60606f64ba48f8f66e7760f5fdceda8e07b Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sat, 4 Jul 2020 01:36:39 -0500 Subject: [PATCH 037/119] add pull bot configuration --- .github/pull.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/pull.yml diff --git a/.github/pull.yml b/.github/pull.yml new file mode 100644 index 000000000..23bd9a6a5 --- /dev/null +++ b/.github/pull.yml @@ -0,0 +1,7 @@ +version: "1" +rules: # Array of rules + - base: upstream_master # Required. Target branch + upstream: atom:master # Required. Must be in the same fork network. + mergeMethod: hardreset # Optional, one of [none, merge, squash, rebase, hardreset], Default: none. + mergeUnstable: false # Optional, merge pull request even when the mergeable_state is not clean. Default: false +label: ":arrow_heading_down: pull upstream" # Optional From fc4dc84e4ff717e7cda5fea86bc04726a8b2c520 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Mon, 6 Jul 2020 21:46:22 -0400 Subject: [PATCH 038/119] CI: Use Cache@2 task in place of Lighthouse --- script/vsts/platforms/linux.yml | 33 ++++++++++------- script/vsts/platforms/macos.yml | 60 ++++++++++++++++++++----------- script/vsts/platforms/windows.yml | 47 ++++++++++-------------- 3 files changed, 78 insertions(+), 62 deletions(-) diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 7342e3eee..c2913a972 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -30,12 +30,26 @@ jobs: - script: npm install --global npm@6.12.1 displayName: Update npm - - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - displayName: Restore node_modules cache + - task: Cache@2 + displayName: Cache node_modules inputs: - keyfile: 'package.json, script/vsts/platforms/linux.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2' + key: 'npm | "$(Agent.OS)" | package.json, package-lock.json, script/vsts/platforms/linux.yml' + path: 'node_modules' + cacheHitVar: MainNodeModulesRestored + + - task: Cache@2 + displayName: Cache script/node_modules + inputs: + key: 'npm | "$(Agent.OS)" | script/package.json, script/package-lock.json, script/vsts/platforms/linux.yml' + path: 'script/node_modules' + cacheHitVar: ScriptNodeModulesRestored + + - task: Cache@2 + displayName: Cache apm/node_modules + inputs: + key: 'npm | "$(Agent.OS)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/linux.yml' + path: 'apm/node_modules' + cacheHitVar: ApmNodeModulesRestored - script: script/bootstrap displayName: Bootstrap build environment @@ -45,14 +59,7 @@ jobs: CC: clang-5.0 CXX: clang++-5.0 npm_config_clang: 1 - condition: ne(variables['CacheRestored'], 'true') - - - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 - displayName: Save node_modules cache - inputs: - keyfile: 'package.json, script/vsts/platforms/linux.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2' + condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) - script: script/lint displayName: Run linter diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index fe03dce7d..cb2115547 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -20,12 +20,26 @@ jobs: - script: npm install --global npm@6.12.1 displayName: Update npm - - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - displayName: Restore node_modules cache + - task: Cache@2 + displayName: Cache node_modules inputs: - keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2' + key: 'npm | "$(Agent.OS)" | package.json, package-lock.json, script/vsts/platforms/macos.yml' + path: 'node_modules' + cacheHitVar: MainNodeModulesRestored + + - task: Cache@2 + displayName: Cache script/node_modules + inputs: + key: 'npm | "$(Agent.OS)" | script/package.json, script/package-lock.json, script/vsts/platforms/macos.yml' + path: 'script/node_modules' + cacheHitVar: ScriptNodeModulesRestored + + - task: Cache@2 + displayName: Cache apm/node_modules + inputs: + key: 'npm | "$(Agent.OS)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/macos.yml' + path: 'apm/node_modules' + cacheHitVar: ApmNodeModulesRestored - script: script/bootstrap displayName: Bootstrap build environment @@ -34,14 +48,7 @@ jobs: CI_PROVIDER: VSTS NPM_BIN_PATH: /usr/local/bin/npm npm_config_build_from_source: true - condition: ne(variables['CacheRestored'], 'true') - - - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 - displayName: Save node_modules cache - inputs: - keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2' + condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) - script: script/lint displayName: Run linter @@ -121,12 +128,26 @@ jobs: - script: npm install --global npm@6.12.1 displayName: Update npm - - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - displayName: Restore node_modules cache + - task: Cache@2 + displayName: Cache node_modules inputs: - keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2' + key: 'npm | "$(Agent.OS)" | package.json, package-lock.json, script/vsts/platforms/macos.yml' + path: 'node_modules' + cacheHitVar: MainNodeModulesRestored + + - task: Cache@2 + displayName: Cache script/node_modules + inputs: + key: 'npm | "$(Agent.OS)" | script/package.json, script/package-lock.json, script/vsts/platforms/macos.yml' + path: 'script/node_modules' + cacheHitVar: ScriptNodeModulesRestored + + - task: Cache@2 + displayName: Cache apm/node_modules + inputs: + key: 'npm | "$(Agent.OS)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/macos.yml' + path: 'apm/node_modules' + cacheHitVar: ApmNodeModulesRestored # The artifact caching task does not work on forks, so we need to # bootstrap again for pull requests coming from forked repositories. @@ -137,8 +158,7 @@ jobs: CI_PROVIDER: VSTS NPM_BIN_PATH: /usr/local/bin/npm npm_config_build_from_source: true - - condition: ne(variables['CacheRestored'], 'true') + condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) - task: DownloadBuildArtifacts@0 displayName: Download atom-mac.zip diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index b0ec07cc4..74e551e9a 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -48,21 +48,26 @@ jobs: npm install displayName: Install Windows build dependencies - - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - displayName: Restore node_modules cache (x64) + - task: Cache@2 + displayName: Cache node_modules inputs: - keyfile: 'package.json, script/vsts/platforms/windows.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x64-cache-key' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2' - condition: eq(variables['buildArch'], 'x64') + key: 'npm | "$(Agent.OS)" | "$(buildArch)" | package.json, package-lock.json, script/vsts/platforms/windows.yml' + path: 'node_modules' + cacheHitVar: MainNodeModulesRestored - - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - displayName: Restore node_modules cache (x86) + - task: Cache@2 + displayName: Cache script/node_modules inputs: - keyfile: 'package.json, script/vsts/platforms/windows.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x86-cache-key' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2' - condition: eq(variables['buildArch'], 'x86') + key: 'npm | "$(Agent.OS)" | "$(buildArch)" | script/package.json, script/package-lock.json, script/vsts/platforms/windows.yml' + path: 'script/node_modules' + cacheHitVar: ScriptNodeModulesRestored + + - task: Cache@2 + displayName: Cache apm/node_modules + inputs: + key: 'npm | "$(Agent.OS)" | "$(buildArch)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/windows.yml' + path: 'apm/node_modules' + cacheHitVar: ApmNodeModulesRestored - script: | node script\vsts\windows-run.js script\bootstrap.cmd @@ -73,23 +78,7 @@ jobs: NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\12.13.1\\x64\\npm.cmd" npm_config_build_from_source: true displayName: Bootstrap build environment - condition: ne(variables['CacheRestored'], 'true') - - - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 - displayName: Save node_modules cache (x64) - inputs: - keyfile: 'package.json, script/vsts/platforms/windows.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x64-cache-key' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2' - condition: eq(variables['buildArch'], 'x64') - - - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 - displayName: Save node_modules cache (x86) - inputs: - keyfile: 'package.json, script/vsts/platforms/windows.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json, script/vsts/x86-cache-key' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2' - condition: eq(variables['buildArch'], 'x86') + condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) - script: node script\vsts\windows-run.js script\lint.cmd env: From 57dfd4add495bf77b852a3795e85822fe0f4c863 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Fri, 10 Jul 2020 21:44:26 -0400 Subject: [PATCH 039/119] vsts: Don't hard-code repo owner or repo names Replace strings with re-usable consts: REPO_OWNER, MAIN_REPO and NIGHTLY_RELEASE_REPO, so that these values can easily be updated/edited in fewer places. --- script/vsts/get-release-version.js | 5 ++++- script/vsts/lib/release-notes.js | 26 +++++++++++++++----------- script/vsts/upload-artifacts.js | 10 +++++++--- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/script/vsts/get-release-version.js b/script/vsts/get-release-version.js index 4e8999d72..452dd92e3 100644 --- a/script/vsts/get-release-version.js +++ b/script/vsts/get-release-version.js @@ -4,6 +4,9 @@ const request = require('request-promise-native'); const repositoryRootPath = path.resolve(__dirname, '..', '..'); const appMetadata = require(path.join(repositoryRootPath, 'package.json')); +const REPO_OWNER = 'atom'; +const NIGHTLY_RELEASE_REPO = 'atom-nightly-releases'; + const yargs = require('yargs'); const argv = yargs .usage('Usage: $0 [options]') @@ -26,7 +29,7 @@ async function getReleaseVersion() { let releaseVersion = process.env.ATOM_RELEASE_VERSION || appMetadata.version; if (argv.nightly) { const releases = await request({ - url: 'https://api.github.com/repos/atom/atom-nightly-releases/releases', + url: `https://api.github.com/repos/${REPO_OWNER}/${NIGHTLY_RELEASE_REPO}/releases`, headers: { Accept: 'application/vnd.github.v3+json', 'User-Agent': 'Atom Release Build' diff --git a/script/vsts/lib/release-notes.js b/script/vsts/lib/release-notes.js index 144518d17..a323e7274 100644 --- a/script/vsts/lib/release-notes.js +++ b/script/vsts/lib/release-notes.js @@ -3,6 +3,10 @@ const octokit = require('@octokit/rest')(); const changelog = require('pr-changelog'); const childProcess = require('child_process'); +const REPO_OWNER = 'atom'; +const MAIN_REPO = 'atom'; +const NIGHTLY_RELEASE_REPO = 'atom-nightly-repo'; + module.exports.getRelease = async function(releaseVersion, githubToken) { if (githubToken) { octokit.authenticate({ @@ -12,8 +16,8 @@ module.exports.getRelease = async function(releaseVersion, githubToken) { } const releases = await octokit.repos.getReleases({ - owner: 'atom', - repo: 'atom' + owner: REPO_OWNER, + repo: MAIN_REPO }); const release = releases.data.find(r => semver.eq(r.name, releaseVersion)); @@ -49,16 +53,16 @@ module.exports.generateForVersion = async function( oldVersionName = `v${parsedVersion.major}.${parsedVersion.minor - 1}.0`; } else { let releases = await octokit.repos.getReleases({ - owner: 'atom', - repo: 'atom' + owner: REPO_OWNER, + repo: MAIN_REPO }); oldVersion = 'v' + getPreviousRelease(releaseVersion, releases.data).name; oldVersionName = oldVersion; } const allChangesText = await changelog.getChangelog({ - owner: 'atom', - repo: 'atom', + owner: REPO_OWNER, + repo: MAIN_REPO, fromTag: oldVersion, toTag: newVersionBranch, dependencyKey: 'packageDependencies', @@ -71,7 +75,7 @@ module.exports.generateForVersion = async function( }) { let prString = changelog.pullRequestsToString(pullRequests); let title = repo; - if (repo === 'atom') { + if (repo === MAIN_REPO) { title = 'Atom Core'; fromTag = oldVersionName; toTag = releaseVersion; @@ -110,13 +114,13 @@ module.exports.generateForNightly = async function( const latestCommit = latestCommitResult.stdout.toString().trim(); const output = [ - `### This nightly release is based on https://github.com/atom/atom/commit/${latestCommit} :atom: :night_with_stars:` + `### This nightly release is based on https://github.com/${REPO_OWNER}/${MAIN_REPO}/commit/${latestCommit} :atom: :night_with_stars:` ]; try { const releases = await octokit.repos.getReleases({ - owner: 'atom', - repo: 'atom-nightly-releases' + owner: REPO_OWNER, + repo: NIGHTLY_RELEASE_REPO }); const previousRelease = getPreviousRelease(releaseVersion, releases.data); @@ -139,7 +143,7 @@ module.exports.generateForNightly = async function( output.push('No changes have been included in this release'); } else { output.push( - `Click [here](https://github.com/atom/atom/compare/${previousCommit}...${latestCommit}) to see the changes included with this release!` + `Click [here](https://github.com/${REPO_OWNER}/${MAIN_REPO}/compare/${previousCommit}...${latestCommit}) to see the changes included with this release!` ); } } diff --git a/script/vsts/upload-artifacts.js b/script/vsts/upload-artifacts.js index 20175e30c..4d05a5774 100644 --- a/script/vsts/upload-artifacts.js +++ b/script/vsts/upload-artifacts.js @@ -12,6 +12,10 @@ const uploadLinuxPackages = require('./lib/upload-linux-packages'); const CONFIG = require('../config'); +const REPO_OWNER = 'atom'; +const MAIN_REPO = 'atom'; +const NIGHTLY_RELEASE_REPO = 'atom-nightly-releases'; + const yargs = require('yargs'); const argv = yargs .usage('Usage: $0 [options]') @@ -127,13 +131,13 @@ async function uploadArtifacts() { ? spawnSync('git', ['rev-parse', 'HEAD']) .stdout.toString() .trimEnd() - : 'master'; // Nightly tags are created in atom/atom-nightly-releases so the SHA is irrelevant + : 'master'; // Nightly tags are created in REPO_OWNER/NIGHTLY_RELEASE_REPO so the SHA is irrelevant console.log(`Creating GitHub release v${releaseVersion}`); const release = await publishReleaseAsync({ token: process.env.GITHUB_TOKEN, - owner: 'atom', - repo: !isNightlyRelease ? 'atom' : 'atom-nightly-releases', + owner: REPO_OWNER, + repo: !isNightlyRelease ? MAIN_REPO : NIGHTLY_RELEASE_REPO, name: CONFIG.computedAppVersion, notes: newReleaseNotes, target_commitish: releaseSha, From 0666ac7f669628e766e903139a90dc57088e0c30 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Fri, 10 Jul 2020 22:09:08 -0400 Subject: [PATCH 040/119] vsts: Set REPO/OWNER consts from DevOps env vars Still hard-coded in the YAML, but set up so the change required to make them reconfigurable variables is minimal. --- script/vsts/get-release-version.js | 4 ++-- script/vsts/lib/release-notes.js | 6 +++--- script/vsts/nightly-release.yml | 6 ++++++ script/vsts/pull-requests.yml | 3 +++ script/vsts/release-branch-build.yml | 9 +++++++++ script/vsts/upload-artifacts.js | 6 +++--- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/script/vsts/get-release-version.js b/script/vsts/get-release-version.js index 452dd92e3..1195da4c4 100644 --- a/script/vsts/get-release-version.js +++ b/script/vsts/get-release-version.js @@ -4,8 +4,8 @@ const request = require('request-promise-native'); const repositoryRootPath = path.resolve(__dirname, '..', '..'); const appMetadata = require(path.join(repositoryRootPath, 'package.json')); -const REPO_OWNER = 'atom'; -const NIGHTLY_RELEASE_REPO = 'atom-nightly-releases'; +const REPO_OWNER = process.env.REPO_OWNER; +const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO; const yargs = require('yargs'); const argv = yargs diff --git a/script/vsts/lib/release-notes.js b/script/vsts/lib/release-notes.js index a323e7274..5cf139fe9 100644 --- a/script/vsts/lib/release-notes.js +++ b/script/vsts/lib/release-notes.js @@ -3,9 +3,9 @@ const octokit = require('@octokit/rest')(); const changelog = require('pr-changelog'); const childProcess = require('child_process'); -const REPO_OWNER = 'atom'; -const MAIN_REPO = 'atom'; -const NIGHTLY_RELEASE_REPO = 'atom-nightly-repo'; +const REPO_OWNER = process.env.REPO_OWNER; +const MAIN_REPO = process.env.MAIN_REPO; +const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO; module.exports.getRelease = async function(releaseVersion, githubToken) { if (githubToken) { diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 632238e9e..0a7736b78 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -11,6 +11,9 @@ jobs: displayName: npm install - script: node script\vsts\get-release-version.js --nightly name: Version + env: + REPO_OWNER: atom + NIGHTLY_RELEASE_REPO: atom-nightly-releases # Import OS-specific build definitions - template: platforms/windows.yml @@ -59,6 +62,9 @@ jobs: ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET) ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY) + REPO_OWNER: atom + MAIN_REPO: atom + NIGHTLY_RELEASE_REPO: atom-nightly-releases displayName: Create Nightly Release - job: bump_dependencies displayName: Bump Dependencies diff --git a/script/vsts/pull-requests.yml b/script/vsts/pull-requests.yml index c23df7095..954935a9c 100644 --- a/script/vsts/pull-requests.yml +++ b/script/vsts/pull-requests.yml @@ -13,6 +13,9 @@ jobs: displayName: npm install - script: node script\vsts\get-release-version.js name: Version + env: + REPO_OWNER: atom + NIGHTLY_RELEASE_REPO: atom-nightly-releases # Import OS-specific build definitions - template: platforms/windows.yml diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index f53ffd2c1..69486e9df 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -17,6 +17,9 @@ jobs: displayName: npm install - script: node script\vsts\get-release-version.js name: Version + env: + REPO_OWNER: atom + NIGHTLY_RELEASE_REPO: atom-nightly-releases # Import OS-specific build definitions. - template: platforms/windows.yml @@ -68,6 +71,9 @@ jobs: ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET) ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY) + REPO_OWNER: atom + MAIN_REPO: atom + NIGHTLY_RELEASE_REPO: atom-nightly-releases displayName: Create Draft Release condition: and(succeeded(), eq(variables['Atom.AutoDraftRelease'], 'true'), eq(variables['IsReleaseBranch'], 'true')) @@ -78,5 +84,8 @@ jobs: ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY) ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET) ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) + REPO_OWNER: atom + MAIN_REPO: atom + NIGHTLY_RELEASE_REPO: atom-nightly-releases displayName: Upload CI Artifacts to S3 condition: and(succeeded(), eq(variables['IsSignedZipBranch'], 'true')) diff --git a/script/vsts/upload-artifacts.js b/script/vsts/upload-artifacts.js index 4d05a5774..08a3e2d13 100644 --- a/script/vsts/upload-artifacts.js +++ b/script/vsts/upload-artifacts.js @@ -12,9 +12,9 @@ const uploadLinuxPackages = require('./lib/upload-linux-packages'); const CONFIG = require('../config'); -const REPO_OWNER = 'atom'; -const MAIN_REPO = 'atom'; -const NIGHTLY_RELEASE_REPO = 'atom-nightly-releases'; +const REPO_OWNER = process.env.REPO_OWNER; +const MAIN_REPO = process.env.MAIN_REPO; +const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO; const yargs = require('yargs'); const argv = yargs From 9551fa5a2aa338642d61e013f75d2335c616cc9e Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Fri, 10 Jul 2020 22:23:49 -0400 Subject: [PATCH 041/119] vsts: Convert hard-coded REPO/OWNER strings to var These can be set in Azure DevOps UI now. --- script/vsts/nightly-release.yml | 10 +++++----- script/vsts/pull-requests.yml | 4 ++-- script/vsts/release-branch-build.yml | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 0a7736b78..78876bab7 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -12,8 +12,8 @@ jobs: - script: node script\vsts\get-release-version.js --nightly name: Version env: - REPO_OWNER: atom - NIGHTLY_RELEASE_REPO: atom-nightly-releases + REPO_OWNER: $(REPO_OWNER) + NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) # Import OS-specific build definitions - template: platforms/windows.yml @@ -62,9 +62,9 @@ jobs: ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET) ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY) - REPO_OWNER: atom - MAIN_REPO: atom - NIGHTLY_RELEASE_REPO: atom-nightly-releases + REPO_OWNER: $(REPO_OWNER) + MAIN_REPO: $(MAIN_REPO) + NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) displayName: Create Nightly Release - job: bump_dependencies displayName: Bump Dependencies diff --git a/script/vsts/pull-requests.yml b/script/vsts/pull-requests.yml index 954935a9c..66a665d36 100644 --- a/script/vsts/pull-requests.yml +++ b/script/vsts/pull-requests.yml @@ -14,8 +14,8 @@ jobs: - script: node script\vsts\get-release-version.js name: Version env: - REPO_OWNER: atom - NIGHTLY_RELEASE_REPO: atom-nightly-releases + REPO_OWNER: $(REPO_OWNER) + NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) # Import OS-specific build definitions - template: platforms/windows.yml diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index 69486e9df..8ea5d48e9 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -18,8 +18,8 @@ jobs: - script: node script\vsts\get-release-version.js name: Version env: - REPO_OWNER: atom - NIGHTLY_RELEASE_REPO: atom-nightly-releases + REPO_OWNER: $(REPO_OWNER) + NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) # Import OS-specific build definitions. - template: platforms/windows.yml @@ -71,9 +71,9 @@ jobs: ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET) ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY) - REPO_OWNER: atom - MAIN_REPO: atom - NIGHTLY_RELEASE_REPO: atom-nightly-releases + REPO_OWNER: $(REPO_OWNER) + MAIN_REPO: $(MAIN_REPO) + NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) displayName: Create Draft Release condition: and(succeeded(), eq(variables['Atom.AutoDraftRelease'], 'true'), eq(variables['IsReleaseBranch'], 'true')) @@ -84,8 +84,8 @@ jobs: ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY) ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET) ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) - REPO_OWNER: atom - MAIN_REPO: atom - NIGHTLY_RELEASE_REPO: atom-nightly-releases + REPO_OWNER: $(REPO_OWNER) + MAIN_REPO: $(MAIN_REPO) + NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) displayName: Upload CI Artifacts to S3 condition: and(succeeded(), eq(variables['IsSignedZipBranch'], 'true')) From bcc9e1d11bbd497af211629dc9526b92ddd23ed6 Mon Sep 17 00:00:00 2001 From: aminya Date: Fri, 10 Jul 2020 19:43:16 -0500 Subject: [PATCH 042/119] cache template --- script/vsts/platforms/cache.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 script/vsts/platforms/cache.yml diff --git a/script/vsts/platforms/cache.yml b/script/vsts/platforms/cache.yml new file mode 100644 index 000000000..992e35bdc --- /dev/null +++ b/script/vsts/platforms/cache.yml @@ -0,0 +1,30 @@ +parameters: + - name: OS + displayName: Operating System + type: string + values: + - windows + - linux + - macos + +steps: + - task: Cache@2 + displayName: Cache node_modules + inputs: + key: 'npm | "$(Agent.OS)" | "$(buildArch)" | package.json, package-lock.json, script/vsts/platforms/${{ parameters.OS }}.yml' + path: 'node_modules' + cacheHitVar: MainNodeModulesRestored + + - task: Cache@2 + displayName: Cache script/node_modules + inputs: + key: 'npm | "$(Agent.OS)" | "$(buildArch)" | script/package.json, script/package-lock.json, script/vsts/platforms/${{ parameters.OS }}.yml' + path: 'script/node_modules' + cacheHitVar: ScriptNodeModulesRestored + + - task: Cache@2 + displayName: Cache apm/node_modules + inputs: + key: 'npm | "$(Agent.OS)" | "$(buildArch)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/${{ parameters.OS }}.yml' + path: 'apm/node_modules' + cacheHitVar: ApmNodeModulesRestored From 22858b9723f6a2a331f381f54cbaab64b265f45b Mon Sep 17 00:00:00 2001 From: aminya Date: Fri, 10 Jul 2020 22:08:37 -0500 Subject: [PATCH 043/119] using cache template in the workflows --- script/vsts/platforms/linux.yml | 23 ++-------------- script/vsts/platforms/macos.yml | 46 ++++--------------------------- script/vsts/platforms/windows.yml | 23 ++-------------- 3 files changed, 12 insertions(+), 80 deletions(-) diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index c2913a972..56ea7468e 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -30,26 +30,9 @@ jobs: - script: npm install --global npm@6.12.1 displayName: Update npm - - task: Cache@2 - displayName: Cache node_modules - inputs: - key: 'npm | "$(Agent.OS)" | package.json, package-lock.json, script/vsts/platforms/linux.yml' - path: 'node_modules' - cacheHitVar: MainNodeModulesRestored - - - task: Cache@2 - displayName: Cache script/node_modules - inputs: - key: 'npm | "$(Agent.OS)" | script/package.json, script/package-lock.json, script/vsts/platforms/linux.yml' - path: 'script/node_modules' - cacheHitVar: ScriptNodeModulesRestored - - - task: Cache@2 - displayName: Cache apm/node_modules - inputs: - key: 'npm | "$(Agent.OS)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/linux.yml' - path: 'apm/node_modules' - cacheHitVar: ApmNodeModulesRestored + - template: cache.yml + parameters: + OS: linux - script: script/bootstrap displayName: Bootstrap build environment diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index cb2115547..a4fe1619d 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -20,26 +20,9 @@ jobs: - script: npm install --global npm@6.12.1 displayName: Update npm - - task: Cache@2 - displayName: Cache node_modules - inputs: - key: 'npm | "$(Agent.OS)" | package.json, package-lock.json, script/vsts/platforms/macos.yml' - path: 'node_modules' - cacheHitVar: MainNodeModulesRestored - - - task: Cache@2 - displayName: Cache script/node_modules - inputs: - key: 'npm | "$(Agent.OS)" | script/package.json, script/package-lock.json, script/vsts/platforms/macos.yml' - path: 'script/node_modules' - cacheHitVar: ScriptNodeModulesRestored - - - task: Cache@2 - displayName: Cache apm/node_modules - inputs: - key: 'npm | "$(Agent.OS)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/macos.yml' - path: 'apm/node_modules' - cacheHitVar: ApmNodeModulesRestored + - template: cache.yml + parameters: + OS: macos - script: script/bootstrap displayName: Bootstrap build environment @@ -128,26 +111,9 @@ jobs: - script: npm install --global npm@6.12.1 displayName: Update npm - - task: Cache@2 - displayName: Cache node_modules - inputs: - key: 'npm | "$(Agent.OS)" | package.json, package-lock.json, script/vsts/platforms/macos.yml' - path: 'node_modules' - cacheHitVar: MainNodeModulesRestored - - - task: Cache@2 - displayName: Cache script/node_modules - inputs: - key: 'npm | "$(Agent.OS)" | script/package.json, script/package-lock.json, script/vsts/platforms/macos.yml' - path: 'script/node_modules' - cacheHitVar: ScriptNodeModulesRestored - - - task: Cache@2 - displayName: Cache apm/node_modules - inputs: - key: 'npm | "$(Agent.OS)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/macos.yml' - path: 'apm/node_modules' - cacheHitVar: ApmNodeModulesRestored + - template: cache.yml + parameters: + OS: macos # The artifact caching task does not work on forks, so we need to # bootstrap again for pull requests coming from forked repositories. diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 74e551e9a..f24e7c9c1 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -48,26 +48,9 @@ jobs: npm install displayName: Install Windows build dependencies - - task: Cache@2 - displayName: Cache node_modules - inputs: - key: 'npm | "$(Agent.OS)" | "$(buildArch)" | package.json, package-lock.json, script/vsts/platforms/windows.yml' - path: 'node_modules' - cacheHitVar: MainNodeModulesRestored - - - task: Cache@2 - displayName: Cache script/node_modules - inputs: - key: 'npm | "$(Agent.OS)" | "$(buildArch)" | script/package.json, script/package-lock.json, script/vsts/platforms/windows.yml' - path: 'script/node_modules' - cacheHitVar: ScriptNodeModulesRestored - - - task: Cache@2 - displayName: Cache apm/node_modules - inputs: - key: 'npm | "$(Agent.OS)" | "$(buildArch)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/windows.yml' - path: 'apm/node_modules' - cacheHitVar: ApmNodeModulesRestored + - template: cache.yml + parameters: + OS: windows - script: | node script\vsts\windows-run.js script\bootstrap.cmd From a2e98d28776b36821b51a78cd35e638cb48fcc01 Mon Sep 17 00:00:00 2001 From: aminya Date: Sat, 11 Jul 2020 02:59:57 -0500 Subject: [PATCH 044/119] detect symbolic link packages --- src/package-manager.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/package-manager.js b/src/package-manager.js index 14f1c9377..c1d857120 100644 --- a/src/package-manager.js +++ b/src/package-manager.js @@ -419,10 +419,15 @@ module.exports = class PackageManager { for (const packageDirPath of this.packageDirPaths) { if (fs.isDirectorySync(packageDirPath)) { + + // checks for directories. + // dirent is faster, but for checking symbolic link we need stat. const packageNames = fs .readdirSync(packageDirPath, { withFileTypes: true }) - .filter(dirent => dirent.isDirectory()) - .map(dirent => dirent.name); + .filter(dirent => ( + dirent.isDirectory() || + (dirent.isSymbolicLink() && fs.isDirectorySync(path.join(packageDirPath, dirent.name)))) + ).map(dirent => dirent.name); for (const packageName of packageNames) { if ( From aca4629f460afb467af0fad96a9badf575f32cfa Mon Sep 17 00:00:00 2001 From: aminya Date: Sat, 11 Jul 2020 19:36:27 -0500 Subject: [PATCH 045/119] lint --- src/package-manager.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/package-manager.js b/src/package-manager.js index c1d857120..4e1bd5a29 100644 --- a/src/package-manager.js +++ b/src/package-manager.js @@ -419,15 +419,17 @@ module.exports = class PackageManager { for (const packageDirPath of this.packageDirPaths) { if (fs.isDirectorySync(packageDirPath)) { - // checks for directories. // dirent is faster, but for checking symbolic link we need stat. const packageNames = fs .readdirSync(packageDirPath, { withFileTypes: true }) - .filter(dirent => ( - dirent.isDirectory() || - (dirent.isSymbolicLink() && fs.isDirectorySync(path.join(packageDirPath, dirent.name)))) - ).map(dirent => dirent.name); + .filter( + dirent => + dirent.isDirectory() || + (dirent.isSymbolicLink() && + fs.isDirectorySync(path.join(packageDirPath, dirent.name))) + ) + .map(dirent => dirent.name); for (const packageName of packageNames) { if ( From deabf83d444b59d4529c0010003e520b41dfb570 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 14:43:46 -0500 Subject: [PATCH 046/119] move cache.yml to templates folder --- script/vsts/platforms/linux.yml | 2 +- script/vsts/platforms/macos.yml | 4 ++-- script/vsts/platforms/{ => templates}/cache.yml | 0 script/vsts/platforms/windows.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename script/vsts/platforms/{ => templates}/cache.yml (100%) diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 56ea7468e..a9eab3eb7 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -30,7 +30,7 @@ jobs: - script: npm install --global npm@6.12.1 displayName: Update npm - - template: cache.yml + - template: templates/cache.yml parameters: OS: linux diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index a4fe1619d..9208a0e75 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -20,7 +20,7 @@ jobs: - script: npm install --global npm@6.12.1 displayName: Update npm - - template: cache.yml + - template: templates/cache.yml parameters: OS: macos @@ -111,7 +111,7 @@ jobs: - script: npm install --global npm@6.12.1 displayName: Update npm - - template: cache.yml + - template: templates/cache.yml parameters: OS: macos diff --git a/script/vsts/platforms/cache.yml b/script/vsts/platforms/templates/cache.yml similarity index 100% rename from script/vsts/platforms/cache.yml rename to script/vsts/platforms/templates/cache.yml diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index f24e7c9c1..69cac9302 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -48,7 +48,7 @@ jobs: npm install displayName: Install Windows build dependencies - - template: cache.yml + - template: templates/cache.yml parameters: OS: windows From 9f406e24a9d27110f52fa387b665d8eca0b5f4cd Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 14:46:15 -0500 Subject: [PATCH 047/119] windows-preparation.yml --- .../templates/windows-preparation.yml | 30 +++++++++++++++++++ script/vsts/platforms/windows.yml | 28 +---------------- 2 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 script/vsts/platforms/templates/windows-preparation.yml diff --git a/script/vsts/platforms/templates/windows-preparation.yml b/script/vsts/platforms/templates/windows-preparation.yml new file mode 100644 index 000000000..068ad088f --- /dev/null +++ b/script/vsts/platforms/templates/windows-preparation.yml @@ -0,0 +1,30 @@ +# Windows CI preparation + +steps: + - task: UsePythonVersion@0 + inputs: + versionSpec: '3.8' + + - task: NodeTool@0 + inputs: + versionSpec: 12.13.1 + displayName: Install Node.js 12.13.1 + + - script: | + ECHO Installing npm-windows-upgrade + npm install --global --production npm-windows-upgrade + displayName: Install npm-windows-upgrade + + - script: | + ECHO Upgrading npm + npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.12.1 + displayName: Install npm 6.12.1 + + - script: | + npm install --global --production windows-build-tools@4.0 + displayName: Install windows build tools + + - script: | + cd script\vsts + npm install + displayName: Install Windows build dependencies diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 69cac9302..c96dce42d 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -20,33 +20,7 @@ jobs: IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ] steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.8' - - - task: NodeTool@0 - inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 - - - script: | - ECHO Installing npm-windows-upgrade - npm install --global --production npm-windows-upgrade - displayName: Install npm-windows-upgrade - - - script: | - ECHO Upgrading npm - npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.12.1 - displayName: Install npm 6.12.1 - - - script: | - npm install --global --production windows-build-tools@4.0 - displayName: Install windows build tools - - - script: | - cd script\vsts - npm install - displayName: Install Windows build dependencies + - template: templates/windows-preparation.yml - template: templates/cache.yml parameters: From 3127fa5d432f11afb57e97d5bc9f44bdcc7125a8 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 14:53:13 -0500 Subject: [PATCH 048/119] windows-test.yml --- .../vsts/platforms/templates/windows-test.yml | 58 +++++++++++++++++++ script/vsts/platforms/windows.yml | 57 +----------------- 2 files changed, 60 insertions(+), 55 deletions(-) create mode 100644 script/vsts/platforms/templates/windows-test.yml diff --git a/script/vsts/platforms/templates/windows-test.yml b/script/vsts/platforms/templates/windows-test.yml new file mode 100644 index 000000000..acae4deeb --- /dev/null +++ b/script/vsts/platforms/templates/windows-test.yml @@ -0,0 +1,58 @@ +# Runs the windows tests + +steps: + - script: | + node script\vsts\windows-run.js script\test.cmd + env: + CI: true + CI_PROVIDER: VSTS + ATOM_JASMINE_REPORTER: list + TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit + BUILD_ARCH: $(buildArch) + displayName: Run tests + condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) + + - script: > + node script\vsts\windows-run.js script\postprocess-junit-results.cmd + --search-folder %TEST_JUNIT_XML_ROOT% --test-results-files "**/*.xml" + env: + TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit + displayName: Post-process test results + condition: ne(variables['Atom.SkipTests'], 'true') + + - task: PublishTestResults@2 + inputs: + testResultsFormat: JUnit + searchFolder: $(Common.TestResultsDirectory)\junit + testResultsFiles: '**/*.xml' + mergeTestResults: true + testRunTitle: Windows $(buildArch) + condition: ne(variables['Atom.SkipTests'], 'true') + + - script: | + IF NOT EXIST "%ARTIFACT_STAGING_DIR%\crash-reports" MKDIR "%ARTIFACT_STAGING_DIR%\crash-reports" + IF EXIST "%Temp%\Atom Crashes" ( + FOR %%a in ("%Temp%\Atom Crashes\*.dmp") DO XCOPY "%%a" "%ARTIFACT_STAGING_DIR%\crash-reports" /I + ) + displayName: Stage crash reports + condition: failed() + env: + ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory) + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports + ArtifactName: crash-reports + displayName: Publish crash reports on non-release branch + condition: and(failed(), eq(variables['ATOM_RELEASES_S3_KEY'], '')) + + - script: > + node $(Build.SourcesDirectory)\script\vsts\upload-crash-reports.js --crash-report-path "%ARTIFACT_STAGING_DIR%\crash-reports" --s3-path "vsts-artifacts/%BUILD_ID%/" + env: + ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY) + ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET) + ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) + ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory) + BUILD_ID: $(Build.BuildId) + displayName: Upload crash reports to S3 on release branch + condition: and(failed(), ne(variables['ATOM_RELEASES_S3_KEY'], '')) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index c96dce42d..3b23d3c03 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -76,61 +76,6 @@ jobs: npm_config_build_from_source: true displayName: Build Atom - - script: node script\vsts\windows-run.js script\test.cmd - env: - CI: true - CI_PROVIDER: VSTS - ATOM_JASMINE_REPORTER: list - TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit - BUILD_ARCH: $(buildArch) - displayName: Run tests - condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) - - - script: > - node script\vsts\windows-run.js script\postprocess-junit-results.cmd - --search-folder %TEST_JUNIT_XML_ROOT% --test-results-files "**/*.xml" - env: - TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit - displayName: Post-process test results - condition: ne(variables['Atom.SkipTests'], 'true') - - - task: PublishTestResults@2 - inputs: - testResultsFormat: JUnit - searchFolder: $(Common.TestResultsDirectory)\junit - testResultsFiles: '**/*.xml' - mergeTestResults: true - testRunTitle: Windows $(buildArch) - condition: ne(variables['Atom.SkipTests'], 'true') - - - script: | - IF NOT EXIST "%ARTIFACT_STAGING_DIR%\crash-reports" MKDIR "%ARTIFACT_STAGING_DIR%\crash-reports" - IF EXIST "%Temp%\Atom Crashes" ( - FOR %%a in ("%Temp%\Atom Crashes\*.dmp") DO XCOPY "%%a" "%ARTIFACT_STAGING_DIR%\crash-reports" /I - ) - displayName: Stage crash reports - condition: failed() - env: - ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports - ArtifactName: crash-reports - displayName: Publish crash reports on non-release branch - condition: and(failed(), eq(variables['ATOM_RELEASES_S3_KEY'], '')) - - - script: > - node $(Build.SourcesDirectory)\script\vsts\upload-crash-reports.js --crash-report-path "%ARTIFACT_STAGING_DIR%\crash-reports" --s3-path "vsts-artifacts/%BUILD_ID%/" - env: - ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY) - ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET) - ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) - ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory) - BUILD_ID: $(Build.BuildId) - displayName: Upload crash reports to S3 on release branch - condition: and(failed(), ne(variables['ATOM_RELEASES_S3_KEY'], '')) - - task: PublishBuildArtifacts@1 inputs: PathtoPublish: $(Build.SourcesDirectory)/out/atom-x64-windows.zip @@ -212,3 +157,5 @@ jobs: ArtifactType: Container displayName: Upload RELEASES condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86')) + + - template: templates/windows-test.yml From 4d6855fe15ea75d97dd95e8d4cde35997a0282c4 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 15:32:58 -0500 Subject: [PATCH 049/119] windows-bootstrap.yml --- script/vsts/platforms/templates/windows-bootstrap.yml | 11 +++++++++++ script/vsts/platforms/windows.yml | 11 +---------- 2 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 script/vsts/platforms/templates/windows-bootstrap.yml diff --git a/script/vsts/platforms/templates/windows-bootstrap.yml b/script/vsts/platforms/templates/windows-bootstrap.yml new file mode 100644 index 000000000..31aa73195 --- /dev/null +++ b/script/vsts/platforms/templates/windows-bootstrap.yml @@ -0,0 +1,11 @@ +steps: + - script: | + node script\vsts\windows-run.js script\bootstrap.cmd + env: + BUILD_ARCH: $(buildArch) + CI: true + CI_PROVIDER: VSTS + NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\12.13.1\\x64\\npm.cmd" + npm_config_build_from_source: true + displayName: Bootstrap build environment + condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 3b23d3c03..470da5529 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -26,16 +26,7 @@ jobs: parameters: OS: windows - - script: | - node script\vsts\windows-run.js script\bootstrap.cmd - env: - BUILD_ARCH: $(buildArch) - CI: true - CI_PROVIDER: VSTS - NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\12.13.1\\x64\\npm.cmd" - npm_config_build_from_source: true - displayName: Bootstrap build environment - condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) + - template: templates/windows-bootstrap.yml - script: node script\vsts\windows-run.js script\lint.cmd env: From 7a4c8c62fe81d630ffe589ca9d678645aa173388 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 15:37:04 -0500 Subject: [PATCH 050/119] windows-build.yml and windows-publish.yml --- .../platforms/templates/windows-build.yml | 34 +++++ .../platforms/templates/windows-publish.yml | 52 ++++++++ script/vsts/platforms/windows.yml | 118 +----------------- 3 files changed, 89 insertions(+), 115 deletions(-) create mode 100644 script/vsts/platforms/templates/windows-build.yml create mode 100644 script/vsts/platforms/templates/windows-publish.yml diff --git a/script/vsts/platforms/templates/windows-build.yml b/script/vsts/platforms/templates/windows-build.yml new file mode 100644 index 000000000..8ed84bb0b --- /dev/null +++ b/script/vsts/platforms/templates/windows-build.yml @@ -0,0 +1,34 @@ +steps: + - script: | + IF NOT EXIST C:\tmp MKDIR C:\tmp + SET SQUIRREL_TEMP=C:\tmp + IF [%IS_RELEASE_BRANCH%]==[true] ( + ECHO Creating production artifacts for release branch %BUILD_SOURCEBRANCHNAME% + IF [%SHOULD_SIGN%]==[true] ( + node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts --create-windows-installer + ) ELSE ( + node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts --create-windows-installer + ) + ) ELSE ( + IF [%IS_SIGNED_ZIP_BRANCH%]==[true] ( + ECHO Creating signed CI artifacts for branch %BUILD_SOURCEBRANCHNAME% + IF [%SHOULD_SIGN%]==[true] ( + node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts + ) ELSE ( + node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts + ) + ) ELSE ( + ECHO Pull request build, no code signing will be performed + node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts + ) + ) + env: + GITHUB_TOKEN: $(GITHUB_TOKEN) + BUILD_ARCH: $(buildArch) + ATOM_RELEASE_VERSION: $(ReleaseVersion) + ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL) + ATOM_WIN_CODE_SIGNING_CERT_PASSWORD: $(ATOM_WIN_CODE_SIGNING_CERT_PASSWORD) + IS_RELEASE_BRANCH: $(IsReleaseBranch) + IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch) + npm_config_build_from_source: true + displayName: Build Atom diff --git a/script/vsts/platforms/templates/windows-publish.yml b/script/vsts/platforms/templates/windows-publish.yml new file mode 100644 index 000000000..fde8cd6f7 --- /dev/null +++ b/script/vsts/platforms/templates/windows-publish.yml @@ -0,0 +1,52 @@ +steps: + - script: | + IF [%BUILD_ARCH%]==[x64] ( + SET FileID=-x64 + ) ELSE ( + SET FileID= + ) + echo FileID set to: %FileID% + env: + BUILD_ARCH: $(buildArch) + displayName: Set FileID based on the arch + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.SourcesDirectory)/out/atom$(FileID)-windows.zip + ArtifactName: atom$(FileID)-windows.zip + ArtifactType: Container + displayName: Upload atom$(FileID)-windows.zip + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.SourcesDirectory)/out/AtomSetup$(FileID).exe + ArtifactName: AtomSetup$(FileID).exe + ArtifactType: Container + displayName: Upload AtomSetup$(FileID).exe + condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.SourcesDirectory)/out/$(AppName)$(FileID)-$(ReleaseVersion)-full.nupkg + ArtifactName: $(AppName)$(FileID)-$(ReleaseVersion)-full.nupkg + ArtifactType: Container + displayName: Upload $(AppName)$(FileID)-$(ReleaseVersion)-full.nupkg + condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.SourcesDirectory)/out/$(AppName)$(FileID)-$(ReleaseVersion)-delta.nupkg + ArtifactName: $(AppName)$(FileID)-$(ReleaseVersion)-delta.nupkg + ArtifactType: Container + displayName: Upload $(AppName)$(FileID)-$(ReleaseVersion)-delta.nupkg + condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) + continueOnError: true # Nightly builds don't produce delta packages yet, so don't fail the build + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.SourcesDirectory)/out/RELEASES$(FileID) + ArtifactName: RELEASES$(FileID) + ArtifactType: Container + displayName: Upload RELEASES$(FileID) + condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 470da5529..17dfdbed1 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -33,120 +33,8 @@ jobs: BUILD_ARCH: $(buildArch) displayName: Run linter - - script: | - IF NOT EXIST C:\tmp MKDIR C:\tmp - SET SQUIRREL_TEMP=C:\tmp - IF [%IS_RELEASE_BRANCH%]==[true] ( - ECHO Creating production artifacts for release branch %BUILD_SOURCEBRANCHNAME% - IF [%SHOULD_SIGN%]==[true] ( - node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts --create-windows-installer - ) ELSE ( - node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts --create-windows-installer - ) - ) ELSE ( - IF [%IS_SIGNED_ZIP_BRANCH%]==[true] ( - ECHO Creating signed CI artifacts for branch %BUILD_SOURCEBRANCHNAME% - IF [%SHOULD_SIGN%]==[true] ( - node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts - ) ELSE ( - node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts - ) - ) ELSE ( - ECHO Pull request build, no code signing will be performed - node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts - ) - ) - env: - GITHUB_TOKEN: $(GITHUB_TOKEN) - BUILD_ARCH: $(buildArch) - ATOM_RELEASE_VERSION: $(ReleaseVersion) - ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL) - ATOM_WIN_CODE_SIGNING_CERT_PASSWORD: $(ATOM_WIN_CODE_SIGNING_CERT_PASSWORD) - IS_RELEASE_BRANCH: $(IsReleaseBranch) - IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch) - npm_config_build_from_source: true - displayName: Build Atom - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/atom-x64-windows.zip - ArtifactName: atom-x64-windows.zip - ArtifactType: Container - displayName: Upload atom-x64-windows.zip - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['buildArch'], 'x64')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/AtomSetup-x64.exe - ArtifactName: AtomSetup-x64.exe - ArtifactType: Container - displayName: Upload AtomSetup-x64.exe - condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/$(AppName)-x64-$(ReleaseVersion)-full.nupkg - ArtifactName: $(AppName)-x64-$(ReleaseVersion)-full.nupkg - ArtifactType: Container - displayName: Upload $(AppName)-x64-$(ReleaseVersion)-full.nupkg - condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/$(AppName)-x64-$(ReleaseVersion)-delta.nupkg - ArtifactName: $(AppName)-x64-$(ReleaseVersion)-delta.nupkg - ArtifactType: Container - displayName: Upload $(AppName)-x64-$(ReleaseVersion)-delta.nupkg - condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64')) - continueOnError: true # Nightly builds don't produce delta packages yet, so don't fail the build - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/RELEASES-x64 - ArtifactName: RELEASES-x64 - ArtifactType: Container - displayName: Upload RELEASES-x64 - condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x64')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/atom-windows.zip - ArtifactName: atom-windows.zip - ArtifactType: Container - displayName: Upload atom-windows.zip - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['buildArch'], 'x86')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/AtomSetup.exe - ArtifactName: AtomSetup.exe - ArtifactType: Container - displayName: Upload AtomSetup.exe - condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/$(AppName)-$(ReleaseVersion)-full.nupkg - ArtifactName: $(AppName)-$(ReleaseVersion)-full.nupkg - ArtifactType: Container - displayName: Upload $(AppName)-$(ReleaseVersion)-full.nupkg - condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/$(AppName)-$(ReleaseVersion)-delta.nupkg - ArtifactName: $(AppName)-$(ReleaseVersion)-delta.nupkg - ArtifactType: Container - displayName: Upload $(AppName)-$(ReleaseVersion)-delta.nupkg - condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86')) - continueOnError: true # Nightly builds don't produce delta packages yet, so don't fail the build - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/RELEASES - ArtifactName: RELEASES - ArtifactType: Container - displayName: Upload RELEASES - condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'), eq(variables['buildArch'], 'x86')) + - template: templates/windows-build.yml - template: templates/windows-test.yml + + - template: templates/windows-publish.yml From ee3022b175896a85a1bbbc1179f3e9a4c6e06d2a Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 15:16:30 -0500 Subject: [PATCH 051/119] macos-preparation.yml --- script/vsts/platforms/macos.yml | 16 ++-------------- .../platforms/templates/macos-preparation.yml | 8 ++++++++ 2 files changed, 10 insertions(+), 14 deletions(-) create mode 100644 script/vsts/platforms/templates/macos-preparation.yml diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index 9208a0e75..f75c59ebc 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -12,13 +12,7 @@ jobs: vmImage: macos-10.14 steps: - - task: NodeTool@0 - inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 - - - script: npm install --global npm@6.12.1 - displayName: Update npm + - template: templates/macos-preparation.yml - template: templates/cache.yml parameters: @@ -103,13 +97,7 @@ jobs: RunPackageTests: 2 steps: - - task: NodeTool@0 - inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 - - - script: npm install --global npm@6.12.1 - displayName: Update npm + - template: templates/macos-preparation.yml - template: templates/cache.yml parameters: diff --git a/script/vsts/platforms/templates/macos-preparation.yml b/script/vsts/platforms/templates/macos-preparation.yml new file mode 100644 index 000000000..6e0de9ae6 --- /dev/null +++ b/script/vsts/platforms/templates/macos-preparation.yml @@ -0,0 +1,8 @@ +steps: + - task: NodeTool@0 + inputs: + versionSpec: 12.13.1 + displayName: Install Node.js 12.13.1 + + - script: npm install --global npm@6.12.1 + displayName: Update npm From f0074f54651fa2bad1b8a27de4176a3d0fd8546b Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 15:21:05 -0500 Subject: [PATCH 052/119] macos-bootstrap.yml --- script/vsts/platforms/macos.yml | 18 ++---------------- .../platforms/templates/macos-bootstrap.yml | 9 +++++++++ 2 files changed, 11 insertions(+), 16 deletions(-) create mode 100644 script/vsts/platforms/templates/macos-bootstrap.yml diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index f75c59ebc..e83bd510d 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -18,14 +18,7 @@ jobs: parameters: OS: macos - - script: script/bootstrap - displayName: Bootstrap build environment - env: - CI: true - CI_PROVIDER: VSTS - NPM_BIN_PATH: /usr/local/bin/npm - npm_config_build_from_source: true - condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) + - template: templates/macos-bootstrap.yml - script: script/lint displayName: Run linter @@ -105,14 +98,7 @@ jobs: # The artifact caching task does not work on forks, so we need to # bootstrap again for pull requests coming from forked repositories. - - script: script/bootstrap - displayName: Bootstrap build environment - env: - CI: true - CI_PROVIDER: VSTS - NPM_BIN_PATH: /usr/local/bin/npm - npm_config_build_from_source: true - condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) + - template: templates/macos-bootstrap.yml - task: DownloadBuildArtifacts@0 displayName: Download atom-mac.zip diff --git a/script/vsts/platforms/templates/macos-bootstrap.yml b/script/vsts/platforms/templates/macos-bootstrap.yml new file mode 100644 index 000000000..f78c3e940 --- /dev/null +++ b/script/vsts/platforms/templates/macos-bootstrap.yml @@ -0,0 +1,9 @@ +steps: + - script: script/bootstrap + displayName: Bootstrap build environment + env: + CI: true + CI_PROVIDER: VSTS + NPM_BIN_PATH: /usr/local/bin/npm + npm_config_build_from_source: true + condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) From bf06d17e45514ab21fc39a1cdb0d64adeae36803 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 15:21:32 -0500 Subject: [PATCH 053/119] macos-build.yml and macos-publish.yml --- script/vsts/platforms/macos.yml | 47 +------------------ .../vsts/platforms/templates/macos-build.yml | 19 ++++++++ .../platforms/templates/macos-publish.yml | 28 +++++++++++ 3 files changed, 49 insertions(+), 45 deletions(-) create mode 100644 script/vsts/platforms/templates/macos-build.yml create mode 100644 script/vsts/platforms/templates/macos-publish.yml diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index e83bd510d..b88baf099 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -23,52 +23,9 @@ jobs: - script: script/lint displayName: Run linter - - script: | - if [ $SHOULD_SIGN == "true" ] && ([ $IS_RELEASE_BRANCH == "true" ] || [ $IS_SIGNED_ZIP_BRANCH == "true" ]); then - script/build --no-bootstrap --code-sign --compress-artifacts - else - script/build --no-bootstrap --compress-artifacts - fi - displayName: Build Atom - env: - GITHUB_TOKEN: $(GITHUB_TOKEN) - IS_RELEASE_BRANCH: $(IsReleaseBranch) - IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch) - ATOM_RELEASE_VERSION: $(ReleaseVersion) - ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL) - ATOM_MAC_CODE_SIGNING_CERT_PASSWORD: $(ATOM_MAC_CODE_SIGNING_CERT_PASSWORD) - ATOM_MAC_CODE_SIGNING_KEYCHAIN: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN) - ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD) - AC_USER: $(AC_USER) - AC_PASSWORD: $(AC_PASSWORD) + - template: templates/macos-build.yml - - script: | - cp $(Build.SourcesDirectory)/out/*.zip $(Build.ArtifactStagingDirectory) - displayName: Stage Artifacts - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac.zip - ArtifactName: atom-mac.zip - ArtifactType: Container - displayName: Upload atom-mac.zip - condition: succeeded() - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac-symbols.zip - ArtifactName: atom-mac-symbols.zip - ArtifactType: Container - displayName: Upload atom-mac-symbols.zip - condition: succeeded() - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/docs/output/atom-api.json - ArtifactName: atom-api.json - ArtifactType: Container - displayName: Upload atom-api.json - condition: succeeded() + - template: templates/macos-publish.yml - job: macOS_tests displayName: macOS test diff --git a/script/vsts/platforms/templates/macos-build.yml b/script/vsts/platforms/templates/macos-build.yml new file mode 100644 index 000000000..1105a2b4c --- /dev/null +++ b/script/vsts/platforms/templates/macos-build.yml @@ -0,0 +1,19 @@ +steps: + - script: | + if [ $SHOULD_SIGN == "true" ] && ([ $IS_RELEASE_BRANCH == "true" ] || [ $IS_SIGNED_ZIP_BRANCH == "true" ]); then + script/build --no-bootstrap --code-sign --compress-artifacts + else + script/build --no-bootstrap --compress-artifacts + fi + displayName: Build Atom + env: + GITHUB_TOKEN: $(GITHUB_TOKEN) + IS_RELEASE_BRANCH: $(IsReleaseBranch) + IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch) + ATOM_RELEASE_VERSION: $(ReleaseVersion) + ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL) + ATOM_MAC_CODE_SIGNING_CERT_PASSWORD: $(ATOM_MAC_CODE_SIGNING_CERT_PASSWORD) + ATOM_MAC_CODE_SIGNING_KEYCHAIN: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN) + ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD) + AC_USER: $(AC_USER) + AC_PASSWORD: $(AC_PASSWORD) diff --git a/script/vsts/platforms/templates/macos-publish.yml b/script/vsts/platforms/templates/macos-publish.yml new file mode 100644 index 000000000..bef241c69 --- /dev/null +++ b/script/vsts/platforms/templates/macos-publish.yml @@ -0,0 +1,28 @@ +steps: + - script: | + cp $(Build.SourcesDirectory)/out/*.zip $(Build.ArtifactStagingDirectory) + displayName: Stage Artifacts + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac.zip + ArtifactName: atom-mac.zip + ArtifactType: Container + displayName: Upload atom-mac.zip + condition: succeeded() + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac-symbols.zip + ArtifactName: atom-mac-symbols.zip + ArtifactType: Container + displayName: Upload atom-mac-symbols.zip + condition: succeeded() + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.SourcesDirectory)/docs/output/atom-api.json + ArtifactName: atom-api.json + ArtifactType: Container + displayName: Upload atom-api.json + condition: succeeded() From b5bf75997d276232f6219838b766ee4de03b0d6b Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 15:23:02 -0500 Subject: [PATCH 054/119] macos-test.yml --- script/vsts/platforms/macos.yml | 59 +------------------ .../vsts/platforms/templates/macos-test.yml | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+), 58 deletions(-) create mode 100644 script/vsts/platforms/templates/macos-test.yml diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index b88baf099..8cca9a732 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -57,61 +57,4 @@ jobs: # bootstrap again for pull requests coming from forked repositories. - template: templates/macos-bootstrap.yml - - task: DownloadBuildArtifacts@0 - displayName: Download atom-mac.zip - inputs: - artifactName: 'atom-mac.zip' - downloadPath: $(Build.SourcesDirectory) - - - script: unzip atom-mac.zip/atom-mac.zip -d out - displayName: Unzip atom-mac.zip - - - task: DownloadBuildArtifacts@0 - displayName: Download atom-mac-symbols.zip - inputs: - artifactName: 'atom-mac-symbols.zip' - downloadPath: $(Build.SourcesDirectory) - - - script: unzip atom-mac-symbols.zip/atom-mac-symbols.zip -d out - displayName: Unzip atom-mac-symbols.zip - - - script: | - osascript -e 'tell application "System Events" to keystroke "x"' # clear screen saver - caffeinate -s script/test # Run with caffeinate to prevent screen saver - env: - CI: true - CI_PROVIDER: VSTS - ATOM_JASMINE_REPORTER: list - TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit - ATOM_RUN_CORE_TESTS: $(RunCoreTests) - ATOM_RUN_PACKAGE_TESTS: $(RunPackageTests) - displayName: Run tests - condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) - - - script: script/postprocess-junit-results --search-folder "${TEST_JUNIT_XML_ROOT}" --test-results-files "**/*.xml" - env: - TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit - displayName: Post-process test results - condition: ne(variables['Atom.SkipTests'], 'true') - - - task: PublishTestResults@2 - inputs: - testResultsFormat: JUnit - searchFolder: $(Common.TestResultsDirectory)/junit - testResultsFiles: '**/*.xml' - mergeTestResults: true - testRunTitle: MacOS - condition: ne(variables['Atom.SkipTests'], 'true') - - - script: | - mkdir -p $(Build.ArtifactStagingDirectory)/crash-reports - cp ${HOME}/Library/Logs/DiagnosticReports/*.crash $(Build.ArtifactStagingDirectory)/crash-reports - displayName: Stage Crash Reports - condition: failed() - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports - ArtifactName: crash-reports.zip - displayName: Upload Crash Reports - condition: failed() + - template: templates/macos-test.yml diff --git a/script/vsts/platforms/templates/macos-test.yml b/script/vsts/platforms/templates/macos-test.yml new file mode 100644 index 000000000..ac13c7233 --- /dev/null +++ b/script/vsts/platforms/templates/macos-test.yml @@ -0,0 +1,59 @@ +steps: + - task: DownloadBuildArtifacts@0 + displayName: Download atom-mac.zip + inputs: + artifactName: 'atom-mac.zip' + downloadPath: $(Build.SourcesDirectory) + + - script: unzip atom-mac.zip/atom-mac.zip -d out + displayName: Unzip atom-mac.zip + + - task: DownloadBuildArtifacts@0 + displayName: Download atom-mac-symbols.zip + inputs: + artifactName: 'atom-mac-symbols.zip' + downloadPath: $(Build.SourcesDirectory) + + - script: unzip atom-mac-symbols.zip/atom-mac-symbols.zip -d out + displayName: Unzip atom-mac-symbols.zip + + - script: | + osascript -e 'tell application "System Events" to keystroke "x"' # clear screen saver + caffeinate -s script/test # Run with caffeinate to prevent screen saver + env: + CI: true + CI_PROVIDER: VSTS + ATOM_JASMINE_REPORTER: list + TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit + ATOM_RUN_CORE_TESTS: $(RunCoreTests) + ATOM_RUN_PACKAGE_TESTS: $(RunPackageTests) + displayName: Run tests + condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) + + - script: script/postprocess-junit-results --search-folder "${TEST_JUNIT_XML_ROOT}" --test-results-files "**/*.xml" + env: + TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit + displayName: Post-process test results + condition: ne(variables['Atom.SkipTests'], 'true') + + - task: PublishTestResults@2 + inputs: + testResultsFormat: JUnit + searchFolder: $(Common.TestResultsDirectory)/junit + testResultsFiles: '**/*.xml' + mergeTestResults: true + testRunTitle: MacOS + condition: ne(variables['Atom.SkipTests'], 'true') + + - script: | + mkdir -p $(Build.ArtifactStagingDirectory)/crash-reports + cp ${HOME}/Library/Logs/DiagnosticReports/*.crash $(Build.ArtifactStagingDirectory)/crash-reports + displayName: Stage Crash Reports + condition: failed() + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports + ArtifactName: crash-reports.zip + displayName: Upload Crash Reports + condition: failed() From 1fe38afb25c62c000d229f617ff9a8ee801926ed Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 15:24:41 -0500 Subject: [PATCH 055/119] linux-preparation.yml --- script/vsts/platforms/linux.yml | 22 ++----------------- .../platforms/templates/linux-preparation.yml | 20 +++++++++++++++++ 2 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 script/vsts/platforms/templates/linux-preparation.yml diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index a9eab3eb7..58aec6ae9 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -10,25 +10,7 @@ jobs: container: ubuntu:trusty steps: - - script: | - sudo apt-get update - sudo apt-get install -y wget software-properties-common - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo apt-add-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" - sudo apt-get update - sudo apt-get install -y build-essential ca-certificates clang-5.0 xvfb fakeroot git libsecret-1-dev rpm libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgconf2-4 libgtk-3-0 libasound2 libicu-dev - displayName: Install apt dependencies - - - script: sudo /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 - displayName: Start Xvfb - - - task: NodeTool@0 - inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 - - - script: npm install --global npm@6.12.1 - displayName: Update npm + - template: templates/linux-preparation.yml - template: templates/cache.yml parameters: @@ -46,7 +28,7 @@ jobs: - script: script/lint displayName: Run linter - + - script: script/build --no-bootstrap --create-debian-package --create-rpm-package --compress-artifacts env: GITHUB_TOKEN: $(GITHUB_TOKEN) diff --git a/script/vsts/platforms/templates/linux-preparation.yml b/script/vsts/platforms/templates/linux-preparation.yml new file mode 100644 index 000000000..c6c3bbd0d --- /dev/null +++ b/script/vsts/platforms/templates/linux-preparation.yml @@ -0,0 +1,20 @@ +steps: + - script: | + sudo apt-get update + sudo apt-get install -y wget software-properties-common + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - + sudo apt-add-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" + sudo apt-get update + sudo apt-get install -y build-essential ca-certificates clang-5.0 xvfb fakeroot git libsecret-1-dev rpm libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgconf2-4 libgtk-3-0 libasound2 libicu-dev + displayName: Install apt dependencies + + - script: sudo /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 + displayName: Start Xvfb + + - task: NodeTool@0 + inputs: + versionSpec: 12.13.1 + displayName: Install Node.js 12.13.1 + + - script: npm install --global npm@6.12.1 + displayName: Update npm From cf0c4a7fe233462df013ca433b9397f5dd4314f0 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 15:25:34 -0500 Subject: [PATCH 056/119] linux-bootstrap.yml --- script/vsts/platforms/linux.yml | 10 +--------- script/vsts/platforms/templates/linux-bootstrap.yml | 10 ++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 script/vsts/platforms/templates/linux-bootstrap.yml diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 58aec6ae9..ff27e6916 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -16,15 +16,7 @@ jobs: parameters: OS: linux - - script: script/bootstrap - displayName: Bootstrap build environment - env: - CI: true - CI_PROVIDER: VSTS - CC: clang-5.0 - CXX: clang++-5.0 - npm_config_clang: 1 - condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) + - template: templates/linux-bootstrap.yml - script: script/lint displayName: Run linter diff --git a/script/vsts/platforms/templates/linux-bootstrap.yml b/script/vsts/platforms/templates/linux-bootstrap.yml new file mode 100644 index 000000000..fec228bf3 --- /dev/null +++ b/script/vsts/platforms/templates/linux-bootstrap.yml @@ -0,0 +1,10 @@ +steps: + - script: script/bootstrap + displayName: Bootstrap build environment + env: + CI: true + CI_PROVIDER: VSTS + CC: clang-5.0 + CXX: clang++-5.0 + npm_config_clang: 1 + condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) From df3e80a88b8a9e7231673bb6f522f609d3b65af7 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 15:31:55 -0500 Subject: [PATCH 057/119] linux-test.yml --- script/vsts/platforms/linux.yml | 25 +------------------ .../vsts/platforms/templates/linux-test.yml | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 script/vsts/platforms/templates/linux-test.yml diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index ff27e6916..6cceb3a32 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -35,30 +35,7 @@ jobs: sudo chmod 4755 ./out/atom*-amd64/chrome-sandbox displayName: Tweaking chrome-sandbox binary - - script: script/test - env: - CI: true - CI_PROVIDER: VSTS - ATOM_JASMINE_REPORTER: list - TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit - DISPLAY: :99.0 - displayName: Run tests - condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) - - - script: script/postprocess-junit-results --search-folder "${TEST_JUNIT_XML_ROOT}" --test-results-files "**/*.xml" - env: - TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit - displayName: Post-process test results - condition: ne(variables['Atom.SkipTests'], 'true') - - - task: PublishTestResults@2 - inputs: - testResultsFormat: JUnit - searchFolder: $(Common.TestResultsDirectory)/junit - testResultsFiles: '**/*.xml' - mergeTestResults: true - testRunTitle: Linux - condition: ne(variables['Atom.SkipTests'], 'true') + - template: templates/linux-test.yml - task: PublishBuildArtifacts@1 inputs: diff --git a/script/vsts/platforms/templates/linux-test.yml b/script/vsts/platforms/templates/linux-test.yml new file mode 100644 index 000000000..92c132622 --- /dev/null +++ b/script/vsts/platforms/templates/linux-test.yml @@ -0,0 +1,25 @@ +steps: + - script: script/test + env: + CI: true + CI_PROVIDER: VSTS + ATOM_JASMINE_REPORTER: list + TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit + DISPLAY: :99.0 + displayName: Run tests + condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) + + - script: script/postprocess-junit-results --search-folder "${TEST_JUNIT_XML_ROOT}" --test-results-files "**/*.xml" + env: + TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit + displayName: Post-process test results + condition: ne(variables['Atom.SkipTests'], 'true') + + - task: PublishTestResults@2 + inputs: + testResultsFormat: JUnit + searchFolder: $(Common.TestResultsDirectory)/junit + testResultsFiles: '**/*.xml' + mergeTestResults: true + testRunTitle: Linux + condition: ne(variables['Atom.SkipTests'], 'true') From 91f302f5451780bf19d6d84436647297080b4ce9 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 15:31:46 -0500 Subject: [PATCH 058/119] linux-build.yml and linux-publish.yml --- script/vsts/platforms/linux.yml | 38 +------------------ .../vsts/platforms/templates/linux-build.yml | 14 +++++++ .../platforms/templates/linux-publish.yml | 24 ++++++++++++ 3 files changed, 40 insertions(+), 36 deletions(-) create mode 100644 script/vsts/platforms/templates/linux-build.yml create mode 100644 script/vsts/platforms/templates/linux-publish.yml diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 6cceb3a32..460bd5fdf 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -21,42 +21,8 @@ jobs: - script: script/lint displayName: Run linter - - script: script/build --no-bootstrap --create-debian-package --create-rpm-package --compress-artifacts - env: - GITHUB_TOKEN: $(GITHUB_TOKEN) - ATOM_RELEASE_VERSION: $(ReleaseVersion) - CC: clang-5.0 - CXX: clang++-5.0 - npm_config_clang: 1 - displayName: Build Atom - - - script: | - sudo chown root ./out/atom*-amd64/chrome-sandbox - sudo chmod 4755 ./out/atom*-amd64/chrome-sandbox - displayName: Tweaking chrome-sandbox binary + - template: templates/linux-build.yml - template: templates/linux-test.yml - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/atom.x86_64.rpm - ArtifactName: atom.x86_64.rpm - ArtifactType: Container - displayName: Upload atom.x84_64.rpm - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/atom-amd64.deb - ArtifactName: atom-amd64.deb - ArtifactType: Container - displayName: Upload atom-amd64.deb - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/atom-amd64.tar.gz - ArtifactName: atom-amd64.tar.gz - ArtifactType: Container - displayName: Upload atom-amd64.tar.gz - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + - template: templates/linux-publish.yml diff --git a/script/vsts/platforms/templates/linux-build.yml b/script/vsts/platforms/templates/linux-build.yml new file mode 100644 index 000000000..9b4641cb6 --- /dev/null +++ b/script/vsts/platforms/templates/linux-build.yml @@ -0,0 +1,14 @@ +steps: + - script: script/build --no-bootstrap --create-debian-package --create-rpm-package --compress-artifacts + env: + GITHUB_TOKEN: $(GITHUB_TOKEN) + ATOM_RELEASE_VERSION: $(ReleaseVersion) + CC: clang-5.0 + CXX: clang++-5.0 + npm_config_clang: 1 + displayName: Build Atom + + - script: | + sudo chown root ./out/atom*-amd64/chrome-sandbox + sudo chmod 4755 ./out/atom*-amd64/chrome-sandbox + displayName: Tweaking chrome-sandbox binary diff --git a/script/vsts/platforms/templates/linux-publish.yml b/script/vsts/platforms/templates/linux-publish.yml new file mode 100644 index 000000000..8ce1fe79c --- /dev/null +++ b/script/vsts/platforms/templates/linux-publish.yml @@ -0,0 +1,24 @@ +steps: + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.SourcesDirectory)/out/atom.x86_64.rpm + ArtifactName: atom.x86_64.rpm + ArtifactType: Container + displayName: Upload atom.x84_64.rpm + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.SourcesDirectory)/out/atom-amd64.deb + ArtifactName: atom-amd64.deb + ArtifactType: Container + displayName: Upload atom-amd64.deb + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.SourcesDirectory)/out/atom-amd64.tar.gz + ArtifactName: atom-amd64.tar.gz + ArtifactType: Container + displayName: Upload atom-amd64.tar.gz + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) From 264fdd434f4830cc61f1b80a9263be3e0bc420a2 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 17:37:19 -0500 Subject: [PATCH 059/119] combine publish for all OS --- script/vsts/platforms/linux.yml | 13 ++++- script/vsts/platforms/macos.yml | 17 +++++- .../platforms/templates/linux-publish.yml | 24 --------- .../platforms/templates/macos-publish.yml | 28 ---------- script/vsts/platforms/templates/publish.yml | 16 ++++++ .../platforms/templates/windows-publish.yml | 52 ------------------- script/vsts/platforms/windows.yml | 31 ++++++++++- 7 files changed, 74 insertions(+), 107 deletions(-) delete mode 100644 script/vsts/platforms/templates/linux-publish.yml delete mode 100644 script/vsts/platforms/templates/macos-publish.yml create mode 100644 script/vsts/platforms/templates/publish.yml delete mode 100644 script/vsts/platforms/templates/windows-publish.yml diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 460bd5fdf..72b1fe704 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -25,4 +25,15 @@ jobs: - template: templates/linux-test.yml - - template: templates/linux-publish.yml + - template: templates/publish.yml + parameters: + artifacts: + - filename: atom.x86_64.rpm + dir: $(Build.SourcesDirectory)/out + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + - filename: atom-amd64.deb + dir: $(Build.SourcesDirectory)/out + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + - filename: atom-amd64.tar.gz + dir: $(Build.SourcesDirectory)/out + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index 8cca9a732..ec5d7bc22 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -25,7 +25,22 @@ jobs: - template: templates/macos-build.yml - - template: templates/macos-publish.yml + - script: | + cp $(Build.SourcesDirectory)/out/*.zip $(Build.ArtifactStagingDirectory) + displayName: Stage Artifacts + + - template: templates/publish.yml + parameters: + artifacts: + - filename: atom-mac.zip + dir: $(Build.ArtifactStagingDirectory) + condition: succeeded() + - filename: atom-mac-symbols.zip + dir: $(Build.ArtifactStagingDirectory) + condition: succeeded() + - filename: atom-api.json + dir: $(Build.SourcesDirectory)/docs/output + condition: succeeded() - job: macOS_tests displayName: macOS test diff --git a/script/vsts/platforms/templates/linux-publish.yml b/script/vsts/platforms/templates/linux-publish.yml deleted file mode 100644 index 8ce1fe79c..000000000 --- a/script/vsts/platforms/templates/linux-publish.yml +++ /dev/null @@ -1,24 +0,0 @@ -steps: - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/atom.x86_64.rpm - ArtifactName: atom.x86_64.rpm - ArtifactType: Container - displayName: Upload atom.x84_64.rpm - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/atom-amd64.deb - ArtifactName: atom-amd64.deb - ArtifactType: Container - displayName: Upload atom-amd64.deb - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/atom-amd64.tar.gz - ArtifactName: atom-amd64.tar.gz - ArtifactType: Container - displayName: Upload atom-amd64.tar.gz - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) diff --git a/script/vsts/platforms/templates/macos-publish.yml b/script/vsts/platforms/templates/macos-publish.yml deleted file mode 100644 index bef241c69..000000000 --- a/script/vsts/platforms/templates/macos-publish.yml +++ /dev/null @@ -1,28 +0,0 @@ -steps: - - script: | - cp $(Build.SourcesDirectory)/out/*.zip $(Build.ArtifactStagingDirectory) - displayName: Stage Artifacts - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac.zip - ArtifactName: atom-mac.zip - ArtifactType: Container - displayName: Upload atom-mac.zip - condition: succeeded() - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac-symbols.zip - ArtifactName: atom-mac-symbols.zip - ArtifactType: Container - displayName: Upload atom-mac-symbols.zip - condition: succeeded() - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/docs/output/atom-api.json - ArtifactName: atom-api.json - ArtifactType: Container - displayName: Upload atom-api.json - condition: succeeded() diff --git a/script/vsts/platforms/templates/publish.yml b/script/vsts/platforms/templates/publish.yml new file mode 100644 index 000000000..b7c294a34 --- /dev/null +++ b/script/vsts/platforms/templates/publish.yml @@ -0,0 +1,16 @@ +parameters: + - name: artifacts + type: object + +steps: + - ${{ each artifact in parameters.artifacts }}: + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: ${{artifact.dir}}/${{artifact.filename}} + ArtifactName: ${{artifact.filename}} + ArtifactType: Container + displayName: Upload ${{artifact.filename}} + ${{ if artifact.condition }}: + condition: ${{artifact.condition}} + ${{ if artifact.continueOnError }}: + continueOnError: ${{artifact.continueOnError}} diff --git a/script/vsts/platforms/templates/windows-publish.yml b/script/vsts/platforms/templates/windows-publish.yml deleted file mode 100644 index fde8cd6f7..000000000 --- a/script/vsts/platforms/templates/windows-publish.yml +++ /dev/null @@ -1,52 +0,0 @@ -steps: - - script: | - IF [%BUILD_ARCH%]==[x64] ( - SET FileID=-x64 - ) ELSE ( - SET FileID= - ) - echo FileID set to: %FileID% - env: - BUILD_ARCH: $(buildArch) - displayName: Set FileID based on the arch - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/atom$(FileID)-windows.zip - ArtifactName: atom$(FileID)-windows.zip - ArtifactType: Container - displayName: Upload atom$(FileID)-windows.zip - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/AtomSetup$(FileID).exe - ArtifactName: AtomSetup$(FileID).exe - ArtifactType: Container - displayName: Upload AtomSetup$(FileID).exe - condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/$(AppName)$(FileID)-$(ReleaseVersion)-full.nupkg - ArtifactName: $(AppName)$(FileID)-$(ReleaseVersion)-full.nupkg - ArtifactType: Container - displayName: Upload $(AppName)$(FileID)-$(ReleaseVersion)-full.nupkg - condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/$(AppName)$(FileID)-$(ReleaseVersion)-delta.nupkg - ArtifactName: $(AppName)$(FileID)-$(ReleaseVersion)-delta.nupkg - ArtifactType: Container - displayName: Upload $(AppName)$(FileID)-$(ReleaseVersion)-delta.nupkg - condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) - continueOnError: true # Nightly builds don't produce delta packages yet, so don't fail the build - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.SourcesDirectory)/out/RELEASES$(FileID) - ArtifactName: RELEASES$(FileID) - ArtifactType: Container - displayName: Upload RELEASES$(FileID) - condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 17dfdbed1..a978fee30 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -37,4 +37,33 @@ jobs: - template: templates/windows-test.yml - - template: templates/windows-publish.yml + - script: | + IF [%BUILD_ARCH%]==[x64] ( + SET FileID=-x64 + ) ELSE ( + SET FileID= + ) + echo FileID set to: %FileID% + env: + BUILD_ARCH: $(buildArch) + displayName: Set FileID based on the arch + + - template: templates/publish.yml + parameters: + artifacts: + - filename: atom$(FileID)-windows.zip + dir: $(Build.SourcesDirectory)/out + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + - filename: AtomSetup$(FileID).exe + dir: $(Build.SourcesDirectory)/out + condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) + - filename: $(AppName)$(FileID)-$(ReleaseVersion)-full.nupkg + dir: $(Build.SourcesDirectory)/out + condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) + - filename: $(AppName)$(FileID)-$(ReleaseVersion)-delta.nupkg + dir: $(Build.SourcesDirectory)/out + condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) + continueOnError: true # Nightly builds don't produce delta packages yet, so don't fail the build + - filename: RELEASES$(FileID) + dir: $(Build.SourcesDirectory)/out + condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) From 443c98ebc7b083983550a8a2bde3754c306558f4 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 19:14:28 -0500 Subject: [PATCH 060/119] combine bootstrap for all OS --- script/vsts/platforms/linux.yml | 2 +- script/vsts/platforms/macos.yml | 4 ++-- script/vsts/platforms/templates/bootstrap.yml | 24 +++++++++++++++++++ .../platforms/templates/linux-bootstrap.yml | 10 -------- .../platforms/templates/macos-bootstrap.yml | 9 ------- .../platforms/templates/windows-bootstrap.yml | 11 --------- script/vsts/platforms/windows.yml | 2 +- 7 files changed, 28 insertions(+), 34 deletions(-) create mode 100644 script/vsts/platforms/templates/bootstrap.yml delete mode 100644 script/vsts/platforms/templates/linux-bootstrap.yml delete mode 100644 script/vsts/platforms/templates/macos-bootstrap.yml delete mode 100644 script/vsts/platforms/templates/windows-bootstrap.yml diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 72b1fe704..f66661aa4 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -16,7 +16,7 @@ jobs: parameters: OS: linux - - template: templates/linux-bootstrap.yml + - template: templates/bootstrap.yml - script: script/lint displayName: Run linter diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index ec5d7bc22..a7221ccfc 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -18,7 +18,7 @@ jobs: parameters: OS: macos - - template: templates/macos-bootstrap.yml + - template: templates/bootstrap.yml - script: script/lint displayName: Run linter @@ -70,6 +70,6 @@ jobs: # The artifact caching task does not work on forks, so we need to # bootstrap again for pull requests coming from forked repositories. - - template: templates/macos-bootstrap.yml + - template: templates/bootstrap.yml - template: templates/macos-test.yml diff --git a/script/vsts/platforms/templates/bootstrap.yml b/script/vsts/platforms/templates/bootstrap.yml new file mode 100644 index 000000000..6b9a6a855 --- /dev/null +++ b/script/vsts/platforms/templates/bootstrap.yml @@ -0,0 +1,24 @@ +steps: + - bash: | + if ["$OS" == "Windows_NT"]; then + node script/vsts/windows-run.js script/bootstrap.cmd + else + script/bootstrap + fi + displayName: Bootstrap build environment + env: + OS: $(Agent.OS) + CI: true + CI_PROVIDER: VSTS + ${{ if eq(variables['Agent.OS'], 'Windows_NT') }}: + NPM_BIN_PATH: C:/hostedtoolcache/windows/node/12.13.1/x64/npm.cmd + BUILD_ARCH: $(buildArch) + ${{ if in(variables['Agent.OS'], 'Darwin', 'Linux') }}: + NPM_BIN_PATH: /usr/local/bin/npm + ${{ if in(variables['Agent.OS'], 'Darwin', 'Windows_NT') }}: + npm_config_build_from_source: true + ${{ if eq(variables['Agent.OS'], 'Linux') }}: + CC: clang-5.0 + CXX: clang++-5.0 + npm_config_clang: 1 + condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) diff --git a/script/vsts/platforms/templates/linux-bootstrap.yml b/script/vsts/platforms/templates/linux-bootstrap.yml deleted file mode 100644 index fec228bf3..000000000 --- a/script/vsts/platforms/templates/linux-bootstrap.yml +++ /dev/null @@ -1,10 +0,0 @@ -steps: - - script: script/bootstrap - displayName: Bootstrap build environment - env: - CI: true - CI_PROVIDER: VSTS - CC: clang-5.0 - CXX: clang++-5.0 - npm_config_clang: 1 - condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) diff --git a/script/vsts/platforms/templates/macos-bootstrap.yml b/script/vsts/platforms/templates/macos-bootstrap.yml deleted file mode 100644 index f78c3e940..000000000 --- a/script/vsts/platforms/templates/macos-bootstrap.yml +++ /dev/null @@ -1,9 +0,0 @@ -steps: - - script: script/bootstrap - displayName: Bootstrap build environment - env: - CI: true - CI_PROVIDER: VSTS - NPM_BIN_PATH: /usr/local/bin/npm - npm_config_build_from_source: true - condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) diff --git a/script/vsts/platforms/templates/windows-bootstrap.yml b/script/vsts/platforms/templates/windows-bootstrap.yml deleted file mode 100644 index 31aa73195..000000000 --- a/script/vsts/platforms/templates/windows-bootstrap.yml +++ /dev/null @@ -1,11 +0,0 @@ -steps: - - script: | - node script\vsts\windows-run.js script\bootstrap.cmd - env: - BUILD_ARCH: $(buildArch) - CI: true - CI_PROVIDER: VSTS - NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\12.13.1\\x64\\npm.cmd" - npm_config_build_from_source: true - displayName: Bootstrap build environment - condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index a978fee30..5c17b6063 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -26,7 +26,7 @@ jobs: parameters: OS: windows - - template: templates/windows-bootstrap.yml + - template: templates/bootstrap.yml - script: node script\vsts\windows-run.js script\lint.cmd env: From da793c9f7fc513476e1f53dba2fd16b8f6546706 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 19:22:34 -0500 Subject: [PATCH 061/119] download-unzip.yml --- script/vsts/platforms/macos.yml | 6 ++++++ .../platforms/templates/download-unzip.yml | 18 ++++++++++++++++++ script/vsts/platforms/templates/macos-test.yml | 18 ------------------ 3 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 script/vsts/platforms/templates/download-unzip.yml diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index a7221ccfc..f33e85550 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -72,4 +72,10 @@ jobs: # bootstrap again for pull requests coming from forked repositories. - template: templates/bootstrap.yml + - template: templates/download-unzip.yml + parameters: + artifacts: + - atom-mac.zip + - atom-mac-symbols.zip + - template: templates/macos-test.yml diff --git a/script/vsts/platforms/templates/download-unzip.yml b/script/vsts/platforms/templates/download-unzip.yml new file mode 100644 index 000000000..3076374b9 --- /dev/null +++ b/script/vsts/platforms/templates/download-unzip.yml @@ -0,0 +1,18 @@ +parameters: + - name: artifacts + type: object + default: {} + - name: downloadPath + type: string + default: $(Build.SourcesDirectory) + +steps: + - ${{ each artifact in parameters.artifacts }}: + - task: DownloadBuildArtifacts@0 + displayName: Download ${{artifact}} + inputs: + artifactName: ${{artifact}} + downloadPath: ${{parameters.downloadPath}} + + - script: unzip ${{artifact}}/${{artifact}} -d out + displayName: Unzip ${{artifact}} diff --git a/script/vsts/platforms/templates/macos-test.yml b/script/vsts/platforms/templates/macos-test.yml index ac13c7233..c7b4fb176 100644 --- a/script/vsts/platforms/templates/macos-test.yml +++ b/script/vsts/platforms/templates/macos-test.yml @@ -1,22 +1,4 @@ steps: - - task: DownloadBuildArtifacts@0 - displayName: Download atom-mac.zip - inputs: - artifactName: 'atom-mac.zip' - downloadPath: $(Build.SourcesDirectory) - - - script: unzip atom-mac.zip/atom-mac.zip -d out - displayName: Unzip atom-mac.zip - - - task: DownloadBuildArtifacts@0 - displayName: Download atom-mac-symbols.zip - inputs: - artifactName: 'atom-mac-symbols.zip' - downloadPath: $(Build.SourcesDirectory) - - - script: unzip atom-mac-symbols.zip/atom-mac-symbols.zip -d out - displayName: Unzip atom-mac-symbols.zip - - script: | osascript -e 'tell application "System Events" to keystroke "x"' # clear screen saver caffeinate -s script/test # Run with caffeinate to prevent screen saver From 309e3c0801cb253c4120909e5bee4491d4675432 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 19:48:45 -0500 Subject: [PATCH 062/119] Update bootstrap.yml Co-Authored-By: deedeeg --- script/vsts/platforms/templates/bootstrap.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/script/vsts/platforms/templates/bootstrap.yml b/script/vsts/platforms/templates/bootstrap.yml index 6b9a6a855..253fc8919 100644 --- a/script/vsts/platforms/templates/bootstrap.yml +++ b/script/vsts/platforms/templates/bootstrap.yml @@ -7,6 +7,7 @@ steps: fi displayName: Bootstrap build environment env: + GITHUB_TOKEN: $(GITHUB_TOKEN) OS: $(Agent.OS) CI: true CI_PROVIDER: VSTS From 4e4a6e0b59a29c63037e866cf08526f65207da6f Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 19:51:04 -0500 Subject: [PATCH 063/119] combine preparation for all OS --- script/vsts/platforms/linux.yml | 2 +- script/vsts/platforms/macos.yml | 4 +- .../platforms/templates/linux-preparation.yml | 20 ------- .../platforms/templates/macos-preparation.yml | 8 --- .../vsts/platforms/templates/preparation.yml | 55 +++++++++++++++++++ .../templates/windows-preparation.yml | 30 ---------- script/vsts/platforms/windows.yml | 2 +- 7 files changed, 59 insertions(+), 62 deletions(-) delete mode 100644 script/vsts/platforms/templates/linux-preparation.yml delete mode 100644 script/vsts/platforms/templates/macos-preparation.yml create mode 100644 script/vsts/platforms/templates/preparation.yml delete mode 100644 script/vsts/platforms/templates/windows-preparation.yml diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index f66661aa4..3bb71db35 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -10,7 +10,7 @@ jobs: container: ubuntu:trusty steps: - - template: templates/linux-preparation.yml + - template: templates/preparation.yml - template: templates/cache.yml parameters: diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index f33e85550..181cb5ec6 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -12,7 +12,7 @@ jobs: vmImage: macos-10.14 steps: - - template: templates/macos-preparation.yml + - template: templates/preparation.yml - template: templates/cache.yml parameters: @@ -62,7 +62,7 @@ jobs: RunPackageTests: 2 steps: - - template: templates/macos-preparation.yml + - template: templates/preparation.yml - template: templates/cache.yml parameters: diff --git a/script/vsts/platforms/templates/linux-preparation.yml b/script/vsts/platforms/templates/linux-preparation.yml deleted file mode 100644 index c6c3bbd0d..000000000 --- a/script/vsts/platforms/templates/linux-preparation.yml +++ /dev/null @@ -1,20 +0,0 @@ -steps: - - script: | - sudo apt-get update - sudo apt-get install -y wget software-properties-common - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo apt-add-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" - sudo apt-get update - sudo apt-get install -y build-essential ca-certificates clang-5.0 xvfb fakeroot git libsecret-1-dev rpm libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgconf2-4 libgtk-3-0 libasound2 libicu-dev - displayName: Install apt dependencies - - - script: sudo /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 - displayName: Start Xvfb - - - task: NodeTool@0 - inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 - - - script: npm install --global npm@6.12.1 - displayName: Update npm diff --git a/script/vsts/platforms/templates/macos-preparation.yml b/script/vsts/platforms/templates/macos-preparation.yml deleted file mode 100644 index 6e0de9ae6..000000000 --- a/script/vsts/platforms/templates/macos-preparation.yml +++ /dev/null @@ -1,8 +0,0 @@ -steps: - - task: NodeTool@0 - inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 - - - script: npm install --global npm@6.12.1 - displayName: Update npm diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml new file mode 100644 index 000000000..52bce9659 --- /dev/null +++ b/script/vsts/platforms/templates/preparation.yml @@ -0,0 +1,55 @@ +steps: + + # Linux Specific + - script: | + sudo apt-get update + sudo apt-get install -y wget software-properties-common + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - + sudo apt-add-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" + sudo apt-get update + sudo apt-get install -y build-essential ca-certificates clang-5.0 xvfb fakeroot git libsecret-1-dev rpm libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgconf2-4 libgtk-3-0 libasound2 libicu-dev + displayName: Install apt dependencies + condition: eq(variables['Agent.OS'], 'Linux') + + - script: sudo /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 + displayName: Start Xvfb + condition: eq(variables['Agent.OS'], 'Linux') + + # Common + - task: NodeTool@0 + inputs: + versionSpec: 12.13.1 + displayName: Install Node.js 12.13.1 + + - script: npm install --global npm@6.12.1 + displayName: Update npm + + + # Windows Specific + - task: UsePythonVersion@0 + inputs: + versionSpec: '3.8' + condition: eq(variables['Agent.OS'], 'Windows_NT') + + - script: | + ECHO Installing npm-windows-upgrade + npm install --global --production npm-windows-upgrade + displayName: Install npm-windows-upgrade + condition: eq(variables['Agent.OS'], 'Windows_NT') + + - script: | + ECHO Upgrading npm + npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.12.1 + displayName: Install npm 6.12.1 + condition: eq(variables['Agent.OS'], 'Windows_NT') + + - script: | + npm install --global --production windows-build-tools@4.0 + displayName: Install windows build tools + condition: eq(variables['Agent.OS'], 'Windows_NT') + + - script: | + cd script\vsts + npm install + displayName: Install Windows build dependencies + condition: eq(variables['Agent.OS'], 'Windows_NT') diff --git a/script/vsts/platforms/templates/windows-preparation.yml b/script/vsts/platforms/templates/windows-preparation.yml deleted file mode 100644 index 068ad088f..000000000 --- a/script/vsts/platforms/templates/windows-preparation.yml +++ /dev/null @@ -1,30 +0,0 @@ -# Windows CI preparation - -steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.8' - - - task: NodeTool@0 - inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 - - - script: | - ECHO Installing npm-windows-upgrade - npm install --global --production npm-windows-upgrade - displayName: Install npm-windows-upgrade - - - script: | - ECHO Upgrading npm - npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.12.1 - displayName: Install npm 6.12.1 - - - script: | - npm install --global --production windows-build-tools@4.0 - displayName: Install windows build tools - - - script: | - cd script\vsts - npm install - displayName: Install Windows build dependencies diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 5c17b6063..d05885ef4 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -20,7 +20,7 @@ jobs: IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ] steps: - - template: templates/windows-preparation.yml + - template: templates/preparation.yml - template: templates/cache.yml parameters: From f113939865eaebb572da86ada078b6d7bc2d2733 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 22:04:56 -0500 Subject: [PATCH 064/119] Use pwsh --- script/vsts/platforms/templates/bootstrap.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/script/vsts/platforms/templates/bootstrap.yml b/script/vsts/platforms/templates/bootstrap.yml index 253fc8919..aaa485dbc 100644 --- a/script/vsts/platforms/templates/bootstrap.yml +++ b/script/vsts/platforms/templates/bootstrap.yml @@ -1,10 +1,11 @@ steps: - - bash: | - if ["$OS" == "Windows_NT"]; then - node script/vsts/windows-run.js script/bootstrap.cmd - else + - pwsh: | + if (($env:OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { + node 'script\vsts\windows-run.js' 'script\bootstrap.cmd' + } + else { script/bootstrap - fi + } displayName: Bootstrap build environment env: GITHUB_TOKEN: $(GITHUB_TOKEN) From e74543aa1e3a7d98f17836b8c8b6d4115d9629d9 Mon Sep 17 00:00:00 2001 From: aminya Date: Mon, 13 Jul 2020 22:43:40 -0500 Subject: [PATCH 065/119] Remove linux container and use clang 9 pwsh is not detected inside the container, and Clang 5 is very old. --- script/vsts/platforms/linux.yml | 1 - script/vsts/platforms/templates/bootstrap.yml | 4 ++-- script/vsts/platforms/templates/linux-build.yml | 4 ++-- script/vsts/platforms/templates/preparation.yml | 12 ++++++++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 3bb71db35..ce4df8245 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -7,7 +7,6 @@ jobs: pool: # This image is used to host the Docker container that runs the build vmImage: ubuntu-16.04 - container: ubuntu:trusty steps: - template: templates/preparation.yml diff --git a/script/vsts/platforms/templates/bootstrap.yml b/script/vsts/platforms/templates/bootstrap.yml index aaa485dbc..e483ec4ea 100644 --- a/script/vsts/platforms/templates/bootstrap.yml +++ b/script/vsts/platforms/templates/bootstrap.yml @@ -20,7 +20,7 @@ steps: ${{ if in(variables['Agent.OS'], 'Darwin', 'Windows_NT') }}: npm_config_build_from_source: true ${{ if eq(variables['Agent.OS'], 'Linux') }}: - CC: clang-5.0 - CXX: clang++-5.0 + CC: clang + CXX: clang++ npm_config_clang: 1 condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) diff --git a/script/vsts/platforms/templates/linux-build.yml b/script/vsts/platforms/templates/linux-build.yml index 9b4641cb6..7ae642f24 100644 --- a/script/vsts/platforms/templates/linux-build.yml +++ b/script/vsts/platforms/templates/linux-build.yml @@ -3,8 +3,8 @@ steps: env: GITHUB_TOKEN: $(GITHUB_TOKEN) ATOM_RELEASE_VERSION: $(ReleaseVersion) - CC: clang-5.0 - CXX: clang++-5.0 + CC: clang + CXX: clang++ npm_config_clang: 1 displayName: Build Atom diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml index 52bce9659..032b8b344 100644 --- a/script/vsts/platforms/templates/preparation.yml +++ b/script/vsts/platforms/templates/preparation.yml @@ -4,13 +4,17 @@ steps: - script: | sudo apt-get update sudo apt-get install -y wget software-properties-common - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo apt-add-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" - sudo apt-get update - sudo apt-get install -y build-essential ca-certificates clang-5.0 xvfb fakeroot git libsecret-1-dev rpm libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgconf2-4 libgtk-3-0 libasound2 libicu-dev + sudo apt-get install -y build-essential ca-certificates xvfb fakeroot git libsecret-1-dev rpm libx11-dev libxkbfile-dev xz-utils xorriso zsync libxss1 libgconf2-4 libgtk-3-0 libasound2 libicu-dev + # clang 9 is included in the image + sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 10 + sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 10 + sudo update-alternatives --config clang + sudo update-alternatives --config clang++ + clang -v displayName: Install apt dependencies condition: eq(variables['Agent.OS'], 'Linux') + - script: sudo /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 displayName: Start Xvfb condition: eq(variables['Agent.OS'], 'Linux') From 710111916223b02592df762c1d6b908899ed1a64 Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 00:32:15 -0500 Subject: [PATCH 066/119] combine build for all OS --- script/vsts/platforms/linux.yml | 2 +- script/vsts/platforms/macos.yml | 2 +- script/vsts/platforms/templates/build.yml | 54 +++++++++++++++++++ .../vsts/platforms/templates/linux-build.yml | 14 ----- .../vsts/platforms/templates/macos-build.yml | 19 ------- .../platforms/templates/windows-build.yml | 34 ------------ script/vsts/platforms/windows.yml | 2 +- 7 files changed, 57 insertions(+), 70 deletions(-) create mode 100644 script/vsts/platforms/templates/build.yml delete mode 100644 script/vsts/platforms/templates/linux-build.yml delete mode 100644 script/vsts/platforms/templates/macos-build.yml delete mode 100644 script/vsts/platforms/templates/windows-build.yml diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index ce4df8245..9d1af164f 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -20,7 +20,7 @@ jobs: - script: script/lint displayName: Run linter - - template: templates/linux-build.yml + - template: templates/build.yml - template: templates/linux-test.yml diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index 181cb5ec6..5a89541f0 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -23,7 +23,7 @@ jobs: - script: script/lint displayName: Run linter - - template: templates/macos-build.yml + - template: templates/build.yml - script: | cp $(Build.SourcesDirectory)/out/*.zip $(Build.ArtifactStagingDirectory) diff --git a/script/vsts/platforms/templates/build.yml b/script/vsts/platforms/templates/build.yml new file mode 100644 index 000000000..b683e675a --- /dev/null +++ b/script/vsts/platforms/templates/build.yml @@ -0,0 +1,54 @@ +steps: + - pwsh: | + if ($env:OS -eq "Windows_NT") { + mkdir -f -p $env:SQUIRREL_TEMP + if ($env:IS_RELEASE_BRANCH -eq "true") { + $CreateWindowsInstallaer="--create-windows-installer" + } else { + $CreateWindowsInstallaer="" + } + } + if ( ($env:SHOULD_SIGN -eq "true") -and (($env:IS_RELEASE_BRANCH -eq "true") -or ($env:IS_SIGNED_ZIP_BRANCH -eq "true")) ) { + $CodeSign="--code-sign" + } else { + $CodeSign="" + } + if (($env:OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { + node 'script\vsts\windows-run.js' 'script\build.cmd' --no-bootstrap --compress-artifacts $env:args $CodeSign $CreateWindowsInstallaer + } else { + script/build --no-bootstrap --compress-artifacts $env:args $CodeSign $CreateWindowsInstallaer + } + displayName: Build Atom + env: + OS: $(Agent.OS) + GITHUB_TOKEN: $(GITHUB_TOKEN) + IS_RELEASE_BRANCH: $(IsReleaseBranch) + IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch) + ATOM_RELEASE_VERSION: $(ReleaseVersion) + ${{ if eq(variables['Agent.OS'], 'Windows_NT') }}: + SQUIRREL_TEMP: "C:/tmp" + BUILD_ARCH: $(buildArch) + ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL) + ATOM_WIN_CODE_SIGNING_CERT_PASSWORD: $(ATOM_WIN_CODE_SIGNING_CERT_PASSWORD) + npm_config_build_from_source: true + SHOULD_SIGN: $(SHOULD_SIGN) + ${{ if eq(variables['Agent.OS'], 'Darwin') }}: + ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL) + ATOM_MAC_CODE_SIGNING_CERT_PASSWORD: $(ATOM_MAC_CODE_SIGNING_CERT_PASSWORD) + ATOM_MAC_CODE_SIGNING_KEYCHAIN: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN) + ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD) + AC_USER: $(AC_USER) + AC_PASSWORD: $(AC_PASSWORD) + SHOULD_SIGN: $(SHOULD_SIGN) + ${{ if eq(variables['Agent.OS'], 'Linux') }}: + CC: clang + CXX: clang++ + npm_config_clang: 1 + args: "--create-debian-package --create-rpm-package" + SHOULD_SIGN: "false" + + - script: | + sudo chown root ./out/atom*-amd64/chrome-sandbox + sudo chmod 4755 ./out/atom*-amd64/chrome-sandbox + displayName: Tweaking chrome-sandbox binary + condition: eq(variables['Agent.OS'], 'Linux') diff --git a/script/vsts/platforms/templates/linux-build.yml b/script/vsts/platforms/templates/linux-build.yml deleted file mode 100644 index 7ae642f24..000000000 --- a/script/vsts/platforms/templates/linux-build.yml +++ /dev/null @@ -1,14 +0,0 @@ -steps: - - script: script/build --no-bootstrap --create-debian-package --create-rpm-package --compress-artifacts - env: - GITHUB_TOKEN: $(GITHUB_TOKEN) - ATOM_RELEASE_VERSION: $(ReleaseVersion) - CC: clang - CXX: clang++ - npm_config_clang: 1 - displayName: Build Atom - - - script: | - sudo chown root ./out/atom*-amd64/chrome-sandbox - sudo chmod 4755 ./out/atom*-amd64/chrome-sandbox - displayName: Tweaking chrome-sandbox binary diff --git a/script/vsts/platforms/templates/macos-build.yml b/script/vsts/platforms/templates/macos-build.yml deleted file mode 100644 index 1105a2b4c..000000000 --- a/script/vsts/platforms/templates/macos-build.yml +++ /dev/null @@ -1,19 +0,0 @@ -steps: - - script: | - if [ $SHOULD_SIGN == "true" ] && ([ $IS_RELEASE_BRANCH == "true" ] || [ $IS_SIGNED_ZIP_BRANCH == "true" ]); then - script/build --no-bootstrap --code-sign --compress-artifacts - else - script/build --no-bootstrap --compress-artifacts - fi - displayName: Build Atom - env: - GITHUB_TOKEN: $(GITHUB_TOKEN) - IS_RELEASE_BRANCH: $(IsReleaseBranch) - IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch) - ATOM_RELEASE_VERSION: $(ReleaseVersion) - ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL) - ATOM_MAC_CODE_SIGNING_CERT_PASSWORD: $(ATOM_MAC_CODE_SIGNING_CERT_PASSWORD) - ATOM_MAC_CODE_SIGNING_KEYCHAIN: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN) - ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD) - AC_USER: $(AC_USER) - AC_PASSWORD: $(AC_PASSWORD) diff --git a/script/vsts/platforms/templates/windows-build.yml b/script/vsts/platforms/templates/windows-build.yml deleted file mode 100644 index 8ed84bb0b..000000000 --- a/script/vsts/platforms/templates/windows-build.yml +++ /dev/null @@ -1,34 +0,0 @@ -steps: - - script: | - IF NOT EXIST C:\tmp MKDIR C:\tmp - SET SQUIRREL_TEMP=C:\tmp - IF [%IS_RELEASE_BRANCH%]==[true] ( - ECHO Creating production artifacts for release branch %BUILD_SOURCEBRANCHNAME% - IF [%SHOULD_SIGN%]==[true] ( - node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts --create-windows-installer - ) ELSE ( - node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts --create-windows-installer - ) - ) ELSE ( - IF [%IS_SIGNED_ZIP_BRANCH%]==[true] ( - ECHO Creating signed CI artifacts for branch %BUILD_SOURCEBRANCHNAME% - IF [%SHOULD_SIGN%]==[true] ( - node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts - ) ELSE ( - node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts - ) - ) ELSE ( - ECHO Pull request build, no code signing will be performed - node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts - ) - ) - env: - GITHUB_TOKEN: $(GITHUB_TOKEN) - BUILD_ARCH: $(buildArch) - ATOM_RELEASE_VERSION: $(ReleaseVersion) - ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL) - ATOM_WIN_CODE_SIGNING_CERT_PASSWORD: $(ATOM_WIN_CODE_SIGNING_CERT_PASSWORD) - IS_RELEASE_BRANCH: $(IsReleaseBranch) - IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch) - npm_config_build_from_source: true - displayName: Build Atom diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index d05885ef4..b86b07fac 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -33,7 +33,7 @@ jobs: BUILD_ARCH: $(buildArch) displayName: Run linter - - template: templates/windows-build.yml + - template: templates/build.yml - template: templates/windows-test.yml From 9a3112cb9d2d93ef89368de4aa0470943533d737 Mon Sep 17 00:00:00 2001 From: aminya Date: Tue, 14 Jul 2020 01:54:22 -0500 Subject: [PATCH 067/119] combine test for all OS test: quote x86 runner --- script/vsts/platforms/linux.yml | 2 +- script/vsts/platforms/macos.yml | 2 +- .../vsts/platforms/templates/linux-test.yml | 25 ------ .../vsts/platforms/templates/macos-test.yml | 41 --------- script/vsts/platforms/templates/test.yml | 85 +++++++++++++++++++ .../vsts/platforms/templates/windows-test.yml | 58 ------------- script/vsts/platforms/windows.yml | 2 +- 7 files changed, 88 insertions(+), 127 deletions(-) delete mode 100644 script/vsts/platforms/templates/linux-test.yml delete mode 100644 script/vsts/platforms/templates/macos-test.yml create mode 100644 script/vsts/platforms/templates/test.yml delete mode 100644 script/vsts/platforms/templates/windows-test.yml diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 9d1af164f..975af51a7 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -22,7 +22,7 @@ jobs: - template: templates/build.yml - - template: templates/linux-test.yml + - template: templates/test.yml - template: templates/publish.yml parameters: diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index 5a89541f0..cc13d2c77 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -78,4 +78,4 @@ jobs: - atom-mac.zip - atom-mac-symbols.zip - - template: templates/macos-test.yml + - template: templates/test.yml diff --git a/script/vsts/platforms/templates/linux-test.yml b/script/vsts/platforms/templates/linux-test.yml deleted file mode 100644 index 92c132622..000000000 --- a/script/vsts/platforms/templates/linux-test.yml +++ /dev/null @@ -1,25 +0,0 @@ -steps: - - script: script/test - env: - CI: true - CI_PROVIDER: VSTS - ATOM_JASMINE_REPORTER: list - TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit - DISPLAY: :99.0 - displayName: Run tests - condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) - - - script: script/postprocess-junit-results --search-folder "${TEST_JUNIT_XML_ROOT}" --test-results-files "**/*.xml" - env: - TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit - displayName: Post-process test results - condition: ne(variables['Atom.SkipTests'], 'true') - - - task: PublishTestResults@2 - inputs: - testResultsFormat: JUnit - searchFolder: $(Common.TestResultsDirectory)/junit - testResultsFiles: '**/*.xml' - mergeTestResults: true - testRunTitle: Linux - condition: ne(variables['Atom.SkipTests'], 'true') diff --git a/script/vsts/platforms/templates/macos-test.yml b/script/vsts/platforms/templates/macos-test.yml deleted file mode 100644 index c7b4fb176..000000000 --- a/script/vsts/platforms/templates/macos-test.yml +++ /dev/null @@ -1,41 +0,0 @@ -steps: - - script: | - osascript -e 'tell application "System Events" to keystroke "x"' # clear screen saver - caffeinate -s script/test # Run with caffeinate to prevent screen saver - env: - CI: true - CI_PROVIDER: VSTS - ATOM_JASMINE_REPORTER: list - TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit - ATOM_RUN_CORE_TESTS: $(RunCoreTests) - ATOM_RUN_PACKAGE_TESTS: $(RunPackageTests) - displayName: Run tests - condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) - - - script: script/postprocess-junit-results --search-folder "${TEST_JUNIT_XML_ROOT}" --test-results-files "**/*.xml" - env: - TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit - displayName: Post-process test results - condition: ne(variables['Atom.SkipTests'], 'true') - - - task: PublishTestResults@2 - inputs: - testResultsFormat: JUnit - searchFolder: $(Common.TestResultsDirectory)/junit - testResultsFiles: '**/*.xml' - mergeTestResults: true - testRunTitle: MacOS - condition: ne(variables['Atom.SkipTests'], 'true') - - - script: | - mkdir -p $(Build.ArtifactStagingDirectory)/crash-reports - cp ${HOME}/Library/Logs/DiagnosticReports/*.crash $(Build.ArtifactStagingDirectory)/crash-reports - displayName: Stage Crash Reports - condition: failed() - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports - ArtifactName: crash-reports.zip - displayName: Upload Crash Reports - condition: failed() diff --git a/script/vsts/platforms/templates/test.yml b/script/vsts/platforms/templates/test.yml new file mode 100644 index 000000000..ddef43c9e --- /dev/null +++ b/script/vsts/platforms/templates/test.yml @@ -0,0 +1,85 @@ +steps: + - pwsh: | + if ($env:OS -eq "Darwin") { + osascript -e 'tell application "System Events" to keystroke "x"' # clear screen saver + caffeinate -s script/test # Run with caffeinate to prevent screen saver + } elseif (($env:OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { + node 'script\vsts\windows-run.js' 'script\test.cmd' + } else { + script/test + } + env: + OS: $(Agent.OS) + ${{ if eq(variables['Agent.OS'], 'Windows_NT') }}: + BUILD_ARCH: $(buildArch) + ${{ if eq(variables['Agent.OS'], 'Linux') }}: + DISPLAY: :99.0 + CI: true + CI_PROVIDER: VSTS + ATOM_JASMINE_REPORTER: list + TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit + ATOM_RUN_CORE_TESTS: $(RunCoreTests) + ATOM_RUN_PACKAGE_TESTS: $(RunPackageTests) + displayName: Run tests + condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) + + # Test results + - pwsh: | + if (($env:OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { + node 'script\vsts\windows-run.js' 'script\postprocess-junit-results.cmd' --search-folder "$env:TEST_JUNIT_XML_ROOT" --test-results-files "**/*.xml" + } else { + script/postprocess-junit-results --search-folder "$env:TEST_JUNIT_XML_ROOT" --test-results-files "**/*.xml" + } + env: + OS: $(Agent.OS) + ${{ if eq(variables['Agent.OS'], 'Windows_NT') }}: + BUILD_ARCH: $(buildArch) + TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit + displayName: Post-process test results + condition: ne(variables['Atom.SkipTests'], 'true') + + + - task: PublishTestResults@2 + inputs: + testResultsFormat: JUnit + searchFolder: $(Common.TestResultsDirectory)/junit + testResultsFiles: '**/*.xml' + mergeTestResults: true + testRunTitle: $(Agent.OS) $(buildArch) + condition: ne(variables['Atom.SkipTests'], 'true') + + # Crash Reports + - pwsh: | + mkdir -f -p $env:ARTIFACT_STAGING_DIR/crash-reports + if (($env:OS -eq "Windows_NT") -and (Test-Path "$env:TEMP/Atom Crashes")) { + cp "$env:TEMP/Atom Crashes/*.dmp" $env:ARTIFACT_STAGING_DIR/crash-reports + } else { + cp $env:HOME/Library/Logs/DiagnosticReports/*.crash $env:ARTIFACT_STAGING_DIR/crash-reports + } + env: + OS: $(Agent.OS) + ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory) + displayName: Stage Crash Reports + condition: failed() + + - task: PublishBuildArtifacts@1 + inputs: + PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports + ArtifactName: crash-reports.zip + ${{ if eq(variables['Agent.OS'], 'Windows_NT') }}: + condition: and(failed(), eq(variables['ATOM_RELEASES_S3_KEY'], '')) + displayName: Publish crash reports on non-release branch + ${{ if ne(variables['Agent.OS'], 'Windows_NT') }}: + condition: failed() + displayName: Upload Crash Reports + + - script: > + node $(Build.SourcesDirectory)\script\vsts\upload-crash-reports.js --crash-report-path "%ARTIFACT_STAGING_DIR%\crash-reports" --s3-path "vsts-artifacts/%BUILD_ID%/" + env: + ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY) + ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET) + ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) + ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory) + BUILD_ID: $(Build.BuildId) + displayName: Upload crash reports to S3 on release branch + condition: and(failed(), ne(variables['ATOM_RELEASES_S3_KEY'], ''), eq(variables['Agent.OS'], 'Windows_NT')) diff --git a/script/vsts/platforms/templates/windows-test.yml b/script/vsts/platforms/templates/windows-test.yml deleted file mode 100644 index acae4deeb..000000000 --- a/script/vsts/platforms/templates/windows-test.yml +++ /dev/null @@ -1,58 +0,0 @@ -# Runs the windows tests - -steps: - - script: | - node script\vsts\windows-run.js script\test.cmd - env: - CI: true - CI_PROVIDER: VSTS - ATOM_JASMINE_REPORTER: list - TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit - BUILD_ARCH: $(buildArch) - displayName: Run tests - condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) - - - script: > - node script\vsts\windows-run.js script\postprocess-junit-results.cmd - --search-folder %TEST_JUNIT_XML_ROOT% --test-results-files "**/*.xml" - env: - TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit - displayName: Post-process test results - condition: ne(variables['Atom.SkipTests'], 'true') - - - task: PublishTestResults@2 - inputs: - testResultsFormat: JUnit - searchFolder: $(Common.TestResultsDirectory)\junit - testResultsFiles: '**/*.xml' - mergeTestResults: true - testRunTitle: Windows $(buildArch) - condition: ne(variables['Atom.SkipTests'], 'true') - - - script: | - IF NOT EXIST "%ARTIFACT_STAGING_DIR%\crash-reports" MKDIR "%ARTIFACT_STAGING_DIR%\crash-reports" - IF EXIST "%Temp%\Atom Crashes" ( - FOR %%a in ("%Temp%\Atom Crashes\*.dmp") DO XCOPY "%%a" "%ARTIFACT_STAGING_DIR%\crash-reports" /I - ) - displayName: Stage crash reports - condition: failed() - env: - ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory) - - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: $(Build.ArtifactStagingDirectory)/crash-reports - ArtifactName: crash-reports - displayName: Publish crash reports on non-release branch - condition: and(failed(), eq(variables['ATOM_RELEASES_S3_KEY'], '')) - - - script: > - node $(Build.SourcesDirectory)\script\vsts\upload-crash-reports.js --crash-report-path "%ARTIFACT_STAGING_DIR%\crash-reports" --s3-path "vsts-artifacts/%BUILD_ID%/" - env: - ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY) - ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET) - ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) - ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory) - BUILD_ID: $(Build.BuildId) - displayName: Upload crash reports to S3 on release branch - condition: and(failed(), ne(variables['ATOM_RELEASES_S3_KEY'], '')) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index b86b07fac..89051fa69 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -35,7 +35,7 @@ jobs: - template: templates/build.yml - - template: templates/windows-test.yml + - template: templates/test.yml - script: | IF [%BUILD_ARCH%]==[x64] ( From b0aa6c678ceb1c069f3092bc2ca0d0970b824bb5 Mon Sep 17 00:00:00 2001 From: aminya Date: Tue, 14 Jul 2020 22:43:31 -0500 Subject: [PATCH 068/119] using AGENT_OS directly --- script/vsts/platforms/templates/bootstrap.yml | 3 +-- script/vsts/platforms/templates/build.yml | 5 ++--- script/vsts/platforms/templates/test.yml | 11 ++++------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/script/vsts/platforms/templates/bootstrap.yml b/script/vsts/platforms/templates/bootstrap.yml index e483ec4ea..6e10e8165 100644 --- a/script/vsts/platforms/templates/bootstrap.yml +++ b/script/vsts/platforms/templates/bootstrap.yml @@ -1,6 +1,6 @@ steps: - pwsh: | - if (($env:OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { + if (($env:AGENT_OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { node 'script\vsts\windows-run.js' 'script\bootstrap.cmd' } else { @@ -9,7 +9,6 @@ steps: displayName: Bootstrap build environment env: GITHUB_TOKEN: $(GITHUB_TOKEN) - OS: $(Agent.OS) CI: true CI_PROVIDER: VSTS ${{ if eq(variables['Agent.OS'], 'Windows_NT') }}: diff --git a/script/vsts/platforms/templates/build.yml b/script/vsts/platforms/templates/build.yml index b683e675a..5d7563ad1 100644 --- a/script/vsts/platforms/templates/build.yml +++ b/script/vsts/platforms/templates/build.yml @@ -1,6 +1,6 @@ steps: - pwsh: | - if ($env:OS -eq "Windows_NT") { + if ($env:AGENT_OS -eq "Windows_NT") { mkdir -f -p $env:SQUIRREL_TEMP if ($env:IS_RELEASE_BRANCH -eq "true") { $CreateWindowsInstallaer="--create-windows-installer" @@ -13,14 +13,13 @@ steps: } else { $CodeSign="" } - if (($env:OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { + if (($env:AGENT_OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { node 'script\vsts\windows-run.js' 'script\build.cmd' --no-bootstrap --compress-artifacts $env:args $CodeSign $CreateWindowsInstallaer } else { script/build --no-bootstrap --compress-artifacts $env:args $CodeSign $CreateWindowsInstallaer } displayName: Build Atom env: - OS: $(Agent.OS) GITHUB_TOKEN: $(GITHUB_TOKEN) IS_RELEASE_BRANCH: $(IsReleaseBranch) IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch) diff --git a/script/vsts/platforms/templates/test.yml b/script/vsts/platforms/templates/test.yml index ddef43c9e..2e08f3091 100644 --- a/script/vsts/platforms/templates/test.yml +++ b/script/vsts/platforms/templates/test.yml @@ -1,15 +1,14 @@ steps: - pwsh: | - if ($env:OS -eq "Darwin") { + if ($env:AGENT_OS -eq "Darwin") { osascript -e 'tell application "System Events" to keystroke "x"' # clear screen saver caffeinate -s script/test # Run with caffeinate to prevent screen saver - } elseif (($env:OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { + } elseif (($env:AGENT_OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { node 'script\vsts\windows-run.js' 'script\test.cmd' } else { script/test } env: - OS: $(Agent.OS) ${{ if eq(variables['Agent.OS'], 'Windows_NT') }}: BUILD_ARCH: $(buildArch) ${{ if eq(variables['Agent.OS'], 'Linux') }}: @@ -25,13 +24,12 @@ steps: # Test results - pwsh: | - if (($env:OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { + if (($env:AGENT_OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { node 'script\vsts\windows-run.js' 'script\postprocess-junit-results.cmd' --search-folder "$env:TEST_JUNIT_XML_ROOT" --test-results-files "**/*.xml" } else { script/postprocess-junit-results --search-folder "$env:TEST_JUNIT_XML_ROOT" --test-results-files "**/*.xml" } env: - OS: $(Agent.OS) ${{ if eq(variables['Agent.OS'], 'Windows_NT') }}: BUILD_ARCH: $(buildArch) TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit @@ -51,13 +49,12 @@ steps: # Crash Reports - pwsh: | mkdir -f -p $env:ARTIFACT_STAGING_DIR/crash-reports - if (($env:OS -eq "Windows_NT") -and (Test-Path "$env:TEMP/Atom Crashes")) { + if (($env:AGENT_OS -eq "Windows_NT") -and (Test-Path "$env:TEMP/Atom Crashes")) { cp "$env:TEMP/Atom Crashes/*.dmp" $env:ARTIFACT_STAGING_DIR/crash-reports } else { cp $env:HOME/Library/Logs/DiagnosticReports/*.crash $env:ARTIFACT_STAGING_DIR/crash-reports } env: - OS: $(Agent.OS) ARTIFACT_STAGING_DIR: $(Build.ArtifactStagingDirectory) displayName: Stage Crash Reports condition: failed() From 225fb5bf52e8ad0dcbe20d00e0a3561976370cae Mon Sep 17 00:00:00 2001 From: aminya Date: Tue, 14 Jul 2020 23:05:06 -0500 Subject: [PATCH 069/119] build: using pwsh for managing env variables Azure syntax for conditional env variables has issues https://stackoverflow.com/questions/62890370/azure-pipeline-conditional-env-variable-based-on-os --- script/vsts/platforms/templates/build.yml | 61 ++++++++++++----------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/script/vsts/platforms/templates/build.yml b/script/vsts/platforms/templates/build.yml index 5d7563ad1..77fb61729 100644 --- a/script/vsts/platforms/templates/build.yml +++ b/script/vsts/platforms/templates/build.yml @@ -1,22 +1,48 @@ steps: - pwsh: | - if ($env:AGENT_OS -eq "Windows_NT") { + # OS specific env variables + if ($env:AGENT_OS -eq "Windows_NT") { + $env:SQUIRREL_TEMP="C:/tmp" + $env:BUILD_ARCH=$env:buildArch + $env:npm_config_build_from_source=true + $ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL=$env:ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL + $ATOM_WIN_CODE_SIGNING_CERT_PASSWORD=$env:ATOM_WIN_CODE_SIGNING_CERT_PASSWORD + } + if ($env:AGENT_OS -eq "Darwin") { + $ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL=$env:ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL + $ATOM_MAC_CODE_SIGNING_CERT_PASSWORD=$env:ATOM_MAC_CODE_SIGNING_CERT_PASSWORD + $ATOM_MAC_CODE_SIGNING_KEYCHAIN=$env:ATOM_MAC_CODE_SIGNING_KEYCHAIN + $ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD=$env:ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD + $AC_USER=$env:AC_USER + $AC_PASSWORD=$env:AC_PASSWORD + } + if ($env:AGENT_OS -eq "Linux") { + $env:CC=clang + $env:CXX=clang++ + $env:npm_config_clang=1 + $env:LinuxArgs="--create-debian-package --create-rpm-package" + $env:SHOULD_SIGN="false" + } + + # Build Arguments + ## Creation of Windows Installaer + if ($env:AGENT_OS -eq "Windows_NT") { mkdir -f -p $env:SQUIRREL_TEMP if ($env:IS_RELEASE_BRANCH -eq "true") { $CreateWindowsInstallaer="--create-windows-installer" - } else { - $CreateWindowsInstallaer="" } } + + ## Code Sign if ( ($env:SHOULD_SIGN -eq "true") -and (($env:IS_RELEASE_BRANCH -eq "true") -or ($env:IS_SIGNED_ZIP_BRANCH -eq "true")) ) { $CodeSign="--code-sign" - } else { - $CodeSign="" } + + # Build if (($env:AGENT_OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { - node 'script\vsts\windows-run.js' 'script\build.cmd' --no-bootstrap --compress-artifacts $env:args $CodeSign $CreateWindowsInstallaer + node 'script\vsts\windows-run.js' 'script\build.cmd' --no-bootstrap --compress-artifacts $CodeSign $CreateWindowsInstallaer } else { - script/build --no-bootstrap --compress-artifacts $env:args $CodeSign $CreateWindowsInstallaer + script/build --no-bootstrap --compress-artifacts $env:LinuxArgs $CodeSign $CreateWindowsInstallaer } displayName: Build Atom env: @@ -24,27 +50,6 @@ steps: IS_RELEASE_BRANCH: $(IsReleaseBranch) IS_SIGNED_ZIP_BRANCH: $(IsSignedZipBranch) ATOM_RELEASE_VERSION: $(ReleaseVersion) - ${{ if eq(variables['Agent.OS'], 'Windows_NT') }}: - SQUIRREL_TEMP: "C:/tmp" - BUILD_ARCH: $(buildArch) - ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL) - ATOM_WIN_CODE_SIGNING_CERT_PASSWORD: $(ATOM_WIN_CODE_SIGNING_CERT_PASSWORD) - npm_config_build_from_source: true - SHOULD_SIGN: $(SHOULD_SIGN) - ${{ if eq(variables['Agent.OS'], 'Darwin') }}: - ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL: $(ATOM_MAC_CODE_SIGNING_CERT_DOWNLOAD_URL) - ATOM_MAC_CODE_SIGNING_CERT_PASSWORD: $(ATOM_MAC_CODE_SIGNING_CERT_PASSWORD) - ATOM_MAC_CODE_SIGNING_KEYCHAIN: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN) - ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD: $(ATOM_MAC_CODE_SIGNING_KEYCHAIN_PASSWORD) - AC_USER: $(AC_USER) - AC_PASSWORD: $(AC_PASSWORD) - SHOULD_SIGN: $(SHOULD_SIGN) - ${{ if eq(variables['Agent.OS'], 'Linux') }}: - CC: clang - CXX: clang++ - npm_config_clang: 1 - args: "--create-debian-package --create-rpm-package" - SHOULD_SIGN: "false" - script: | sudo chown root ./out/atom*-amd64/chrome-sandbox From e95af73aac0a1f975f943d71646cd65c5ff0dd62 Mon Sep 17 00:00:00 2001 From: aminya Date: Tue, 14 Jul 2020 23:11:02 -0500 Subject: [PATCH 070/119] bootstrap: using pwsh for managing env variables --- script/vsts/platforms/templates/bootstrap.yml | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/script/vsts/platforms/templates/bootstrap.yml b/script/vsts/platforms/templates/bootstrap.yml index 6e10e8165..517c9965d 100644 --- a/script/vsts/platforms/templates/bootstrap.yml +++ b/script/vsts/platforms/templates/bootstrap.yml @@ -1,5 +1,23 @@ steps: - pwsh: | + # OS specific env variables + if ($env:AGENT_OS -eq "Windows_NT") { + $env:NPM_BIN_PATH="C:/hostedtoolcache/windows/node/12.13.1/x64/npm.cmd" + $env:BUILD_ARCH=$env:buildArch + $env:npm_config_build_from_source=true + } + if ($env:AGENT_OS -eq "Darwin") { + $env:NPM_BIN_PATH="/usr/local/bin/npm" + $env:npm_config_build_from_source=true + } + if ($env:AGENT_OS -eq "Linux") { + $env:NPM_BIN_PATH="/usr/local/bin/npm" + $env:CC=clang + $env:CXX=clang++ + $env:npm_config_clang=1 + } + + # Bootstrap if (($env:AGENT_OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { node 'script\vsts\windows-run.js' 'script\bootstrap.cmd' } @@ -11,15 +29,4 @@ steps: GITHUB_TOKEN: $(GITHUB_TOKEN) CI: true CI_PROVIDER: VSTS - ${{ if eq(variables['Agent.OS'], 'Windows_NT') }}: - NPM_BIN_PATH: C:/hostedtoolcache/windows/node/12.13.1/x64/npm.cmd - BUILD_ARCH: $(buildArch) - ${{ if in(variables['Agent.OS'], 'Darwin', 'Linux') }}: - NPM_BIN_PATH: /usr/local/bin/npm - ${{ if in(variables['Agent.OS'], 'Darwin', 'Windows_NT') }}: - npm_config_build_from_source: true - ${{ if eq(variables['Agent.OS'], 'Linux') }}: - CC: clang - CXX: clang++ - npm_config_clang: 1 condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) From 3da79e3d5ab0979575ac2a63a0192b34b9442888 Mon Sep 17 00:00:00 2001 From: aminya Date: Wed, 15 Jul 2020 20:49:19 -0500 Subject: [PATCH 071/119] test: using pwsh for managing env variables --- script/vsts/platforms/templates/test.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/script/vsts/platforms/templates/test.yml b/script/vsts/platforms/templates/test.yml index 2e08f3091..4e9be933f 100644 --- a/script/vsts/platforms/templates/test.yml +++ b/script/vsts/platforms/templates/test.yml @@ -1,5 +1,15 @@ steps: - pwsh: | + # OS specific env variables + if ($env:AGENT_OS -eq "Windows_NT") { + $env:BUILD_ARCH=$env:buildArch + } + if ($env:AGENT_OS -eq "Linux") { + $env:DISPLAY=":99.0" + $env:npm_config_build_from_source=true + } + + # Test if ($env:AGENT_OS -eq "Darwin") { osascript -e 'tell application "System Events" to keystroke "x"' # clear screen saver caffeinate -s script/test # Run with caffeinate to prevent screen saver @@ -9,10 +19,6 @@ steps: script/test } env: - ${{ if eq(variables['Agent.OS'], 'Windows_NT') }}: - BUILD_ARCH: $(buildArch) - ${{ if eq(variables['Agent.OS'], 'Linux') }}: - DISPLAY: :99.0 CI: true CI_PROVIDER: VSTS ATOM_JASMINE_REPORTER: list @@ -24,14 +30,17 @@ steps: # Test results - pwsh: | + # OS specific env variables + if ($env:AGENT_OS -eq "Windows_NT") { + $env:BUILD_ARCH=$env:buildArch + } + if (($env:AGENT_OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { node 'script\vsts\windows-run.js' 'script\postprocess-junit-results.cmd' --search-folder "$env:TEST_JUNIT_XML_ROOT" --test-results-files "**/*.xml" } else { script/postprocess-junit-results --search-folder "$env:TEST_JUNIT_XML_ROOT" --test-results-files "**/*.xml" } env: - ${{ if eq(variables['Agent.OS'], 'Windows_NT') }}: - BUILD_ARCH: $(buildArch) TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit displayName: Post-process test results condition: ne(variables['Atom.SkipTests'], 'true') From 7c63d85ccf9973b2db67ce045d0789947d204cb6 Mon Sep 17 00:00:00 2001 From: aminya Date: Wed, 15 Jul 2020 21:29:17 -0500 Subject: [PATCH 072/119] using pwsh for setting FileID --- script/vsts/platforms/windows.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 89051fa69..fc5416f6e 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -37,13 +37,11 @@ jobs: - template: templates/test.yml - - script: | - IF [%BUILD_ARCH%]==[x64] ( - SET FileID=-x64 - ) ELSE ( - SET FileID= - ) - echo FileID set to: %FileID% + - pwsh: | + if ($env:BUILD_ARCH -eq "x64") { + $env:FileID="-x64" + echo "##vso[task.setvariable variable=FileID]$env:FileID" # Azure syntax + } env: BUILD_ARCH: $(buildArch) displayName: Set FileID based on the arch From 5f5b93bbc8cb49b1b5fe6b1a559296c337b11127 Mon Sep 17 00:00:00 2001 From: aminya Date: Wed, 15 Jul 2020 21:36:48 -0500 Subject: [PATCH 073/119] set BUILD_ARCH in preparation use Azure syntax for passing variables between the steps --- script/vsts/platforms/templates/bootstrap.yml | 1 - script/vsts/platforms/templates/build.yml | 1 - script/vsts/platforms/templates/cache.yml | 6 +++--- script/vsts/platforms/templates/preparation.yml | 7 +++++++ script/vsts/platforms/templates/test.yml | 10 +--------- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/script/vsts/platforms/templates/bootstrap.yml b/script/vsts/platforms/templates/bootstrap.yml index 517c9965d..1d57b688d 100644 --- a/script/vsts/platforms/templates/bootstrap.yml +++ b/script/vsts/platforms/templates/bootstrap.yml @@ -3,7 +3,6 @@ steps: # OS specific env variables if ($env:AGENT_OS -eq "Windows_NT") { $env:NPM_BIN_PATH="C:/hostedtoolcache/windows/node/12.13.1/x64/npm.cmd" - $env:BUILD_ARCH=$env:buildArch $env:npm_config_build_from_source=true } if ($env:AGENT_OS -eq "Darwin") { diff --git a/script/vsts/platforms/templates/build.yml b/script/vsts/platforms/templates/build.yml index 77fb61729..9d02ffced 100644 --- a/script/vsts/platforms/templates/build.yml +++ b/script/vsts/platforms/templates/build.yml @@ -3,7 +3,6 @@ steps: # OS specific env variables if ($env:AGENT_OS -eq "Windows_NT") { $env:SQUIRREL_TEMP="C:/tmp" - $env:BUILD_ARCH=$env:buildArch $env:npm_config_build_from_source=true $ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL=$env:ATOM_WIN_CODE_SIGNING_CERT_DOWNLOAD_URL $ATOM_WIN_CODE_SIGNING_CERT_PASSWORD=$env:ATOM_WIN_CODE_SIGNING_CERT_PASSWORD diff --git a/script/vsts/platforms/templates/cache.yml b/script/vsts/platforms/templates/cache.yml index 992e35bdc..37683f403 100644 --- a/script/vsts/platforms/templates/cache.yml +++ b/script/vsts/platforms/templates/cache.yml @@ -11,20 +11,20 @@ steps: - task: Cache@2 displayName: Cache node_modules inputs: - key: 'npm | "$(Agent.OS)" | "$(buildArch)" | package.json, package-lock.json, script/vsts/platforms/${{ parameters.OS }}.yml' + key: 'npm | "$(Agent.OS)" | "$(BUILD_ARCH)" | package.json, package-lock.json, script/vsts/platforms/${{ parameters.OS }}.yml' path: 'node_modules' cacheHitVar: MainNodeModulesRestored - task: Cache@2 displayName: Cache script/node_modules inputs: - key: 'npm | "$(Agent.OS)" | "$(buildArch)" | script/package.json, script/package-lock.json, script/vsts/platforms/${{ parameters.OS }}.yml' + key: 'npm | "$(Agent.OS)" | "$(BUILD_ARCH)" | script/package.json, script/package-lock.json, script/vsts/platforms/${{ parameters.OS }}.yml' path: 'script/node_modules' cacheHitVar: ScriptNodeModulesRestored - task: Cache@2 displayName: Cache apm/node_modules inputs: - key: 'npm | "$(Agent.OS)" | "$(buildArch)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/${{ parameters.OS }}.yml' + key: 'npm | "$(Agent.OS)" | "$(BUILD_ARCH)" | apm/package.json, apm/package-lock.json, script/vsts/platforms/${{ parameters.OS }}.yml' path: 'apm/node_modules' cacheHitVar: ApmNodeModulesRestored diff --git a/script/vsts/platforms/templates/preparation.yml b/script/vsts/platforms/templates/preparation.yml index 032b8b344..5fab01263 100644 --- a/script/vsts/platforms/templates/preparation.yml +++ b/script/vsts/platforms/templates/preparation.yml @@ -28,6 +28,13 @@ steps: - script: npm install --global npm@6.12.1 displayName: Update npm + - pwsh: | + if ($env:AGENT_OS -eq "Windows_NT") { + $env:BUILD_ARCH=$env:buildArch + echo "##vso[task.setvariable variable=BUILD_ARCH]$env:BUILD_ARCH" # Azure syntax + } + echo BUILD_ARCH: $env:BUILD_ARCH + displayName: Setting globally used env variables # Windows Specific - task: UsePythonVersion@0 diff --git a/script/vsts/platforms/templates/test.yml b/script/vsts/platforms/templates/test.yml index 4e9be933f..72389353e 100644 --- a/script/vsts/platforms/templates/test.yml +++ b/script/vsts/platforms/templates/test.yml @@ -1,9 +1,6 @@ steps: - pwsh: | # OS specific env variables - if ($env:AGENT_OS -eq "Windows_NT") { - $env:BUILD_ARCH=$env:buildArch - } if ($env:AGENT_OS -eq "Linux") { $env:DISPLAY=":99.0" $env:npm_config_build_from_source=true @@ -30,11 +27,6 @@ steps: # Test results - pwsh: | - # OS specific env variables - if ($env:AGENT_OS -eq "Windows_NT") { - $env:BUILD_ARCH=$env:buildArch - } - if (($env:AGENT_OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { node 'script\vsts\windows-run.js' 'script\postprocess-junit-results.cmd' --search-folder "$env:TEST_JUNIT_XML_ROOT" --test-results-files "**/*.xml" } else { @@ -52,7 +44,7 @@ steps: searchFolder: $(Common.TestResultsDirectory)/junit testResultsFiles: '**/*.xml' mergeTestResults: true - testRunTitle: $(Agent.OS) $(buildArch) + testRunTitle: $(Agent.OS) $(BUILD_ARCH) condition: ne(variables['Atom.SkipTests'], 'true') # Crash Reports From 2d7a8df6f68dabd7bde49edb2ef6867fecc0ec94 Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 00:41:49 -0500 Subject: [PATCH 074/119] using templates in nightly-release.yml --- script/vsts/nightly-release.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 78876bab7..faff9bfec 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -35,10 +35,7 @@ jobs: ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ] steps: - - task: NodeTool@0 - inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 + - template: platforms/templates/preparation.yml #This has to be done separately because VSTS inexplicably #exits the script block after `npm install` completes. @@ -74,23 +71,15 @@ jobs: vmImage: macos-10.14 steps: - - task: NodeTool@0 - inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 + - template: platforms/templates/preparation.yml - - script: npm install --global npm@6.12.1 - displayName: Update npm + - template: platforms/templates/bootstrap.yml - - script: | - script/bootstrap - displayName: Bootstrap - - - script: | + - script: | cd script/lib npm install displayName: npm install - - script: | + - script: | cd script/lib/update-dependency node index.js displayName: Bump depedencies From ef45a89f20edce2422db912b3a836f15b618dd1b Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 00:43:15 -0500 Subject: [PATCH 075/119] using templates in release-branch-build.yml --- script/vsts/release-branch-build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index 8ea5d48e9..2385f9cc8 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -42,10 +42,7 @@ jobs: IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ] steps: - - task: NodeTool@0 - inputs: - versionSpec: 12.13.1 - displayName: Install Node.js 12.13.1 + - template: platforms/templates/preparation.yml # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. From 0c956dd3e66b47a75f036471d95e22bcea5ade66 Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 03:47:27 -0500 Subject: [PATCH 076/119] build: use esc for passing arguments --- script/vsts/platforms/templates/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/script/vsts/platforms/templates/build.yml b/script/vsts/platforms/templates/build.yml index 9d02ffced..e4eac6e64 100644 --- a/script/vsts/platforms/templates/build.yml +++ b/script/vsts/platforms/templates/build.yml @@ -38,10 +38,11 @@ steps: } # Build + $esc = '--%' if (($env:AGENT_OS -eq "Windows_NT") -and ($env:BUILD_ARCH -eq "x86")) { - node 'script\vsts\windows-run.js' 'script\build.cmd' --no-bootstrap --compress-artifacts $CodeSign $CreateWindowsInstallaer + node 'script\vsts\windows-run.js' 'script\build.cmd' --no-bootstrap --compress-artifacts $esc $CodeSign $CreateWindowsInstallaer } else { - script/build --no-bootstrap --compress-artifacts $env:LinuxArgs $CodeSign $CreateWindowsInstallaer + script/build --no-bootstrap --compress-artifacts $esc $env:LinuxArgs $CodeSign $CreateWindowsInstallaer } displayName: Build Atom env: From 52de343cc574965472a42820c68f22bb2db27583 Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 08:30:37 -0500 Subject: [PATCH 077/119] create empty FileID for x86 --- script/vsts/platforms/windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index fc5416f6e..b9bd45702 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -40,8 +40,10 @@ jobs: - pwsh: | if ($env:BUILD_ARCH -eq "x64") { $env:FileID="-x64" - echo "##vso[task.setvariable variable=FileID]$env:FileID" # Azure syntax + } else { + $env:FileID="" } + echo "##vso[task.setvariable variable=FileID]$env:FileID" # Azure syntax env: BUILD_ARCH: $(buildArch) displayName: Set FileID based on the arch From 4bdeb86c831ed6626e7badf64c4fe9fae13342c7 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Thu, 16 Jul 2020 11:18:24 -0500 Subject: [PATCH 078/119] Merge branch 'master' into electron-6.1.12-bump-electron-packager-from-git --- .gitignore | 1 + .python-version | 1 - README.md | 3 +- docs/rfcs/001-updatable-bundled-packages.md | 2 +- package-lock.json | 108 +- package.json | 20 +- .../grammars/tree-sitter-rust.cson | 2 + resources/linux/debian/lintian-overrides | 7 - script/lib/create-debian-package.js | 20 - .../fetch-outdated-dependencies.js | 80 + script/lib/update-dependency/git.js | 67 + script/lib/update-dependency/index.js | 3 + script/lib/update-dependency/main.js | 97 ++ script/lib/update-dependency/pull-request.js | 40 + .../spec/fetch-outdated-dependencies-spec.js | 27 + .../spec/fixtures/create-pr-response.json | 524 ++++++ .../lib/update-dependency/spec/fixtures/dummy | 1 + .../spec/fixtures/latest-package.json | 28 + .../spec/fixtures/search-response.json | 41 + script/lib/update-dependency/spec/git-spec.js | 94 ++ script/lib/update-dependency/spec/helpers.js | 28 + .../spec/pull-request-spec.js | 53 + .../lib/update-dependency/spec/util-spec.js | 38 + script/lib/update-dependency/util.js | 61 + script/lib/verify-machine-requirements.js | 144 +- script/package-lock.json | 1464 ++++++++++++++++- script/package.json | 7 +- script/vsts/nightly-release.yml | 30 + script/vsts/platforms/windows.yml | 2 +- script/vsts/release-branch-build.yml | 1 + spec/text-editor-component-spec.js | 14 +- src/grammar-registry.js | 6 +- src/package-manager.js | 13 +- src/ripgrep-directory-searcher.js | 2 +- src/text-editor-component.js | 4 +- src/text-editor.js | 2 +- src/uri-handler-registry.js | 2 +- 37 files changed, 2910 insertions(+), 127 deletions(-) delete mode 100644 .python-version delete mode 100644 resources/linux/debian/lintian-overrides create mode 100644 script/lib/update-dependency/fetch-outdated-dependencies.js create mode 100644 script/lib/update-dependency/git.js create mode 100644 script/lib/update-dependency/index.js create mode 100644 script/lib/update-dependency/main.js create mode 100644 script/lib/update-dependency/pull-request.js create mode 100644 script/lib/update-dependency/spec/fetch-outdated-dependencies-spec.js create mode 100644 script/lib/update-dependency/spec/fixtures/create-pr-response.json create mode 160000 script/lib/update-dependency/spec/fixtures/dummy create mode 100644 script/lib/update-dependency/spec/fixtures/latest-package.json create mode 100644 script/lib/update-dependency/spec/fixtures/search-response.json create mode 100644 script/lib/update-dependency/spec/git-spec.js create mode 100644 script/lib/update-dependency/spec/helpers.js create mode 100644 script/lib/update-dependency/spec/pull-request-spec.js create mode 100644 script/lib/update-dependency/spec/util-spec.js create mode 100644 script/lib/update-dependency/util.js diff --git a/.gitignore b/.gitignore index 5457617c5..cd95b89a0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ Thumbs.db .svn .nvm-version .vscode +.python-version node_modules npm-debug.log debug.log diff --git a/.python-version b/.python-version deleted file mode 100644 index ecc17b8e9..000000000 --- a/.python-version +++ /dev/null @@ -1 +0,0 @@ -2.7.13 diff --git a/README.md b/README.md index 23a37611b..6d2ae4f8c 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,8 @@ An archive is available for people who don't want to install `atom` as root. This version enables you to install multiple Atom versions in parallel. It has been built on Ubuntu 64-bit, but should be compatible with other Linux distributions. -1. Install dependencies (on Ubuntu): `sudo apt install git gconf2 gconf-service libgtk2.0-0 libudev1 libgcrypt20 libnotify4 libxtst6 libnss3 python gvfs-bin xdg-utils libcap2` +1. Install dependencies (on Ubuntu): `sudo apt install git gconf2 gconf-service libgtk2.0-0 libudev1 libgcrypt20 libnotify4 libxtst6 libnss3 python3 gvfs-bin xdg-utils libcap2` + 1. (If the `python3` package isn't available, or is too old (Python 3 should be >= 3.5), either `python2` or `python` (2.6 or 2.7) will work in its place.) 2. Download `atom-amd64.tar.gz` from the [Atom releases page](https://github.com/atom/atom/releases/latest). 3. Run `tar xf atom-amd64.tar.gz` in the directory where you want to extract the Atom folder. 4. Launch Atom using the installed `atom` command from the newly extracted directory. diff --git a/docs/rfcs/001-updatable-bundled-packages.md b/docs/rfcs/001-updatable-bundled-packages.md index dbf23b678..96b328e3d 100644 --- a/docs/rfcs/001-updatable-bundled-packages.md +++ b/docs/rfcs/001-updatable-bundled-packages.md @@ -60,7 +60,7 @@ The primary drawback of this approach is that Updatable bundled packages might e ### Increased Atom startup time -Another major drawback is that the snapshotted code for the bundled package will no longer be used since a newer version has been installed. This updated version of the package cannot be easily added back into Atom's snapshot so it could cause a noticable drag on Atom's startup time. Some quick measurements with Timecop show a 10x increase in GitHub package load time for bundled (snapshot) vs updated (non-snapshot) package code: +Another major drawback is that the snapshotted code for the bundled package will no longer be used since a newer version has been installed. This updated version of the package cannot be easily added back into Atom's snapshot so it could cause a noticeable drag on Atom's startup time. Some quick measurements with Timecop show a 10x increase in GitHub package load time for bundled (snapshot) vs updated (non-snapshot) package code: | GitHub Package Code | Load Time | |----------------------------------|-----------| diff --git a/package-lock.json b/package-lock.json index 17f4dfd78..0a53a08eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "atom", - "version": "1.49.0-dev", + "version": "1.50.0-dev", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1858,6 +1858,15 @@ "node-releases": "^1.1.50" } }, + "buffer": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz", + "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" + } + }, "buffer-alloc": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", @@ -3811,6 +3820,11 @@ "resolved": "https://registry.npmjs.org/idb/-/idb-4.0.5.tgz", "integrity": "sha512-P+Fk9HT2h1DhXoE1YNK183SY+CRh2GHNh28de94sGwhe0bUA75JJeVJWt3SenE5p0BXK7maflIq29dl6UZHrFw==" }, + "ieee754": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + }, "image-size": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", @@ -4301,8 +4315,8 @@ } }, "language-gfm": { - "version": "https://www.atom.io/api/packages/language-gfm/versions/0.90.7/tarball", - "integrity": "sha512-4be6dv7Nm0mzSdL9LUioMNZ4V+EQ7z9xUq+kAO+nWHjfUvTW3wOEdWAHLjRGDHDLkIa+M4YJaw20nsYC2YFhkg==" + "version": "https://www.atom.io/api/packages/language-gfm/versions/0.90.8/tarball", + "integrity": "sha512-YQ13ypnfPvQTcZ/8j6cUuLsYBoU88qqPlFTRXNXa72L1HVaahFDgG0d0a/QOdOnxrYBtmEWR/5Q3FNPwPpSehw==" }, "language-git": { "version": "https://www.atom.io/api/packages/language-git/versions/0.19.1/tarball", @@ -4369,8 +4383,8 @@ "integrity": "sha512-XXHULyFvbxAiRoj+MxIXoeO//in3bQctHZbaD72p3vFxm3klxe2ebx7b3cFmFYqf/g0eajmLrR3tR5m1Rmz1XQ==" }, "language-php": { - "version": "https://www.atom.io/api/packages/language-php/versions/0.44.4/tarball", - "integrity": "sha512-DmXEgSt32uqyrd9Fj9rDqqsmRzX7pDdYZAxO+COXVvTWvgbQPTf1Id3fwg2KxVYhXCUwVfdGVez5Xe/1OvYcCQ==" + "version": "https://www.atom.io/api/packages/language-php/versions/0.44.5/tarball", + "integrity": "sha512-MYs1c5EFZjpAJttQOD2YM+bHbeBFQXZkoeTumegMP4fa5U3mNHYraLjXZKXKggoF5Ba0DKFRV3izhf22pYAJ7A==" }, "language-property-list": { "version": "https://www.atom.io/api/packages/language-property-list/versions/0.9.1/tarball", @@ -4433,8 +4447,8 @@ "integrity": "sha512-6xFDqM6nZpynmxGKUS85iUWY0yeub7GYvLyzSOqDejMuOL5UXAITnSNcb7jhr+hQA8KTj5dCmRjphkAQER4Ucg==" }, "language-typescript": { - "version": "https://www.atom.io/api/packages/language-typescript/versions/0.6.2/tarball", - "integrity": "sha512-aSqO4xj5plYfgDcYVZBxC431h1RRkR8U4tSEgw9dFehYnxh5WHLELhsQXoLC6uwGnEen5PD7dTtKy4Qs6ZSTQw==", + "version": "https://www.atom.io/api/packages/language-typescript/versions/0.6.3/tarball", + "integrity": "sha512-F/ZnFXEF7C14/8JQ3T1kiCKVff+AB043LE5i0k3m86YsVl6IrjK6ElBNu5TsmUd7Se3STmqPfjn0Pf3280AZmg==", "requires": { "tree-sitter-typescript": "^0.16.1" } @@ -4931,6 +4945,11 @@ } } }, + "mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" + }, "mocha": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.1.tgz", @@ -5167,6 +5186,13 @@ "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "normalize-url": { @@ -5195,6 +5221,11 @@ "glob": "^7.1.3" } }, + "semver": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" + }, "temp": { "version": "0.8.4", "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz", @@ -5536,14 +5567,14 @@ } }, "prebuild-install": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.3.tgz", - "integrity": "sha512-GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g==", + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.5.tgz", + "integrity": "sha512-YmMO7dph9CYKi5IR/BzjOJlRzpxGGVo1EsLSUZ0mt/Mq0HWZIHOKHHcHdT69yG54C9m6i45GpItwRHpk0Py7Uw==", "requires": { "detect-libc": "^1.0.3", "expand-template": "^2.0.3", "github-from-package": "0.0.0", - "minimist": "^1.2.0", + "minimist": "^1.2.3", "mkdirp": "^0.5.1", "napi-build-utils": "^1.0.1", "node-abi": "^2.7.0", @@ -5558,11 +5589,13 @@ }, "dependencies": { "bl": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz", - "integrity": "sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz", + "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==", "requires": { - "readable-stream": "^3.0.1" + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" } }, "decompress-response": { @@ -5574,9 +5607,14 @@ } }, "mimic-response": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz", - "integrity": "sha512-8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", + "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==" + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "pump": { "version": "3.0.0", @@ -5588,9 +5626,9 @@ } }, "readable-stream": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz", - "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -5608,22 +5646,22 @@ } }, "tar-fs": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz", - "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz", + "integrity": "sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==", "requires": { "chownr": "^1.1.1", - "mkdirp": "^0.5.1", + "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", "tar-stream": "^2.0.0" } }, "tar-stream": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz", - "integrity": "sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.2.tgz", + "integrity": "sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q==", "requires": { - "bl": "^3.0.0", + "bl": "^4.0.1", "end-of-stream": "^1.4.1", "fs-constants": "^1.0.0", "inherits": "^2.0.3", @@ -5998,9 +6036,9 @@ "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==" }, "resolve": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.13.1.tgz", - "integrity": "sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "requires": { "path-parse": "^1.0.6" } @@ -6268,9 +6306,9 @@ } }, "semver": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", - "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==" }, "serializable": { "version": "1.0.3", diff --git a/package.json b/package.json index 78bd9e6e1..e200274f3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "1.50.0-dev", + "version": "1.51.0-dev", "description": "A hackable text editor for the 21st Century.", "main": "./src/main-process/main.js", "repository": { @@ -84,7 +84,7 @@ "language-coffee-script": "https://www.atom.io/api/packages/language-coffee-script/versions/0.50.0/tarball", "language-csharp": "https://www.atom.io/api/packages/language-csharp/versions/1.1.0/tarball", "language-css": "https://www.atom.io/api/packages/language-css/versions/0.44.4/tarball", - "language-gfm": "https://www.atom.io/api/packages/language-gfm/versions/0.90.7/tarball", + "language-gfm": "https://www.atom.io/api/packages/language-gfm/versions/0.90.8/tarball", "language-git": "https://www.atom.io/api/packages/language-git/versions/0.19.1/tarball", "language-go": "https://www.atom.io/api/packages/language-go/versions/0.47.2/tarball", "language-html": "https://www.atom.io/api/packages/language-html/versions/0.53.1/tarball", @@ -97,7 +97,7 @@ "language-mustache": "https://www.atom.io/api/packages/language-mustache/versions/0.14.5/tarball", "language-objective-c": "https://www.atom.io/api/packages/language-objective-c/versions/0.16.0/tarball", "language-perl": "https://www.atom.io/api/packages/language-perl/versions/0.38.1/tarball", - "language-php": "https://www.atom.io/api/packages/language-php/versions/0.44.4/tarball", + "language-php": "https://www.atom.io/api/packages/language-php/versions/0.44.5/tarball", "language-property-list": "https://www.atom.io/api/packages/language-property-list/versions/0.9.1/tarball", "language-python": "https://www.atom.io/api/packages/language-python/versions/0.53.4/tarball", "language-ruby": "https://www.atom.io/api/packages/language-ruby/versions/0.72.23/tarball", @@ -110,7 +110,7 @@ "language-text": "https://www.atom.io/api/packages/language-text/versions/0.7.4/tarball", "language-todo": "https://www.atom.io/api/packages/language-todo/versions/0.29.4/tarball", "language-toml": "https://www.atom.io/api/packages/language-toml/versions/0.20.0/tarball", - "language-typescript": "https://www.atom.io/api/packages/language-typescript/versions/0.6.2/tarball", + "language-typescript": "https://www.atom.io/api/packages/language-typescript/versions/0.6.3/tarball", "language-xml": "https://www.atom.io/api/packages/language-xml/versions/0.35.3/tarball", "language-yaml": "https://www.atom.io/api/packages/language-yaml/versions/0.32.0/tarball", "less-cache": "1.1.0", @@ -137,15 +137,15 @@ "pathwatcher": "8.1.0", "postcss": "5.2.4", "postcss-selector-parser": "2.2.1", - "prebuild-install": "^5.3.3", + "prebuild-install": "5.3.5", "property-accessors": "^1.1.3", "random-words": "0.0.1", - "resolve": "^1.1.6", + "resolve": "1.17.0", "scandal": "^3.2.0", "scoped-property-store": "^0.17.0", "scrollbar-style": "3.2.1", "season": "^6.0.2", - "semver": "^4.3.3", + "semver": "7.3.2", "service-hub": "^0.7.4", "settings-view": "https://www.atom.io/api/packages/settings-view/versions/0.261.4/tarball", "sinon": "1.17.4", @@ -236,7 +236,7 @@ "language-coffee-script": "0.50.0", "language-csharp": "1.1.0", "language-css": "0.44.4", - "language-gfm": "0.90.7", + "language-gfm": "0.90.8", "language-git": "0.19.1", "language-go": "0.47.2", "language-html": "0.53.1", @@ -249,7 +249,7 @@ "language-mustache": "0.14.5", "language-objective-c": "0.16.0", "language-perl": "0.38.1", - "language-php": "0.44.4", + "language-php": "0.44.5", "language-property-list": "0.9.1", "language-python": "0.53.4", "language-ruby": "0.72.23", @@ -262,7 +262,7 @@ "language-text": "0.7.4", "language-todo": "0.29.4", "language-toml": "0.20.0", - "language-typescript": "0.6.2", + "language-typescript": "0.6.3", "language-xml": "0.35.3", "language-yaml": "0.32.0" }, diff --git a/packages/language-rust-bundled/grammars/tree-sitter-rust.cson b/packages/language-rust-bundled/grammars/tree-sitter-rust.cson index 651e2e247..ef011c924 100644 --- a/packages/language-rust-bundled/grammars/tree-sitter-rust.cson +++ b/packages/language-rust-bundled/grammars/tree-sitter-rust.cson @@ -131,6 +131,8 @@ scopes: '"where"': 'keyword.control' '"ref"': 'keyword.control' '"macro_rules!"': 'keyword.control' + '"async"': 'keyword.control' + '"await"': 'keyword.control' '"as"': 'keyword.operator' diff --git a/resources/linux/debian/lintian-overrides b/resources/linux/debian/lintian-overrides deleted file mode 100644 index 8a33af0a7..000000000 --- a/resources/linux/debian/lintian-overrides +++ /dev/null @@ -1,7 +0,0 @@ -atom: arch-dependent-file-in-usr-share -atom: changelog-file-missing-in-native-package -atom: copyright-file-contains-full-apache-2-license -atom: copyright-should-refer-to-common-license-file-for-apache-2 -atom: embedded-library -atom: package-installs-python-bytecode -atom: unstripped-binary-or-object diff --git a/script/lib/create-debian-package.js b/script/lib/create-debian-package.js index 33c0e38e4..c354bf67c 100644 --- a/script/lib/create-debian-package.js +++ b/script/lib/create-debian-package.js @@ -54,11 +54,6 @@ module.exports = function(packagedAppPath) { debianPackageShareDirPath, 'pixmaps' ); - const debianPackageLintianOverridesDirPath = path.join( - debianPackageShareDirPath, - 'lintian', - 'overrides' - ); const debianPackageDocsDirPath = path.join( debianPackageShareDirPath, 'doc', @@ -93,7 +88,6 @@ module.exports = function(packagedAppPath) { fs.mkdirpSync(debianPackageShareDirPath); fs.mkdirpSync(debianPackageApplicationsDirPath); fs.mkdirpSync(debianPackageIconsDirPath); - fs.mkdirpSync(debianPackageLintianOverridesDirPath); fs.mkdirpSync(debianPackageDocsDirPath); fs.mkdirpSync(debianPackageBinDirPath); @@ -192,20 +186,6 @@ module.exports = function(packagedAppPath) { path.join(debianPackageDocsDirPath, 'copyright') ); - console.log( - `Copying lintian overrides into "${debianPackageLintianOverridesDirPath}"` - ); - fs.copySync( - path.join( - CONFIG.repositoryRootPath, - 'resources', - 'linux', - 'debian', - 'lintian-overrides' - ), - path.join(debianPackageLintianOverridesDirPath, atomExecutableName) - ); - console.log( `Copying polkit configuration into "${debianPackageShareDirPath}"` ); diff --git a/script/lib/update-dependency/fetch-outdated-dependencies.js b/script/lib/update-dependency/fetch-outdated-dependencies.js new file mode 100644 index 000000000..7678784f7 --- /dev/null +++ b/script/lib/update-dependency/fetch-outdated-dependencies.js @@ -0,0 +1,80 @@ +const fetch = require('node-fetch'); +const npmCheck = require('npm-check'); + +// this may be updated to use github releases instead +const apm = async function({ dependencies, packageDependencies }) { + try { + console.log('Checking apm registry...'); + const coreDependencies = Object.keys(dependencies).filter(dependency => { + // all core packages point to a remote url + return dependencies[dependency].match(new RegExp('^https?://')); + }); + + const promises = coreDependencies.map(async dependency => { + return fetch(`https://atom.io/api/packages/${dependency}`) + .then(res => res.json()) + .then(res => res) + .catch(ex => console.log(ex.message)); + }); + + const packages = await Promise.all(promises); + const outdatedPackages = []; + packages.map(dependency => { + if (dependency.hasOwnProperty('name')) { + const latestVersion = dependency.releases.latest; + const installed = packageDependencies[dependency.name]; + if (latestVersion > installed) { + outdatedPackages.push({ + moduleName: dependency.name, + latest: dependency.releases.latest, + isCorePackage: true, + installed + }); + } + } + }); + + console.log(`${outdatedPackages.length} outdated package(s) found`); + + return outdatedPackages; + } catch (ex) { + console.error(`An error occured: ${ex.message}`); + } +}; + +const npm = async function(cwd) { + try { + console.log('Checking npm registry...'); + + const currentState = await npmCheck({ + cwd, + ignoreDev: true, + skipUnused: true + }); + const outdatedPackages = currentState + .get('packages') + .filter(p => { + if (p.packageJson && p.latest && p.installed) { + return p.latest > p.installed; + } + }) + .map(({ packageJson, installed, moduleName, latest }) => ({ + packageJson, + installed, + moduleName, + latest, + isCorePackage: false + })); + + console.log(`${outdatedPackages.length} outdated package(s) found`); + + return outdatedPackages; + } catch (ex) { + console.error(`An error occured: ${ex.message}`); + } +}; + +module.exports = { + apm, + npm +}; diff --git a/script/lib/update-dependency/git.js b/script/lib/update-dependency/git.js new file mode 100644 index 000000000..a9f8843fe --- /dev/null +++ b/script/lib/update-dependency/git.js @@ -0,0 +1,67 @@ +const git = (git, repositoryRootPath) => { + const path = require('path'); + const packageJsonFilePath = path.join(repositoryRootPath, 'package.json'); + const packageLockFilePath = path.join( + repositoryRootPath, + 'package-lock.json' + ); + try { + git.getRemotes((err, remotes) => { + if (!err && !remotes.map(({ name }) => name).includes('ATOM')) { + git.addRemote( + 'ATOM', + `https://atom:${process.env.AUTH_TOKEN}@github.com/atom/atom.git/` + ); + } + }); + } catch (ex) { + console.log(ex.message); + } + return { + switchToMaster: async function() { + const { current } = await git.branch(); + if (current !== 'master') { + await git.checkout('master'); + } + }, + makeBranch: async function(dependency) { + const newBranch = `${dependency.moduleName}-${dependency.latest}`; + const { branches } = await git.branch(); + const { files } = await git.status(); + if (files.length > 0) { + await git.reset('hard'); + } + const found = Object.keys(branches).find( + branch => branch.indexOf(newBranch) > -1 + ); + found + ? await git.checkout(found) + : await git.checkoutLocalBranch(newBranch); + return { found, newBranch }; + }, + createCommit: async function({ moduleName, latest }) { + try { + const commitMessage = `:arrow_up: ${moduleName}@${latest}`; + await git.add([packageJsonFilePath, packageLockFilePath]); + await git.commit(commitMessage); + } catch (ex) { + throw Error(ex.message); + } + }, + publishBranch: async function(branch) { + try { + await git.push('ATOM', branch); + } catch (ex) { + throw Error(ex.message); + } + }, + deleteBranch: async function(branch) { + try { + await git.deleteLocalBranch(branch, true); + } catch (ex) { + throw Error(ex.message); + } + } + }; +}; +module.exports = git; diff --git a/script/lib/update-dependency/index.js b/script/lib/update-dependency/index.js new file mode 100644 index 000000000..3348f0c41 --- /dev/null +++ b/script/lib/update-dependency/index.js @@ -0,0 +1,3 @@ +const run = require('./main'); + +run(); diff --git a/script/lib/update-dependency/main.js b/script/lib/update-dependency/main.js new file mode 100644 index 000000000..9cfeb099e --- /dev/null +++ b/script/lib/update-dependency/main.js @@ -0,0 +1,97 @@ +/* eslint-disable camelcase */ +const simpleGit = require('simple-git'); +const path = require('path'); + +const { repositoryRootPath } = require('../../config'); +const packageJSON = require(path.join(repositoryRootPath, 'package.json')); +const git = simpleGit(repositoryRootPath); +const { createPR, findPR, addLabel } = require('./pull-request'); +const runApmInstall = require('../run-apm-install'); +const { + makeBranch, + createCommit, + switchToMaster, + publishBranch, + deleteBranch +} = require('./git')(git, repositoryRootPath); +const { updatePackageJson, sleep } = require('./util')(repositoryRootPath); +const fetchOutdatedDependencies = require('./fetch-outdated-dependencies'); + +module.exports = async function() { + try { + // ensure we are on master + await switchToMaster(); + const failedBumps = []; + const successfullBumps = []; + const outdateDependencies = [ + ...(await fetchOutdatedDependencies.npm(repositoryRootPath)), + ...(await fetchOutdatedDependencies.apm(packageJSON)) + ]; + const totalDependencies = outdateDependencies.length; + const pendingPRs = []; + for (const dependency of outdateDependencies) { + const { found, newBranch } = await makeBranch(dependency); + if (found) { + console.log(`Branch was found ${found}`); + console.log('checking if a PR already exists'); + const { + data: { total_count } + } = await findPR(dependency, newBranch); + if (total_count > 0) { + console.log(`pull request found!`); + } else { + console.log(`pull request not found!`); + const pr = { dependency, branch: newBranch, branchIsRemote: false }; + // confirm if branch found is a local branch + if (found.indexOf('remotes') === -1) { + await publishBranch(found); + } else { + pr.branchIsRemote = true; + } + pendingPRs.push(pr); + } + } else { + await updatePackageJson(dependency); + runApmInstall(repositoryRootPath, false); + await createCommit(dependency); + await publishBranch(newBranch); + pendingPRs.push({ + dependency, + branch: newBranch, + branchIsRemote: false + }); + } + + await switchToMaster(); + } + // create PRs here + for (const { dependency, branch, branchIsRemote } of pendingPRs) { + const { status, data = {} } = await createPR(dependency, branch); + if (status === 201) { + successfullBumps.push(dependency); + await addLabel(data.number); + } else { + failedBumps.push(dependency); + } + + if (!branchIsRemote) { + await deleteBranch(branch); + } + // https://developer.github.com/v3/guides/best-practices-for-integrators/#dealing-with-abuse-rate-limits + await sleep(2000); + } + console.table([ + { + totalDependencies, + totalSuccessfullBumps: successfullBumps.length, + totalFailedBumps: failedBumps.length + } + ]); + console.log('Successfull bumps'); + console.table(successfullBumps); + console.log('Failed bumps'); + console.table(failedBumps); + } catch (ex) { + console.log(ex.message); + } +}; diff --git a/script/lib/update-dependency/pull-request.js b/script/lib/update-dependency/pull-request.js new file mode 100644 index 000000000..f10a3540d --- /dev/null +++ b/script/lib/update-dependency/pull-request.js @@ -0,0 +1,40 @@ +const { request } = require('@octokit/request'); + +const requestWithAuth = request.defaults({ + baseUrl: 'https://api.github.com', + headers: { + 'user-agent': 'atom', + authorization: `token ${process.env.AUTH_TOKEN}` + }, + owner: 'atom', + repo: 'atom' +}); + +module.exports = { + createPR: async ( + { moduleName, isCorePackage, latest, installed }, + branch + ) => { + let description = `Bumps ${moduleName} from ${installed} to ${latest}`; + if (isCorePackage) { + description = `*List of changes between ${moduleName}@${installed} and ${moduleName}@${latest}: https://github.com/atom/${moduleName}/compare/v${installed}...v${latest}*`; + } + return requestWithAuth('POST /repos/:owner/:repo/pulls', { + title: `⬆️ ${moduleName}@${latest}`, + body: description, + base: 'master', + head: branch + }); + }, + findPR: async ({ moduleName, latest }, branch) => { + return requestWithAuth('GET /search/issues', { + q: `${moduleName} type:pr ${moduleName}@${latest} in:title repo:atom/atom head:${branch} state:open` + }); + }, + addLabel: async pullRequestNumber => { + return requestWithAuth('PATCH /repos/:owner/:repo/issues/:issue_number', { + labels: ['depency ⬆️'], + issue_number: pullRequestNumber + }); + } +}; diff --git a/script/lib/update-dependency/spec/fetch-outdated-dependencies-spec.js b/script/lib/update-dependency/spec/fetch-outdated-dependencies-spec.js new file mode 100644 index 000000000..2660d4e70 --- /dev/null +++ b/script/lib/update-dependency/spec/fetch-outdated-dependencies-spec.js @@ -0,0 +1,27 @@ +const path = require('path'); +const fetchOutdatedDependencies = require('../fetch-outdated-dependencies'); +const { nativeDependencies } = require('./helpers'); +const repositoryRootPath = path.resolve('.', 'fixtures', 'dummy'); +const packageJSON = require(path.join(repositoryRootPath, 'package.json')); + +describe('Fetch outdated dependencies', function() { + it('should fetch outdated native dependencies', async () => { + spyOn(fetchOutdatedDependencies, 'npm').andReturn( + Promise.resolve(nativeDependencies) + ); + + expect(await fetchOutdatedDependencies.npm(repositoryRootPath)).toEqual( + nativeDependencies + ); + }); + + it('should fetch outdated core dependencies', async () => { + spyOn(fetchOutdatedDependencies, 'apm').andReturn( + Promise.resolve(nativeDependencies) + ); + + expect(await fetchOutdatedDependencies.apm(packageJSON)).toEqual( + nativeDependencies + ); + }); +}); diff --git a/script/lib/update-dependency/spec/fixtures/create-pr-response.json b/script/lib/update-dependency/spec/fixtures/create-pr-response.json new file mode 100644 index 000000000..351e48998 --- /dev/null +++ b/script/lib/update-dependency/spec/fixtures/create-pr-response.json @@ -0,0 +1,524 @@ +{ + "url": "https://api.github.com/repos/atom/octocat/pulls/1347", + "id": 1, + "node_id": "MDExOlB1bGxSZXF1ZXN0MQ==", + "html_url": "https://github.com/atom/octocat/pull/1347", + "diff_url": "https://github.com/atom/octocat/pull/1347.diff", + "patch_url": "https://github.com/atom/octocat/pull/1347.patch", + "issue_url": "https://api.github.com/repos/atom/octocat/issues/1347", + "commits_url": "https://api.github.com/repos/atom/octocat/pulls/1347/commits", + "review_comments_url": "https://api.github.com/repos/atom/octocat/pulls/1347/comments", + "review_comment_url": "https://api.github.com/repos/atom/octocat/pulls/comments{/number}", + "comments_url": "https://api.github.com/repos/atom/octocat/issues/1347/comments", + "statuses_url": "https://api.github.com/repos/atom/octocat/statuses/6dcb09b5b57875f334f61aebed695e2e4193db5e", + "number": 1347, + "state": "open", + "locked": true, + "title": "⬆️ octocat@2.0.0", + "user": { + "login": "octocat", + "id": 1, + "node_id": "MDQ6VXNlcjE=", + "avatar_url": "https://github.com/images/error/octocat_happy.gif", + "gravatar_id": "", + "url": "https://api.github.com/users/octocat", + "html_url": "https://github.com/octocat", + "followers_url": "https://api.github.com/users/octocat/followers", + "following_url": "https://api.github.com/users/octocat/following{/other_user}", + "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/octocat/subscriptions", + "organizations_url": "https://api.github.com/users/octocat/orgs", + "repos_url": "https://api.github.com/users/octocat/repos", + "events_url": "https://api.github.com/users/octocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/octocat/received_events", + "type": "User", + "site_admin": false + }, + "body": "Bumps octocat from 1.0.0 to 2.0.0", + "labels": [ + { + "id": 208045946, + "node_id": "MDU6TGFiZWwyMDgwNDU5NDY=", + "url": "https://api.github.com/repos/atom/octocat/labels/bug", + "name": "bug", + "description": "Something isn't working", + "color": "f29513", + "default": true + } + ], + "milestone": { + "url": "https://api.github.com/repos/atom/octocat/milestones/1", + "html_url": "https://github.com/atom/octocat/milestones/v1.0", + "labels_url": "https://api.github.com/repos/atom/octocat/milestones/1/labels", + "id": 1002604, + "node_id": "MDk6TWlsZXN0b25lMTAwMjYwNA==", + "number": 1, + "state": "open", + "title": "v1.0", + "description": "Tracking milestone for version 1.0", + "creator": { + "login": "octocat", + "id": 1, + "node_id": "MDQ6VXNlcjE=", + "avatar_url": "https://github.com/images/error/octocat_happy.gif", + "gravatar_id": "", + "url": "https://api.github.com/users/octocat", + "html_url": "https://github.com/octocat", + "followers_url": "https://api.github.com/users/octocat/followers", + "following_url": "https://api.github.com/users/octocat/following{/other_user}", + "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/octocat/subscriptions", + "organizations_url": "https://api.github.com/users/octocat/orgs", + "repos_url": "https://api.github.com/users/octocat/repos", + "events_url": "https://api.github.com/users/octocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/octocat/received_events", + "type": "User", + "site_admin": false + }, + "open_issues": 4, + "closed_issues": 8, + "created_at": "2011-04-10T20:09:31Z", + "updated_at": "2014-03-03T18:58:10Z", + "closed_at": "2013-02-12T13:22:01Z", + "due_on": "2012-10-09T23:39:01Z" + }, + "active_lock_reason": "too heated", + "created_at": "2011-01-26T19:01:12Z", + "updated_at": "2011-01-26T19:01:12Z", + "closed_at": "2011-01-26T19:01:12Z", + "merged_at": "2011-01-26T19:01:12Z", + "merge_commit_sha": "e5bd3914e2e596debea16f433f57875b5b90bcd6", + "assignee": { + "login": "octocat", + "id": 1, + "node_id": "MDQ6VXNlcjE=", + "avatar_url": "https://github.com/images/error/octocat_happy.gif", + "gravatar_id": "", + "url": "https://api.github.com/users/octocat", + "html_url": "https://github.com/octocat", + "followers_url": "https://api.github.com/users/octocat/followers", + "following_url": "https://api.github.com/users/octocat/following{/other_user}", + "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/octocat/subscriptions", + "organizations_url": "https://api.github.com/users/octocat/orgs", + "repos_url": "https://api.github.com/users/octocat/repos", + "events_url": "https://api.github.com/users/octocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/octocat/received_events", + "type": "User", + "site_admin": false + }, + "assignees": [ + { + "login": "octocat", + "id": 1, + "node_id": "MDQ6VXNlcjE=", + "avatar_url": "https://github.com/images/error/octocat_happy.gif", + "gravatar_id": "", + "url": "https://api.github.com/users/octocat", + "html_url": "https://github.com/octocat", + "followers_url": "https://api.github.com/users/octocat/followers", + "following_url": "https://api.github.com/users/octocat/following{/other_user}", + "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/octocat/subscriptions", + "organizations_url": "https://api.github.com/users/octocat/orgs", + "repos_url": "https://api.github.com/users/octocat/repos", + "events_url": "https://api.github.com/users/octocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/octocat/received_events", + "type": "User", + "site_admin": false + }, + { + "login": "hubot", + "id": 1, + "node_id": "MDQ6VXNlcjE=", + "avatar_url": "https://github.com/images/error/hubot_happy.gif", + "gravatar_id": "", + "url": "https://api.github.com/users/hubot", + "html_url": "https://github.com/hubot", + "followers_url": "https://api.github.com/users/hubot/followers", + "following_url": "https://api.github.com/users/hubot/following{/other_user}", + "gists_url": "https://api.github.com/users/hubot/gists{/gist_id}", + "starred_url": "https://api.github.com/users/hubot/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/hubot/subscriptions", + "organizations_url": "https://api.github.com/users/hubot/orgs", + "repos_url": "https://api.github.com/users/hubot/repos", + "events_url": "https://api.github.com/users/hubot/events{/privacy}", + "received_events_url": "https://api.github.com/users/hubot/received_events", + "type": "User", + "site_admin": true + } + ], + "requested_reviewers": [ + { + "login": "other_user", + "id": 1, + "node_id": "MDQ6VXNlcjE=", + "avatar_url": "https://github.com/images/error/other_user_happy.gif", + "gravatar_id": "", + "url": "https://api.github.com/users/other_user", + "html_url": "https://github.com/other_user", + "followers_url": "https://api.github.com/users/other_user/followers", + "following_url": "https://api.github.com/users/other_user/following{/other_user}", + "gists_url": "https://api.github.com/users/other_user/gists{/gist_id}", + "starred_url": "https://api.github.com/users/other_user/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/other_user/subscriptions", + "organizations_url": "https://api.github.com/users/other_user/orgs", + "repos_url": "https://api.github.com/users/other_user/repos", + "events_url": "https://api.github.com/users/other_user/events{/privacy}", + "received_events_url": "https://api.github.com/users/other_user/received_events", + "type": "User", + "site_admin": false + } + ], + "requested_teams": [ + { + "id": 1, + "node_id": "MDQ6VGVhbTE=", + "url": "https://api.github.com/teams/1", + "html_url": "https://api.github.com/teams/justice-league", + "name": "Justice League", + "slug": "justice-league", + "description": "A great team.", + "privacy": "closed", + "permission": "admin", + "members_url": "https://api.github.com/teams/1/members{/member}", + "repositories_url": "https://api.github.com/teams/1/repos", + "parent": null + } + ], + "head": { + "label": "atom:octocat-2.0.0", + "ref": "octocat-2.0.0", + "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e", + "user": { + "login": "octocat", + "id": 1, + "node_id": "MDQ6VXNlcjE=", + "avatar_url": "https://github.com/images/error/octocat_happy.gif", + "gravatar_id": "", + "url": "https://api.github.com/users/octocat", + "html_url": "https://github.com/octocat", + "followers_url": "https://api.github.com/users/octocat/followers", + "following_url": "https://api.github.com/users/octocat/following{/other_user}", + "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/octocat/subscriptions", + "organizations_url": "https://api.github.com/users/octocat/orgs", + "repos_url": "https://api.github.com/users/octocat/repos", + "events_url": "https://api.github.com/users/octocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/octocat/received_events", + "type": "User", + "site_admin": false + }, + "repo": { + "id": 1296269, + "node_id": "MDEwOlJlcG9zaXRvcnkxMjk2MjY5", + "name": "Hello-World", + "full_name": "atom/octocat", + "owner": { + "login": "octocat", + "id": 1, + "node_id": "MDQ6VXNlcjE=", + "avatar_url": "https://github.com/images/error/octocat_happy.gif", + "gravatar_id": "", + "url": "https://api.github.com/users/octocat", + "html_url": "https://github.com/octocat", + "followers_url": "https://api.github.com/users/octocat/followers", + "following_url": "https://api.github.com/users/octocat/following{/other_user}", + "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/octocat/subscriptions", + "organizations_url": "https://api.github.com/users/octocat/orgs", + "repos_url": "https://api.github.com/users/octocat/repos", + "events_url": "https://api.github.com/users/octocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/octocat/received_events", + "type": "User", + "site_admin": false + }, + "private": false, + "html_url": "https://github.com/atom/octocat", + "description": "This your first repo!", + "fork": false, + "url": "https://api.github.com/repos/atom/octocat", + "archive_url": "http://api.github.com/repos/atom/octocat/{archive_format}{/ref}", + "assignees_url": "http://api.github.com/repos/atom/octocat/assignees{/user}", + "blobs_url": "http://api.github.com/repos/atom/octocat/git/blobs{/sha}", + "branches_url": "http://api.github.com/repos/atom/octocat/branches{/branch}", + "collaborators_url": "http://api.github.com/repos/atom/octocat/collaborators{/collaborator}", + "comments_url": "http://api.github.com/repos/atom/octocat/comments{/number}", + "commits_url": "http://api.github.com/repos/atom/octocat/commits{/sha}", + "compare_url": "http://api.github.com/repos/atom/octocat/compare/{base}...{head}", + "contents_url": "http://api.github.com/repos/atom/octocat/contents/{+path}", + "contributors_url": "http://api.github.com/repos/atom/octocat/contributors", + "deployments_url": "http://api.github.com/repos/atom/octocat/deployments", + "downloads_url": "http://api.github.com/repos/atom/octocat/downloads", + "events_url": "http://api.github.com/repos/atom/octocat/events", + "forks_url": "http://api.github.com/repos/atom/octocat/forks", + "git_commits_url": "http://api.github.com/repos/atom/octocat/git/commits{/sha}", + "git_refs_url": "http://api.github.com/repos/atom/octocat/git/refs{/sha}", + "git_tags_url": "http://api.github.com/repos/atom/octocat/git/tags{/sha}", + "git_url": "git:github.com/atom/octocat.git", + "issue_comment_url": "http://api.github.com/repos/atom/octocat/issues/comments{/number}", + "issue_events_url": "http://api.github.com/repos/atom/octocat/issues/events{/number}", + "issues_url": "http://api.github.com/repos/atom/octocat/issues{/number}", + "keys_url": "http://api.github.com/repos/atom/octocat/keys{/key_id}", + "labels_url": "http://api.github.com/repos/atom/octocat/labels{/name}", + "languages_url": "http://api.github.com/repos/atom/octocat/languages", + "merges_url": "http://api.github.com/repos/atom/octocat/merges", + "milestones_url": "http://api.github.com/repos/atom/octocat/milestones{/number}", + "notifications_url": "http://api.github.com/repos/atom/octocat/notifications{?since,all,participating}", + "pulls_url": "http://api.github.com/repos/atom/octocat/pulls{/number}", + "releases_url": "http://api.github.com/repos/atom/octocat/releases{/id}", + "ssh_url": "git@github.com:atom/octocat.git", + "stargazers_url": "http://api.github.com/repos/atom/octocat/stargazers", + "statuses_url": "http://api.github.com/repos/atom/octocat/statuses/{sha}", + "subscribers_url": "http://api.github.com/repos/atom/octocat/subscribers", + "subscription_url": "http://api.github.com/repos/atom/octocat/subscription", + "tags_url": "http://api.github.com/repos/atom/octocat/tags", + "teams_url": "http://api.github.com/repos/atom/octocat/teams", + "trees_url": "http://api.github.com/repos/atom/octocat/git/trees{/sha}", + "clone_url": "https://github.com/atom/octocat.git", + "mirror_url": "git:git.example.com/atom/octocat", + "hooks_url": "http://api.github.com/repos/atom/octocat/hooks", + "svn_url": "https://svn.github.com/atom/octocat", + "homepage": "https://github.com", + "language": null, + "forks_count": 9, + "stargazers_count": 80, + "watchers_count": 80, + "size": 108, + "default_branch": "master", + "open_issues_count": 0, + "is_template": true, + "topics": [ + "octocat", + "atom", + "electron", + "api" + ], + "has_issues": true, + "has_projects": true, + "has_wiki": true, + "has_pages": false, + "has_downloads": true, + "archived": false, + "disabled": false, + "visibility": "public", + "pushed_at": "2011-01-26T19:06:43Z", + "created_at": "2011-01-26T19:01:12Z", + "updated_at": "2011-01-26T19:14:43Z", + "permissions": { + "admin": false, + "push": false, + "pull": true + }, + "allow_rebase_merge": true, + "template_repository": null, + "temp_clone_token": "ABTLWHOULUVAXGTRYU7OC2876QJ2O", + "allow_squash_merge": true, + "delete_branch_on_merge": true, + "allow_merge_commit": true, + "subscribers_count": 42, + "network_count": 0 + } + }, + "base": { + "label": "octocat:master", + "ref": "master", + "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e", + "user": { + "login": "octocat", + "id": 1, + "node_id": "MDQ6VXNlcjE=", + "avatar_url": "https://github.com/images/error/octocat_happy.gif", + "gravatar_id": "", + "url": "https://api.github.com/users/octocat", + "html_url": "https://github.com/octocat", + "followers_url": "https://api.github.com/users/octocat/followers", + "following_url": "https://api.github.com/users/octocat/following{/other_user}", + "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/octocat/subscriptions", + "organizations_url": "https://api.github.com/users/octocat/orgs", + "repos_url": "https://api.github.com/users/octocat/repos", + "events_url": "https://api.github.com/users/octocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/octocat/received_events", + "type": "User", + "site_admin": false + }, + "repo": { + "id": 1296269, + "node_id": "MDEwOlJlcG9zaXRvcnkxMjk2MjY5", + "name": "Hello-World", + "full_name": "atom/octocat", + "owner": { + "login": "octocat", + "id": 1, + "node_id": "MDQ6VXNlcjE=", + "avatar_url": "https://github.com/images/error/octocat_happy.gif", + "gravatar_id": "", + "url": "https://api.github.com/users/octocat", + "html_url": "https://github.com/octocat", + "followers_url": "https://api.github.com/users/octocat/followers", + "following_url": "https://api.github.com/users/octocat/following{/other_user}", + "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/octocat/subscriptions", + "organizations_url": "https://api.github.com/users/octocat/orgs", + "repos_url": "https://api.github.com/users/octocat/repos", + "events_url": "https://api.github.com/users/octocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/octocat/received_events", + "type": "User", + "site_admin": false + }, + "private": false, + "html_url": "https://github.com/atom/octocat", + "description": "This your first repo!", + "fork": false, + "url": "https://api.github.com/repos/atom/octocat", + "archive_url": "http://api.github.com/repos/atom/octocat/{archive_format}{/ref}", + "assignees_url": "http://api.github.com/repos/atom/octocat/assignees{/user}", + "blobs_url": "http://api.github.com/repos/atom/octocat/git/blobs{/sha}", + "branches_url": "http://api.github.com/repos/atom/octocat/branches{/branch}", + "collaborators_url": "http://api.github.com/repos/atom/octocat/collaborators{/collaborator}", + "comments_url": "http://api.github.com/repos/atom/octocat/comments{/number}", + "commits_url": "http://api.github.com/repos/atom/octocat/commits{/sha}", + "compare_url": "http://api.github.com/repos/atom/octocat/compare/{base}...{head}", + "contents_url": "http://api.github.com/repos/atom/octocat/contents/{+path}", + "contributors_url": "http://api.github.com/repos/atom/octocat/contributors", + "deployments_url": "http://api.github.com/repos/atom/octocat/deployments", + "downloads_url": "http://api.github.com/repos/atom/octocat/downloads", + "events_url": "http://api.github.com/repos/atom/octocat/events", + "forks_url": "http://api.github.com/repos/atom/octocat/forks", + "git_commits_url": "http://api.github.com/repos/atom/octocat/git/commits{/sha}", + "git_refs_url": "http://api.github.com/repos/atom/octocat/git/refs{/sha}", + "git_tags_url": "http://api.github.com/repos/atom/octocat/git/tags{/sha}", + "git_url": "git:github.com/atom/octocat.git", + "issue_comment_url": "http://api.github.com/repos/atom/octocat/issues/comments{/number}", + "issue_events_url": "http://api.github.com/repos/atom/octocat/issues/events{/number}", + "issues_url": "http://api.github.com/repos/atom/octocat/issues{/number}", + "keys_url": "http://api.github.com/repos/atom/octocat/keys{/key_id}", + "labels_url": "http://api.github.com/repos/atom/octocat/labels{/name}", + "languages_url": "http://api.github.com/repos/atom/octocat/languages", + "merges_url": "http://api.github.com/repos/atom/octocat/merges", + "milestones_url": "http://api.github.com/repos/atom/octocat/milestones{/number}", + "notifications_url": "http://api.github.com/repos/atom/octocat/notifications{?since,all,participating}", + "pulls_url": "http://api.github.com/repos/atom/octocat/pulls{/number}", + "releases_url": "http://api.github.com/repos/atom/octocat/releases{/id}", + "ssh_url": "git@github.com:atom/octocat.git", + "stargazers_url": "http://api.github.com/repos/atom/octocat/stargazers", + "statuses_url": "http://api.github.com/repos/atom/octocat/statuses/{sha}", + "subscribers_url": "http://api.github.com/repos/atom/octocat/subscribers", + "subscription_url": "http://api.github.com/repos/atom/octocat/subscription", + "tags_url": "http://api.github.com/repos/atom/octocat/tags", + "teams_url": "http://api.github.com/repos/atom/octocat/teams", + "trees_url": "http://api.github.com/repos/atom/octocat/git/trees{/sha}", + "clone_url": "https://github.com/atom/octocat.git", + "mirror_url": "git:git.example.com/atom/octocat", + "hooks_url": "http://api.github.com/repos/atom/octocat/hooks", + "svn_url": "https://svn.github.com/atom/octocat", + "homepage": "https://github.com", + "language": null, + "forks_count": 9, + "stargazers_count": 80, + "watchers_count": 80, + "size": 108, + "default_branch": "master", + "open_issues_count": 0, + "is_template": true, + "topics": [ + "octocat", + "atom", + "electron", + "api" + ], + "has_issues": true, + "has_projects": true, + "has_wiki": true, + "has_pages": false, + "has_downloads": true, + "archived": false, + "disabled": false, + "visibility": "public", + "pushed_at": "2011-01-26T19:06:43Z", + "created_at": "2011-01-26T19:01:12Z", + "updated_at": "2011-01-26T19:14:43Z", + "permissions": { + "admin": false, + "push": false, + "pull": true + }, + "allow_rebase_merge": true, + "template_repository": null, + "temp_clone_token": "ABTLWHOULUVAXGTRYU7OC2876QJ2O", + "allow_squash_merge": true, + "delete_branch_on_merge": true, + "allow_merge_commit": true, + "subscribers_count": 42, + "network_count": 0 + } + }, + "_links": { + "self": { + "href": "https://api.github.com/repos/atom/octocat/pulls/1347" + }, + "html": { + "href": "https://github.com/atom/octocat/pull/1347" + }, + "issue": { + "href": "https://api.github.com/repos/atom/octocat/issues/1347" + }, + "comments": { + "href": "https://api.github.com/repos/atom/octocat/issues/1347/comments" + }, + "review_comments": { + "href": "https://api.github.com/repos/atom/octocat/pulls/1347/comments" + }, + "review_comment": { + "href": "https://api.github.com/repos/atom/octocat/pulls/comments{/number}" + }, + "commits": { + "href": "https://api.github.com/repos/atom/octocat/pulls/1347/commits" + }, + "statuses": { + "href": "https://api.github.com/repos/atom/octocat/statuses/6dcb09b5b57875f334f61aebed695e2e4193db5e" + } + }, + "author_association": "OWNER", + "draft": false, + "merged": false, + "mergeable": true, + "rebaseable": true, + "mergeable_state": "clean", + "merged_by": { + "login": "octocat", + "id": 1, + "node_id": "MDQ6VXNlcjE=", + "avatar_url": "https://github.com/images/error/octocat_happy.gif", + "gravatar_id": "", + "url": "https://api.github.com/users/octocat", + "html_url": "https://github.com/octocat", + "followers_url": "https://api.github.com/users/octocat/followers", + "following_url": "https://api.github.com/users/octocat/following{/other_user}", + "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}", + "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/octocat/subscriptions", + "organizations_url": "https://api.github.com/users/octocat/orgs", + "repos_url": "https://api.github.com/users/octocat/repos", + "events_url": "https://api.github.com/users/octocat/events{/privacy}", + "received_events_url": "https://api.github.com/users/octocat/received_events", + "type": "User", + "site_admin": false + }, + "comments": 10, + "review_comments": 0, + "maintainer_can_modify": true, + "commits": 3, + "additions": 100, + "deletions": 3, + "changed_files": 5 + } diff --git a/script/lib/update-dependency/spec/fixtures/dummy b/script/lib/update-dependency/spec/fixtures/dummy new file mode 160000 index 000000000..526c50836 --- /dev/null +++ b/script/lib/update-dependency/spec/fixtures/dummy @@ -0,0 +1 @@ +Subproject commit 526c50836158b43d38cbaf11ad305fa8a6f43d1f diff --git a/script/lib/update-dependency/spec/fixtures/latest-package.json b/script/lib/update-dependency/spec/fixtures/latest-package.json new file mode 100644 index 000000000..dc291966f --- /dev/null +++ b/script/lib/update-dependency/spec/fixtures/latest-package.json @@ -0,0 +1,28 @@ +{ + "name": "test", + "version": "1.0.0", + "description": "just test", + "main": "index.js", + "dependencies": { + "spell-check": "https://www.atom.io/api/packages/spell-check/versions/0.79.1/tarball", + "status-bar": "https://www.atom.io/api/packages/status-bar/versions/2.8.17/tarball", + "styleguide": "https://www.atom.io/api/packages/styleguide/versions/1.49.12/tarball", + "symbols-view": "https://www.atom.io/api/packages/symbols-view/versions/0.118.5/tarball", + "@atom/watcher": "1.3.1", + "clear-cut": "^2.0.3", + "dedent": "^1.0.0", + "devtron": "1.2.6" + }, + "packageDependencies": { + "spell-check": "0.79.1", + "status-bar": "2.8.17", + "styleguide": "1.49.12", + "symbols-view": "0.118.5" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "darangi", + "license": "ISC" + } + \ No newline at end of file diff --git a/script/lib/update-dependency/spec/fixtures/search-response.json b/script/lib/update-dependency/spec/fixtures/search-response.json new file mode 100644 index 000000000..a38108116 --- /dev/null +++ b/script/lib/update-dependency/spec/fixtures/search-response.json @@ -0,0 +1,41 @@ +{ + "total_count": 40, + "incomplete_results": false, + "items": [ + { + "id": 3081286, + "node_id": "MDEwOlJlcG9zaXRvcnkzMDgxMjg2", + "name": "Tetris", + "full_name": "dtrupenn/Tetris", + "owner": { + "login": "dtrupenn", + "id": 872147, + "node_id": "MDQ6VXNlcjg3MjE0Nw==", + "avatar_url": "https://secure.gravatar.com/avatar/e7956084e75f239de85d3a31bc172ace?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png", + "gravatar_id": "", + "url": "https://api.github.com/users/dtrupenn", + "received_events_url": "https://api.github.com/users/dtrupenn/received_events", + "type": "User" + }, + "private": false, + "html_url": "https://github.com/dtrupenn/Tetris", + "description": "A C implementation of Tetris using Pennsim through LC4", + "fork": false, + "url": "https://api.github.com/repos/dtrupenn/Tetris", + "created_at": "2012-01-01T00:31:50Z", + "updated_at": "2013-01-05T17:58:47Z", + "pushed_at": "2012-01-01T00:37:02Z", + "homepage": "", + "size": 524, + "stargazers_count": 1, + "watchers_count": 1, + "language": "Assembly", + "forks_count": 0, + "open_issues_count": 0, + "master_branch": "master", + "default_branch": "master", + "score": 1.0 + } + ] + } + \ No newline at end of file diff --git a/script/lib/update-dependency/spec/git-spec.js b/script/lib/update-dependency/spec/git-spec.js new file mode 100644 index 000000000..fca2ca765 --- /dev/null +++ b/script/lib/update-dependency/spec/git-spec.js @@ -0,0 +1,94 @@ +const path = require('path'); +const simpleGit = require('simple-git'); +const repositoryRootPath = path.resolve('.', 'fixtures', 'dummy'); +const git = simpleGit(repositoryRootPath); + +const { + switchToMaster, + makeBranch, + publishBranch, + createCommit, + deleteBranch +} = require('../git')(git, repositoryRootPath); + +describe('GIT', () => { + async function findBranch(branch) { + const { branches } = await git.branch(); + return Object.keys(branches).find(_branch => _branch.indexOf(branch) > -1); + } + const dependency = { + moduleName: 'atom', + latest: '2.0.0' + }; + const branch = `${dependency.moduleName}-${dependency.latest}`; + + beforeEach(async () => { + await git.checkout('master'); + }); + + it('remotes should include ATOM', async () => { + const remotes = await git.getRemotes(); + expect(remotes.map(({ name }) => name).includes('ATOM')).toBeTruthy(); + }); + + it('current branch should be master', async () => { + const testBranchExists = await findBranch('test'); + testBranchExists + ? await git.checkout('test') + : await git.checkoutLocalBranch('test'); + expect((await git.branch()).current).toBe('test'); + await switchToMaster(); + expect((await git.branch()).current).toBe('master'); + await git.deleteLocalBranch('test', true); + }); + + it('should make new branch and checkout to the new branch', async () => { + const { found, newBranch } = await makeBranch(dependency); + expect(found).toBe(undefined); + expect(newBranch).toBe(branch); + expect((await git.branch()).current).toBe(branch); + await git.checkout('master'); + await git.deleteLocalBranch(branch, true); + }); + + it('should find an existing branch and checkout to the branch', async () => { + await git.checkoutLocalBranch(branch); + const { found } = await makeBranch(dependency); + expect(found).not.toBe(undefined); + expect((await git.branch()).current).toBe(found); + await git.checkout('master'); + await git.deleteLocalBranch(branch, true); + }); + + it('should create a commit', async () => { + const packageJsonFilePath = path.join(repositoryRootPath, 'package.json'); + const packageLockFilePath = path.join( + repositoryRootPath, + 'package-lock.json' + ); + spyOn(git, 'commit'); + spyOn(git, 'add'); + await createCommit(dependency); + expect(git.add).toHaveBeenCalledWith([ + packageJsonFilePath, + packageLockFilePath + ]); + expect(git.commit).toHaveBeenCalledWith( + `${`:arrow_up: ${dependency.moduleName}@${dependency.latest}`}` + ); + }); + + it('should publish branch', async () => { + spyOn(git, 'push'); + await publishBranch(branch); + expect(git.push).toHaveBeenCalledWith('ATOM', branch); + }); + + it('should delete an existing branch', async () => { + await git.checkoutLocalBranch(branch); + await git.checkout('master'); + expect(await findBranch(branch)).not.toBe(undefined); + await deleteBranch(branch); + expect(await findBranch(branch)).toBe(undefined); + }); +}); diff --git a/script/lib/update-dependency/spec/helpers.js b/script/lib/update-dependency/spec/helpers.js new file mode 100644 index 000000000..09affa105 --- /dev/null +++ b/script/lib/update-dependency/spec/helpers.js @@ -0,0 +1,28 @@ +const latestPackageJSON = require('./fixtures/latest-package.json'); +const packageJSON = require('./fixtures/dummy/package.json'); +module.exports = { + coreDependencies: Object.keys(packageJSON.packageDependencies).map( + dependency => { + return { + latest: latestPackageJSON.packageDependencies[dependency], + installed: packageJSON.packageDependencies[dependency], + moduleName: dependency, + isCorePackage: true + }; + } + ), + nativeDependencies: Object.keys(packageJSON.dependencies) + .filter( + dependency => + !packageJSON.dependencies[dependency].match(new RegExp('^https?://')) + ) + .map(dependency => { + return { + latest: latestPackageJSON.dependencies[dependency], + packageJson: packageJSON.dependencies[dependency], + installed: packageJSON.dependencies[dependency], + moduleName: dependency, + isCorePackage: false + }; + }) +}; diff --git a/script/lib/update-dependency/spec/pull-request-spec.js b/script/lib/update-dependency/spec/pull-request-spec.js new file mode 100644 index 000000000..0d3cd38be --- /dev/null +++ b/script/lib/update-dependency/spec/pull-request-spec.js @@ -0,0 +1,53 @@ +const nock = require('nock'); +const { createPR, findPR } = require('../pull-request'); +const createPrResponse = require('./fixtures/create-pr-response.json'); +const searchResponse = require('./fixtures/search-response.json'); + +describe('Pull Request', () => { + it('Should create a pull request', async () => { + const scope = nock('https://api.github.com') + .post('/repos/atom/atom/pulls', { + title: '⬆️ octocat@2.0.0', + body: 'Bumps octocat from 1.0.0 to 2.0.0', + head: 'octocat-2.0.0', + base: 'master' + }) + .reply(200, createPrResponse); + const response = await createPR( + { + moduleName: 'octocat', + installed: '1.0.0', + latest: '2.0.0', + isCorePackage: false + }, + 'octocat-2.0.0' + ); + scope.done(); + + expect(response.data).toEqual(createPrResponse); + }); + + it('Should search for a pull request', async () => { + const scope = nock('https://api.github.com') + .get('/search/issues') + .query({ + q: + 'octocat type:pr octocat@2.0.0 in:title repo:atom/atom head:octocat-2.0.0 state:open', + owner: 'atom', + repo: 'atom' + }) + .reply(200, searchResponse); + + const response = await findPR( + { + moduleName: 'octocat', + installed: '1.0.0', + latest: '2.0.0' + }, + 'octocat-2.0.0' + ); + scope.done(); + + expect(response.data).toEqual(searchResponse); + }); +}); diff --git a/script/lib/update-dependency/spec/util-spec.js b/script/lib/update-dependency/spec/util-spec.js new file mode 100644 index 000000000..d4b8742e8 --- /dev/null +++ b/script/lib/update-dependency/spec/util-spec.js @@ -0,0 +1,38 @@ +const path = require('path'); +const fs = require('fs'); +const repositoryRootPath = path.resolve('.', 'fixtures', 'dummy'); +const packageJsonFilePath = path.join(repositoryRootPath, 'package.json'); +const { updatePackageJson } = require('../util')(repositoryRootPath); +const { coreDependencies, nativeDependencies } = require('./helpers'); + +describe('Update-dependency', function() { + const oldPackageJson = JSON.parse( + JSON.stringify(require(packageJsonFilePath)) + ); + var packageJson; + + it('bumps package.json properly', async function() { + const dependencies = [...coreDependencies, ...nativeDependencies]; + for (const dependency of dependencies) { + await updatePackageJson(dependency); + packageJson = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8')); + if (dependency.isCorePackage) { + expect(packageJson.packageDependencies[dependency.moduleName]).toBe( + dependency.latest + ); + expect(packageJson.dependencies[dependency.moduleName]).toContain( + dependency.latest + ); + } else { + expect(packageJson.dependencies[dependency.moduleName]).toBe( + dependency.latest + ); + } + } + + fs.writeFileSync( + packageJsonFilePath, + JSON.stringify(oldPackageJson, null, 2) + ); + }); +}); diff --git a/script/lib/update-dependency/util.js b/script/lib/update-dependency/util.js new file mode 100644 index 000000000..8031e0e98 --- /dev/null +++ b/script/lib/update-dependency/util.js @@ -0,0 +1,61 @@ +const fs = require('fs'); +const path = require('path'); + +const util = repositoryRootPath => { + const packageJsonFilePath = path.join(repositoryRootPath, 'package.json'); + const packageJSON = require(packageJsonFilePath); + return { + updatePackageJson: async function({ + moduleName, + installed, + latest, + isCorePackage = false, + packageJson = '' + }) { + console.log(`Bumping ${moduleName} from ${installed} to ${latest}`); + const updatePackageJson = JSON.parse(JSON.stringify(packageJSON)); + if (updatePackageJson.dependencies[moduleName]) { + let searchString = installed; + // gets the exact version installed in package json for native packages + if (!isCorePackage) { + if (/\^|~/.test(packageJson)) { + searchString = new RegExp(`\\${packageJson}`); + } else { + searchString = packageJson; + } + } + updatePackageJson.dependencies[ + moduleName + ] = updatePackageJson.dependencies[moduleName].replace( + searchString, + latest + ); + } + if (updatePackageJson.packageDependencies[moduleName]) { + updatePackageJson.packageDependencies[ + moduleName + ] = updatePackageJson.packageDependencies[moduleName].replace( + new RegExp(installed), + latest + ); + } + return new Promise((resolve, reject) => { + fs.writeFile( + packageJsonFilePath, + JSON.stringify(updatePackageJson, null, 2), + function(err) { + if (err) { + return reject(err); + } + + console.log(`Bumped ${moduleName} from ${installed} to ${latest}`); + return resolve(); + } + ); + }); + }, + sleep: ms => new Promise(resolve => setTimeout(resolve, ms)) + }; +}; + +module.exports = util; diff --git a/script/lib/verify-machine-requirements.js b/script/lib/verify-machine-requirements.js index 51ca5a6cd..ccc4a6841 100644 --- a/script/lib/verify-machine-requirements.js +++ b/script/lib/verify-machine-requirements.js @@ -1,7 +1,6 @@ 'use strict'; const childProcess = require('child_process'); -const fs = require('fs'); const path = require('path'); const CONFIG = require('../config'); @@ -9,9 +8,7 @@ const CONFIG = require('../config'); module.exports = function(ci) { verifyNode(); verifyNpm(ci); - if (process.platform === 'win32') { - verifyPython(); - } + verifyPython(); }; function verifyNode() { @@ -50,36 +47,127 @@ function verifyNpm(ci) { } function verifyPython() { - const systemDrive = process.env.SystemDrive || 'C:\\'; - let pythonExecutable; - if (process.env.PYTHON) { - pythonExecutable = process.env.PYTHON; - } else { - const pythonBinPath = path.join(systemDrive, 'Python27', 'python.exe'); - if (fs.existsSync(pythonBinPath)) { - pythonExecutable = pythonBinPath; - } else { - pythonExecutable = 'python'; + // This function essentially re-implements node-gyp's "find-python.js" library, + // but in a synchronous, bootstrap-script-friendly way. + // It is based off of the logic of the file from node-gyp v5.x: + // https://github.com/nodejs/node-gyp/blob/v5.1.1/lib/find-python.js + // This node-gyp is the version in use by current npm (in mid 2020). + // + // TODO: If this repo ships a newer version of node-gyp (v6.x or later), please update this script. + // (Currently, the build scripts and apm each depend on npm v6.14, which depends on node-gyp v5.) + // Differences between major versions of node-gyp: + // node-gyp 5.x looks for python, then python2, then python3. + // node-gyp 6.x looks for python3, then python, then python2.) + // node-gyp 5.x accepts Python ^2.6 || >= 3.5, node-gyp 6+ only accepts Python == 2.7 || >= 3.5. + // node-gyp 7.x stopped using the "-2" flag for "py.exe", + // so as to allow finding Python 3 as well, not just Python 2. + // https://github.com/nodejs/node-gyp/blob/master/CHANGELOG.md#v700-2020-06-03 + + let stdout; + let fullVersion; + let usablePythonWasFound; + let triedLog = ''; + let binaryPlusFlag; + + function verifyBinary(binary, prependFlag) { + if (binary && !usablePythonWasFound) { + // clear re-used "result" variables now that we're checking another python binary. + stdout = ''; + fullVersion = ''; + + let allFlags = [ + '-c', + 'import platform\nprint(platform.python_version())' + ]; + if (prependFlag) { + // prependFlag is an optional argument, + // used to prepend "-2" for the "py.exe" launcher. + // + // TODO: Refactor this script by eliminating "prependFlag" + // once we update to node-gyp v7.x or newer; + // the "-2" flag is not used in node-gyp v7.x. + allFlags.unshift(prependFlag); + } + + try { + stdout = childProcess.execFileSync(binary, allFlags, { + env: process.env, + stdio: ['ignore', 'pipe', 'ignore'] + }); + } catch {} + + if (stdout) { + if (stdout.indexOf('+') !== -1) + stdout = stdout.toString().replace(/\+/g, ''); + if (stdout.indexOf('rc') !== -1) + stdout = stdout.toString().replace(/rc(.*)$/gi, ''); + fullVersion = stdout.toString().trim(); + } + + if (fullVersion) { + let versionComponents = fullVersion.split('.'); + let majorVersion = Number(versionComponents[0]); + let minorVersion = Number(versionComponents[1]); + if ( + (majorVersion === 2 && minorVersion >= 6) || + (majorVersion === 3 && minorVersion >= 5) + ) { + usablePythonWasFound = true; + } + } + + // Prepare to log which commands were tried, and the results, in case no usable Python can be found. + if (prependFlag) { + binaryPlusFlag = binary + ' ' + prependFlag; + } else { + binaryPlusFlag = binary; + } + triedLog = triedLog.concat( + `log message: tried to check version of "${binaryPlusFlag}", got: "${fullVersion}"\n` + ); } } - let stdout = childProcess.execFileSync( - pythonExecutable, - ['-c', 'import platform\nprint(platform.python_version())'], - { env: process.env } - ); - if (stdout.indexOf('+') !== -1) stdout = stdout.replace(/\+/g, ''); - if (stdout.indexOf('rc') !== -1) stdout = stdout.replace(/rc(.*)$/gi, ''); - const fullVersion = stdout.toString().trim(); - const versionComponents = fullVersion.split('.'); - const majorVersion = Number(versionComponents[0]); - const minorVersion = Number(versionComponents[1]); - if (majorVersion === 2 && minorVersion === 7) { + function verifyForcedBinary(binary) { + if (typeof binary !== 'undefined' && binary.length > 0) { + verifyBinary(binary); + if (!usablePythonWasFound) { + throw new Error( + `NODE_GYP_FORCE_PYTHON is set to: "${binary}", but this is not a valid Python.\n` + + 'Please set NODE_GYP_FORCE_PYTHON to something valid, or unset it entirely.\n' + + '(Python 2.6, 2.7 or 3.5+ is required to build Atom.)\n' + ); + } + } + } + + // These first two checks do nothing if the relevant + // environment variables aren't set. + verifyForcedBinary(process.env.NODE_GYP_FORCE_PYTHON); + // All the following checks will no-op if a previous check has succeeded. + verifyBinary(process.env.PYTHON); + verifyBinary('python'); + verifyBinary('python2'); + verifyBinary('python3'); + if (process.platform === 'win32') { + verifyBinary('py.exe', '-2'); + verifyBinary( + path.join(process.env.SystemDrive || 'C:', 'Python27', 'python.exe') + ); + verifyBinary( + path.join(process.env.SystemDrive || 'C:', 'Python37', 'python.exe') + ); + } + + if (usablePythonWasFound) { console.log(`Python:\tv${fullVersion}`); } else { throw new Error( - `Python 2.7 is required to build Atom. ${pythonExecutable} returns version ${fullVersion}.\n` + - `Set the PYTHON env var to '/path/to/Python27/python.exe' if your python is installed in a non-default location.` + `\n${triedLog}\n` + + 'Python 2.6, 2.7 or 3.5+ is required to build Atom.\n' + + 'verify-machine-requirements.js was unable to find such a version of Python.\n' + + "Set the PYTHON env var to e.g. 'C:/path/to/Python27/python.exe'\n" + + 'if your Python is installed in a non-default location.\n' ); } } diff --git a/script/package-lock.json b/script/package-lock.json index d28d5f99d..a91f4f035 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -322,6 +322,34 @@ } } }, + "@kwsites/file-exists": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz", + "integrity": "sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==", + "requires": { + "debug": "^4.1.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, + "@kwsites/promise-deferred": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz", + "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==" + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -336,6 +364,63 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz", "integrity": "sha512-LAQ1d4OPfSJ/BMbI2DuizmYrrkD9JMaTdi2hQTlI53lQ4kRQPyZQRS4CYQ7O66bnBBnP/oYdRxbk++X0xuFU6A==" }, + "@octokit/endpoint": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.3.tgz", + "integrity": "sha512-Y900+r0gIz+cWp6ytnkibbD95ucEzDSKzlEnaWS52hbCDNcCJYO5mRmWW7HRAnDc7am+N/5Lnd8MppSaTYx1Yg==", + "requires": { + "@octokit/types": "^5.0.0", + "is-plain-object": "^3.0.0", + "universal-user-agent": "^5.0.0" + }, + "dependencies": { + "is-plain-object": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz", + "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==" + } + } + }, + "@octokit/request": { + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.5.tgz", + "integrity": "sha512-atAs5GAGbZedvJXXdjtKljin+e2SltEs48B3naJjqWupYl2IUBbB/CJisyjbNHcKpHzb3E+OYEZ46G8eakXgQg==", + "requires": { + "@octokit/endpoint": "^6.0.1", + "@octokit/request-error": "^2.0.0", + "@octokit/types": "^5.0.0", + "deprecation": "^2.0.0", + "is-plain-object": "^3.0.0", + "node-fetch": "^2.3.0", + "once": "^1.4.0", + "universal-user-agent": "^5.0.0" + }, + "dependencies": { + "is-plain-object": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz", + "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==" + } + } + }, + "@octokit/request-error": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.2.tgz", + "integrity": "sha512-2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw==", + "requires": { + "@octokit/types": "^5.0.1", + "deprecation": "^2.0.0", + "once": "^1.4.0" + } + }, + "@octokit/types": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.0.1.tgz", + "integrity": "sha512-GorvORVwp244fGKEt3cgt/P+M0MGy4xEDbckw+K5ojEezxyMDgCaYPKVct+/eWQfZXOT7uq0xRpmrl/+hliabA==", + "requires": { + "@types/node": ">= 8" + } + }, "@sindresorhus/is": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", @@ -533,6 +618,43 @@ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, + "ansi-align": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", + "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", + "requires": { + "string-width": "^2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, "ansi-escapes": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", @@ -991,6 +1113,27 @@ "resolved": "https://registry.npmjs.org/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz", "integrity": "sha1-f1eO+LeN+uYAM4XYQXph7aBuL4E=" }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "requires": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + }, + "dependencies": { + "core-js": { + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + } + } + }, "babylon": { "version": "5.8.38", "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz", @@ -1128,6 +1271,85 @@ "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==" }, + "boxen": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", + "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", + "requires": { + "ansi-align": "^2.0.0", + "camelcase": "^4.0.0", + "chalk": "^2.0.1", + "cli-boxes": "^1.0.0", + "string-width": "^2.0.0", + "term-size": "^1.2.0", + "widest-line": "^2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } + }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1266,6 +1488,24 @@ "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=" }, + "callsite": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", + "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=" + }, + "callsite-record": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/callsite-record/-/callsite-record-3.2.2.tgz", + "integrity": "sha1-mgOQZC5D/ou4I5ReUUZPafQWQ94=", + "requires": { + "callsite": "^1.0.0", + "chalk": "^1.1.1", + "error-stack-parser": "^1.3.3", + "highlight-es": "^1.0.0", + "lodash": "4.6.1 || ^4.16.1", + "pinkie-promise": "^2.0.0" + } + }, "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -1281,6 +1521,11 @@ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000865.tgz", "integrity": "sha512-vs79o1mOSKRGv/1pSkp4EXgl4ZviWeYReXw60XfacPU64uQWZwJT6vZNmxRF9O+6zu71sJwMxLK5JXxbzuVrLw==" }, + "capture-stack-trace": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz", + "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==" + }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -1360,6 +1605,11 @@ "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=" }, + "ci-info": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz", + "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==" + }, "circular-json": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", @@ -1391,6 +1641,11 @@ } } }, + "cli-boxes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", + "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=" + }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", @@ -1399,6 +1654,11 @@ "restore-cursor": "^2.0.0" } }, + "cli-spinners": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz", + "integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=" + }, "cli-width": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", @@ -1635,6 +1895,19 @@ "proto-list": "~1.2.1" } }, + "configstore": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", + "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", + "requires": { + "dot-prop": "^4.1.0", + "graceful-fs": "^4.1.2", + "make-dir": "^1.0.0", + "unique-string": "^1.0.0", + "write-file-atomic": "^2.0.0", + "xdg-basedir": "^3.0.0" + } + }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", @@ -1686,6 +1959,14 @@ } } }, + "create-error-class": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", + "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", + "requires": { + "capture-stack-trace": "^1.0.0" + } + }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", @@ -1719,6 +2000,11 @@ "which": "^1.2.8" } }, + "crypto-random-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", + "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=" + }, "cson-parser": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-1.0.9.tgz", @@ -1787,6 +2073,11 @@ "assert-plus": "^1.0.0" } }, + "de-indent": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", + "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=" + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -1993,6 +2284,231 @@ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, + "depcheck": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/depcheck/-/depcheck-0.8.3.tgz", + "integrity": "sha512-xcLTnaovCFFTts5Ge7mUUhMGHSu6eRfftvVvOjN7gXO5EFUhJfX6UQa1b08a0SIwKfzG9eKNn5mzZlXp0mZARA==", + "requires": { + "@babel/parser": "^7.3.1", + "@babel/traverse": "^7.2.3", + "builtin-modules": "^3.0.0", + "deprecate": "^1.0.0", + "deps-regex": "^0.1.4", + "js-yaml": "^3.4.2", + "lodash": "^4.17.11", + "minimatch": "^3.0.2", + "node-sass-tilde-importer": "^1.0.2", + "please-upgrade-node": "^3.1.1", + "require-package-name": "^2.0.1", + "resolve": "^1.10.0", + "vue-template-compiler": "^2.6.10", + "walkdir": "^0.3.2", + "yargs": "^13.2.2" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } + }, + "builtin-modules": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz", + "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==" + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "requires": { + "locate-path": "^3.0.0" + } + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "requires": { + "p-limit": "^2.0.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "requires": { + "path-parse": "^1.0.6" + } + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "walkdir": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.3.2.tgz", + "integrity": "sha512-0Twghia4Z5wDGDYWURlhZmI47GvERMCsXIu0QZWVVZyW9ZjpbbZvD9Zy9M6cWiQQRRbAcYajIyKNavaZZDt1Uw==" + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" + }, + "yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, + "deprecate": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deprecate/-/deprecate-1.1.1.tgz", + "integrity": "sha512-ZGDXefq1xknT292LnorMY5s8UVU08/WKdzDZCUT6t9JzsiMSP4uzUhgpqugffNVcT5WC6wMBiSQ+LFjlv3v7iQ==" + }, + "deprecation": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", + "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==" + }, + "deps-regex": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deps-regex/-/deps-regex-0.1.4.tgz", + "integrity": "sha1-UYZnt2kUYKXn4KNBvnbrfOgJAYQ=" + }, "detect-indent": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz", @@ -2515,6 +3031,14 @@ "is-arrayish": "^0.2.1" } }, + "error-stack-parser": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz", + "integrity": "sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=", + "requires": { + "stackframe": "^0.3.1" + } + }, "es-abstract": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", @@ -3073,6 +3597,11 @@ "clone-regexp": "^1.0.0" } }, + "exit-hook": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz", + "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=" + }, "expand-brackets": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", @@ -3094,6 +3623,14 @@ "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==" }, + "expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "requires": { + "homedir-polyfill": "^1.0.1" + } + }, "extend": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", @@ -3566,6 +4103,11 @@ "repeat-string": "^1.5.2" } }, + "find-parent-dir": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz", + "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=" + }, "find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", @@ -3916,6 +4458,11 @@ "resolved": "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz", "integrity": "sha1-fdeTMNKr5pwQws73lxTJchV5Hfo=" }, + "giturl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/giturl/-/giturl-1.0.1.tgz", + "integrity": "sha512-wQourBdI13n8tbjcZTDl6k+ZrCRMU6p9vfp9jknZq+zfWc8xXNztpZFM4XkPHVzHcMSUZxEMYYKZjIGkPlei6Q==" + }, "glob": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz", @@ -3988,6 +4535,36 @@ } } }, + "global-dirs": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", + "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", + "requires": { + "ini": "^1.3.4" + } + }, + "global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "requires": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + } + }, + "global-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "requires": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + } + }, "global-tunnel-ng": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", @@ -4189,6 +4766,59 @@ } } }, + "he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" + }, + "highlight-es": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/highlight-es/-/highlight-es-1.0.3.tgz", + "integrity": "sha512-s/SIX6yp/5S1p8aC/NRDC1fwEb+myGIfp8/TzZz0rtAv8fzsdX7vGl3Q1TrXCsczFq8DI3CBFBCySPClfBSdbg==", + "requires": { + "chalk": "^2.4.0", + "is-es2016-keyword": "^1.0.0", + "js-tokens": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "home-or-tmp": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz", @@ -4198,6 +4828,14 @@ "user-home": "^1.1.1" } }, + "homedir-polyfill": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", + "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", + "requires": { + "parse-passwd": "^1.0.0" + } + }, "hosted-git-info": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", @@ -4510,6 +5148,14 @@ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==" }, + "is-ci": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz", + "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==", + "requires": { + "ci-info": "^1.5.0" + } + }, "is-data-descriptor": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", @@ -4563,6 +5209,11 @@ "is-primitive": "^2.0.0" } }, + "is-es2016-keyword": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-es2016-keyword/-/is-es2016-keyword-1.0.0.tgz", + "integrity": "sha1-9uVOEQxeT40mXmnS7Q6vjPX0dxg=" + }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", @@ -4602,6 +5253,15 @@ "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz", "integrity": "sha512-but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==" }, + "is-installed-globally": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", + "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", + "requires": { + "global-dirs": "^0.1.0", + "is-path-inside": "^1.0.0" + } + }, "is-integer": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/is-integer/-/is-integer-1.0.7.tgz", @@ -4610,6 +5270,11 @@ "is-finite": "^1.0.0" } }, + "is-npm": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", + "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=" + }, "is-number": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", @@ -4679,6 +5344,11 @@ "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" }, + "is-redirect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", + "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=" + }, "is-regex": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", @@ -4692,6 +5362,11 @@ "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=" }, + "is-retry-allowed": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", + "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==" + }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -4923,6 +5598,14 @@ "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.6.1.tgz", "integrity": "sha512-nQRpMcHm1cQ6gmztdvLcIvxocznSMqH/y6XtERrWrHaymOYdDGroRqetJvJycxGEr1aakXiigDgn7JnzuXlk6A==" }, + "latest-version": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", + "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", + "requires": { + "package-json": "^4.0.0" + } + }, "lazy-cache": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", @@ -5060,6 +5743,24 @@ "strip-bom": "^2.0.0" } }, + "load-yaml-file": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/load-yaml-file/-/load-yaml-file-0.1.1.tgz", + "integrity": "sha512-G910TofXH7u0NfslAzqv6c9pHpvBzObNOo2hMG0/KUDpdHeFY0wE/fTBMExt0Gb12gg5bXS7Hj6pb0e+xbBXLA==", + "requires": { + "graceful-fs": "^4.1.5", + "js-yaml": "^3.13.0", + "pify": "^2.3.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" + } + } + }, "locate-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", @@ -5111,6 +5812,11 @@ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" }, + "lodash.set": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz", + "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=" + }, "lodash.startcase": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz", @@ -5133,6 +5839,11 @@ "lodash._reinterpolate": "^3.0.0" } }, + "lodash.toarray": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz", + "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=" + }, "lodash.zip": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz", @@ -5222,6 +5933,26 @@ "yallist": "^2.1.2" } }, + "macos-release": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.0.tgz", + "integrity": "sha512-ko6deozZYiAkqa/0gmcsz+p4jSy3gY7/ZsCEokPaYd8k+6/aXGkiTgr61+Owup7Sf+xjqW8u2ElhoM9SEcEfuA==" + }, + "make-dir": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "requires": { + "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -5476,6 +6207,32 @@ "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, + "nock": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/nock/-/nock-13.0.2.tgz", + "integrity": "sha512-Wm8H22iT3UKPDf138tmgJ0NRfCLd9f2LByki9T2mGHnB66pEqvJh3gV/up1ZufZF24n7/pDYyLGybdqOzF3JIw==", + "requires": { + "debug": "^4.1.0", + "json-stringify-safe": "^5.0.1", + "lodash.set": "^4.3.2", + "propagate": "^2.0.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "node-abi": { "version": "2.13.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.13.0.tgz", @@ -5491,11 +6248,56 @@ } } }, + "node-emoji": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", + "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==", + "requires": { + "lodash.toarray": "^4.4.0" + } + }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + }, "node-gyp-build": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz", "integrity": "sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==" }, + "node-sass-tilde-importer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz", + "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==", + "requires": { + "find-parent-dir": "^0.3.0" + } + }, + "nodeify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz", + "integrity": "sha1-ZKtpp7268DzhB7TwM1yHwLnpGx0=", + "requires": { + "is-promise": "~1.0.0", + "promise": "~1.3.0" + }, + "dependencies": { + "is-promise": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz", + "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU=" + }, + "promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz", + "integrity": "sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU=", + "requires": { + "is-promise": "~1" + } + } + } + }, "noop-logger": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", @@ -8641,6 +9443,176 @@ } } }, + "npm-check": { + "version": "5.9.2", + "resolved": "https://registry.npmjs.org/npm-check/-/npm-check-5.9.2.tgz", + "integrity": "sha512-YlTZGP1A8+Rad5wldGil9STYxgZpZl18X6GZI03f4Ch6qTI1TLHIYM0ISco19qgg8M3UHfooEqMfYOpOkF3AeA==", + "requires": { + "babel-runtime": "^6.6.1", + "callsite-record": "^3.0.0", + "chalk": "^1.1.3", + "co": "^4.6.0", + "depcheck": "0.8.3", + "execa": "^0.2.2", + "giturl": "^1.0.0", + "global-modules": "^1.0.0", + "globby": "^4.0.0", + "inquirer": "^0.12.0", + "is-ci": "^1.0.8", + "lodash": "^4.17.15", + "meow": "^3.7.0", + "minimatch": "^3.0.2", + "node-emoji": "^1.0.3", + "ora": "^0.2.1", + "package-json": "^4.0.1", + "path-exists": "^2.1.0", + "pkg-dir": "^1.0.0", + "preferred-pm": "^1.0.1", + "semver": "^5.0.1", + "semver-diff": "^2.0.0", + "text-table": "^0.2.0", + "throat": "^2.0.2", + "update-notifier": "^2.1.0", + "xtend": "^4.0.1" + }, + "dependencies": { + "ansi-escapes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", + "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=" + }, + "cli-cursor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", + "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", + "requires": { + "restore-cursor": "^1.0.1" + } + }, + "execa": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.2.2.tgz", + "integrity": "sha1-4urUcsLDGq1vc/GslW7vReEjIMs=", + "requires": { + "cross-spawn-async": "^2.1.1", + "npm-run-path": "^1.0.0", + "object-assign": "^4.0.1", + "path-key": "^1.0.0", + "strip-eof": "^1.0.0" + } + }, + "figures": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "requires": { + "escape-string-regexp": "^1.0.5", + "object-assign": "^4.1.0" + } + }, + "glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "globby": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz", + "integrity": "sha1-CA9UVJ7BuCpsYOYx/ILhIR2+lfg=", + "requires": { + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "glob": "^6.0.1", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "inquirer": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz", + "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=", + "requires": { + "ansi-escapes": "^1.1.0", + "ansi-regex": "^2.0.0", + "chalk": "^1.0.0", + "cli-cursor": "^1.0.1", + "cli-width": "^2.0.0", + "figures": "^1.3.5", + "lodash": "^4.3.0", + "readline2": "^1.0.1", + "run-async": "^0.1.0", + "rx-lite": "^3.1.2", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.0", + "through": "^2.3.6" + } + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "onetime": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=" + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "requires": { + "pinkie-promise": "^2.0.0" + } + }, + "pkg-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz", + "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", + "requires": { + "find-up": "^1.0.0" + } + }, + "restore-cursor": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", + "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", + "requires": { + "exit-hook": "^1.0.0", + "onetime": "^1.0.0" + } + }, + "run-async": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", + "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=", + "requires": { + "once": "^1.3.0" + } + }, + "xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" + } + } + }, "npm-conf": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", @@ -8817,6 +9789,41 @@ } } }, + "ora": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz", + "integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=", + "requires": { + "chalk": "^1.1.1", + "cli-cursor": "^1.0.2", + "cli-spinners": "^0.1.2", + "object-assign": "^4.0.1" + }, + "dependencies": { + "cli-cursor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", + "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", + "requires": { + "restore-cursor": "^1.0.1" + } + }, + "onetime": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=" + }, + "restore-cursor": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", + "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", + "requires": { + "exit-hook": "^1.0.0", + "onetime": "^1.0.0" + } + } + } + }, "os-locale": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", @@ -8825,6 +9832,15 @@ "lcid": "^1.0.0" } }, + "os-name": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz", + "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==", + "requires": { + "macos-release": "^2.2.0", + "windows-release": "^3.1.0" + } + }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", @@ -8845,6 +9861,11 @@ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" + }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -8866,6 +9887,55 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" }, + "package-json": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", + "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", + "requires": { + "got": "^6.7.1", + "registry-auth-token": "^3.0.1", + "registry-url": "^3.0.3", + "semver": "^5.1.0" + }, + "dependencies": { + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "got": { + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", + "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", + "requires": { + "create-error-class": "^3.0.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "is-redirect": "^1.0.0", + "is-retry-allowed": "^1.0.0", + "is-stream": "^1.0.0", + "lowercase-keys": "^1.0.0", + "safe-buffer": "^5.0.1", + "timed-out": "^4.0.0", + "unzip-response": "^2.0.1", + "url-parse-lax": "^1.0.0" + } + }, + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" + }, + "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "requires": { + "prepend-http": "^1.0.1" + } + } + } + }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -8914,6 +9984,11 @@ "error-ex": "^1.2.0" } }, + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" + }, "parse5": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz", @@ -9027,6 +10102,14 @@ } } }, + "please-upgrade-node": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", + "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==", + "requires": { + "semver-compare": "^1.0.0" + } + }, "plist": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz", @@ -9305,6 +10388,22 @@ "which-pm-runs": "^1.0.0" } }, + "preferred-pm": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/preferred-pm/-/preferred-pm-1.0.1.tgz", + "integrity": "sha512-9Uxgin5Xnsl67DBvlNFsmDIlBuG9/XKK2cVBTj//7/7wW6ZY+IC9/GlLqxyHABpoasAsJ1MARFOdYPxMUtndxA==", + "requires": { + "path-exists": "^3.0.0", + "which-pm": "^1.0.1" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + } + } + }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", @@ -9356,6 +10455,11 @@ "asap": "~2.0.3" } }, + "propagate": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz", + "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==" + }, "proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -9568,6 +10672,23 @@ "once": "^1.3.0" } }, + "readline2": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz", + "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "mute-stream": "0.0.5" + }, + "dependencies": { + "mute-stream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz", + "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=" + } + } + }, "recast": { "version": "0.10.33", "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.33.tgz", @@ -9650,6 +10771,23 @@ } } }, + "registry-auth-token": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz", + "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==", + "requires": { + "rc": "^1.1.6", + "safe-buffer": "^5.0.1" + } + }, + "registry-url": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", + "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", + "requires": { + "rc": "^1.0.1" + } + }, "regjsgen": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", @@ -9795,6 +10933,11 @@ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" }, + "require-package-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz", + "integrity": "sha1-wR6XJ2tluOKSP3Xav1+y7ww4Qbk=" + }, "resolve": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", @@ -9803,6 +10946,15 @@ "path-parse": "^1.0.5" } }, + "resolve-dir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", + "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", + "requires": { + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" + } + }, "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -9924,6 +11076,11 @@ "is-promise": "^2.1.0" } }, + "rx-lite": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz", + "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=" + }, "rxjs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", @@ -9978,8 +11135,15 @@ "semver-compare": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", - "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", - "optional": true + "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=" + }, + "semver-diff": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", + "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", + "requires": { + "semver": "^5.0.3" + } }, "serialize-error": { "version": "3.0.0", @@ -10050,6 +11214,31 @@ "simple-concat": "^1.0.0" } }, + "simple-git": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.11.0.tgz", + "integrity": "sha512-wFePCEQYY6BzVOg/BuUVEhr3jZPF/cPG/BN2UXgax6NHc3bJ9UrDc5AME281gs2C7J1UZ6BGRJYT64khx9T+ng==", + "requires": { + "@kwsites/file-exists": "^1.1.1", + "@kwsites/promise-deferred": "^1.0.1", + "debug": "^4.1.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "simple-is": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz", @@ -10294,6 +11483,11 @@ "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==" }, + "stackframe": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz", + "integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=" + }, "state-toggle": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz", @@ -10942,6 +12136,58 @@ "rimraf": "~2.6.2" } }, + "term-size": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", + "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", + "requires": { + "execa": "^0.7.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "requires": { + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "requires": { + "path-key": "^2.0.0" + } + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + } + } + }, "terser": { "version": "3.10.8", "resolved": "https://registry.npmjs.org/terser/-/terser-3.10.8.tgz", @@ -10998,11 +12244,35 @@ } } }, + "throat": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/throat/-/throat-2.0.2.tgz", + "integrity": "sha1-qfzoCLaeEzpjJZB4DzQsMKYkmwI=" + }, + "throttleit": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz", + "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=" + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, + "through2": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz", + "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=", + "requires": { + "readable-stream": "~1.1.9", + "xtend": "~2.1.1" + } + }, + "timed-out": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", + "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=" + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -11312,6 +12582,14 @@ "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=" }, + "unique-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", + "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", + "requires": { + "crypto-random-string": "^1.0.0" + } + }, "unist-util-find-all-after": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-1.0.2.tgz", @@ -11354,6 +12632,14 @@ "unist-util-is": "^2.1.1" } }, + "universal-user-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz", + "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==", + "requires": { + "os-name": "^3.1.0" + } + }, "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", @@ -11400,6 +12686,66 @@ } } }, + "unzip-response": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz", + "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=" + }, + "update-notifier": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", + "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", + "requires": { + "boxen": "^1.2.1", + "chalk": "^2.0.1", + "configstore": "^3.0.0", + "import-lazy": "^2.1.0", + "is-ci": "^1.0.10", + "is-installed-globally": "^0.1.0", + "is-npm": "^1.0.0", + "latest-version": "^3.0.0", + "semver-diff": "^2.0.0", + "xdg-basedir": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + }, + "import-lazy": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", + "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=" + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", @@ -11501,6 +12847,15 @@ "unist-util-stringify-position": "^1.1.1" } }, + "vue-template-compiler": { + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz", + "integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==", + "requires": { + "de-indent": "^1.0.2", + "he": "^1.1.0" + } + }, "walkdir": { "version": "0.0.12", "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.12.tgz", @@ -11551,6 +12906,22 @@ "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" }, + "which-pm": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/which-pm/-/which-pm-1.1.0.tgz", + "integrity": "sha512-7GHHJQpALk7BWMD8I+xSILSbHyngvBlfSXlwGpdRFY2voFwVCx+eJAybXTzTnUYmt7zio6B9SEdI81T0fBjxNA==", + "requires": { + "load-yaml-file": "^0.1.0", + "path-exists": "^3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + } + } + }, "which-pm-runs": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz", @@ -11564,11 +12935,85 @@ "string-width": "^1.0.2 || 2" } }, + "widest-line": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz", + "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==", + "requires": { + "string-width": "^2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, "window-size": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=" }, + "windows-release": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.1.tgz", + "integrity": "sha512-Pngk/RDCaI/DkuHPlGTdIkDiTAnAkyMjoQMZqRsxydNl1qGXNIoZrB7RK8g53F2tEgQBMqQJHQdYZuQEEAu54A==", + "requires": { + "execa": "^1.0.0" + }, + "dependencies": { + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "requires": { + "path-key": "^2.0.0" + } + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + } + } + }, "wordwrap": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", @@ -11596,11 +13041,26 @@ "mkdirp": "^0.5.1" } }, + "write-file-atomic": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", + "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", + "requires": { + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" + } + }, "x-is-string": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz", "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=" }, + "xdg-basedir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", + "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=" + }, "xmlbuilder": { "version": "9.0.7", "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", diff --git a/script/package.json b/script/package.json index 9eab6ad86..50762104a 100644 --- a/script/package.json +++ b/script/package.json @@ -3,6 +3,8 @@ "description": "Atom build scripts", "dependencies": { "7zip-bin": "^4.0.2", + "@atom/electron-winstaller": "0.0.1", + "@octokit/request": "^5.4.5", "async": "2.0.1", "babel-core": "5.8.38", "babel-eslint": "^10.0.1", @@ -14,7 +16,6 @@ "electron-link": "^0.4.3", "electron-mksnapshot": "^9.0.2", "electron-packager": "^15.0.0", - "@atom/electron-winstaller": "0.0.1", "eslint": "^5.16.0", "eslint-config-prettier": "^4.2.0", "eslint-config-standard": "^12.0.0", @@ -33,14 +34,18 @@ "lodash.template": "4.5.0", "minidump": "0.9.0", "mkdirp": "0.5.1", + "nock": "^13.0.2", + "node-fetch": "^2.6.0", "normalize-package-data": "2.3.5", "npm": "6.14.4", + "npm-check": "^5.9.2", "passwd-user": "2.1.0", "pegjs": "0.9.0", "prettier": "^1.17.0", "random-seed": "^0.3.0", "season": "5.3.0", "semver": "5.3.0", + "simple-git": "^2.7.0", "stylelint": "^9.0.0", "stylelint-config-standard": "^18.1.0", "sync-request": "3.0.1", diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 8dfc00bc6..274065287 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -58,3 +58,33 @@ jobs: ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY) displayName: Create Nightly Release + - job: bump_dependencies + displayName: Bump Dependencies + timeoutInMinutes: 180 + + pool: + vmImage: macos-10.14 + + steps: + - task: NodeTool@0 + inputs: + versionSpec: 12.13.1 + displayName: Install Node.js 12.13.1 + + - script: npm install --global npm@6.12.1 + displayName: Update npm + + - script: | + script/bootstrap + displayName: Bootstrap + + - script: | + cd script/lib + npm install + displayName: npm install + - script: | + cd script/lib/update-dependency + node index.js + displayName: Bump depedencies + env: + AUTH_TOKEN: $(GITHUB_TOKEN) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 95b891c4d..dd8953ea7 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -22,7 +22,7 @@ jobs: steps: - task: UsePythonVersion@0 inputs: - versionSpec: '2.7' + versionSpec: '3.8' - task: NodeTool@0 inputs: diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index 69bffeae5..0333ea3f2 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -2,6 +2,7 @@ trigger: - master - 1.* # VSTS only supports wildcards at the end - electron-* +pr: none # no PR triggers jobs: - job: GetReleaseVersion diff --git a/spec/text-editor-component-spec.js b/spec/text-editor-component-spec.js index cee4eda1e..d6769dd59 100644 --- a/spec/text-editor-component-spec.js +++ b/spec/text-editor-component-spec.js @@ -4221,7 +4221,7 @@ describe('TextEditorComponent', () => { }); it('adds or removes cursors when holding cmd or ctrl when single-clicking', () => { - atom.config.set('core.editor.multiCursorOnClick', true); + atom.config.set('editor.multiCursorOnClick', true); const { component, editor } = buildComponent({ platform: 'darwin' }); expect(editor.getCursorScreenPositions()).toEqual([[0, 0]]); @@ -4302,7 +4302,7 @@ describe('TextEditorComponent', () => { }); it('adds word selections when holding cmd or ctrl when double-clicking', () => { - atom.config.set('core.editor.multiCursorOnClick', true); + atom.config.set('editor.multiCursorOnClick', true); const { component, editor } = buildComponent(); editor.addCursorAtScreenPosition([1, 16], { autoscroll: false }); expect(editor.getCursorScreenPositions()).toEqual([[0, 0], [1, 16]]); @@ -4329,7 +4329,7 @@ describe('TextEditorComponent', () => { }); it('adds line selections when holding cmd or ctrl when triple-clicking', () => { - atom.config.set('core.editor.multiCursorOnClick', true); + atom.config.set('editor.multiCursorOnClick', true); const { component, editor } = buildComponent(); editor.addCursorAtScreenPosition([1, 16], { autoscroll: false }); expect(editor.getCursorScreenPositions()).toEqual([[0, 0], [1, 16]]); @@ -4369,7 +4369,7 @@ describe('TextEditorComponent', () => { }); it('does not add cursors when holding cmd or ctrl when single-clicking', () => { - atom.config.set('core.editor.multiCursorOnClick', false); + atom.config.set('editor.multiCursorOnClick', false); const { component, editor } = buildComponent({ platform: 'darwin' }); expect(editor.getCursorScreenPositions()).toEqual([[0, 0]]); @@ -4411,7 +4411,7 @@ describe('TextEditorComponent', () => { }); it('does not add word selections when holding cmd or ctrl when double-clicking', () => { - atom.config.set('core.editor.multiCursorOnClick', false); + atom.config.set('editor.multiCursorOnClick', false); const { component, editor } = buildComponent(); component.didMouseDownOnContent( @@ -4435,7 +4435,7 @@ describe('TextEditorComponent', () => { }); it('does not add line selections when holding cmd or ctrl when triple-clicking', () => { - atom.config.set('core.editor.multiCursorOnClick', false); + atom.config.set('editor.multiCursorOnClick', false); const { component, editor } = buildComponent(); const { clientX, clientY } = clientPositionForCharacter( @@ -4557,7 +4557,7 @@ describe('TextEditorComponent', () => { }); it('expands the last selection on drag', () => { - atom.config.set('core.editor.multiCursorOnClick', true); + atom.config.set('editor.multiCursorOnClick', true); const { component, editor } = buildComponent(); spyOn(component, 'handleMouseDragUntilMouseUp'); diff --git a/src/grammar-registry.js b/src/grammar-registry.js index 5deda75e1..c5973e1aa 100644 --- a/src/grammar-registry.js +++ b/src/grammar-registry.js @@ -154,7 +154,7 @@ module.exports = class GrammarRegistry { // * `buffer` The {TextBuffer} whose grammar will be set. // * `grammar` The desired {Grammar}. // - // Returns a {Boolean} that indicates whether the assignment was sucessful + // Returns a {Boolean} that indicates whether the assignment was successful assignGrammar(buffer, grammar) { if (!grammar) return false; if (buffer.getBuffer) buffer = buffer.getBuffer(); @@ -547,7 +547,7 @@ module.exports = class GrammarRegistry { // * `grammarPath` A {String} absolute file path to a grammar file. // * `callback` A {Function} to call when loaded with the following arguments: // * `error` An {Error}, may be null. - // * `grammar` A {Grammar} or null if an error occured. + // * `grammar` A {Grammar} or null if an error occurred. loadGrammar(grammarPath, callback) { this.readGrammar(grammarPath, (error, grammar) => { if (error) return callback(error); @@ -572,7 +572,7 @@ module.exports = class GrammarRegistry { // * `grammarPath` A {String} absolute file path to a grammar file. // * `callback` A {Function} to call when read with the following arguments: // * `error` An {Error}, may be null. - // * `grammar` A {Grammar} or null if an error occured. + // * `grammar` A {Grammar} or null if an error occurred. // // Returns undefined. readGrammar(grammarPath, callback) { diff --git a/src/package-manager.js b/src/package-manager.js index eabfbdf7b..14f1c9377 100644 --- a/src/package-manager.js +++ b/src/package-manager.js @@ -419,14 +419,17 @@ module.exports = class PackageManager { for (const packageDirPath of this.packageDirPaths) { if (fs.isDirectorySync(packageDirPath)) { - for (let packagePath of fs.readdirSync(packageDirPath)) { - packagePath = path.join(packageDirPath, packagePath); - const packageName = path.basename(packagePath); + const packageNames = fs + .readdirSync(packageDirPath, { withFileTypes: true }) + .filter(dirent => dirent.isDirectory()) + .map(dirent => dirent.name); + + for (const packageName of packageNames) { if ( !packageName.startsWith('.') && - !packagesByName.has(packageName) && - fs.isDirectorySync(packagePath) + !packagesByName.has(packageName) ) { + const packagePath = path.join(packageDirPath, packageName); packages.push({ name: packageName, path: packagePath, diff --git a/src/ripgrep-directory-searcher.js b/src/ripgrep-directory-searcher.js index 9d46e9cd2..55bfe4e1d 100644 --- a/src/ripgrep-directory-searcher.js +++ b/src/ripgrep-directory-searcher.js @@ -129,7 +129,7 @@ function processUnicodeMatch(match) { // This function processes a ripgrep submatch to create the correct // range. This is mostly needed for multi-line results, since the range -// will have differnt start and end rows and we need to calculate these +// will have different start and end rows and we need to calculate these // based on the lines that ripgrep returns. function processSubmatch(submatch, lineText, offsetRow) { const lineParts = lineText.split('\n'); diff --git a/src/text-editor-component.js b/src/text-editor-component.js index fff4fd224..c83235266 100644 --- a/src/text-editor-component.js +++ b/src/text-editor-component.js @@ -1868,7 +1868,7 @@ module.exports = class TextEditorComponent { // keydown(code: X), keypress, keydown(code: X) // // The code X must be the same in the keydown events that bracket the - // keypress, meaning we're *holding* the _same_ key we intially pressed. + // keypress, meaning we're *holding* the _same_ key we initially pressed. // Got that? didKeydown(event) { // Stop dragging when user interacts with the keyboard. This prevents @@ -1994,7 +1994,7 @@ module.exports = class TextEditorComponent { return; } - const allowMultiCursor = atom.config.get('core.editor.multiCursorOnClick'); + const allowMultiCursor = atom.config.get('editor.multiCursorOnClick'); const addOrRemoveSelection = allowMultiCursor && (metaKey || (ctrlKey && platform !== 'darwin')); diff --git a/src/text-editor.js b/src/text-editor.js index 48fe8c72f..e70d9b75c 100644 --- a/src/text-editor.js +++ b/src/text-editor.js @@ -2597,7 +2597,7 @@ module.exports = class TextEditor { // * __cursor__: Render a cursor at the head of the {DisplayMarker}. If multiple cursor decorations // are created for the same marker, their class strings and style objects are combined // into a single cursor. This decoration type may be used to style existing cursors - // by passing in their markers or to render artificial cursors that don't actaully + // by passing in their markers or to render artificial cursors that don't actually // exist in the model by passing a marker that isn't associated with a real cursor. // // ## Arguments diff --git a/src/uri-handler-registry.js b/src/uri-handler-registry.js index 73dbd946f..7b232ccc6 100644 --- a/src/uri-handler-registry.js +++ b/src/uri-handler-registry.js @@ -27,7 +27,7 @@ const { Emitter, Disposable } = require('event-kit'); // is triggered. If you need your package to activate right away, you can add // `"deferActivation": false` to your "uriHandler" configuration object. When activation // is deferred, once Atom receives a request for a URI in your package's namespace, it will -// activate your pacakge and then call `methodName` on it as before. +// activate your package and then call `methodName` on it as before. // // If your package specifies a deprecated `urlMain` property, you cannot register URI handlers // via the `uriHandler` key. From c6058e9600b79427d35f1e5cc8326bd3fdb1145f Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Thu, 16 Jul 2020 11:33:36 -0500 Subject: [PATCH 079/119] local bootstrap --- script/package-lock.json | 111 +++++++++++++++++++++++++-------------- 1 file changed, 73 insertions(+), 38 deletions(-) diff --git a/script/package-lock.json b/script/package-lock.json index a91f4f035..fc1332a54 100644 --- a/script/package-lock.json +++ b/script/package-lock.json @@ -1516,6 +1516,22 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "requires": { + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" + }, + "dependencies": { + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" + } + } + }, "caniuse-lite": { "version": "1.0.30000865", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000865.tgz", @@ -6022,6 +6038,23 @@ "unist-util-visit": "^1.1.0" } }, + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "requires": { + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" + } + }, "merge2": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz", @@ -6274,30 +6307,6 @@ "find-parent-dir": "^0.3.0" } }, - "nodeify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz", - "integrity": "sha1-ZKtpp7268DzhB7TwM1yHwLnpGx0=", - "requires": { - "is-promise": "~1.0.0", - "promise": "~1.3.0" - }, - "dependencies": { - "is-promise": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz", - "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU=" - }, - "promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz", - "integrity": "sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU=", - "requires": { - "is-promise": "~1" - } - } - } - }, "noop-logger": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", @@ -10707,6 +10716,33 @@ } } }, + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "requires": { + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" + }, + "dependencies": { + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "requires": { + "repeating": "^2.0.0" + } + }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "requires": { + "is-finite": "^1.0.0" + } + } + } + }, "regenerate": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", @@ -11579,6 +11615,14 @@ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, + "strip-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "requires": { + "get-stdin": "^4.0.1" + } + }, "strip-json-comments": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", @@ -12249,25 +12293,11 @@ "resolved": "https://registry.npmjs.org/throat/-/throat-2.0.2.tgz", "integrity": "sha1-qfzoCLaeEzpjJZB4DzQsMKYkmwI=" }, - "throttleit": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz", - "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=" - }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, - "through2": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz", - "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=", - "requires": { - "readable-stream": "~1.1.9", - "xtend": "~2.1.1" - } - }, "timed-out": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", @@ -12402,6 +12432,11 @@ "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz", "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=" }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=" + }, "trim-repeated": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", From 73c7a637a0ef6c04125faade5c06e12414bbacd3 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Thu, 16 Jul 2020 12:50:43 -0500 Subject: [PATCH 080/119] re-enable the bootstrap cache on macOS CI --- script/vsts/platforms/macos.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index 28983fc74..b44b7ca82 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -17,12 +17,12 @@ jobs: versionSpec: 12.4.0 displayName: Install Node.js 12.4.0 - #- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - # displayName: Restore node_modules cache - # inputs: - # keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json' - # targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - # vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2' + - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 + displayName: Restore node_modules cache + inputs: + keyfile: 'package.json, script/vsts/platforms/macos.yml, **/package-lock.json, !**/node_modules/**/package-lock.json, !**/.*/**/package-lock.json' + targetfolder: '**/node_modules, !**/node_modules/**/node_modules' + vstsFeed: 'bae1bc26-220d-43c7-a955-4de039370de2' - script: script/bootstrap displayName: Bootstrap build environment From b99b8800fe965308692d0d93d0b67bc18709eafd Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 02:04:08 -0500 Subject: [PATCH 081/119] run package tests in parallel for windows tests --- script/test | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/script/test b/script/test index 974f29d83..ee9421e57 100755 --- a/script/test +++ b/script/test @@ -205,28 +205,24 @@ function requestedTestSuites () { function testSuitesForPlatform (platform) { let suites = [] - switch (platform) { - case 'darwin': - const PACKAGES_TO_TEST_IN_PARALLEL = 23 + if ((platform === 'darwin') || (platform === 'win32' && process.arch === 'x64')) { + const PACKAGES_TO_TEST_IN_PARALLEL = 23 - if (process.env.ATOM_RUN_CORE_TESTS === 'true') { - suites = [runCoreMainProcessTests, runCoreRenderProcessTests] - } else if (process.env.ATOM_RUN_PACKAGE_TESTS === '1') { - suites = packageTestSuites.slice(0, PACKAGES_TO_TEST_IN_PARALLEL) - } else if (process.env.ATOM_RUN_PACKAGE_TESTS === '2') { - suites = packageTestSuites.slice(PACKAGES_TO_TEST_IN_PARALLEL) - } else { - suites = [runCoreMainProcessTests, runCoreRenderProcessTests].concat(packageTestSuites) - } - break - case 'win32': - suites = (process.arch === 'x64') ? [runCoreMainProcessTests, runCoreRenderProcessTests] : [runCoreMainProcessTests] - break - case 'linux': - suites = [runCoreMainProcessTests] - break - default: - console.log(`Unrecognized platform: ${platform}`) + if (process.env.ATOM_RUN_CORE_TESTS === 'true') { + suites = [runCoreMainProcessTests, runCoreRenderProcessTests] + } else if (process.env.ATOM_RUN_PACKAGE_TESTS === '1') { + suites = packageTestSuites.slice(0, PACKAGES_TO_TEST_IN_PARALLEL) + } else if (process.env.ATOM_RUN_PACKAGE_TESTS === '2') { + suites = packageTestSuites.slice(PACKAGES_TO_TEST_IN_PARALLEL) + } else { + suites = [runCoreMainProcessTests, runCoreRenderProcessTests].concat(packageTestSuites) + } + } + else if ((platform === 'linux') || (platform === 'win32' && process.arch === 'x86')) { + suites = [runCoreMainProcessTests] + } + else { + console.log(`Unrecognized platform: ${platform}`) } if (argv.skipMainProcessTests) { From 038d6394a91367582ab7d7673c9c70f15ec95bc7 Mon Sep 17 00:00:00 2001 From: aminya Date: Sat, 11 Jul 2020 23:36:57 -0500 Subject: [PATCH 082/119] parallelize core tests --- script/test | 73 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/script/test b/script/test index ee9421e57..24431b53c 100755 --- a/script/test +++ b/script/test @@ -97,18 +97,23 @@ function runCoreMainProcessTests (callback) { cp.on('close', exitCode => { callback(null, {exitCode, step: 'core-main-process'}) }) } -function runCoreRenderProcessTests (callback) { - const testPath = path.join(CONFIG.repositoryRootPath, 'spec') - const testArguments = [ - '--resource-path', resourcePath, - '--test', testPath - ] - const testEnv = prepareEnv('core-render-process') +// Build an array of functions, each running tests for a different rendering test +const coreRenderProcessTestSuites = [] +const testPath = path.join(CONFIG.repositoryRootPath, 'spec') +let testFiles = glob.sync(path.join(testPath, '*-spec.+(js|coffee|ts|jsx|tsx|mjs)')) +for (let testFile of testFiles) { + coreRenderProcessTestSuites.push( function (callback) { - console.log('Executing core render process tests'.bold.green) - const cp = childProcess.spawn(executablePath, testArguments, {stdio: 'inherit', env: testEnv}) - cp.on('error', error => { callback(error) }) - cp.on('close', exitCode => { callback(null, {exitCode, step: 'core-render-process'}) }) + const testEnv = prepareEnv('core-render-process') + console.log(`Executing core render process tests for ${testFile}`.bold.green) + const testArguments = [ + '--resource-path', resourcePath, + '--test', testFile + ] + const cp = childProcess.spawn(executablePath, testArguments, {stdio: 'inherit', env: testEnv}) + cp.on('error', error => { callback(error) }) + cp.on('close', exitCode => { callback(null, {exitCode, step: `core-render-process for ${testFile}`}) }) + }) } // Build an array of functions, each running tests for a different bundled package @@ -192,7 +197,7 @@ function requestedTestSuites () { suites.push(runCoreMainProcessTests) } if (argv.coreRenderer) { - suites.push(runCoreRenderProcessTests) + suites.push(...coreRenderProcessTestSuites) } if (argv.coreBenchmark) { suites.push(runBenchmarkTests) @@ -205,24 +210,36 @@ function requestedTestSuites () { function testSuitesForPlatform (platform) { let suites = [] - if ((platform === 'darwin') || (platform === 'win32' && process.arch === 'x64')) { - const PACKAGES_TO_TEST_IN_PARALLEL = 23 + // Env variable options + let coreMain = process.env.ATOM_RUN_CORE_MAIN_TESTS === 'true' + let coreRenderer1 = process.env.ATOM_RUN_CORE_RENDER_TESTS === '1' + let coreRenderer2 = process.env.ATOM_RUN_CORE_RENDER_TESTS === '2' + let coreAll = process.env.ATOM_RUN_CORE_TESTS === 'true' + let packages1 = process.env.ATOM_RUN_PACKAGE_TESTS === '1' + let packages2 = process.env.ATOM_RUN_PACKAGE_TESTS === '2' - if (process.env.ATOM_RUN_CORE_TESTS === 'true') { - suites = [runCoreMainProcessTests, runCoreRenderProcessTests] - } else if (process.env.ATOM_RUN_PACKAGE_TESTS === '1') { - suites = packageTestSuites.slice(0, PACKAGES_TO_TEST_IN_PARALLEL) - } else if (process.env.ATOM_RUN_PACKAGE_TESTS === '2') { - suites = packageTestSuites.slice(PACKAGES_TO_TEST_IN_PARALLEL) - } else { - suites = [runCoreMainProcessTests, runCoreRenderProcessTests].concat(packageTestSuites) - } - } - else if ((platform === 'linux') || (platform === 'win32' && process.arch === 'x86')) { + // Operating system overrides: + coreMain = coreMain || (platform === 'linux') || (platform === 'win32' && process.arch === 'x86') + + // split package tests (used for macos in CI) + const PACKAGES_TO_TEST_IN_PARALLEL = 23 + // split core render test (used for windows x64 in CI) + const CORE_RENDER_TO_TEST_IN_PARALLEL = 35 + + if (coreMain) { suites = [runCoreMainProcessTests] - } - else { - console.log(`Unrecognized platform: ${platform}`) + } else if (coreRenderer1) { + suites = coreRenderProcessTestSuites.slice(0, CORE_RENDER_TO_TEST_IN_PARALLEL) + } else if (coreRenderer2) { + suites = coreRenderProcessTestSuites.slice(CORE_RENDER_TO_TEST_IN_PARALLEL) + } else if (coreAll) { + suites = [runCoreMainProcessTests, ...coreRenderProcessTestSuites] + } else if (packages1) { + suites = packageTestSuites.slice(0, PACKAGES_TO_TEST_IN_PARALLEL) + } else if (packages2) { + suites = packageTestSuites.slice(PACKAGES_TO_TEST_IN_PARALLEL) + } else { + suites = [runCoreMainProcessTests, ...coreRenderProcessTestSuites, ...packageTestSuites] // all } if (argv.skipMainProcessTests) { From bbfd0ec29adf43b802eeab16986469dec0851e91 Mon Sep 17 00:00:00 2001 From: aminya Date: Sun, 12 Jul 2020 03:23:11 -0500 Subject: [PATCH 083/119] allow requesting parallel tests for all OS --- script/test | 94 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 37 deletions(-) diff --git a/script/test b/script/test index 24431b53c..ecdc6698f 100755 --- a/script/test +++ b/script/test @@ -189,34 +189,19 @@ function runBenchmarkTests (callback) { cp.on('close', exitCode => { callback(null, {exitCode, step: 'core-benchmarks'}) }) } -let testSuitesToRun = requestedTestSuites() || testSuitesForPlatform(process.platform) +let testSuitesToRun = requestedTestSuites(process.platform) -function requestedTestSuites () { - const suites = [] - if (argv.coreMain) { - suites.push(runCoreMainProcessTests) - } - if (argv.coreRenderer) { - suites.push(...coreRenderProcessTestSuites) - } - if (argv.coreBenchmark) { - suites.push(runBenchmarkTests) - } - if (argv.package) { - suites.push(...packageTestSuites) - } - return suites.length > 0 ? suites : null -} - -function testSuitesForPlatform (platform) { - let suites = [] - // Env variable options - let coreMain = process.env.ATOM_RUN_CORE_MAIN_TESTS === 'true' +function requestedTestSuites (platform) { + // env variable or argv options + let coreAll = process.env.ATOM_RUN_CORE_TESTS === 'true' + let coreMain = process.env.ATOM_RUN_CORE_MAIN_TESTS === 'true' || argv.coreMain + let coreRenderer = argv.coreRenderer || process.env.ATOM_RUN_CORE_RENDER_TESTS == 'true' let coreRenderer1 = process.env.ATOM_RUN_CORE_RENDER_TESTS === '1' let coreRenderer2 = process.env.ATOM_RUN_CORE_RENDER_TESTS === '2' - let coreAll = process.env.ATOM_RUN_CORE_TESTS === 'true' + let packageAll = argv.package || process.env.ATOM_RUN_PACKAGE_TESTS == 'true' let packages1 = process.env.ATOM_RUN_PACKAGE_TESTS === '1' let packages2 = process.env.ATOM_RUN_PACKAGE_TESTS === '2' + let benchmark = argv.coreBenchmark // Operating system overrides: coreMain = coreMain || (platform === 'linux') || (platform === 'win32' && process.arch === 'x86') @@ -224,28 +209,63 @@ function testSuitesForPlatform (platform) { // split package tests (used for macos in CI) const PACKAGES_TO_TEST_IN_PARALLEL = 23 // split core render test (used for windows x64 in CI) - const CORE_RENDER_TO_TEST_IN_PARALLEL = 35 + const CORE_RENDER_TO_TEST_IN_PARALLEL = 45 - if (coreMain) { - suites = [runCoreMainProcessTests] - } else if (coreRenderer1) { - suites = coreRenderProcessTestSuites.slice(0, CORE_RENDER_TO_TEST_IN_PARALLEL) - } else if (coreRenderer2) { - suites = coreRenderProcessTestSuites.slice(CORE_RENDER_TO_TEST_IN_PARALLEL) - } else if (coreAll) { - suites = [runCoreMainProcessTests, ...coreRenderProcessTestSuites] - } else if (packages1) { - suites = packageTestSuites.slice(0, PACKAGES_TO_TEST_IN_PARALLEL) - } else if (packages2) { - suites = packageTestSuites.slice(PACKAGES_TO_TEST_IN_PARALLEL) + let suites = [] + // Core tess + if (coreAll) { + suites.push(...[runCoreMainProcessTests, ...coreRenderProcessTestSuites]) } else { - suites = [runCoreMainProcessTests, ...coreRenderProcessTestSuites, ...packageTestSuites] // all + + // Core main tests + if (coreMain) { + suites.push(runCoreMainProcessTests) + } + + // Core renderer tests + if (coreRenderer) { + suites.push(...coreRenderProcessTestSuites) + } else { + // split + if (coreRenderer1) { + suites.push(...coreRenderProcessTestSuites.slice(0, CORE_RENDER_TO_TEST_IN_PARALLEL)) + } + if (coreRenderer2) { + suites.push(...coreRenderProcessTestSuites.slice(CORE_RENDER_TO_TEST_IN_PARALLEL)) + } + } + + } + + // Package tests + if (packageAll) { + suites.push(...packageTestSuites) + } else { + // split + if (packages1) { + suites.push(...packageTestSuites.slice(0, PACKAGES_TO_TEST_IN_PARALLEL)) + } + if (packages2) { + suites.push(...packageTestSuites.slice(PACKAGES_TO_TEST_IN_PARALLEL)) + } + } + + // Benchmark tests + if (benchmark) { + suites.push(runBenchmarkTests) } if (argv.skipMainProcessTests) { suites = suites.filter(suite => suite !== runCoreMainProcessTests) } + // Remove duplicates + suites = Array.from(new Set(suites)) + + if (suites.length == 0) { + throw new Error("No tests was requested") + } + return suites } From b61475ffe420672b3360b50aba7b0f347ea319d4 Mon Sep 17 00:00:00 2001 From: aminya Date: Wed, 15 Jul 2020 00:51:39 -0500 Subject: [PATCH 084/119] run tests using async.parallel --- script/test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/test b/script/test index ecdc6698f..ff8bdf0c7 100755 --- a/script/test +++ b/script/test @@ -269,7 +269,7 @@ function requestedTestSuites (platform) { return suites } -async.series(testSuitesToRun, function (err, results) { +async.parallel(testSuitesToRun, function (err, results) { if (err) { console.error(err) process.exit(1) From 3d400d02cd748486fbf27d273b1936500eff583b Mon Sep 17 00:00:00 2001 From: aminya Date: Wed, 15 Jul 2020 04:37:49 -0500 Subject: [PATCH 085/119] don't use temp.track() cleanup process fails when the file is locked (in parallel tests) --- src/main-process/start.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main-process/start.js b/src/main-process/start.js index 82c0591a5..9f0d58161 100644 --- a/src/main-process/start.js +++ b/src/main-process/start.js @@ -1,7 +1,7 @@ const { app } = require('electron'); const nslog = require('nslog'); const path = require('path'); -const temp = require('temp').track(); +const temp = require('temp'); const parseCommandLine = require('./parse-command-line'); const startCrashReporter = require('../crash-reporter-start'); const getReleaseChannel = require('../get-release-channel'); From 266910d0598872ac6f2d545ee7d3802627f35111 Mon Sep 17 00:00:00 2001 From: aminya Date: Wed, 15 Jul 2020 05:03:00 -0500 Subject: [PATCH 086/119] warn before error reporting Helps visually --- script/test | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/script/test b/script/test index ff8bdf0c7..80a4d6b54 100755 --- a/script/test +++ b/script/test @@ -276,10 +276,14 @@ async.parallel(testSuitesToRun, function (err, results) { } else { const failedSteps = results.filter(({exitCode}) => exitCode !== 0) - for (const {step} of failedSteps) { - console.error(`Error! The '${step}' test step finished with a non-zero exit code`) + if (failedSteps.length > 0) { + console.warn("\n \n *** Reporting the errors that happened in all of the tests: *** \n \n") + for (const {step} of failedSteps) { + console.error(`Error! The '${step}' test step finished with a non-zero exit code`) + } + process.exit(1) } - process.exit(failedSteps.length === 0 ? 0 : 1) + process.exit(0) } }) From 2fa0f6ebb9dfb43239d4ed27b4fd0cdcfc0324ca Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 00:51:26 -0500 Subject: [PATCH 087/119] test: use Azure format for printing --- script/test | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/script/test b/script/test index 80a4d6b54..a0ddfa4ce 100755 --- a/script/test +++ b/script/test @@ -60,7 +60,7 @@ if (process.platform === 'darwin') { assert(executablePaths.length === 1, `More than one application to run tests against was found. ${executablePaths.join(',')}`) executablePath = executablePaths[0] } else { - throw new Error('Running tests on this platform is not supported.') + throw new Error('##[error] Running tests on this platform is not supported.') } function prepareEnv (suiteName) { @@ -91,7 +91,7 @@ function runCoreMainProcessTests (callback) { const testEnv = Object.assign({}, prepareEnv('core-main-process'), {ATOM_GITHUB_INLINE_GIT_EXEC: 'true'}) - console.log('Executing core main process tests'.bold.green) + console.log('##[command] Executing core main process tests'.bold.green) const cp = childProcess.spawn(executablePath, testArguments, {stdio: 'inherit', env: testEnv}) cp.on('error', error => { callback(error) }) cp.on('close', exitCode => { callback(null, {exitCode, step: 'core-main-process'}) }) @@ -105,7 +105,7 @@ for (let testFile of testFiles) { coreRenderProcessTestSuites.push( function (callback) { const testEnv = prepareEnv('core-render-process') - console.log(`Executing core render process tests for ${testFile}`.bold.green) + console.log(`##[command] Executing core render process tests for ${testFile}`.bold.green) const testArguments = [ '--resource-path', resourcePath, '--test', testFile @@ -145,7 +145,7 @@ for (let packageName in CONFIG.appMetadata.packageDependencies) { const nodeModulesPath = path.join(repositoryPackagePath, 'node_modules') let finalize = () => null if (require(pkgJsonPath).atomTestRunner) { - console.log(`Installing test runner dependencies for ${packageName}`.bold.green) + console.log(`##[command] Installing test runner dependencies for ${packageName}`.bold.green) if (fs.existsSync(nodeModulesPath)) { const backup = backupNodeModules(repositoryPackagePath) finalize = backup.restore @@ -153,9 +153,9 @@ for (let packageName in CONFIG.appMetadata.packageDependencies) { finalize = () => fs.removeSync(nodeModulesPath) } runApmInstall(repositoryPackagePath) - console.log(`Executing ${packageName} tests`.green) + console.log(`##[command] Executing ${packageName} tests`.green) } else { - console.log(`Executing ${packageName} tests`.bold.green) + console.log(`##[command] Executing ${packageName} tests`.bold.green) } const cp = childProcess.spawn(executablePath, testArguments, {env: testEnv}) @@ -169,7 +169,7 @@ for (let packageName in CONFIG.appMetadata.packageDependencies) { }) cp.on('close', exitCode => { if (exitCode !== 0) { - console.log(`Package tests failed for ${packageName}:`.red) + console.log(`##[error] Package tests failed for ${packageName}:`.red) console.log(stderrOutput) } finalize() @@ -183,7 +183,7 @@ function runBenchmarkTests (callback) { const testArguments = ['--benchmark-test', benchmarksPath] const testEnv = prepareEnv('benchmark') - console.log('Executing benchmark tests'.bold.green) + console.log('##[command] Executing benchmark tests'.bold.green) const cp = childProcess.spawn(executablePath, testArguments, {stdio: 'inherit', env: testEnv}) cp.on('error', error => { callback(error) }) cp.on('close', exitCode => { callback(null, {exitCode, step: 'core-benchmarks'}) }) @@ -277,9 +277,9 @@ async.parallel(testSuitesToRun, function (err, results) { const failedSteps = results.filter(({exitCode}) => exitCode !== 0) if (failedSteps.length > 0) { - console.warn("\n \n *** Reporting the errors that happened in all of the tests: *** \n \n") + console.warn("##[error] \n \n *** Reporting the errors that happened in all of the tests: *** \n \n") for (const {step} of failedSteps) { - console.error(`Error! The '${step}' test step finished with a non-zero exit code`) + console.error(`##[error] The '${step}' test step finished with a non-zero exit code`) } process.exit(1) } From 92f4f7891e5a94728a0c69931439fc82f1ffb4d5 Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 02:16:04 -0500 Subject: [PATCH 088/119] Run windows renderer tests in parallel --- script/vsts/platforms/templates/test.yml | 1 + script/vsts/platforms/windows.yml | 51 +++++++++++++++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/test.yml b/script/vsts/platforms/templates/test.yml index 72389353e..a116fa3dc 100644 --- a/script/vsts/platforms/templates/test.yml +++ b/script/vsts/platforms/templates/test.yml @@ -21,6 +21,7 @@ steps: ATOM_JASMINE_REPORTER: list TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit ATOM_RUN_CORE_TESTS: $(RunCoreTests) + ATOM_RUN_CORE_RENDER_TESTS: $(RunCoreRendererTests) ATOM_RUN_PACKAGE_TESTS: $(RunPackageTests) displayName: Run tests condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index b9bd45702..a8083a587 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -1,5 +1,5 @@ jobs: - - job: Windows + - job: Windows_Build dependsOn: GetReleaseVersion timeoutInMinutes: 180 strategy: @@ -67,3 +67,52 @@ jobs: - filename: RELEASES$(FileID) dir: $(Build.SourcesDirectory)/out condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) + + - job: Windows_RendererTests + dependsOn: Windows_Build + timeoutInMinutes: 180 + strategy: + maxParallel: 2 + matrix: + x64_Renderer_Test1: + RunCoreMainTests: false + RunCoreRendererTests: 1 + buildArch: x64 + x64_Renderer_Test2: + RunCoreMainTests: false + RunCoreRendererTests: 2 + buildArch: x64 + + pool: + vmImage: vs2017-win2016 + + variables: + AppName: $[ dependencies.GetReleaseVersion.outputs['Version.AppName'] ] + ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ] + IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ] + IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ] + + steps: + - template: templates/preparation.yml + + - template: templates/cache.yml + parameters: + OS: windows + + # Downloading the build artifacts + - pwsh: | + if ($env:BUILD_ARCH -eq "x64") { + $env:FileID="-x64" + echo "##vso[task.setvariable variable=FileID]$env:FileID" # Azure syntax + } + env: + BUILD_ARCH: $(buildArch) + displayName: Set FileID based on the arch + + - template: templates/download-unzip.yml + parameters: + artifacts: + - atom$(FileID)-windows.zip + + # Core renderer tests + - template: templates/test.yml From 314a2b6a2b906c8ee49ab2aa6437a3083412cecc Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 02:55:36 -0500 Subject: [PATCH 089/119] Run windows core main tests in the build step --- script/vsts/platforms/templates/test.yml | 1 + script/vsts/platforms/windows.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/script/vsts/platforms/templates/test.yml b/script/vsts/platforms/templates/test.yml index a116fa3dc..b991f36f8 100644 --- a/script/vsts/platforms/templates/test.yml +++ b/script/vsts/platforms/templates/test.yml @@ -21,6 +21,7 @@ steps: ATOM_JASMINE_REPORTER: list TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit ATOM_RUN_CORE_TESTS: $(RunCoreTests) + ATOM_RUN_CORE_MAIN_TESTS: $(RunCoreMainTests) ATOM_RUN_CORE_RENDER_TESTS: $(RunCoreRendererTests) ATOM_RUN_PACKAGE_TESTS: $(RunPackageTests) displayName: Run tests diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index a8083a587..a79b6509d 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -7,8 +7,10 @@ jobs: matrix: x64: buildArch: x64 + RunCoreMainTests: true x86: buildArch: x86 + RunCoreMainTests: true pool: vmImage: vs2017-win2016 From f55b7b8dcee0bad16d73cf22da3d7a402b307d7e Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 08:42:47 -0500 Subject: [PATCH 090/119] always upload atom windows.zip for x64 --- script/vsts/platforms/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index a79b6509d..c6334483a 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -55,7 +55,7 @@ jobs: artifacts: - filename: atom$(FileID)-windows.zip dir: $(Build.SourcesDirectory)/out - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) + condition: and( succeeded(), or( eq(variables['BUILD_ARCH'], 'x64'), ne(variables['Build.Reason'], 'PullRequest') ) ) - filename: AtomSetup$(FileID).exe dir: $(Build.SourcesDirectory)/out condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) From c5af5781ab274270dc451f4ecff055b4ffbafcf3 Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 08:42:52 -0500 Subject: [PATCH 091/119] bootstrap in case cache misses --- script/vsts/platforms/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index c6334483a..81a36df75 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -101,6 +101,8 @@ jobs: parameters: OS: windows + - template: templates/bootstrap.yml + # Downloading the build artifacts - pwsh: | if ($env:BUILD_ARCH -eq "x64") { From d56fef6d9fbb50d7f70b776e7b6a29572e83e037 Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 20:36:53 -0500 Subject: [PATCH 092/119] macos: run core main tests in the build phase --- script/vsts/platforms/macos.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index cc13d2c77..cd9b08fe8 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -8,6 +8,7 @@ jobs: ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ] IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ] IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ] + RunCoreMainTests: true pool: vmImage: macos-10.14 @@ -25,6 +26,9 @@ jobs: - template: templates/build.yml + # core main tests + - template: templates/test.yml + - script: | cp $(Build.SourcesDirectory)/out/*.zip $(Build.ArtifactStagingDirectory) displayName: Stage Artifacts @@ -51,8 +55,8 @@ jobs: strategy: maxParallel: 3 matrix: - core: - RunCoreTests: true + renderer: + RunCoreRendererTests: true RunPackageTests: false packages-1: RunCoreTests: false From a1dab28e4eded68342c10cffefad0b2308f3daf0 Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 23:09:00 -0500 Subject: [PATCH 093/119] print the used testCommand for failed tests --- script/test | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/test b/script/test index a0ddfa4ce..77e481e29 100755 --- a/script/test +++ b/script/test @@ -94,7 +94,7 @@ function runCoreMainProcessTests (callback) { console.log('##[command] Executing core main process tests'.bold.green) const cp = childProcess.spawn(executablePath, testArguments, {stdio: 'inherit', env: testEnv}) cp.on('error', error => { callback(error) }) - cp.on('close', exitCode => { callback(null, {exitCode, step: 'core-main-process'}) }) + cp.on('close', exitCode => { callback(null, {exitCode, step: 'core-main-process', testCommand: `You can run the test again using: \n\t ${executablePath} ${testArguments.join(' ')}`}) }) } // Build an array of functions, each running tests for a different rendering test @@ -112,7 +112,7 @@ for (let testFile of testFiles) { ] const cp = childProcess.spawn(executablePath, testArguments, {stdio: 'inherit', env: testEnv}) cp.on('error', error => { callback(error) }) - cp.on('close', exitCode => { callback(null, {exitCode, step: `core-render-process for ${testFile}`}) }) + cp.on('close', exitCode => { callback(null, {exitCode, step: `core-render-process for ${testFile}.`, testCommand: `You can run the test again using: \n\t ${executablePath} ${testArguments.join(' ')}`}) }) }) } @@ -173,7 +173,7 @@ for (let packageName in CONFIG.appMetadata.packageDependencies) { console.log(stderrOutput) } finalize() - callback(null, {exitCode, step: `package-${packageName}`}) + callback(null, {exitCode, step: `package-${packageName}.`, testCommand: `You can run the test again using: \n\t ${executablePath} ${testArguments.join(' ')}`}) }) }) } @@ -186,7 +186,7 @@ function runBenchmarkTests (callback) { console.log('##[command] Executing benchmark tests'.bold.green) const cp = childProcess.spawn(executablePath, testArguments, {stdio: 'inherit', env: testEnv}) cp.on('error', error => { callback(error) }) - cp.on('close', exitCode => { callback(null, {exitCode, step: 'core-benchmarks'}) }) + cp.on('close', exitCode => { callback(null, {exitCode, step: 'core-benchmarks', testCommand: `You can run the test again using: \n\t ${executablePath} ${testArguments.join(' ')}`}) }) } let testSuitesToRun = requestedTestSuites(process.platform) @@ -278,8 +278,8 @@ async.parallel(testSuitesToRun, function (err, results) { if (failedSteps.length > 0) { console.warn("##[error] \n \n *** Reporting the errors that happened in all of the tests: *** \n \n") - for (const {step} of failedSteps) { - console.error(`##[error] The '${step}' test step finished with a non-zero exit code`) + for (const {step, testCommand} of failedSteps) { + console.error(`##[error] The '${step}' test step finished with a non-zero exit code \n ${testCommand}`) } process.exit(1) } From 582b6d97e32beb18ab6418f6e2f489fd80b8952a Mon Sep 17 00:00:00 2001 From: aminya Date: Fri, 17 Jul 2020 22:28:19 -0500 Subject: [PATCH 094/119] update message about finding a single application to run the tests --- script/test | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/test b/script/test index 77e481e29..8c66a2ae9 100755 --- a/script/test +++ b/script/test @@ -49,15 +49,15 @@ const resourcePath = CONFIG.repositoryRootPath let executablePath if (process.platform === 'darwin') { const executablePaths = glob.sync(path.join(CONFIG.buildOutputPath, '*.app')) - assert(executablePaths.length === 1, `More than one application to run tests against was found. ${executablePaths.join(',')}`) + assert(executablePaths.length === 1, `A single application to run tests against was not found. ${executablePaths.join(',')}`) executablePath = path.join(executablePaths[0], 'Contents', 'MacOS', path.basename(executablePaths[0], '.app')) } else if (process.platform === 'linux') { const executablePaths = glob.sync(path.join(CONFIG.buildOutputPath, 'atom-*', 'atom')) - assert(executablePaths.length === 1, `More than one application to run tests against was found. ${executablePaths.join(',')}`) + assert(executablePaths.length === 1, `A single application to run tests against was not found. ${executablePaths.join(',')}`) executablePath = executablePaths[0] } else if (process.platform === 'win32') { const executablePaths = glob.sync(path.join(CONFIG.buildOutputPath, '**', 'atom*.exe')) - assert(executablePaths.length === 1, `More than one application to run tests against was found. ${executablePaths.join(',')}`) + assert(executablePaths.length === 1, `A single application to run tests against was not found. ${executablePaths.join(',')}`) executablePath = executablePaths[0] } else { throw new Error('##[error] Running tests on this platform is not supported.') From b0853cb3bb5d4c172609d59f757d0a5ca893467c Mon Sep 17 00:00:00 2001 From: aminya Date: Thu, 16 Jul 2020 21:28:21 -0500 Subject: [PATCH 095/119] fix bootstrap condition indentation --- script/vsts/platforms/templates/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/bootstrap.yml b/script/vsts/platforms/templates/bootstrap.yml index 1d57b688d..898d8273c 100644 --- a/script/vsts/platforms/templates/bootstrap.yml +++ b/script/vsts/platforms/templates/bootstrap.yml @@ -28,4 +28,4 @@ steps: GITHUB_TOKEN: $(GITHUB_TOKEN) CI: true CI_PROVIDER: VSTS - condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) + condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true')) From 44fa354c18f683be9b756ab77042649048e17263 Mon Sep 17 00:00:00 2001 From: aminya Date: Sat, 18 Jul 2020 01:55:55 -0500 Subject: [PATCH 096/119] use new-item to not conflict mkdir on macos --- script/vsts/platforms/templates/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/vsts/platforms/templates/test.yml b/script/vsts/platforms/templates/test.yml index 72389353e..8b3e4eb0d 100644 --- a/script/vsts/platforms/templates/test.yml +++ b/script/vsts/platforms/templates/test.yml @@ -49,7 +49,7 @@ steps: # Crash Reports - pwsh: | - mkdir -f -p $env:ARTIFACT_STAGING_DIR/crash-reports + New-Item -Path $env:ARTIFACT_STAGING_DIR/crash-reports -Type Directory -Force if (($env:AGENT_OS -eq "Windows_NT") -and (Test-Path "$env:TEMP/Atom Crashes")) { cp "$env:TEMP/Atom Crashes/*.dmp" $env:ARTIFACT_STAGING_DIR/crash-reports } else { From 6d50f3fc5a90184a41ddbefc128d7b5ff73d2fdd Mon Sep 17 00:00:00 2001 From: aminya Date: Sun, 19 Jul 2020 12:54:17 -0500 Subject: [PATCH 097/119] fix: rename windows job back to Windows --- script/vsts/platforms/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 81a36df75..98af05ad7 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -1,5 +1,5 @@ jobs: - - job: Windows_Build + - job: Windows dependsOn: GetReleaseVersion timeoutInMinutes: 180 strategy: @@ -71,7 +71,7 @@ jobs: condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) - job: Windows_RendererTests - dependsOn: Windows_Build + dependsOn: Windows timeoutInMinutes: 180 strategy: maxParallel: 2 From 852be73127fc6f1e7f7da030e4af0d23e62e7b53 Mon Sep 17 00:00:00 2001 From: darangi Date: Tue, 21 Jul 2020 20:48:48 +0100 Subject: [PATCH 098/119] :arrow_up: find-and-replace@0.219.5 --- package-lock.json | 6 +++--- package.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 17f4dfd78..a3ff9c79c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "atom", - "version": "1.49.0-dev", + "version": "1.50.0-dev", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3091,8 +3091,8 @@ } }, "find-and-replace": { - "version": "https://www.atom.io/api/packages/find-and-replace/versions/0.219.3/tarball", - "integrity": "sha512-Ixc+4g6rAjO6L6QPdii8W0fTxGgjMO9AydodAEA6/o91bScGB4veKfn/yiZSMoXQwivw5fJpt8ZiMZ85lSijKw==", + "version": "https://www.atom.io/api/packages/find-and-replace/versions/0.219.5/tarball", + "integrity": "sha512-FVi54caB9IFGRBxye9nqnshryjCGhumlqioU/fwJTE+N8kUmJ/zjTUKiy9FhDK5782PUc4ig0cHimbH7o8vxmA==", "requires": { "binary-search": "^1.3.3", "etch": "0.9.3", diff --git a/package.json b/package.json index 78bd9e6e1..f2d8ab69e 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "etch": "^0.12.6", "event-kit": "^2.5.3", "exception-reporting": "file:packages/exception-reporting", - "find-and-replace": "https://www.atom.io/api/packages/find-and-replace/versions/0.219.3/tarball", + "find-and-replace": "https://www.atom.io/api/packages/find-and-replace/versions/0.219.5/tarball", "find-parent-dir": "^0.3.0", "first-mate": "7.4.1", "focus-trap": "2.4.5", @@ -202,7 +202,7 @@ "dev-live-reload": "file:./packages/dev-live-reload", "encoding-selector": "0.23.9", "exception-reporting": "file:./packages/exception-reporting", - "find-and-replace": "0.219.3", + "find-and-replace": "0.219.5", "fuzzy-finder": "1.14.2", "github": "0.34.2", "git-diff": "file:./packages/git-diff", From 6172046a3245814c2863ad7edcdfdd190e2f4717 Mon Sep 17 00:00:00 2001 From: darangi Date: Tue, 21 Jul 2020 21:41:49 +0100 Subject: [PATCH 099/119] :arrow_up: settings-view@0.261.5 --- package-lock.json | 18 +++++++++--------- package.json | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 17f4dfd78..cd70788a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "atom", - "version": "1.49.0-dev", + "version": "1.50.0-dev", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1271,9 +1271,9 @@ "integrity": "sha512-7+Wlx3BImrK0HiG6y3lU4xX7SpBPSSu8T9iguPMlaueRFxjbYwAQrp9lqZUuFikqKbd/en8lVREILvP2J80uJA==" }, "ajv": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", - "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "version": "6.12.3", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", + "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -3006,9 +3006,9 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "fast-deep-equal": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", - "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "fast-json-stable-stringify": { "version": "2.1.0", @@ -6317,8 +6317,8 @@ "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, "settings-view": { - "version": "https://www.atom.io/api/packages/settings-view/versions/0.261.4/tarball", - "integrity": "sha512-UfFj+d3qa8sIbUc5H/VQKMi8FFuROI+Q2CZhLLWyg13IQzITwiu6kTMarYO932ma6jPOE6F8MjKusMsOP71xNQ==", + "version": "https://www.atom.io/api/packages/settings-view/versions/0.261.5/tarball", + "integrity": "sha512-ydVcLW71bjCX158QSt1R0AfHAaf4R39zqL6nxva3ut6DzpW94Hfd7O+/aHljHygnZILmjgXGIrSfINVVrEDXVQ==", "requires": { "async": "~0.2.9", "dompurify": "^1.0.2", diff --git a/package.json b/package.json index 78bd9e6e1..1733a4ddb 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "season": "^6.0.2", "semver": "^4.3.3", "service-hub": "^0.7.4", - "settings-view": "https://www.atom.io/api/packages/settings-view/versions/0.261.4/tarball", + "settings-view": "https://www.atom.io/api/packages/settings-view/versions/0.261.5/tarball", "sinon": "1.17.4", "snippets": "https://www.atom.io/api/packages/snippets/versions/1.5.1/tarball", "solarized-dark-syntax": "file:packages/solarized-dark-syntax", @@ -218,7 +218,7 @@ "notifications": "0.71.0", "open-on-github": "1.3.2", "package-generator": "1.3.0", - "settings-view": "0.261.4", + "settings-view": "0.261.5", "snippets": "1.5.1", "spell-check": "0.76.1", "status-bar": "1.8.17", From c413a5626a5d348622efad54611aa610ebec04b2 Mon Sep 17 00:00:00 2001 From: aminya Date: Fri, 24 Jul 2020 21:03:41 -0500 Subject: [PATCH 100/119] collect console log in renderer tests Print the output finally to ease diagnosing --- script/test | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/script/test b/script/test index 8c66a2ae9..996191023 100755 --- a/script/test +++ b/script/test @@ -110,9 +110,21 @@ for (let testFile of testFiles) { '--resource-path', resourcePath, '--test', testFile ] - const cp = childProcess.spawn(executablePath, testArguments, {stdio: 'inherit', env: testEnv}) - cp.on('error', error => { callback(error) }) - cp.on('close', exitCode => { callback(null, {exitCode, step: `core-render-process for ${testFile}.`, testCommand: `You can run the test again using: \n\t ${executablePath} ${testArguments.join(' ')}`}) }) + const cp = childProcess.spawn(executablePath, testArguments, { env: testEnv}) + let stderrOutput = '' + cp.stderr.on('data', data => { stderrOutput += data }) + cp.stdout.on('data', data => { stderrOutput += data }) + cp.on('error', error => { + console.log(error, "error") + callback(error) + }) + cp.on('close', exitCode => { + if (exitCode !== 0) { + console.log(`##[error] Renderer tests failed for ${testFile}:`.red) + console.log(stderrOutput) + } + callback(null, {exitCode, step: `core-render-process for ${testFile}.`, testCommand: `You can run the test again using: \n\t ${executablePath} ${testArguments.join(' ')}`}) + }) }) } From 3bdd637ff28a1a4001cdd5d97193a10059b6e2fa Mon Sep 17 00:00:00 2001 From: aminya Date: Fri, 24 Jul 2020 21:03:55 -0500 Subject: [PATCH 101/119] Use async.series Revert b61475ffe420672b3360b50aba7b0f347ea319d4 --- script/test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/test b/script/test index 996191023..930828430 100755 --- a/script/test +++ b/script/test @@ -281,7 +281,7 @@ function requestedTestSuites (platform) { return suites } -async.parallel(testSuitesToRun, function (err, results) { +async.series(testSuitesToRun, function (err, results) { if (err) { console.error(err) process.exit(1) From a2283bf37a3b0939f901a7e321a817babc6c00f7 Mon Sep 17 00:00:00 2001 From: aminya Date: Sat, 25 Jul 2020 02:36:43 -0500 Subject: [PATCH 102/119] support ES6 default require for packages --- src/package.js | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/package.js b/src/package.js index dd5105708..55785a4b7 100644 --- a/src/package.js +++ b/src/package.js @@ -881,8 +881,9 @@ module.exports = class Package { requireMainModule() { if (this.bundledPackage && this.packageManager.packagesCache[this.name]) { if (this.packageManager.packagesCache[this.name].main) { - this.mainModule = require(this.packageManager.packagesCache[this.name] - .main); + this.mainModule = this._require( + this.packageManager.packagesCache[this.name].main + ); return this.mainModule; } } else if (this.mainModuleRequired) { @@ -904,7 +905,7 @@ module.exports = class Package { const previousViewProviderCount = this.viewRegistry.getViewProviderCount(); const previousDeserializerCount = this.deserializerManager.getDeserializerCount(); - this.mainModule = require(mainModulePath); + this.mainModule = this._require(mainModulePath); if ( this.viewRegistry.getViewProviderCount() === previousViewProviderCount && @@ -921,6 +922,27 @@ module.exports = class Package { } } + // a require function with both ES5 and ES6 default export support + _require(path) { + const modul = require(path); + if (modul === null || modul === undefined) { + // if null do not bother + return modul; + } else { + if ( + modul.__esModule === true && + typeof modul.default === 'object' && + typeof modul.default.activate === 'function' + ) { + // __esModule flag is true and the activate function exists inside it, which means + // an object containing the main functions (e.g. activate, etc) is default exported + return modul.default; + } else { + return modul; + } + } + } + getMainModulePath() { if (this.resolvedMainModulePath) return this.mainModulePath; this.resolvedMainModulePath = true; From dea9e4ad0a5da8bb7dc32a3815a8ee775122e378 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Sat, 25 Jul 2020 18:24:40 -0400 Subject: [PATCH 103/119] CI: Use forward-slashes in paths (cross-platform) Backslashes ("\") can be interpreted as escape characters on Unix (Linux, macOS). Replace with forward-slashes, "/", which are interpreted the same (as directory separators) on all OSes, at least in arguments to commands such as `cd` and `node`. --- script/vsts/nightly-release.yml | 8 ++++---- script/vsts/pull-requests.yml | 4 ++-- script/vsts/release-branch-build.yml | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index faff9bfec..b8f1665bb 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -6,10 +6,10 @@ jobs: # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. - script: | - cd script\vsts + cd script/vsts npm install displayName: npm install - - script: node script\vsts\get-release-version.js --nightly + - script: node script/vsts/get-release-version.js --nightly name: Version env: REPO_OWNER: $(REPO_OWNER) @@ -40,7 +40,7 @@ jobs: #This has to be done separately because VSTS inexplicably #exits the script block after `npm install` completes. - script: | - cd script\vsts + cd script/vsts npm install displayName: npm install @@ -51,7 +51,7 @@ jobs: displayName: Download Release Artifacts - script: | - node $(Build.SourcesDirectory)\script\vsts\upload-artifacts.js --create-github-release --assets-path "$(System.ArtifactsDirectory)" --linux-repo-name "atom" + node $(Build.SourcesDirectory)/script/vsts/upload-artifacts.js --create-github-release --assets-path "$(System.ArtifactsDirectory)" --linux-repo-name "atom" env: GITHUB_TOKEN: $(GITHUB_TOKEN) ATOM_RELEASE_VERSION: $(ReleaseVersion) diff --git a/script/vsts/pull-requests.yml b/script/vsts/pull-requests.yml index 66a665d36..60cbd9f8b 100644 --- a/script/vsts/pull-requests.yml +++ b/script/vsts/pull-requests.yml @@ -8,10 +8,10 @@ jobs: # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. - script: | - cd script\vsts + cd script/vsts npm install displayName: npm install - - script: node script\vsts\get-release-version.js + - script: node script/vsts/get-release-version.js name: Version env: REPO_OWNER: $(REPO_OWNER) diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index 2385f9cc8..ca22a84cd 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -12,10 +12,10 @@ jobs: # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. - script: | - cd script\vsts + cd script/vsts npm install displayName: npm install - - script: node script\vsts\get-release-version.js + - script: node script/vsts/get-release-version.js name: Version env: REPO_OWNER: $(REPO_OWNER) @@ -47,7 +47,7 @@ jobs: # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. - script: | - cd script\vsts + cd script/vsts npm install env: GITHUB_TOKEN: $(GITHUB_TOKEN) @@ -60,7 +60,7 @@ jobs: displayName: Download Release Artifacts - script: | - node $(Build.SourcesDirectory)\script\vsts\upload-artifacts.js --create-github-release --assets-path "$(System.ArtifactsDirectory)" --linux-repo-name "atom-staging" + node $(Build.SourcesDirectory)/script/vsts/upload-artifacts.js --create-github-release --assets-path "$(System.ArtifactsDirectory)" --linux-repo-name "atom-staging" env: GITHUB_TOKEN: $(GITHUB_TOKEN) ATOM_RELEASE_VERSION: $(ReleaseVersion) @@ -75,7 +75,7 @@ jobs: condition: and(succeeded(), eq(variables['Atom.AutoDraftRelease'], 'true'), eq(variables['IsReleaseBranch'], 'true')) - script: | - node $(Build.SourcesDirectory)\script\vsts\upload-artifacts.js --assets-path "$(System.ArtifactsDirectory)" --s3-path "vsts-artifacts/$(Build.BuildId)/" + node $(Build.SourcesDirectory)/script/vsts/upload-artifacts.js --assets-path "$(System.ArtifactsDirectory)" --s3-path "vsts-artifacts/$(Build.BuildId)/" env: ATOM_RELEASE_VERSION: $(ReleaseVersion) ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY) From be55c397a7f2994c089f916ba21fd998cfd48cf4 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Sat, 25 Jul 2020 18:32:18 -0400 Subject: [PATCH 104/119] CI: Use 'ubuntu-latest' for GetReleaseVersion Ubuntu is much faster than Windows at installing many small files, such as during `git clone` and `npm install`. --- script/vsts/nightly-release.yml | 2 +- script/vsts/pull-requests.yml | 2 +- script/vsts/release-branch-build.yml | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index b8f1665bb..943b29bb4 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -1,7 +1,7 @@ jobs: - job: GetReleaseVersion pool: - vmImage: 'windows-latest' + vmImage: 'ubuntu-latest' steps: # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. diff --git a/script/vsts/pull-requests.yml b/script/vsts/pull-requests.yml index 60cbd9f8b..c2665c086 100644 --- a/script/vsts/pull-requests.yml +++ b/script/vsts/pull-requests.yml @@ -3,7 +3,7 @@ trigger: none # No CI builds, only PR builds jobs: - job: GetReleaseVersion pool: - vmImage: 'windows-latest' + vmImage: 'ubuntu-latest' steps: # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index ca22a84cd..af46632e3 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -7,7 +7,7 @@ pr: none # no PR triggers jobs: - job: GetReleaseVersion pool: - vmImage: 'windows-latest' + vmImage: 'ubuntu-latest' steps: # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. @@ -42,8 +42,6 @@ jobs: IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ] steps: - - template: platforms/templates/preparation.yml - # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. - script: | From 3793939a20a89c272df2679dfe06429dd2d9bacb Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Sat, 25 Jul 2020 18:35:34 -0400 Subject: [PATCH 105/119] CI: Use 'ubuntu-latest' to upload artifacts This should be marginally faster. No need to run on Windows. --- script/vsts/nightly-release.yml | 2 +- script/vsts/release-branch-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 943b29bb4..47b707f65 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -23,7 +23,7 @@ jobs: - job: Release pool: - vmImage: vs2017-win2016 + vmImage: 'ubuntu-latest' dependsOn: - GetReleaseVersion diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index af46632e3..a4d992515 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -28,7 +28,7 @@ jobs: - job: UploadArtifacts pool: - vmImage: vs2017-win2016 + vmImage: 'ubuntu-latest' dependsOn: - GetReleaseVersion From dd5d536bd5497870a972c9b7edab179b2043f060 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Sun, 26 Jul 2020 13:13:06 -0400 Subject: [PATCH 106/119] CI: Use `npm ci` rather than `npm install` `npm ci` doesn't try to reconcile package.json with package-lock.json, nor with any existing packages in `node_modules`. `npm ci` simply deletes `node_modules` and uses the packages from `package-lock.json`. As a result, `npm ci` is much, much faster than `npm install`. We should use it wherever possible. --- script/vsts/nightly-release.yml | 16 ++++++++-------- script/vsts/pull-requests.yml | 6 +++--- script/vsts/release-branch-build.yml | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 47b707f65..3d8a70efb 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -4,11 +4,11 @@ jobs: vmImage: 'ubuntu-latest' steps: # This has to be done separately because VSTS inexplicably - # exits the script block after `npm install` completes. + # exits the script block after `npm ci` completes. - script: | cd script/vsts - npm install - displayName: npm install + npm ci + displayName: npm ci - script: node script/vsts/get-release-version.js --nightly name: Version env: @@ -38,11 +38,11 @@ jobs: - template: platforms/templates/preparation.yml #This has to be done separately because VSTS inexplicably - #exits the script block after `npm install` completes. + #exits the script block after `npm ci` completes. - script: | cd script/vsts - npm install - displayName: npm install + npm ci + displayName: npm ci - task: DownloadBuildArtifacts@0 inputs: @@ -77,8 +77,8 @@ jobs: - script: | cd script/lib - npm install - displayName: npm install + npm ci + displayName: npm ci - script: | cd script/lib/update-dependency node index.js diff --git a/script/vsts/pull-requests.yml b/script/vsts/pull-requests.yml index c2665c086..de26a721d 100644 --- a/script/vsts/pull-requests.yml +++ b/script/vsts/pull-requests.yml @@ -6,11 +6,11 @@ jobs: vmImage: 'ubuntu-latest' steps: # This has to be done separately because VSTS inexplicably - # exits the script block after `npm install` completes. + # exits the script block after `npm ci` completes. - script: | cd script/vsts - npm install - displayName: npm install + npm ci + displayName: npm ci - script: node script/vsts/get-release-version.js name: Version env: diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index a4d992515..ccaf5d55e 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -10,11 +10,11 @@ jobs: vmImage: 'ubuntu-latest' steps: # This has to be done separately because VSTS inexplicably - # exits the script block after `npm install` completes. + # exits the script block after `npm ci` completes. - script: | cd script/vsts - npm install - displayName: npm install + npm ci + displayName: npm ci - script: node script/vsts/get-release-version.js name: Version env: @@ -43,13 +43,13 @@ jobs: steps: # This has to be done separately because VSTS inexplicably - # exits the script block after `npm install` completes. + # exits the script block after `npm ci` completes. - script: | cd script/vsts - npm install + npm ci env: GITHUB_TOKEN: $(GITHUB_TOKEN) - displayName: npm install + displayName: npm ci - task: DownloadBuildArtifacts@0 inputs: From 6723ee01db804f77dd093bea6f84cd375127db98 Mon Sep 17 00:00:00 2001 From: aminya Date: Sat, 1 Aug 2020 23:19:42 -0500 Subject: [PATCH 107/119] enable multi-threading on Atom https://www.electronjs.org/docs/tutorial/multithreading --- src/main-process/atom-window.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main-process/atom-window.js b/src/main-process/atom-window.js index e10d2d11d..2680d2401 100644 --- a/src/main-process/atom-window.js +++ b/src/main-process/atom-window.js @@ -49,7 +49,9 @@ module.exports = class AtomWindow extends EventEmitter { // (Ref: https://github.com/atom/atom/pull/12696#issuecomment-290496960) disableBlinkFeatures: 'Auxclick', nodeIntegration: true, - webviewTag: true + webviewTag: true, + // multi-threading + nodeIntegrationInWorker: true } }; From dc991c68fec691d88f870640614b1a5ad31e5161 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Tue, 4 Aug 2020 12:40:06 -0400 Subject: [PATCH 108/119] CI: Move GetReleaseVersion to its own template --- script/vsts/nightly-release.yml | 17 ++--------------- .../platforms/templates/get-release-version.yml | 17 +++++++++++++++++ script/vsts/pull-requests.yml | 17 ++--------------- script/vsts/release-branch-build.yml | 17 ++--------------- 4 files changed, 23 insertions(+), 45 deletions(-) create mode 100644 script/vsts/platforms/templates/get-release-version.yml diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 3d8a70efb..437785616 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -1,19 +1,6 @@ jobs: - - job: GetReleaseVersion - pool: - vmImage: 'ubuntu-latest' - steps: - # This has to be done separately because VSTS inexplicably - # exits the script block after `npm ci` completes. - - script: | - cd script/vsts - npm ci - displayName: npm ci - - script: node script/vsts/get-release-version.js --nightly - name: Version - env: - REPO_OWNER: $(REPO_OWNER) - NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) + # Import "GetReleaseVersion" job definition + - template: platforms/templates/get-release-version.yml # Import OS-specific build definitions - template: platforms/windows.yml diff --git a/script/vsts/platforms/templates/get-release-version.yml b/script/vsts/platforms/templates/get-release-version.yml new file mode 100644 index 000000000..1e72f44ec --- /dev/null +++ b/script/vsts/platforms/templates/get-release-version.yml @@ -0,0 +1,17 @@ +jobs: + +- job: GetReleaseVersion + pool: + vmImage: 'ubuntu-latest' + steps: + # This has to be done separately because VSTS inexplicably + # exits the script block after `npm ci` completes. + - script: | + cd script/vsts + npm ci + displayName: npm ci + - script: node script/vsts/get-release-version.js + name: Version + env: + REPO_OWNER: $(REPO_OWNER) + NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) diff --git a/script/vsts/pull-requests.yml b/script/vsts/pull-requests.yml index de26a721d..58c989b97 100644 --- a/script/vsts/pull-requests.yml +++ b/script/vsts/pull-requests.yml @@ -1,21 +1,8 @@ trigger: none # No CI builds, only PR builds jobs: - - job: GetReleaseVersion - pool: - vmImage: 'ubuntu-latest' - steps: - # This has to be done separately because VSTS inexplicably - # exits the script block after `npm ci` completes. - - script: | - cd script/vsts - npm ci - displayName: npm ci - - script: node script/vsts/get-release-version.js - name: Version - env: - REPO_OWNER: $(REPO_OWNER) - NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) + # Import "GetReleaseVersion" job definition + - template: platforms/templates/get-release-version.yml # Import OS-specific build definitions - template: platforms/windows.yml diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index ccaf5d55e..5537fec7b 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -5,21 +5,8 @@ trigger: pr: none # no PR triggers jobs: - - job: GetReleaseVersion - pool: - vmImage: 'ubuntu-latest' - steps: - # This has to be done separately because VSTS inexplicably - # exits the script block after `npm ci` completes. - - script: | - cd script/vsts - npm ci - displayName: npm ci - - script: node script/vsts/get-release-version.js - name: Version - env: - REPO_OWNER: $(REPO_OWNER) - NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) + # Import "GetReleaseVersion" job definition + - template: platforms/templates/get-release-version.yml # Import OS-specific build definitions. - template: platforms/windows.yml From ecf9bdad8754303c4e5d90f4e2343323e835ff0a Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Wed, 12 Aug 2020 13:20:21 -0400 Subject: [PATCH 109/119] CI: Add NightlyFlag parameter in GetReleaseVersion We can use this to run `get-release-version.js` with the `--nightly` flag on the "Atom Nightly" pipeline. --- script/vsts/nightly-release.yml | 4 +++- .../vsts/platforms/templates/get-release-version.yml | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 437785616..84fc14e21 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -1,6 +1,8 @@ jobs: - # Import "GetReleaseVersion" job definition + # Import "GetReleaseVersion" job definition, with the "NightlyFlag" parameter set - template: platforms/templates/get-release-version.yml + parameters: + NightlyFlag: --nightly # Import OS-specific build definitions - template: platforms/windows.yml diff --git a/script/vsts/platforms/templates/get-release-version.yml b/script/vsts/platforms/templates/get-release-version.yml index 1e72f44ec..6e8ac4b85 100644 --- a/script/vsts/platforms/templates/get-release-version.yml +++ b/script/vsts/platforms/templates/get-release-version.yml @@ -1,3 +1,11 @@ +parameters: + - name: NightlyFlag + type: string + values: + - ' ' + - --nightly + default: ' ' + jobs: - job: GetReleaseVersion @@ -10,7 +18,7 @@ jobs: cd script/vsts npm ci displayName: npm ci - - script: node script/vsts/get-release-version.js + - script: node script/vsts/get-release-version.js ${{ parameters.NightlyFlag }} name: Version env: REPO_OWNER: $(REPO_OWNER) From e0abca696daf52f3f2e388f5722327195c5bbbb4 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Tue, 4 Aug 2020 12:12:09 -0400 Subject: [PATCH 110/119] CI: Fix Windows job names Also make sure "Release" job depends on successful Windows tests, not just on the Windows build job, before/regardless of testing. --- script/vsts/nightly-release.yml | 2 +- script/vsts/platforms/windows.yml | 4 ++-- script/vsts/release-branch-build.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 3d8a70efb..2b4bfceb0 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -27,7 +27,7 @@ jobs: dependsOn: - GetReleaseVersion - - Windows + - Windows_RendererTests - Linux - macOS_tests diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 98af05ad7..ac7a53aea 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -1,5 +1,5 @@ jobs: - - job: Windows + - job: Windows_build dependsOn: GetReleaseVersion timeoutInMinutes: 180 strategy: @@ -71,7 +71,7 @@ jobs: condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) - job: Windows_RendererTests - dependsOn: Windows + dependsOn: Windows_build timeoutInMinutes: 180 strategy: maxParallel: 2 diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index ccaf5d55e..da3fa34f0 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -32,7 +32,7 @@ jobs: dependsOn: - GetReleaseVersion - - Windows + - Windows_RendererTests - Linux - macOS_tests From 9c138f8269d361364e7d8d138e9ed292c3311b0f Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Tue, 4 Aug 2020 12:14:17 -0400 Subject: [PATCH 111/119] CI: Delete outdated comment in platforms/linux.yml We no-longer run the Linux build in an old Ubuntu 14.04 "Trusty Tahr" Docker container. We run builds directly in a virtualized Ubuntu 16.04 "Xenial Xerus" image now. --- script/vsts/platforms/linux.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 975af51a7..c6995819a 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -5,7 +5,6 @@ jobs: variables: ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ] pool: - # This image is used to host the Docker container that runs the build vmImage: ubuntu-16.04 steps: From 72e9dc6a3cdad985086bf0fa7c015eefcfa8bac4 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Tue, 4 Aug 2020 13:48:04 -0400 Subject: [PATCH 112/119] CI: Don't pass REPO variables via `env:` yml Using the `env:` yaml key is not actually needed unless the variables contain secret/sensitive information. (These varibales won't have sensitive content, just a repo owner and some repo names). These environment variables would expand to literally `${VAR_NAME}`, rather than to an empty string, if not explicitly set in Azure DevOps. This would make consuming the variables in JavaScript unnecessarily awkward. Instead, we can set reasonable defaults if the variables are falsy (i.e. unset or null in our case), and otherwise override with what's manually set in the environment variables. --- script/vsts/nightly-release.yml | 6 ------ script/vsts/pull-requests.yml | 3 --- script/vsts/release-branch-build.yml | 9 --------- 3 files changed, 18 deletions(-) diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 2b4bfceb0..774abb7bb 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -11,9 +11,6 @@ jobs: displayName: npm ci - script: node script/vsts/get-release-version.js --nightly name: Version - env: - REPO_OWNER: $(REPO_OWNER) - NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) # Import OS-specific build definitions - template: platforms/windows.yml @@ -59,9 +56,6 @@ jobs: ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET) ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY) - REPO_OWNER: $(REPO_OWNER) - MAIN_REPO: $(MAIN_REPO) - NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) displayName: Create Nightly Release - job: bump_dependencies displayName: Bump Dependencies diff --git a/script/vsts/pull-requests.yml b/script/vsts/pull-requests.yml index de26a721d..82367ca05 100644 --- a/script/vsts/pull-requests.yml +++ b/script/vsts/pull-requests.yml @@ -13,9 +13,6 @@ jobs: displayName: npm ci - script: node script/vsts/get-release-version.js name: Version - env: - REPO_OWNER: $(REPO_OWNER) - NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) # Import OS-specific build definitions - template: platforms/windows.yml diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index da3fa34f0..6d4774d88 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -17,9 +17,6 @@ jobs: displayName: npm ci - script: node script/vsts/get-release-version.js name: Version - env: - REPO_OWNER: $(REPO_OWNER) - NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) # Import OS-specific build definitions. - template: platforms/windows.yml @@ -66,9 +63,6 @@ jobs: ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET) ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY) - REPO_OWNER: $(REPO_OWNER) - MAIN_REPO: $(MAIN_REPO) - NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) displayName: Create Draft Release condition: and(succeeded(), eq(variables['Atom.AutoDraftRelease'], 'true'), eq(variables['IsReleaseBranch'], 'true')) @@ -79,8 +73,5 @@ jobs: ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY) ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET) ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET) - REPO_OWNER: $(REPO_OWNER) - MAIN_REPO: $(MAIN_REPO) - NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) displayName: Upload CI Artifacts to S3 condition: and(succeeded(), eq(variables['IsSignedZipBranch'], 'true')) From d77c2a20bf700173c57052ca9a7fea162c0f2893 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Tue, 4 Aug 2020 14:26:19 -0400 Subject: [PATCH 113/119] CI: Set appropriate default values for REPO vars REPO_OWNER, MAIN_REPO, and NIGHTLY_RELEASE_REPO now default to 'atom', 'atom' and 'atom-nightly-releases', respectively. --- script/vsts/get-release-version.js | 4 ++-- script/vsts/lib/release-notes.js | 6 +++--- script/vsts/upload-artifacts.js | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/script/vsts/get-release-version.js b/script/vsts/get-release-version.js index 1195da4c4..8c7b099c9 100644 --- a/script/vsts/get-release-version.js +++ b/script/vsts/get-release-version.js @@ -4,8 +4,8 @@ const request = require('request-promise-native'); const repositoryRootPath = path.resolve(__dirname, '..', '..'); const appMetadata = require(path.join(repositoryRootPath, 'package.json')); -const REPO_OWNER = process.env.REPO_OWNER; -const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO; +const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom'; +const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO ? process.env.NIGHTLY_RELEASE_REPO : 'atom-nightly-releases'; const yargs = require('yargs'); const argv = yargs diff --git a/script/vsts/lib/release-notes.js b/script/vsts/lib/release-notes.js index 5cf139fe9..17fd056c0 100644 --- a/script/vsts/lib/release-notes.js +++ b/script/vsts/lib/release-notes.js @@ -3,9 +3,9 @@ const octokit = require('@octokit/rest')(); const changelog = require('pr-changelog'); const childProcess = require('child_process'); -const REPO_OWNER = process.env.REPO_OWNER; -const MAIN_REPO = process.env.MAIN_REPO; -const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO; +const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom'; +const MAIN_REPO = process.env.MAIN_REPO ? process.env.MAIN_REPO : 'atom'; +const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO ? process.env.NIGHTLY_RELEASE_REPO : 'atom-nightly-releases'; module.exports.getRelease = async function(releaseVersion, githubToken) { if (githubToken) { diff --git a/script/vsts/upload-artifacts.js b/script/vsts/upload-artifacts.js index 08a3e2d13..a9559d107 100644 --- a/script/vsts/upload-artifacts.js +++ b/script/vsts/upload-artifacts.js @@ -12,9 +12,9 @@ const uploadLinuxPackages = require('./lib/upload-linux-packages'); const CONFIG = require('../config'); -const REPO_OWNER = process.env.REPO_OWNER; -const MAIN_REPO = process.env.MAIN_REPO; -const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO; +const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom'; +const MAIN_REPO = process.env.MAIN_REPO ? process.env.MAIN_REPO : 'atom'; +const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO ? process.env.NIGHTLY_RELEASE_REPO : 'atom-nightly-releases'; const yargs = require('yargs'); const argv = yargs From d167180bba0ea946214d8d8dd9c60136772b96a8 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Tue, 4 Aug 2020 14:31:40 -0400 Subject: [PATCH 114/119] :shirt: CI: Fix JS lints (prettier) --- script/vsts/get-release-version.js | 4 +++- script/vsts/lib/release-notes.js | 4 +++- script/vsts/upload-artifacts.js | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/script/vsts/get-release-version.js b/script/vsts/get-release-version.js index 8c7b099c9..f83209b30 100644 --- a/script/vsts/get-release-version.js +++ b/script/vsts/get-release-version.js @@ -5,7 +5,9 @@ const repositoryRootPath = path.resolve(__dirname, '..', '..'); const appMetadata = require(path.join(repositoryRootPath, 'package.json')); const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom'; -const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO ? process.env.NIGHTLY_RELEASE_REPO : 'atom-nightly-releases'; +const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO + ? process.env.NIGHTLY_RELEASE_REPO + : 'atom-nightly-releases'; const yargs = require('yargs'); const argv = yargs diff --git a/script/vsts/lib/release-notes.js b/script/vsts/lib/release-notes.js index 17fd056c0..a1743e70c 100644 --- a/script/vsts/lib/release-notes.js +++ b/script/vsts/lib/release-notes.js @@ -5,7 +5,9 @@ const childProcess = require('child_process'); const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom'; const MAIN_REPO = process.env.MAIN_REPO ? process.env.MAIN_REPO : 'atom'; -const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO ? process.env.NIGHTLY_RELEASE_REPO : 'atom-nightly-releases'; +const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO + ? process.env.NIGHTLY_RELEASE_REPO + : 'atom-nightly-releases'; module.exports.getRelease = async function(releaseVersion, githubToken) { if (githubToken) { diff --git a/script/vsts/upload-artifacts.js b/script/vsts/upload-artifacts.js index a9559d107..a8e0849d4 100644 --- a/script/vsts/upload-artifacts.js +++ b/script/vsts/upload-artifacts.js @@ -14,7 +14,9 @@ const CONFIG = require('../config'); const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom'; const MAIN_REPO = process.env.MAIN_REPO ? process.env.MAIN_REPO : 'atom'; -const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO ? process.env.NIGHTLY_RELEASE_REPO : 'atom-nightly-releases'; +const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO + ? process.env.NIGHTLY_RELEASE_REPO + : 'atom-nightly-releases'; const yargs = require('yargs'); const argv = yargs From a24e93acf26a0b101bc14168e75d98e608efbfb0 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Tue, 4 Aug 2020 22:35:16 -0400 Subject: [PATCH 115/119] CI: Update displayNames for Windows jobs --- script/vsts/platforms/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index ac7a53aea..4613b934d 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -1,5 +1,6 @@ jobs: - job: Windows_build + displayName: Windows build dependsOn: GetReleaseVersion timeoutInMinutes: 180 strategy: @@ -71,6 +72,7 @@ jobs: condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true')) - job: Windows_RendererTests + displayName: Windows dependsOn: Windows_build timeoutInMinutes: 180 strategy: From d5c8456e2ad7ebda19cb4c60baadb66b9fdab7ee Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Wed, 5 Aug 2020 09:57:31 -0400 Subject: [PATCH 116/119] CI: Use more-compact "default var" syntax in JS Co-authored-by: Amin Yahyaabadi --- script/vsts/get-release-version.js | 6 ++---- script/vsts/lib/release-notes.js | 8 +++----- script/vsts/upload-artifacts.js | 8 +++----- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/script/vsts/get-release-version.js b/script/vsts/get-release-version.js index f83209b30..28ca977b6 100644 --- a/script/vsts/get-release-version.js +++ b/script/vsts/get-release-version.js @@ -4,10 +4,8 @@ const request = require('request-promise-native'); const repositoryRootPath = path.resolve(__dirname, '..', '..'); const appMetadata = require(path.join(repositoryRootPath, 'package.json')); -const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom'; -const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO - ? process.env.NIGHTLY_RELEASE_REPO - : 'atom-nightly-releases'; +const REPO_OWNER = process.env.REPO_OWNER || 'atom'; +const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases'; const yargs = require('yargs'); const argv = yargs diff --git a/script/vsts/lib/release-notes.js b/script/vsts/lib/release-notes.js index a1743e70c..552fe1f30 100644 --- a/script/vsts/lib/release-notes.js +++ b/script/vsts/lib/release-notes.js @@ -3,11 +3,9 @@ const octokit = require('@octokit/rest')(); const changelog = require('pr-changelog'); const childProcess = require('child_process'); -const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom'; -const MAIN_REPO = process.env.MAIN_REPO ? process.env.MAIN_REPO : 'atom'; -const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO - ? process.env.NIGHTLY_RELEASE_REPO - : 'atom-nightly-releases'; +const REPO_OWNER = process.env.REPO_OWNER || 'atom'; +const MAIN_REPO = process.env.MAIN_REPO || 'atom'; +const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases'; module.exports.getRelease = async function(releaseVersion, githubToken) { if (githubToken) { diff --git a/script/vsts/upload-artifacts.js b/script/vsts/upload-artifacts.js index a8e0849d4..b3d2a0fd9 100644 --- a/script/vsts/upload-artifacts.js +++ b/script/vsts/upload-artifacts.js @@ -12,11 +12,9 @@ const uploadLinuxPackages = require('./lib/upload-linux-packages'); const CONFIG = require('../config'); -const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom'; -const MAIN_REPO = process.env.MAIN_REPO ? process.env.MAIN_REPO : 'atom'; -const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO - ? process.env.NIGHTLY_RELEASE_REPO - : 'atom-nightly-releases'; +const REPO_OWNER = process.env.REPO_OWNER || 'atom'; +const MAIN_REPO = process.env.MAIN_REPO || 'atom'; +const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases'; const yargs = require('yargs'); const argv = yargs From 1ee74e56613f84ec2ffd141dc80c99b1672cf3f5 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Wed, 5 Aug 2020 11:01:59 -0400 Subject: [PATCH 117/119] :shirt: Fix lints again --- script/vsts/get-release-version.js | 3 ++- script/vsts/lib/release-notes.js | 3 ++- script/vsts/upload-artifacts.js | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/script/vsts/get-release-version.js b/script/vsts/get-release-version.js index 28ca977b6..5ddf3659b 100644 --- a/script/vsts/get-release-version.js +++ b/script/vsts/get-release-version.js @@ -5,7 +5,8 @@ const repositoryRootPath = path.resolve(__dirname, '..', '..'); const appMetadata = require(path.join(repositoryRootPath, 'package.json')); const REPO_OWNER = process.env.REPO_OWNER || 'atom'; -const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases'; +const NIGHTLY_RELEASE_REPO = + process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases'; const yargs = require('yargs'); const argv = yargs diff --git a/script/vsts/lib/release-notes.js b/script/vsts/lib/release-notes.js index 552fe1f30..1901e9a16 100644 --- a/script/vsts/lib/release-notes.js +++ b/script/vsts/lib/release-notes.js @@ -5,7 +5,8 @@ const childProcess = require('child_process'); const REPO_OWNER = process.env.REPO_OWNER || 'atom'; const MAIN_REPO = process.env.MAIN_REPO || 'atom'; -const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases'; +const NIGHTLY_RELEASE_REPO = + process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases'; module.exports.getRelease = async function(releaseVersion, githubToken) { if (githubToken) { diff --git a/script/vsts/upload-artifacts.js b/script/vsts/upload-artifacts.js index b3d2a0fd9..ed7530921 100644 --- a/script/vsts/upload-artifacts.js +++ b/script/vsts/upload-artifacts.js @@ -14,7 +14,8 @@ const CONFIG = require('../config'); const REPO_OWNER = process.env.REPO_OWNER || 'atom'; const MAIN_REPO = process.env.MAIN_REPO || 'atom'; -const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases'; +const NIGHTLY_RELEASE_REPO = + process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases'; const yargs = require('yargs'); const argv = yargs From cfd4a0b2ce0977acc493517a841aa55f2ebb77a1 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Wed, 12 Aug 2020 19:53:31 -0400 Subject: [PATCH 118/119] CI: Drop old workaround, refactor script blocks This old bug in the CI inexplicably went away at some point. --- script/vsts/nightly-release.yml | 7 +------ script/vsts/pull-requests.yml | 5 +---- script/vsts/release-branch-build.yml | 7 +------ 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 774abb7bb..4e19f593c 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -3,13 +3,10 @@ jobs: pool: vmImage: 'ubuntu-latest' steps: - # This has to be done separately because VSTS inexplicably - # exits the script block after `npm ci` completes. - script: | cd script/vsts npm ci - displayName: npm ci - - script: node script/vsts/get-release-version.js --nightly + node get-release-version.js --nightly name: Version # Import OS-specific build definitions @@ -34,8 +31,6 @@ jobs: steps: - template: platforms/templates/preparation.yml - #This has to be done separately because VSTS inexplicably - #exits the script block after `npm ci` completes. - script: | cd script/vsts npm ci diff --git a/script/vsts/pull-requests.yml b/script/vsts/pull-requests.yml index 82367ca05..b92de1622 100644 --- a/script/vsts/pull-requests.yml +++ b/script/vsts/pull-requests.yml @@ -5,13 +5,10 @@ jobs: pool: vmImage: 'ubuntu-latest' steps: - # This has to be done separately because VSTS inexplicably - # exits the script block after `npm ci` completes. - script: | cd script/vsts npm ci - displayName: npm ci - - script: node script/vsts/get-release-version.js + node get-release-version.js name: Version # Import OS-specific build definitions diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index 6d4774d88..24b1e44b9 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -9,13 +9,10 @@ jobs: pool: vmImage: 'ubuntu-latest' steps: - # This has to be done separately because VSTS inexplicably - # exits the script block after `npm ci` completes. - script: | cd script/vsts npm ci - displayName: npm ci - - script: node script/vsts/get-release-version.js + node get-release-version.js name: Version # Import OS-specific build definitions. @@ -39,8 +36,6 @@ jobs: IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ] steps: - # This has to be done separately because VSTS inexplicably - # exits the script block after `npm ci` completes. - script: | cd script/vsts npm ci From f0963c0e3f50cad0fa829ada7228f7954c39b57a Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sun, 16 Aug 2020 22:38:37 -0500 Subject: [PATCH 119/119] improve comments --- script/vsts/nightly-release.yml | 2 +- script/vsts/pull-requests.yml | 2 +- script/vsts/release-branch-build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index 19739eada..8d56e64e5 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -1,5 +1,5 @@ jobs: - # Import "GetReleaseVersion" job definition, with the "NightlyFlag" parameter set + # GetReleaseVersion for nightly release - template: platforms/templates/get-release-version.yml parameters: NightlyFlag: --nightly diff --git a/script/vsts/pull-requests.yml b/script/vsts/pull-requests.yml index 58c989b97..80805bb4a 100644 --- a/script/vsts/pull-requests.yml +++ b/script/vsts/pull-requests.yml @@ -1,7 +1,7 @@ trigger: none # No CI builds, only PR builds jobs: - # Import "GetReleaseVersion" job definition + # GetReleaseVersion - template: platforms/templates/get-release-version.yml # Import OS-specific build definitions diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index 54b60e01c..64e92b91e 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -5,7 +5,7 @@ trigger: pr: none # no PR triggers jobs: - # Import "GetReleaseVersion" job definition + # GetReleaseVersion - template: platforms/templates/get-release-version.yml # Import OS-specific build definitions.