[0.8] [ENG-5825] remix over next

.github/actions/setup_build_env/action.yml

@@ -34,6 +34,10 @@ runs:
         prune-cache: false
         activate-environment: true
         cache-dependency-glob: "uv.lock"
+    - name: Setup Node
+      uses: actions/setup-node@v4
+      with:
+        node-version: 22
     - name: Install Dependencies
       if: inputs.run-uv-sync == 'true'
       run: uv sync

.github/workflows/integration_app_harness.yml

@@ -15,6 +15,7 @@ on:
       - "**/*.md"
 env:
   APP_HARNESS_HEADLESS: 1
+  PYTHONUNBUFFERED: 1
 
 permissions:
   contents: read

pyi_hashes.json

@@ -1,23 +1,23 @@
 {
-  "reflex/__init__.pyi": "3afc0049639ae1663f916dd91e653dfe",
-  "reflex/components/__init__.pyi": "f3a4ccd8979222bdad1b8649f6734a6d",
-  "reflex/components/base/__init__.pyi": "e9aaf47be1e1977eacee97b880c8f7de",
+  "reflex/__init__.pyi": "0ca4974ab0fc44525e061ad39dd338fa",
+  "reflex/components/__init__.pyi": "f424d22ce0caa9375180195c273eb59c",
+  "reflex/components/base/__init__.pyi": "74d7764e03837231ea40a06dff08f44a",
   "reflex/components/base/app_wrap.pyi": "5c2daf49c552c40d1247d998e200d01c",
   "reflex/components/base/body.pyi": "b1df93ecdea60baf1495ef52aa742f31",
-  "reflex/components/base/document.pyi": "018f0207324a9cd4bac6d209fe3ae324",
+  "reflex/components/base/document.pyi": "f6e2dc26993b5481008da554356c6009",
   "reflex/components/base/error_boundary.pyi": "42779d76ea6bc2847a33533cdac23f21",
   "reflex/components/base/fragment.pyi": "b77ee8f55c73f45abf515ddbeb29c594",
-  "reflex/components/base/head.pyi": "31debbe85c37c40d8166504de121f905",
   "reflex/components/base/link.pyi": "1cdc04cf0fbb2e2ed73feeb67aa55729",
   "reflex/components/base/meta.pyi": "cdfb479b6140d5768285dfa7713774da",
-  "reflex/components/base/script.pyi": "29fcfe9d4655bdc020362eb780d0fa46",
+  "reflex/components/base/script.pyi": "eff80f98522bb4629bac5b55546bbeb2",
   "reflex/components/base/strict_mode.pyi": "1d05089b3f201d3fcccde3a62a854d34",
-  "reflex/components/core/__init__.pyi": "44bcee7bc4e27e2f4f4707b843acf291",
+  "reflex/components/core/__init__.pyi": "d99fbfd4207d8a3f7013221f428e0ed8",
   "reflex/components/core/auto_scroll.pyi": "fd6e78c419cd4b5ce77512f95603f9c9",
   "reflex/components/core/banner.pyi": "75f64f49f7f1157f01f1e003737d2eda",
-  "reflex/components/core/client_side_routing.pyi": "c961a842715a99468110784224140c2c",
+  "reflex/components/core/client_side_routing.pyi": "df659032437ba52bbb94303fa54e1a46",
   "reflex/components/core/clipboard.pyi": "e009ca6d0be9127d8acafbe959334ada",
   "reflex/components/core/debounce.pyi": "72852ec7c60742122689b3c90740d276",
+  "reflex/components/core/helmet.pyi": "499a351957d7ef03c6b29bbbff699dce",
   "reflex/components/core/html.pyi": "41c22b41433ec50ba9e07de813b764e6",
   "reflex/components/core/sticky.pyi": "66c4ce29e7f9419bbb2101278973c0e0",
   "reflex/components/core/upload.pyi": "90039579d573a7aa887d40889ced6154",
@@ -38,13 +38,10 @@
   "reflex/components/el/elements/sectioning.pyi": "029b957c3da82d747a297811e9d71a43",
   "reflex/components/el/elements/tables.pyi": "60ce25fd601003dfadd78d3081b86795",
   "reflex/components/el/elements/typography.pyi": "3c4d82d4c61c84af85023d180631b081",
-  "reflex/components/gridjs/datatable.pyi": "963021af448b5f22960d521107194a87",
+  "reflex/components/gridjs/datatable.pyi": "1b8232fd3e839c6ae772db3d211cd632",
   "reflex/components/lucide/icon.pyi": "b544769b37f1155ce97a170a21d1bcad",
   "reflex/components/markdown/markdown.pyi": "3c818ed8f3a99edcba66ff00ec313f13",
   "reflex/components/moment/moment.pyi": "77e40c9afd511fb046134e2581d8a3bd",
-  "reflex/components/next/base.pyi": "d445d407bf74ef571712632f1fc24c31",
-  "reflex/components/next/image.pyi": "bca53a266ce8159cf0e8ff30c65cf913",
-  "reflex/components/next/link.pyi": "dfb53816a637fb81955b529e7824be47",
   "reflex/components/plotly/plotly.pyi": "8362d4dd3d5c57af79a8bc8d2dbe82c9",
   "reflex/components/radix/__init__.pyi": "8d586cbff1d7130d09476ac72ee73400",
   "reflex/components/radix/primitives/__init__.pyi": "fe8715decf3e9ae471b56bba14e42cb3",
@@ -108,7 +105,7 @@
   "reflex/components/radix/themes/typography/blockquote.pyi": "5ac7c554663caed708e1a41a183a9bcb",
   "reflex/components/radix/themes/typography/code.pyi": "5cbff824db591c92bc207066f2c0004e",
   "reflex/components/radix/themes/typography/heading.pyi": "bb34ff7af2491bd7c424d378940a58c5",
-  "reflex/components/radix/themes/typography/link.pyi": "330158527b84c9e72ee7abf95d1217d3",
+  "reflex/components/radix/themes/typography/link.pyi": "97073a20f49b809a2713f0496fd9225c",
   "reflex/components/radix/themes/typography/text.pyi": "cf2896cf1503d8196c5ca5b06914245f",
   "reflex/components/react_player/audio.pyi": "c6cadf0f3db3892a7cda64e5672f4465",
   "reflex/components/react_player/react_player.pyi": "4f1fbff94bbe714e56697a1d0b462bef",

reflex/.templates/jinja/app/rxconfig.py.jinja2

@@ -3,6 +3,7 @@ import reflex as rx
 config = rx.Config(
     app_name="{{ app_name }}",
     plugins=[
+        rx.plugins.SitemapPlugin(),
         rx.plugins.TailwindV4Plugin(),
     ],
 )

reflex/.templates/jinja/web/package.json.jinja2

@@ -1,9 +1,9 @@
 {
   "name": "reflex",
+  "type": "module",
   "scripts": {
     "dev": "{{ scripts.dev }}",
     "export": "{{ scripts.export }}",
-    "export-sitemap": "{{ scripts.export_sitemap }}",
     "prod": "{{ scripts.prod }}"
   },
   "dependencies": {

reflex/.templates/jinja/web/pages/_app.js.jinja2

@@ -6,8 +6,10 @@ import '$/styles/__reflex_global_styles.css'
 {% endblock %}
 
 {% block declaration %}
-import { EventLoopProvider, StateProvider, defaultColorMode } from "$/utils/context.js";
-import { ThemeProvider } from 'next-themes'
+import { EventLoopProvider, StateProvider, defaultColorMode } from "$/utils/context";
+import { ThemeProvider } from '$/utils/react-theme';
+import { Layout as AppLayout } from './_document';
+import { Outlet } from 'react-router';
 {% for library_alias, library_path in  window_libraries %}
 import * as {{library_alias}} from "{{library_path}}";
 {% endfor %}
@@ -26,8 +28,9 @@ function AppWrap({children}) {
   )
 }
 
-export default function MyApp({ Component, pageProps }) {
-  React.useEffect(() => {
+
+export function Layout({children}) {
+    React.useEffect(() => {
     // Make contexts and state objects available globally for dynamic eval'd components
     let windowImports = {
 {% for library_alias, library_path in  window_libraries %}
@@ -36,17 +39,20 @@ export default function MyApp({ Component, pageProps }) {
     };
     window["__reflex"] = windowImports;
   }, []);
-  return (
-    jsx(ThemeProvider, {defaultTheme:defaultColorMode,attribute:"class"},
+
+  return jsx(AppLayout, {},
+    jsx(ThemeProvider, {defaultTheme: defaultColorMode, attribute: "class"},
       jsx(StateProvider, {},
-        jsx(EventLoopProvider, {}, 
-          jsx(AppWrap, {},
-            jsx(Component, pageProps)
-          )
+        jsx(EventLoopProvider, {},
+          jsx(AppWrap, {}, children)
         )
       )
     )
   );
 }
 
+export default function App() {
+  return jsx(Outlet, {});
+}
+
 {% endblock %}

reflex/.templates/jinja/web/pages/_document.js.jinja2

@@ -1,7 +1,7 @@
 {% extends "web/pages/base_page.js.jinja2" %}
 
 {% block export %}
-export default function Document() {
+export function Layout({children}) {
   return (
     {{utils.render(document)}}
   )

reflex/.templates/jinja/web/pages/base_page.js.jinja2

@@ -1,5 +1,4 @@
 {% import 'web/pages/utils.js.jinja2' as utils %}
-/** @jsxImportSource @emotion/react */
 
 {% block early_imports %}
 {% endblock %}

reflex/.templates/jinja/web/utils/context.js.jinja2

@@ -1,5 +1,6 @@
-import { createContext, useContext, useMemo, useReducer, useState, createElement } from "react"
-import { applyDelta, Event, hydrateClientStorage, useEventLoop, refs } from "$/utils/state.js"
+import { createContext, useContext, useMemo, useReducer, useState, createElement, useEffect } from "react"
+import { applyDelta, Event, hydrateClientStorage, useEventLoop, refs } from "$/utils/state"
+import { jsx } from "@emotion/react";
 
 {% if initial_state %}
 export const initialState = {{ initial_state|json_dumps }}
@@ -77,7 +78,21 @@ export function UploadFilesProvider({ children }) {
     delete newFilesById[id]
     return newFilesById
   })
-  return createElement(UploadFilesContext, {value:[filesById, setFilesById]}, children);
+  return createElement(
+    UploadFilesContext.Provider,
+    { value: [filesById, setFilesById] },
+    children
+  );
+}
+
+export function ClientSide(component) {
+  return ({ children, ...props }) => {
+    const [Component, setComponent] = useState(null);
+    useEffect(() => {
+      setComponent(component);
+    }, []);
+    return Component ? jsx(Component, props, children) : null;
+  };
 }
 
 export function EventLoopProvider({ children }) {
@@ -87,7 +102,11 @@ export function EventLoopProvider({ children }) {
     initialEvents,
     clientStorage,
   )
-  return createElement(EventLoopContext, {value:[addEvents, connectErrors]}, children);
+  return createElement(
+    EventLoopContext.Provider,
+    { value: [addEvents, connectErrors] },
+    children
+  );
 }
 
 export function StateProvider({ children }) {
@@ -106,7 +125,7 @@ export function StateProvider({ children }) {
     {% for state_name in initial_state %}
     createElement(StateContexts.{{state_name|var_name}},{value: {{state_name|var_name}}},
     {% endfor %}
-    createElement(DispatchContext.Provider, {value: dispatchers}, children),
-    {% for state_name in initial_state|reverse %}){% endfor %}
+    createElement(DispatchContext, {value: dispatchers}, children)
+    {% for state_name in initial_state %}){% endfor %}
   )
 }

reflex/.templates/web/app/entry.client.js

@@ -0,0 +1,8 @@
+import { startTransition } from "react";
+import { hydrateRoot } from "react-dom/client";
+import { HydratedRouter } from "react-router/dom";
+import { createElement } from "react";
+
+startTransition(() => {
+  hydrateRoot(document, createElement(HydratedRouter));
+});

reflex/.templates/web/app/routes.js

@@ -0,0 +1,10 @@
+import { route } from "@react-router/dev/routes";
+import { flatRoutes } from "@react-router/fs-routes";
+
+export default [
+  route("*", "routes/[404]_._index.js"),
+  route("404", "routes/[404]_._index.js", { id: "404" }),
+  ...(await flatRoutes({
+    ignoredRouteFiles: ["routes/\\[404\\]_._index.js"],
+  })),
+];

reflex/.templates/web/components/reflex/radix_themes_color_mode_provider.js

@@ -1,45 +1,19 @@
-import { useTheme } from "next-themes";
-import { useRef, useEffect, useState, createElement } from "react";
+import { useTheme } from "$/utils/react-theme";
+import { createElement } from "react";
 import {
   ColorModeContext,
   defaultColorMode,
   isDevMode,
   lastCompiledTimeStamp,
-} from "$/utils/context.js";
+} from "$/utils/context";
 
 export default function RadixThemesColorModeProvider({ children }) {
   const { theme, resolvedTheme, setTheme } = useTheme();
-  const [rawColorMode, setRawColorMode] = useState(defaultColorMode);
-  const [resolvedColorMode, setResolvedColorMode] = useState(
-    defaultColorMode === "dark" ? "dark" : "light",
-  );
-  const firstUpdate = useRef(true);
-  useEffect(() => {
-    if (firstUpdate.current) {
-      firstUpdate.current = false;
-      setRawColorMode(theme);
-      setResolvedColorMode(resolvedTheme);
-    }
-  });
-
-  useEffect(() => {
-    if (isDevMode) {
-      const lastCompiledTimeInLocalStorage =
-        localStorage.getItem("last_compiled_time");
-      if (lastCompiledTimeInLocalStorage !== lastCompiledTimeStamp) {
-        // on app startup, make sure the application color mode is persisted correctly.
-        setTheme(defaultColorMode);
-        localStorage.setItem("last_compiled_time", lastCompiledTimeStamp);
-        return;
-      }
-    }
-    setRawColorMode(theme);
-    setResolvedColorMode(resolvedTheme);
-  }, [theme, resolvedTheme]);
 
   const toggleColorMode = () => {
     setTheme(resolvedTheme === "light" ? "dark" : "light");
   };
+
   const setColorMode = (mode) => {
     const allowedModes = ["light", "dark", "system"];
     if (!allowedModes.includes(mode)) {
@@ -50,10 +24,16 @@ export default function RadixThemesColorModeProvider({ children }) {
     }
     setTheme(mode);
   };
+
   return createElement(
-    ColorModeContext,
+    ColorModeContext.Provider,
     {
-      value: { rawColorMode, resolvedColorMode, toggleColorMode, setColorMode },
+      value: {
+        rawColorMode: theme,
+        resolvedColorMode: resolvedTheme,
+        toggleColorMode,
+        setColorMode,
+      },
     },
     children,
   );

reflex/.templates/web/postcss.config.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   plugins: {
     "postcss-import": {},
     autoprefixer: {},

reflex/.templates/web/react-router.config.js

@@ -0,0 +1,6 @@
+export default {
+  future: {
+    unstable_optimizeDeps: true,
+  },
+  ssr: false,
+};

reflex/.templates/web/utils/client_side_routing.js

@@ -1,41 +1,43 @@
 import { useEffect, useRef, useState } from "react";
-import { useRouter } from "next/router";
+import { useLocation, useNavigate } from "react-router-dom";
 
 /**
- * React hook for use in /404 page to enable client-side routing.
+ * React hook for use in NotFound page to enable client-side routing.
  *
- * Uses the next/router to redirect to the provided URL when loading
- * the 404 page (for example as a fallback in static hosting situations).
+ * Uses React Router to redirect to the provided URL when loading
+ * the NotFound page (for example as a fallback in static hosting situations).
  *
  * @returns {boolean} routeNotFound - true if the current route is an actual 404
  */
 export const useClientSideRouting = () => {
   const [routeNotFound, setRouteNotFound] = useState(false);
   const didRedirect = useRef(false);
-  const router = useRouter();
+  const location = useLocation();
+  const navigate = useNavigate();
+
   useEffect(() => {
-    if (
-      router.isReady &&
-      !didRedirect.current // have not tried redirecting yet
-    ) {
-      didRedirect.current = true; // never redirect twice to avoid "Hard Navigate" error
+    if (!didRedirect.current) {
+      // have not tried redirecting yet
+      didRedirect.current = true; // never redirect twice to avoid navigation loops
+
       // attempt to redirect to the route in the browser address bar once
-      router
-        .replace({
-          pathname: window.location.pathname,
-          query: window.location.search.slice(1),
-        })
+      const path = window.location.pathname;
+      const search = window.location.search;
+
+      // Use navigate instead of replace
+      navigate(path + search, { replace: true })
         .then(() => {
-          // Check if the current route is /404
-          if (router.pathname === "/404") {
+          // Check if we're still on a NotFound route
+          // Note: This depends on how your routes are set up
+          if (location.pathname === path) {
             setRouteNotFound(true); // Mark as an actual 404
           }
         })
-        .catch((e) => {
+        .catch(() => {
           setRouteNotFound(true); // navigation failed, so this is a real 404
         });
     }
-  }, [router.isReady]);
+  }, [location, navigate]);
 
   // Return the reactive bool, to avoid flashing 404 page until we know for sure
   // the route is not found.