ui: unbreak make watch#25871
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom May 23, 2018
Merged
Conversation
Member
|
This change is |
couchand
approved these changes
May 23, 2018
Contributor
couchand
left a comment
There was a problem hiding this comment.
LGTM, seems to fix the problem. Thanks!
pkg/ui/webpack.app.js
Outdated
| proxy: { | ||
| // Note: this shouldn't require a custom bypass function to work; | ||
| // docs say that setting `index: ''` is sufficient to proxy `/`. | ||
| // However, that did not work, and may require upgrading ty webpack 4.x. |
pkg/ui/webpack.app.js
Outdated
| secure: false, | ||
| target: process.env.TARGET, | ||
| bypass: (req) => { | ||
| if (req.path === "/") { |
Contributor
There was a problem hiding this comment.
is it worth putting "/" in proxyPrefixes?
Contributor
Author
There was a problem hiding this comment.
Needs to be a special case because if it were treated as a prefix, it'd match everything. Will move logic to shouldProxy though.
Contributor
Author
|
bors r+ |
Contributor
|
Looks like this is hitting a lint error that failed the bors CI. |
Contributor
Build failed (retrying...) |
By telling Webpack to proxy the path `/` through to the Cockroach process. Webpack used to serve `/` itself from a static file, but as of cockroachdb#25195 we generate `/` dynamically in Go, so we can use it to pass login state to the UI. Fixes cockroachdb#25858 Release note: None
Contributor
Canceled |
Contributor
Author
|
Whoops! Fixed. Looks like bors split out the other PRs and tried to merge them individually, which is cool. bors r+ |
Contributor
Build failed (retrying...) |
craig bot
pushed a commit
that referenced
this pull request
May 23, 2018
25868: sql: Log event for TRUNCATE TABLE r=a-robinson a=a-robinson Fixes #25867 Release note (sql change): TRUNCATE TABLE commands are now logged in the event log. 25871: ui: unbreak `make watch` r=vilterp a=vilterp By telling Webpack to proxy the path `/` through to the Cockroach process. Webpack used to serve `/` itself from a static file, but as of #25195 we generate `/` dynamically in Go, so we can use it to pass login state to the UI. Fixes #25858 Release note: None 25875: ui: fix action names broken by #25823 r=couchand a=couchand In that PR, I mechanically replaced identifiers when there were new warnings about shadowing, but in two places I accidentally changed semantics due to the shorthand form of object literals. 🤦♂️ Release note: None Co-authored-by: Alex Robinson <alexdwanerobinson@gmail.com> Co-authored-by: Pete Vilter <vilterp@cockroachlabs.com> Co-authored-by: Andrew Couch <andrew@cockroachlabs.com>
Contributor
Build succeeded |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
By telling Webpack to proxy the path
/through to the Cockroach process.Webpack used to serve
/itself from a static file, but as of #25195 wegenerate
/dynamically in Go, so we can use it to pass login state tothe UI.
Fixes #25858
Release note: None