mirror of
https://github.com/sourcegraph/sourcegraph.git
synced 2026-02-06 13:11:49 +00:00
Jg experiment whitescreen (#34835)
experimental whitescreen approach to inform users to upgrade browser
This commit is contained in:
Jason Gornall
GitHub
parent
c158127fbe
commit
dd026efd21
@ -148,6 +148,9 @@ export interface SourcegraphContext extends Pick<Required<SiteConfiguration>, 'e
|
||||
|
||||
/** The publishable key for the billing service (Stripe). */
|
||||
billingPublishableKey?: string
|
||||
|
||||
/** Prompt users with browsers that would crash to download a modern browser. */
|
||||
RedirectUnsupportedBrowser?: boolean
|
||||
}
|
||||
|
||||
export interface BrandAssets {
|
||||
|
||||
@ -97,6 +97,8 @@ type JSContext struct {
|
||||
|
||||
CodeInsightsGQLApiEnabled bool `json:"codeInsightsGqlApiEnabled"`
|
||||
|
||||
RedirectUnsupportedBrowser bool `json:"RedirectUnsupportedBrowser"`
|
||||
|
||||
ProductResearchPageEnabled bool `json:"productResearchPageEnabled"`
|
||||
|
||||
ExperimentalFeatures schema.ExperimentalFeatures `json:"experimentalFeatures"`
|
||||
@ -143,6 +145,7 @@ func NewJSContextFromRequest(req *http.Request, db database.DB) JSContext {
|
||||
|
||||
var sentryDSN *string
|
||||
siteConfig := conf.Get().SiteConfiguration
|
||||
|
||||
if siteConfig.Log != nil && siteConfig.Log.Sentry != nil && siteConfig.Log.Sentry.Dsn != "" {
|
||||
sentryDSN = &siteConfig.Log.Sentry.Dsn
|
||||
}
|
||||
@ -165,16 +168,17 @@ func NewJSContextFromRequest(req *http.Request, db database.DB) JSContext {
|
||||
// authentication above, but do not include e.g. hard-coded secrets about
|
||||
// the server instance here as they would be sent to anonymous users.
|
||||
return JSContext{
|
||||
ExternalURL: globals.ExternalURL().String(),
|
||||
XHRHeaders: headers,
|
||||
UserAgentIsBot: isBot(req.UserAgent()),
|
||||
AssetsRoot: assetsutil.URL("").String(),
|
||||
Version: version.Version(),
|
||||
IsAuthenticatedUser: actor.IsAuthenticated(),
|
||||
Datadog: datadogRUM,
|
||||
SentryDSN: sentryDSN,
|
||||
Debug: env.InsecureDev,
|
||||
SiteID: siteID,
|
||||
ExternalURL: globals.ExternalURL().String(),
|
||||
XHRHeaders: headers,
|
||||
UserAgentIsBot: isBot(req.UserAgent()),
|
||||
AssetsRoot: assetsutil.URL("").String(),
|
||||
Version: version.Version(),
|
||||
IsAuthenticatedUser: actor.IsAuthenticated(),
|
||||
Datadog: datadogRUM,
|
||||
SentryDSN: sentryDSN,
|
||||
RedirectUnsupportedBrowser: siteConfig.RedirectUnsupportedBrowser,
|
||||
Debug: env.InsecureDev,
|
||||
SiteID: siteID,
|
||||
|
||||
SiteGQLID: string(graphqlbackend.SiteGQLID()),
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
<html lang="en" class="base">
|
||||
|
||||
<head>
|
||||
|
||||
{{.Injected.HeadTop}}
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="x-ua-compatible" content="ie=edge">
|
||||
@ -44,10 +43,10 @@
|
||||
<script src='https://js.sentry-cdn.com/ae2f74442b154faf90b5ff0f7cd1c618.min.js' crossorigin="anonymous"></script>
|
||||
<!-- End Sentry -->
|
||||
<!-- Datadog RUM -->
|
||||
<script ignore-csp>(function(h,o,u,n,d) { h=h[d]=h[d]||{q:[],onReady:function(c){h.q.push(c)}}
|
||||
d=o.createElement(u);d.async=1;d.src=n;n=o.getElementsByTagName(u)[0];
|
||||
n.parentNode.insertBefore(d,n)})(window,document,'script',
|
||||
'https://www.datadoghq-browser-agent.com/datadog-rum-v4.js','DD_RUM');</script>
|
||||
<script ignore-csp>(function(h,o,u,n,d) { h=h[d]=h[d]||{q:[],onReady:function(c){h.q.push(c)}}
|
||||
d=o.createElement(u);d.async=1;d.src=n;n=o.getElementsByTagName(u)[0];
|
||||
n.parentNode.insertBefore(d,n)})(window,document,'script',
|
||||
'https://www.datadoghq-browser-agent.com/datadog-rum-v4.js','DD_RUM');</script>
|
||||
<!-- End Datadog RUM -->
|
||||
{{ end }}
|
||||
<script ignore-csp>
|
||||
@ -84,7 +83,19 @@
|
||||
|
||||
{{ end }}
|
||||
{{.Injected.BodyTop}}
|
||||
<div id="root"></div>
|
||||
<div id="root">
|
||||
{{ if .Context.RedirectUnsupportedBrowser }}
|
||||
<script ignore-csp>
|
||||
function canRunSourceGraph(){"use strict";if("undefined"==typeof Symbol)return!1;try{eval("class Foo {}"),eval("var bar = (x) => x+1")}catch(r){return!1}return!0}
|
||||
if (!canRunSourceGraph()) {
|
||||
document.write("<h1 ignore-csp style=\"padding: 10px;\">It looks like Sourcegraph does not support your browser. Upgrade or install a JavaScript ES6 supported browser (<a href=\"https://www.microsoft.com/en-us/edge\">Edge</a>, <a href=\"https://www.apple.com/safari/\">Safari</a>, <a href=\"https://www.google.com/chrome/downloads\">Chrome</a>, <a href=\"https://www.mozilla.org/en-US/firefox/new/\">Firefox</a>)</h1>")
|
||||
|
||||
// makes everything below disabled so no crashes
|
||||
document.write('<!--');
|
||||
}
|
||||
</script>
|
||||
{{ end }}
|
||||
</div>
|
||||
<noscript>
|
||||
<p>Sourcegraph is a web-based code search and navigation tool for dev teams. Search, navigate, and review code. Find answers.</p>
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ main() {
|
||||
exit 1
|
||||
fi
|
||||
local found
|
||||
found=$(grep -EHnr '(<script|<style|style=)' "${template_dir}" | grep -v '<script src=' | grep -v '<script ignore-csp' | grep -v '<div ignore-csp' | grep -v '<style ignore-csp' | grep -v '<iframe ignore-csp' || echo -n)
|
||||
found=$(grep -EHnr '(<script|<style|style=)' "${template_dir}" | grep -v '<script src=' | grep -v '<script ignore-csp' | grep -v '<h1 ignore-csp' | grep -v '<div ignore-csp' | grep -v '<style ignore-csp' | grep -v '<iframe ignore-csp' || echo -n)
|
||||
|
||||
if [[ ! "$found" == "" ]]; then
|
||||
echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
|
||||
|
||||
@ -1789,6 +1789,8 @@ type SettingsExperimentalFeatures struct {
|
||||
|
||||
// SiteConfiguration description: Configuration for a Sourcegraph site.
|
||||
type SiteConfiguration struct {
|
||||
// RedirectUnsupportedBrowser description: Prompts user to install new browser for non es5
|
||||
RedirectUnsupportedBrowser bool `json:"RedirectUnsupportedBrowser,omitempty"`
|
||||
// ApiRatelimit description: Configuration for API rate limiting
|
||||
ApiRatelimit *ApiRatelimit `json:"api.ratelimit,omitempty"`
|
||||
// ApidocsSearchIndexSizeLimitFactor description: Deprecated.
|
||||
|
||||
@ -60,6 +60,11 @@
|
||||
"type": "number",
|
||||
"default": -1
|
||||
},
|
||||
"RedirectUnsupportedBrowser": {
|
||||
"description": "Prompts user to install new browser for non es5",
|
||||
"type": "boolean",
|
||||
"default": false
|
||||
},
|
||||
"experimentalFeatures": {
|
||||
"description": "Experimental features to enable or disable. Features that are now enabled by default are marked as deprecated.",
|
||||
"type": "object",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user