Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(gatsby): Switching from devcert-san to devcert to fix HTTPS issues #16726

Merged
merged 9 commits into from
Feb 29, 2020
Merged

fix(gatsby): Switching from devcert-san to devcert to fix HTTPS issues #16726

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a46a5a7
Fix issue #16212
rmorabia Aug 19, 2019
e135a4a
Merge branch 'master' into master
rmorabia Nov 21, 2019
477e3e9
Fix tests
Nov 22, 2019
6a47eab
Merge branch 'master' of https://github.com/gatsbyjs/gatsby
Nov 22, 2019
8d7c77e
Update package.json
rmorabia Nov 22, 2019
6455ab3
Update get-ssl-cert.js
rmorabia Nov 22, 2019
42fd6c7
Merge branch 'master' of https://github.com/gatsbyjs/gatsby
rmorabia Feb 25, 2020
d04c480
fix ssl host
wardpeet Feb 29, 2020
f825259
Merge branch 'master' into master
wardpeet Feb 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/gatsby/src/utils/get-ssl-cert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const getDevelopmentCertificate = require(`devcert-san`).default
const certificateFor = require(`devcert`).certificateFor
const report = require(`gatsby-cli/lib/reporter`)
const fs = require(`fs`)
const path = require(`path`)
Expand Down Expand Up @@ -35,7 +35,7 @@ module.exports = async ({ name, certFile, keyFile, directory }) => {

report.info(`setting up automatic SSL certificate (may require sudo)\n`)
try {
return await getDevelopmentCertificate(name, {
return await certificateFor(name, {
installCertutil: true,
})
} catch (err) {
Expand Down
102 changes: 65 additions & 37 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3412,9 +3412,10 @@
version "2.1.1"
resolved "https://registry.yarnpkg.com/@types/configstore/-/configstore-2.1.1.tgz#cd1e8553633ad3185c3f2f239ecff5d2643e92b6"

"@types/debug@^0.0.29":
version "0.0.29"
resolved "https://registry.yarnpkg.com/@types/debug/-/debug-0.0.29.tgz#a1e514adfbd92f03a224ba54d693111dbf1f3754"
"@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"
Expand All @@ -3429,13 +3430,24 @@
version "1.2.0"
resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"

"@types/get-port@^0.0.4":
version "0.0.4"
resolved "https://registry.yarnpkg.com/@types/get-port/-/get-port-0.0.4.tgz#eb6bb7423d9f888b632660dc7d2fd3e69a35643e"
"@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/glob@*":
version "7.1.1"
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
dependencies:
"@types/events" "*"
"@types/minimatch" "*"
"@types/node" "*"

"@types/glob@^5.0.30":
version "5.0.35"
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a"
"@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" "*"
Expand Down Expand Up @@ -3480,9 +3492,12 @@
version "3.0.3"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"

"@types/mkdirp@^0.3.29":
version "0.3.29"
resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.3.29.tgz#7f2ad7ec55f914482fc9b1ec4bb1ae6028d46066"
"@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/node@*", "@types/node@^12.6.2":
version "12.6.8"
Expand Down Expand Up @@ -7779,26 +7794,34 @@ detective@^4.0.0:
acorn "^5.2.1"
defined "^1.0.0"

devcert-san@^0.3.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/devcert-san/-/devcert-san-0.3.3.tgz#aa77244741b2d831771c011f22ee25e396ad4ba9"
devcert@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/devcert/-/devcert-1.0.0.tgz#88c883017cc207fd6dbf8f42539e50b2b1e77cec"
integrity sha512-M7hoNTVSD0ol+49plNERd+hZdkS9vetRDENZ63Ry++a5OKpADuXrMLuzTbNENOEH+9ZbwPRGZ9bLJvHWy/GdFQ==
dependencies:
"@types/configstore" "^2.1.1"
"@types/debug" "^0.0.29"
"@types/get-port" "^0.0.4"
"@types/glob" "^5.0.30"
"@types/mkdirp" "^0.3.29"
"@types/node" "^7.0.11"
"@types/tmp" "^0.0.32"
"@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.2"
configstore "^3.0.0"
debug "^2.6.3"
eol "^0.8.1"
get-port "^3.0.0"
glob "^7.1.1"
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"
tmp "^0.0.31"
tslib "^1.6.0"
password-prompt "^1.0.4"
rimraf "^2.6.2"
sudo-prompt "^8.2.0"
tmp "^0.0.33"
tslib "^1.8.1"

dezalgo@^1.0.0:
version "1.0.3"
Expand Down Expand Up @@ -8329,9 +8352,10 @@ envinfo@7.4.0, envinfo@^7.4.0:
resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.4.0.tgz#bef4ece9e717423aaf0c3584651430b735ad6630"
integrity sha512-FdDfnWnCVjxTTpWE3d6Jgh5JDIA3Cw7LCgpM/pI7kK1ORkjaqI2r6NqQ+ln2j0dfpgxY00AWieSvtkiZQKIItA==

eol@^0.8.1:
version "0.8.1"
resolved "https://registry.yarnpkg.com/eol/-/eol-0.8.1.tgz#defc3224990c7eca73bb34461a56cf9dc24761d0"
eol@^0.9.1:
version "0.9.1"
resolved "https://registry.yarnpkg.com/eol/-/eol-0.9.1.tgz#f701912f504074be35c6117a5c4ade49cd547acd"
integrity sha512-Ds/TEoZjwggRoz/Q2O7SE3i4Jm66mqTDfmdHdq/7DKVk3bro9Q8h6WdXKdPqFLMoqxrDK5SVRzHVPOS6uuGtrg==

err-code@^1.0.0:
version "1.1.2"
Expand Down Expand Up @@ -15950,7 +15974,7 @@ os-name@^3.0.0:
macos-release "^2.2.0"
windows-release "^3.1.0"

os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"

Expand Down Expand Up @@ -20321,6 +20345,11 @@ supports-color@6.1.0, supports-color@^6.0.0, supports-color@^6.1.0:
dependencies:
has-flag "^3.0.0"

sudo-prompt@^8.2.0:
version "8.2.5"
resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-8.2.5.tgz#cc5ef3769a134bb94b24a631cc09628d4d53603e"
integrity sha512-rlBo3HU/1zAJUrkY6jNxDOC9eVYliG6nS4JA8u8KAshITd07tafMc/Br7xQwCSseXwJ2iCcHCE8SNWX3q8Z+kw==

supports-color@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
Expand Down Expand Up @@ -20780,12 +20809,6 @@ title-case@^2.1.0:
no-case "^2.2.0"
upper-case "^1.0.3"

tmp@^0.0.31:
version "0.0.31"
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
dependencies:
os-tmpdir "~1.0.1"

tmp@^0.0.33:
version "0.0.33"
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
Expand Down Expand Up @@ -21011,6 +21034,11 @@ tsutils@^3.17.1:
dependencies:
tslib "^1.8.1"

tslib@^1.8.1:
version "1.10.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==

tty-browserify@0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
Expand Down