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

Jump to bottom

fix(deps): update dependency parse-domain to version 2.3.4 🌟 #5726

Merged
merged 3 commits into from
Nov 19, 2019
Merged

fix(deps): update dependency parse-domain to version 2.3.4 🌟 #5726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6996b71
fix(deps): update parse-domain to 2.3.4 🌟
renovate-bot Nov 18, 2019
f17a32c
update details now that s3.amazonaws.com is a public suffix
flotwig Nov 18, 2019
f76c414
bump max size
flotwig Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/driver/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"moment": "2.24.0",
"morgan": "1.9.1",
"npm-install-version": "6.0.2",
"parse-domain": "2.0.0",
"parse-domain": "2.3.4",
"setimmediate": "1.0.5",
"sinon": "3.3.0",
"strict-cookie-parser": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"opn": "cypress-io/opn#2f4e9a216ca7bdb95dfae9d46d99ddf004b3cbb5",
"ospath": "1.2.2",
"p-queue": "6.1.0",
"parse-domain": "2.0.0",
"parse-domain": "2.3.4",
"pluralize": "8.0.0",
"pumpify": "1.5.1",
"ramda": "0.24.1",
Expand Down
12 changes: 6 additions & 6 deletions packages/server/test/integration/server_spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,11 +1124,11 @@ describe "Server", ->
origin: "https://s3.amazonaws.com"
strategy: "http"
visiting: false
domainName: "amazonaws.com"
domainName: "s3.amazonaws.com"
fileServer: null
props: {
domain: "amazonaws"
tld: "com"
domain: ""
tld: "s3.amazonaws.com"
port: "443"
}
})
Expand Down Expand Up @@ -1199,10 +1199,10 @@ describe "Server", ->
strategy: "http"
visiting: false
fileServer: null
domainName: "amazonaws.com"
domainName: "s3.amazonaws.com"
props: {
domain: "amazonaws"
tld: "com"
domain: ""
tld: "s3.amazonaws.com"
port: "443"
}
})
4 changes: 2 additions & 2 deletions scripts/binary/zip.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ checkZipSize = (zipPath) ->
stats = fs.statSync(zipPath)
zipSize = filesize(stats.size, {round: 0})
console.log("zip file size #{zipSize}")
MAX_ALLOWED_SIZE_MB = if os.platform() == "win32" then 245 else 150
MAX_ALLOWED_SIZE_MB = if os.platform() == "win32" then 245 else 160
MAX_ZIP_FILE_SIZE = megaBytes(MAX_ALLOWED_SIZE_MB)
if stats.size > MAX_ZIP_FILE_SIZE
throw new Error("Zip file is too large: #{zipSize} exceeds #{MAX_ZIP_FILE_SIZE}")
throw new Error("Zip file is too large: #{zipSize} (#{stats.size} bytes) exceeds #{MAX_ZIP_FILE_SIZE} bytes")

# resolves with zipped filename
linuxZip = (src, dest) ->
Expand Down