laipeng/reflex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into reflex-0.4.0

Browse Source
This commit is contained in:
Masen Furer 2024-02-12 15:05:34 -08:00
commit 0da21ea605
No known key found for this signature in database
GPG Key ID: B0008AD22B3B3A95
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reflex/.templates/web/utils/state.js
View File

@ -64,7 +64,7 @@ export const getToken = () => {
if (token) { if (token) {
return token; return token;
} }
if (window) { if (typeof window !== 'undefined') {
if (!window.sessionStorage.getItem(TOKEN_KEY)) { if (!window.sessionStorage.getItem(TOKEN_KEY)) {
window.sessionStorage.setItem(TOKEN_KEY, generateUUID()); window.sessionStorage.setItem(TOKEN_KEY, generateUUID());
} }
@ -81,7 +81,7 @@ export const getToken = () => {
export const getBackendURL = (url_str) => { export const getBackendURL = (url_str) => {
// Get backend URL object from the endpoint. // Get backend URL object from the endpoint.
const endpoint = new URL(url_str); const endpoint = new URL(url_str);
if (SAME_DOMAIN_HOSTNAMES.includes(endpoint.hostname)) { if ((typeof window !== 'undefined') && SAME_DOMAIN_HOSTNAMES.includes(endpoint.hostname)) {
// Use the frontend domain to access the backend // Use the frontend domain to access the backend
const frontend_hostname = window.location.hostname; const frontend_hostname = window.location.hostname;
endpoint.hostname = frontend_hostname; endpoint.hostname = frontend_hostname;

4
reflex/components/core/banner.py
View File

@ -9,7 +9,7 @@ from reflex.components.chakra.overlay.modal import Modal
from reflex.components.chakra.typography import Text from reflex.components.chakra.typography import Text
from reflex.components.component import Component from reflex.components.component import Component
from reflex.components.core.cond import cond from reflex.components.core.cond import cond
from reflex.constants import Hooks, Imports from reflex.constants import Dirs, Hooks, Imports
from reflex.utils import imports from reflex.utils import imports
from reflex.vars import Var, VarData from reflex.vars import Var, VarData
@ -34,7 +34,7 @@ class WebsocketTargetURL(Bare):
def _get_imports(self) -> imports.ImportDict: def _get_imports(self) -> imports.ImportDict:
return { return {
"/utils/state.js": [imports.ImportVar(tag="getBackendURL")], f"/{Dirs.STATE_PATH}": [imports.ImportVar(tag="getBackendURL")],
"/env.json": [imports.ImportVar(tag="env", is_default=True)], "/env.json": [imports.ImportVar(tag="env", is_default=True)],
} }

2
reflex/components/core/banner.pyi
View File

@ -14,7 +14,7 @@ from reflex.components.chakra.overlay.modal import Modal
from reflex.components.chakra.typography import Text from reflex.components.chakra.typography import Text
from reflex.components.component import Component from reflex.components.component import Component
from reflex.components.core.cond import cond from reflex.components.core.cond import cond
from reflex.constants import Hooks, Imports from reflex.constants import Dirs, Hooks, Imports
from reflex.utils import imports from reflex.utils import imports
from reflex.vars import Var, VarData from reflex.vars import Var, VarData