Remove baseProtocol and baseDomain #337
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bakerkretzmar
added a commit
that referenced
this pull request
Oct 23, 2020
jakebathman
requested changes
Oct 23, 2020
There was a problem hiding this comment.
Looks good. I marked two places where baseUrl is new in this PR just to highlight the order of PR merging with #338. Otherwise good to go 👍
| $this->baseDomain = $url['host'] ?? ''; | ||
| $this->basePort = $url['port'] ?? null; | ||
| }); | ||
| $this->basePort = parse_url($this->baseUrl)['port'] ?? null; |
There was a problem hiding this comment.
Just wanna make sure, same as the other PR, that this gets updated to $this->url in whatever order these PRs are merged. Not necessarily here, probably in #338, but don't wanna forget.
| @@ -28,7 +28,7 @@ class Route { | |||
| // If we're building just a path there's no origin, otherwise: if this route has a | |||
| // domain configured we construct the origin with that, if not we use the app URL | |||
| const origin = !this.config.absolute ? '' : this.definition.domain | |||
| ? `${this.config.baseProtocol}://${this.definition.domain}${this.config.basePort ? `:${this.config.basePort}` : ''}` | |||
| ? `${this.config.baseUrl.match(/^\w+:\/\//)[0]}${this.definition.domain}${this.config.basePort ? `:${this.config.basePort}` : ''}` | |||
There was a problem hiding this comment.
Same here, this.config.url
bakerkretzmar
added a commit
that referenced
this pull request
Nov 6, 2020
* Add upgrade guide * Wip * Wip * Update GitHub actions to not run on Markdown files * Wip * Formatting * Add changes in #337 * Add anchor links * Add changes in #338 * Add changes in #341, formatting * Wip * Update usage examples in Readme * Move CSP section down * LICENSE.md → LICENSE * Wip * Wip * Formatting * Add new features section to Upgrading * Prep Changelog headers and tags for v1 * Move current() with query fix to Fixed section * Add entries for #334 and #344 to Upgrading * Add Upgrading entry for check() being deprecated * Add #345 to Upgrading * Wip on Readme * JavaScript → Javascript * Wording/formatting * Update Readme: - Move Usage above Setup - Remove 'basic setup' section about @routes directive, it's covered in Installation - Wording fixes - Add note about boolean encoding (see #345) - Remove old 'Artisan Command' section * Formatting * Formatting and wording * Javascript → JavaScript * Remove unused heading link * Add section under 'Other' for setting up an API endpoint to return routes, link to that from SPA and JS sections * Fix wording re: watching files * :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes the
baseProtocolandbaseDomainproperties on the Ziggy configuration object.baseDomainactually wasn't used anywhere, andbaseProtocolwas inferred frombaseUrl, so now we just use that directly.Closes #333.