From 55c04facd03b8e073681dfdcf94f8d54ff8c61c1 Mon Sep 17 00:00:00 2001 From: Evan Bacon Date: Mon, 1 Feb 2021 23:53:09 -0800 Subject: [PATCH 1/2] Use devcert fork --- packages/xdl/package.json | 2 +- packages/xdl/src/Webpack.ts | 2 +- yarn.lock | 118 +++++++----------------------------- 3 files changed, 23 insertions(+), 99 deletions(-) diff --git a/packages/xdl/package.json b/packages/xdl/package.json index dff2ec1b98..8073d9195b 100644 --- a/packages/xdl/package.json +++ b/packages/xdl/package.json @@ -33,6 +33,7 @@ "dependencies": { "@expo/bunyan": "4.0.0", "@expo/config": "3.3.28", + "@expo/devcert": "^1.0.0", "@expo/dev-server": "0.1.54", "@expo/json-file": "8.2.27", "@expo/osascript": "2.0.24", @@ -49,7 +50,6 @@ "chalk": "^4.0.0", "concat-stream": "1.6.2", "decache": "4.4.0", - "devcert": "^1.1.0", "express": "4.16.4", "form-data": "^2.3.2", "freeport-async": "2.0.0", diff --git a/packages/xdl/src/Webpack.ts b/packages/xdl/src/Webpack.ts index 56439e4659..495c3de74d 100644 --- a/packages/xdl/src/Webpack.ts +++ b/packages/xdl/src/Webpack.ts @@ -1,7 +1,7 @@ import { getConfig, getNameFromConfig } from '@expo/config'; +import * as devcert from '@expo/devcert'; import { isUsingYarn } from '@expo/package-manager'; import chalk from 'chalk'; -import * as devcert from 'devcert'; import fs from 'fs-extra'; import getenv from 'getenv'; import http from 'http'; diff --git a/yarn.lock b/yarn.lock index fce23e2b41..0ce2f93f34 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1333,6 +1333,25 @@ xcode "^3.0.0" xml-js "^1.6.11" +"@expo/devcert@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@expo/devcert/-/devcert-1.0.0.tgz#79df9431e806bc546f6399e35934b9876384f0a9" + integrity sha512-cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ== + dependencies: + application-config-path "^0.1.0" + command-exists "^1.2.4" + debug "^3.1.0" + eol "^0.9.1" + get-port "^3.2.0" + glob "^7.1.2" + lodash "^4.17.4" + mkdirp "^0.5.1" + password-prompt "^1.0.4" + rimraf "^2.6.2" + sudo-prompt "^8.2.0" + tmp "^0.0.33" + tslib "^1.10.0" + "@expo/ngrok-bin-darwin-ia32@2.2.8": version "2.2.8" resolved "https://registry.yarnpkg.com/@expo/ngrok-bin-darwin-ia32/-/ngrok-bin-darwin-ia32-2.2.8.tgz#46ed6d485a87396acf4af317beeaab7a1f607315" @@ -3151,11 +3170,6 @@ dependencies: "@types/node" "*" -"@types/configstore@^2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@types/configstore/-/configstore-2.1.1.tgz#cd1e8553633ad3185c3f2f239ecff5d2643e92b6" - integrity sha1-zR6FU2M60xhcPy8jns/10mQ+krY= - "@types/connect-history-api-fallback@*": version "1.3.3" resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.3.tgz#4772b79b8b53185f0f4c9deab09236baf76ee3b4" @@ -3184,11 +3198,6 @@ resolved "https://registry.yarnpkg.com/@types/dateformat/-/dateformat-3.0.1.tgz#98d747a2e5e9a56070c6bf14e27bff56204e34cc" integrity sha512-KlPPdikagvL6ELjWsljbyDIPzNCeliYkqRpI+zea99vBBbCIA5JNshZAwQKTON139c87y9qvTFVgkFd14rtS4g== -"@types/debug@^0.0.30": - version "0.0.30" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-0.0.30.tgz#dc1e40f7af3b9c815013a7860e6252f6352a84df" - integrity sha512-orGL5LXERPYsLov6CWs3Fh6203+dXzJkR7OnddIr2514Hsecwc8xRpzCapshBbKFImCsvS/mk6+FWiN5LyZJAQ== - "@types/eslint-visitor-keys@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d" @@ -3255,11 +3264,6 @@ dependencies: "@types/node" "*" -"@types/get-port@^3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@types/get-port/-/get-port-3.2.0.tgz#f9e0a11443cc21336470185eae3dfba4495d29bc" - integrity sha512-TiNg8R1kjDde5Pub9F9vCwZA/BNW9HeXP5b9j7Qucqncy/McfPZ6xze/EyBdXS5FhMIGN6Fx3vg75l5KHy3V1Q== - "@types/getenv@^0.7.0": version "0.7.0" resolved "https://registry.yarnpkg.com/@types/getenv/-/getenv-0.7.0.tgz#35147dcf91601e9cddb64b9e840dfc88a95fc27f" @@ -3276,15 +3280,6 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/glob@^5.0.34": - version "5.0.36" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.36.tgz#0c80a9c8664fc7d19781de229f287077fd622cb2" - integrity sha512-KEzSKuP2+3oOjYYjujue6Z3Yqis5HKA1BsIC+jZ1v3lrRNdsqyNNtX0rQf6LSuI4DJJ2z5UV//zBZCcvM0xikg== - dependencies: - "@types/events" "*" - "@types/minimatch" "*" - "@types/node" "*" - "@types/graceful-fs@^4.1.2": version "4.1.3" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f" @@ -3430,7 +3425,7 @@ dependencies: "@types/lodash" "*" -"@types/lodash@*", "@types/lodash@^4.14.168", "@types/lodash@^4.14.92": +"@types/lodash@*", "@types/lodash@^4.14.168": version "4.14.168" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== @@ -3457,13 +3452,6 @@ dependencies: "@types/node" "*" -"@types/mkdirp@^0.5.2": - version "0.5.2" - resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.5.2.tgz#503aacfe5cc2703d5484326b1b27efa67a339c1f" - integrity sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg== - dependencies: - "@types/node" "*" - "@types/multimatch@^2.1.3": version "2.1.3" resolved "https://registry.yarnpkg.com/@types/multimatch/-/multimatch-2.1.3.tgz#fbc0a7e507ccc9fc58455f83d26971310cedc597" @@ -3514,11 +3502,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.8.tgz#efd6d1a90525519fc608c9db16c8a78f7693a978" integrity sha512-D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg== -"@types/node@^8.5.7": - version "8.10.59" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.59.tgz#9e34261f30183f9777017a13d185dfac6b899e04" - integrity sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ== - "@types/node@^9.4.6": version "9.6.55" resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.55.tgz#7cc1358c9c18e71f6c020e410962971863232cf5" @@ -3633,14 +3616,6 @@ resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== -"@types/rimraf@^2.0.2": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.3.tgz#0199a46af106729ba14213fda7b981278d8c84f2" - integrity sha512-dZfyfL/u9l/oi984hEXdmAjX3JHry7TLWw43u1HQ8HhPv6KtfxnrZ3T/bleJ0GEvnk9t5sM7eePkgMqz3yBcGg== - dependencies: - "@types/glob" "*" - "@types/node" "*" - "@types/semver@^6.0.0": version "6.2.0" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.2.0.tgz#d688d574400d96c5b0114968705366f431831e1a" @@ -3724,11 +3699,6 @@ dependencies: "@types/node" "*" -"@types/tmp@^0.0.33": - version "0.0.33" - resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.0.33.tgz#1073c4bc824754ae3d10cfab88ab0237ba964e4d" - integrity sha1-EHPEvIJHVK49EM+riKsCN7qWTk0= - "@types/uglify-js@*": version "3.0.4" resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.4.tgz#96beae23df6f561862a830b4288a49e86baac082" @@ -6796,18 +6766,6 @@ config-chain@^1.1.11: ini "^1.3.4" proto-list "~1.2.1" -configstore@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" - integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw== - dependencies: - 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" - connect-history-api-fallback@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" @@ -7869,35 +7827,6 @@ detect-port-alt@1.1.6: address "^1.0.1" debug "^2.6.0" -devcert@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/devcert/-/devcert-1.1.0.tgz#255508c20dd21045e3020acf438491b745835dfd" - integrity sha512-ppyIBJueMMisYvJABaXESY10CwEm1pUXoLOm6TeBO2bbDUQE8ZjJPNADlu31I2InL7hduSgratzRG/dHUDF41w== - dependencies: - "@types/configstore" "^2.1.1" - "@types/debug" "^0.0.30" - "@types/get-port" "^3.2.0" - "@types/glob" "^5.0.34" - "@types/lodash" "^4.14.92" - "@types/mkdirp" "^0.5.2" - "@types/node" "^8.5.7" - "@types/rimraf" "^2.0.2" - "@types/tmp" "^0.0.33" - application-config-path "^0.1.0" - command-exists "^1.2.4" - configstore "^3.0.0" - debug "^3.1.0" - eol "^0.9.1" - get-port "^3.2.0" - glob "^7.1.2" - lodash "^4.17.4" - mkdirp "^0.5.1" - password-prompt "^1.0.4" - rimraf "^2.6.2" - sudo-prompt "^8.2.0" - tmp "^0.0.33" - tslib "^1.10.0" - dezalgo@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" @@ -8114,7 +8043,7 @@ dot-prop@^3.0.0: dependencies: is-obj "^1.0.0" -dot-prop@^4.1.0, dot-prop@^4.1.1, dot-prop@^4.2.0: +dot-prop@^4.1.1, dot-prop@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ== @@ -21834,11 +21763,6 @@ xcode@^3.0.0, xcode@^3.0.1: simple-plist "^1.1.0" uuid "^7.0.3" -xdg-basedir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" - integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= - xhr@^2.0.1: version "2.5.0" resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.5.0.tgz#bed8d1676d5ca36108667692b74b316c496e49dd" From 9dcc7fa60ace8c3505a89f5c82586cf67e3c1dc9 Mon Sep 17 00:00:00 2001 From: Evan Bacon Date: Tue, 2 Feb 2021 00:02:56 -0800 Subject: [PATCH 2/2] types/rimraf --- packages/package-manager/package.json | 1 + yarn.lock | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/packages/package-manager/package.json b/packages/package-manager/package.json index 7f8e1504a7..5193799410 100644 --- a/packages/package-manager/package.json +++ b/packages/package-manager/package.json @@ -46,6 +46,7 @@ "devDependencies": { "@expo/babel-preset-cli": "0.2.18", "@types/npm-package-arg": "^6.1.0", + "@types/rimraf": "^3.0.0", "@types/split": "^1.0.0" }, "publishConfig": { diff --git a/yarn.lock b/yarn.lock index 0ce2f93f34..dd0ae08ba0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3616,6 +3616,14 @@ resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== +"@types/rimraf@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.0.tgz#b9d03f090ece263671898d57bb7bb007023ac19f" + integrity sha512-7WhJ0MdpFgYQPXlF4Dx+DhgvlPCfz/x5mHaeDQAKhcenvQP1KCpLQ18JklAqeGMYSAT2PxLpzd0g2/HE7fj7hQ== + dependencies: + "@types/glob" "*" + "@types/node" "*" + "@types/semver@^6.0.0": version "6.2.0" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.2.0.tgz#d688d574400d96c5b0114968705366f431831e1a"