gsd-pi 2.67.0-dev.46f9884 → 2.67.0-dev.a5b1d8f

package/dist/web/standalone/node_modules/next/dist/client/components/app-router-instance.js

@@ -38,10 +38,14 @@ const _react = require("react");
 const _isthenable = require("../../shared/lib/is-thenable");
 const _types = require("./segment-cache/types");
 const _prefetch = require("./segment-cache/prefetch");
+const _navigation = require("./segment-cache/navigation");
 const _useactionqueue = require("./use-action-queue");
+const _optimisticroutes = require("./segment-cache/optimistic-routes");
+const _pprnavigations = require("./router-reducer/ppr-navigations");
 const _addbasepath = require("../add-base-path");
 const _approuterutils = require("./app-router-utils");
 const _links = require("./links");
+const _javascripturl = require("../lib/javascript-url");
 function runRemainingActions(actionQueue, setState) {
     if (actionQueue.pending !== null) {
         actionQueue.pending = actionQueue.pending.next;
@@ -204,9 +208,14 @@ function getProfilingHookForOnNavigationStart() {
     }
     return null;
 }
-function dispatchNavigateAction(href, navigateType, shouldScroll, linkInstanceRef) {
+function dispatchNavigateAction(href, navigateType, scrollBehavior, linkInstanceRef, transitionTypes) {
     // TODO: This stuff could just go into the reducer. Leaving as-is for now
     // since we're about to rewrite all the router reducer stuff anyway.
+    if (transitionTypes) {
+        for (const type of transitionTypes){
+            (0, _react.addTransitionType)(type);
+        }
+    }
     const url = new URL((0, _addbasepath.addBasePath)(href), location.href);
     if (process.env.__NEXT_APP_NAV_FAIL_HANDLING) {
         window.next.__pendingUrl = url;
@@ -221,7 +230,7 @@ function dispatchNavigateAction(href, navigateType, shouldScroll, linkInstanceRe
         url,
         isExternalUrl: (0, _approuterutils.isExternalURL)(url),
         locationSearch: location.search,
-        shouldScroll,
+        scrollBehavior,
         navigateType
     });
 }
@@ -236,6 +245,46 @@ function dispatchTraverseAction(href, historyState) {
         historyState
     });
 }
+/**
+ * (Experimental) Perform a gesture navigation. This dispatches through React's
+ * useOptimistic instead of the main action queue, allowing the state to be
+ * shown during a gesture transition and discarded when the canonical navigation
+ * completes.
+ *
+ * Only available when experimental.gestureTransition is enabled.
+ */ function gesturePush(href, options) {
+    if (process.env.__NEXT_GESTURE_TRANSITION) {
+        // TODO: Trigger a prefetch so the cache starts populating if there isn't
+        // already a prefetch for this route.
+        if ((0, _javascripturl.isJavaScriptURLString)(href)) {
+            throw Object.defineProperty(new Error('Next.js has blocked a javascript: URL as a security precaution.'), "__NEXT_ERROR_CODE", {
+                value: "E978",
+                enumerable: false,
+                configurable: true
+            });
+        }
+        const state = getCurrentAppRouterState();
+        if (state === null) {
+            return;
+        }
+        const url = new URL((0, _addbasepath.addBasePath)(href), location.href);
+        if ((0, _approuterutils.isExternalURL)(url)) {
+            return;
+        }
+        // Fork the router state for the duration of the gesture transition.
+        const currentUrl = new URL(state.canonicalUrl, location.href);
+        const scrollBehavior = options?.scroll === false ? _routerreducertypes.ScrollBehavior.NoScroll : _routerreducertypes.ScrollBehavior.Default;
+        // This is a special freshness policy that prevents dynamic requests from
+        // being spawned. During the gesture, we should only show the cached
+        // prefetched UI, not dynamic data.
+        // TODO: In the case of navigations to an unknown route, this will still
+        // end up performing a dynamic request. The plan is to do prefetch instead.
+        // There's a separate TODO for this.
+        const freshnessPolicy = _pprnavigations.FreshnessPolicy.Gesture;
+        const forkedGestureState = (0, _navigation.navigate)(state, url, currentUrl, state.renderedSearch, state.cache, state.tree, state.nextUrl, freshnessPolicy, scrollBehavior, 'push');
+        (0, _useactionqueue.dispatchGestureState)(forkedGestureState);
+    }
+}
 const publicAppRouterInstance = {
     back: ()=>window.history.back(),
     forward: ()=>window.history.forward(),
@@ -243,6 +292,13 @@ const publicAppRouterInstance = {
     // data in the router reducer state; it writes into a global mutable
     // cache. So we don't need to dispatch an action.
     (href, options)=>{
+        if ((0, _javascripturl.isJavaScriptURLString)(href)) {
+            throw Object.defineProperty(new Error('Next.js has blocked a javascript: URL as a security precaution.'), "__NEXT_ERROR_CODE", {
+                value: "E978",
+                enumerable: false,
+                configurable: true
+            });
+        }
         const actionQueue = getAppRouterActionQueue();
         const prefetchKind = options?.kind ?? _routerreducertypes.PrefetchKind.AUTO;
         // We don't currently offer a way to issue a runtime prefetch via `router.prefetch()`.
@@ -273,13 +329,27 @@ const publicAppRouterInstance = {
         (0, _prefetch.prefetch)(href, actionQueue.state.nextUrl, actionQueue.state.tree, fetchStrategy, options?.onInvalidate ?? null);
     },
     replace: (href, options)=>{
+        if ((0, _javascripturl.isJavaScriptURLString)(href)) {
+            throw Object.defineProperty(new Error('Next.js has blocked a javascript: URL as a security precaution.'), "__NEXT_ERROR_CODE", {
+                value: "E978",
+                enumerable: false,
+                configurable: true
+            });
+        }
         (0, _react.startTransition)(()=>{
-            dispatchNavigateAction(href, 'replace', options?.scroll ?? true, null);
+            dispatchNavigateAction(href, 'replace', options?.scroll === false ? _routerreducertypes.ScrollBehavior.NoScroll : _routerreducertypes.ScrollBehavior.Default, null, options?.transitionTypes);
         });
     },
     push: (href, options)=>{
+        if ((0, _javascripturl.isJavaScriptURLString)(href)) {
+            throw Object.defineProperty(new Error('Next.js has blocked a javascript: URL as a security precaution.'), "__NEXT_ERROR_CODE", {
+                value: "E978",
+                enumerable: false,
+                configurable: true
+            });
+        }
         (0, _react.startTransition)(()=>{
-            dispatchNavigateAction(href, 'push', options?.scroll ?? true, null);
+            dispatchNavigateAction(href, 'push', options?.scroll === false ? _routerreducertypes.ScrollBehavior.NoScroll : _routerreducertypes.ScrollBehavior.Default, null, options?.transitionTypes);
         });
     },
     refresh: ()=>{
@@ -297,6 +367,9 @@ const publicAppRouterInstance = {
                 configurable: true
             });
         } else {
+            // Reset the known routes table so that route predictions are cleared
+            // when routes change during development.
+            (0, _optimisticroutes.resetKnownRoutes)();
             (0, _react.startTransition)(()=>{
                 (0, _useactionqueue.dispatchAppRouterAction)({
                     type: _routerreducertypes.ACTION_HMR_REFRESH
@@ -305,6 +378,11 @@ const publicAppRouterInstance = {
         }
     }
 };
+// Conditionally add experimental_gesturePush when gestureTransition is enabled
+if (process.env.__NEXT_GESTURE_TRANSITION) {
+    ;
+    publicAppRouterInstance.experimental_gesturePush = gesturePush;
+}
 // Exists for debugging purposes. Don't use in application code.
 if (typeof window !== 'undefined' && window.next) {
     window.next.router = publicAppRouterInstance;

package/dist/web/standalone/node_modules/next/dist/client/components/app-router.js

@@ -17,6 +17,7 @@ const _routerreducertypes = require("./router-reducer/router-reducer-types");
 const _createhreffromurl = require("./router-reducer/create-href-from-url");
 const _hooksclientcontextsharedruntime = require("../../shared/lib/hooks-client-context.shared-runtime");
 const _useactionqueue = require("./use-action-queue");
+const _committedstate = require("./router-reducer/reducers/committed-state");
 const _approuterannouncer = require("./app-router-announcer");
 const _redirectboundary = require("./redirect-boundary");
 const _findheadincache = require("./router-reducer/reducers/find-head-in-cache");
@@ -64,6 +65,7 @@ function HistoryUpdater({ appRouterState }) {
         } else {
             window.history.replaceState(historyState, '', canonicalUrl);
         }
+        (0, _committedstate.setLastCommittedTree)(tree);
     }, [
         appRouterState
     ]);
@@ -139,6 +141,16 @@ function Head({ headCacheNode }) {
             tree
         ]);
     }
+    (0, _react.useEffect)(()=>{
+        const sourcePage = (0, _computechangedpath.extractSourcePageFromFlightRouterState)(state.tree);
+        if (sourcePage !== undefined) {
+            window.next.__internal_src_page = sourcePage;
+        } else {
+            delete window.next.__internal_src_page;
+        }
+    }, [
+        state.tree
+    ]);
     (0, _react.useEffect)(()=>{
         // If the app is restored from bfcache, it's possible that
         // pushRef.mpaNavigation is true, which would mean that any re-render of this component
@@ -174,7 +186,7 @@ function Head({ headCacheNode }) {
                 const redirectType = (0, _redirect.getRedirectTypeFromError)(error);
                 // TODO: This should access the router methods directly, rather than
                 // go through the public interface.
-                if (redirectType === _redirecterror.RedirectType.push) {
+                if (redirectType === 'push') {
                     _approuterinstance.publicAppRouterInstance.push(url, {});
                 } else {
                     _approuterinstance.publicAppRouterInstance.replace(url, {});
@@ -320,6 +332,7 @@ function Head({ headCacheNode }) {
             parentCacheNode: cache,
             parentSegmentPath: null,
             parentParams: {},
+            parentLoadingData: null,
             // This is the <Activity> "name" that shows up in the Suspense DevTools.
             // It represents the root of the app.
             debugNameContext: '/',
@@ -374,7 +387,7 @@ function Head({ headCacheNode }) {
             })
         ]
     });
-    if (process.env.NODE_ENV !== 'production') {
+    if (process.env.__NEXT_DEV_SERVER) {
         // In development, we apply few error boundaries and hot-reloader:
         // - DevRootHTTPAccessFallbackBoundary: avoid using navigation API like notFound() in root layout
         // - HotReloader:
@@ -406,7 +419,7 @@ function Head({ headCacheNode }) {
             /*#__PURE__*/ (0, _jsxruntime.jsx)(HistoryUpdater, {
                 appRouterState: state
             }),
-            /*#__PURE__*/ (0, _jsxruntime.jsx)(RuntimeStyles, {}),
+            process.env.TURBOPACK ? null : /*#__PURE__*/ (0, _jsxruntime.jsx)(RuntimeStylesForWebpack, {}),
             /*#__PURE__*/ (0, _jsxruntime.jsx)(_hooksclientcontextsharedruntime.NavigationPromisesContext.Provider, {
                 value: instrumentedNavigationPromises,
                 children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_hooksclientcontextsharedruntime.PathParamsContext.Provider, {
@@ -447,22 +460,28 @@ function AppRouter({ actionQueue, globalErrorState, webSocket, staticIndicatorSt
         children: router
     });
 }
-const runtimeStyles = new Set();
-let runtimeStyleChanged = new Set();
-globalThis._N_E_STYLE_LOAD = function(href) {
-    let len = runtimeStyles.size;
-    runtimeStyles.add(href);
-    if (runtimeStyles.size !== len) {
-        runtimeStyleChanged.forEach((cb)=>cb());
-    }
-    // TODO figure out how to get a promise here
-    // But maybe it's not necessary as react would block rendering until it's loaded
-    return Promise.resolve();
-};
-function RuntimeStyles() {
+let runtimeStyles;
+let runtimeStyleChanged;
+if (!process.env.TURBOPACK && typeof window !== 'undefined') {
+    runtimeStyles = new Set();
+    runtimeStyleChanged = new Set();
+    globalThis._N_E_STYLE_LOAD = function(href) {
+        if (!runtimeStyles || !runtimeStyleChanged) return Promise.resolve();
+        let len = runtimeStyles.size;
+        runtimeStyles.add(href);
+        if (runtimeStyles.size !== len) {
+            runtimeStyleChanged.forEach((cb)=>cb());
+        }
+        // TODO figure out how to get a promise here
+        // But maybe it's not necessary as react would block rendering until it's loaded
+        return Promise.resolve();
+    };
+}
+function RuntimeStylesForWebpack() {
     const [, forceUpdate] = _react.default.useState(0);
-    const renderedStylesSize = runtimeStyles.size;
+    const renderedStylesSize = runtimeStyles?.size ?? 0;
     (0, _react.useEffect)(()=>{
+        if (!runtimeStyles || !runtimeStyleChanged) return;
         const changed = ()=>forceUpdate((c)=>c + 1);
         runtimeStyleChanged.add(changed);
         if (renderedStylesSize !== runtimeStyles.size) {
@@ -475,12 +494,12 @@ function RuntimeStyles() {
         renderedStylesSize,
         forceUpdate
     ]);
-    const dplId = (0, _deploymentid.getDeploymentIdQueryOrEmptyString)();
+    const query = (0, _deploymentid.getAssetTokenQuery)();
     return [
-        ...runtimeStyles
+        ...runtimeStyles || []
     ].map((href, i)=>/*#__PURE__*/ (0, _jsxruntime.jsx)("link", {
             rel: "stylesheet",
-            href: `${href}${dplId}`,
+            href: `${href}${query}`,
             // @ts-ignore
             precedence: "next"
         }, i));

package/dist/web/standalone/node_modules/next/dist/client/components/builtin/app-error.js

@@ -11,82 +11,46 @@ Object.defineProperty(exports, "default", {
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _jsxruntime = require("react/jsx-runtime");
 const _react = /*#__PURE__*/ _interop_require_default._(require("react"));
-const styles = {
-    error: {
-        // https://github.com/sindresorhus/modern-normalize/blob/main/modern-normalize.css#L38-L52
-        fontFamily: 'system-ui,"Segoe UI",Roboto,Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"',
-        height: '100vh',
-        textAlign: 'center',
-        display: 'flex',
-        flexDirection: 'column',
-        alignItems: 'center',
-        justifyContent: 'center'
-    },
-    desc: {
-        lineHeight: '48px'
-    },
-    h1: {
-        display: 'inline-block',
-        margin: '0 20px 0 0',
-        paddingRight: 23,
-        fontSize: 24,
-        fontWeight: 500,
-        verticalAlign: 'top'
-    },
-    h2: {
-        fontSize: 14,
-        fontWeight: 400,
-        lineHeight: '28px'
-    },
-    wrap: {
-        display: 'inline-block'
-    }
-};
-/* CSS minified from
-body { margin: 0; color: #000; background: #fff; }
-.next-error-h1 {
-  border-right: 1px solid rgba(0, 0, 0, .3);
-}
-@media (prefers-color-scheme: dark) {
-  body { color: #fff; background: #000; }
-  .next-error-h1 {
-    border-right: 1px solid rgba(255, 255, 255, .3);
-  }
-}
-*/ const themeCss = `body{color:#000;background:#fff;margin:0}.next-error-h1{border-right:1px solid rgba(0,0,0,.3)}
-@media (prefers-color-scheme:dark){body{color:#fff;background:#000}.next-error-h1{border-right:1px solid rgba(255,255,255,.3)}}`;
+const _errorstyles = require("./error-styles");
+// This is the static 500.html page for App Router apps.
+// Always a server error, rendered at build time.
 function AppError() {
-    const errorMessage = 'Internal Server Error.';
-    const title = `500: ${errorMessage}`;
     return /*#__PURE__*/ (0, _jsxruntime.jsxs)("html", {
         id: "__next_error__",
         children: [
-            /*#__PURE__*/ (0, _jsxruntime.jsx)("head", {
-                children: /*#__PURE__*/ (0, _jsxruntime.jsx)("title", {
-                    children: title
-                })
+            /*#__PURE__*/ (0, _jsxruntime.jsxs)("head", {
+                children: [
+                    /*#__PURE__*/ (0, _jsxruntime.jsx)("title", {
+                        children: "500: This page couldn’t load"
+                    }),
+                    /*#__PURE__*/ (0, _jsxruntime.jsx)("style", {
+                        dangerouslySetInnerHTML: {
+                            __html: _errorstyles.errorThemeCss
+                        }
+                    })
+                ]
             }),
             /*#__PURE__*/ (0, _jsxruntime.jsx)("body", {
                 children: /*#__PURE__*/ (0, _jsxruntime.jsx)("div", {
-                    style: styles.error,
+                    style: _errorstyles.errorStyles.container,
                     children: /*#__PURE__*/ (0, _jsxruntime.jsxs)("div", {
-                        style: styles.desc,
+                        style: _errorstyles.errorStyles.card,
                         children: [
-                            /*#__PURE__*/ (0, _jsxruntime.jsx)("style", {
-                                dangerouslySetInnerHTML: {
-                                    __html: themeCss
-                                }
-                            }),
+                            /*#__PURE__*/ (0, _jsxruntime.jsx)(_errorstyles.WarningIcon, {}),
                             /*#__PURE__*/ (0, _jsxruntime.jsx)("h1", {
-                                className: "next-error-h1",
-                                style: styles.h1,
-                                children: "500"
+                                style: _errorstyles.errorStyles.title,
+                                children: "This page couldn’t load"
+                            }),
+                            /*#__PURE__*/ (0, _jsxruntime.jsx)("p", {
+                                style: _errorstyles.errorStyles.message,
+                                children: "A server error occurred. Reload to try again."
                             }),
-                            /*#__PURE__*/ (0, _jsxruntime.jsx)("div", {
-                                style: styles.wrap,
-                                children: /*#__PURE__*/ (0, _jsxruntime.jsx)("h2", {
-                                    style: styles.h2,
-                                    children: errorMessage
+                            /*#__PURE__*/ (0, _jsxruntime.jsx)("form", {
+                                style: _errorstyles.errorStyles.form,
+                                children: /*#__PURE__*/ (0, _jsxruntime.jsx)("button", {
+                                    type: "submit",
+                                    style: _errorstyles.errorStyles.button,
+                                    children: "Reload"
                                 })
                             })
                         ]

package/dist/web/standalone/node_modules/next/dist/client/components/builtin/error-styles.js

@@ -0,0 +1,165 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+0 && (module.exports = {
+    WarningIcon: null,
+    errorStyles: null,
+    errorThemeCss: null
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    WarningIcon: function() {
+        return WarningIcon;
+    },
+    errorStyles: function() {
+        return errorStyles;
+    },
+    errorThemeCss: function() {
+        return errorThemeCss;
+    }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _jsxruntime = require("react/jsx-runtime");
+const _react = /*#__PURE__*/ _interop_require_default._(require("react"));
+const errorStyles = {
+    container: {
+        fontFamily: 'system-ui,"Segoe UI",Roboto,Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"',
+        height: '100vh',
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center'
+    },
+    card: {
+        marginTop: '-32px',
+        maxWidth: '325px',
+        padding: '32px 28px',
+        textAlign: 'left'
+    },
+    icon: {
+        marginBottom: '24px'
+    },
+    title: {
+        fontSize: '24px',
+        fontWeight: 500,
+        letterSpacing: '-0.02em',
+        lineHeight: '32px',
+        margin: '0 0 12px 0',
+        color: 'var(--next-error-title)'
+    },
+    message: {
+        fontSize: '14px',
+        fontWeight: 400,
+        lineHeight: '21px',
+        margin: '0 0 20px 0',
+        color: 'var(--next-error-message)'
+    },
+    form: {
+        margin: 0
+    },
+    buttonGroup: {
+        display: 'flex',
+        gap: '8px',
+        alignItems: 'center'
+    },
+    button: {
+        display: 'inline-flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        height: '32px',
+        padding: '0 12px',
+        fontSize: '14px',
+        fontWeight: 500,
+        lineHeight: '20px',
+        borderRadius: '6px',
+        cursor: 'pointer',
+        color: 'var(--next-error-btn-text)',
+        background: 'var(--next-error-btn-bg)',
+        border: 'var(--next-error-btn-border)'
+    },
+    buttonSecondary: {
+        display: 'inline-flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        height: '32px',
+        padding: '0 12px',
+        fontSize: '14px',
+        fontWeight: 500,
+        lineHeight: '20px',
+        borderRadius: '6px',
+        cursor: 'pointer',
+        color: 'var(--next-error-btn-secondary-text)',
+        background: 'var(--next-error-btn-secondary-bg)',
+        border: 'var(--next-error-btn-secondary-border)'
+    },
+    digestFooter: {
+        position: 'fixed',
+        bottom: '32px',
+        left: '0',
+        right: '0',
+        textAlign: 'center',
+        fontFamily: 'ui-monospace,SFMono-Regular,"SF Mono",Menlo,Consolas,monospace',
+        fontSize: '12px',
+        lineHeight: '18px',
+        fontWeight: 400,
+        margin: '0',
+        color: 'var(--next-error-digest)'
+    }
+};
+const errorThemeCss = `
+:root {
+  --next-error-bg: #fff;
+  --next-error-text: #171717;
+  --next-error-title: #171717;
+  --next-error-message: #171717;
+  --next-error-digest: #666666;
+  --next-error-btn-text: #fff;
+  --next-error-btn-bg: #171717;
+  --next-error-btn-border: none;
+  --next-error-btn-secondary-text: #171717;
+  --next-error-btn-secondary-bg: transparent;
+  --next-error-btn-secondary-border: 1px solid rgba(0,0,0,0.08);
+}
+@media (prefers-color-scheme: dark) {
+  :root {
+    --next-error-bg: #0a0a0a;
+    --next-error-text: #ededed;
+    --next-error-title: #ededed;
+    --next-error-message: #ededed;
+    --next-error-digest: #a0a0a0;
+    --next-error-btn-text: #0a0a0a;
+    --next-error-btn-bg: #ededed;
+    --next-error-btn-border: none;
+    --next-error-btn-secondary-text: #ededed;
+    --next-error-btn-secondary-bg: transparent;
+    --next-error-btn-secondary-border: 1px solid rgba(255,255,255,0.14);
+  }
+}
+body { margin: 0; color: var(--next-error-text); background: var(--next-error-bg); }
+`.replace(/\n\s*/g, '');
+function WarningIcon() {
+    return /*#__PURE__*/ (0, _jsxruntime.jsx)("svg", {
+        width: "32",
+        height: "32",
+        viewBox: "-0.2 -1.5 32 32",
+        fill: "none",
+        style: errorStyles.icon,
+        children: /*#__PURE__*/ (0, _jsxruntime.jsx)("path", {
+            d: "M16.9328 0C18.0839 0.000116771 19.1334 0.658832 19.634 1.69531L31.4299 26.1309C32.0708 27.4588 31.1036 28.9999 29.6291 29H2.00215C0.527541 29 -0.439628 27.4588 0.201371 26.1309L11.9973 1.69531C12.4979 0.658823 13.5474 7.75066e-05 14.6984 0H16.9328ZM3.59493 26H28.0363L16.9328 3H14.6984L3.59493 26ZM15.8156 19C16.9202 19.0001 17.8156 19.8955 17.8156 21C17.8156 22.1045 16.9202 22.9999 15.8156 23C14.7111 23 13.8156 22.1046 13.8156 21C13.8156 19.8954 14.7111 19 15.8156 19ZM17.3156 16.5H14.3156V8.5H17.3156V16.5Z",
+            fill: "var(--next-error-title)"
+        })
+    });
+}
+
+if ((typeof exports.default === 'function' || (typeof exports.default === 'object' && exports.default !== null)) && typeof exports.default.__esModule === 'undefined') {
+  Object.defineProperty(exports.default, '__esModule', { value: true });
+  Object.assign(exports.default, exports);
+  module.exports = exports.default;
+}
+
+//# sourceMappingURL=error-styles.js.map

package/dist/web/standalone/node_modules/next/dist/client/components/builtin/global-error.js

@@ -11,60 +11,78 @@ Object.defineProperty(exports, // Exported so that the import signature in the l
         return _default;
     }
 });
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _jsxruntime = require("react/jsx-runtime");
+const _react = /*#__PURE__*/ _interop_require_default._(require("react"));
 const _handleisrerror = require("../handle-isr-error");
-const styles = {
-    error: {
-        // https://github.com/sindresorhus/modern-normalize/blob/main/modern-normalize.css#L38-L52
-        fontFamily: 'system-ui,"Segoe UI",Roboto,Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji"',
-        height: '100vh',
-        textAlign: 'center',
-        display: 'flex',
-        flexDirection: 'column',
-        alignItems: 'center',
-        justifyContent: 'center'
-    },
-    text: {
-        fontSize: '14px',
-        fontWeight: 400,
-        lineHeight: '28px',
-        margin: '0 8px'
-    }
-};
+const _errorstyles = require("./error-styles");
 function DefaultGlobalError({ error }) {
     const digest = error?.digest;
+    const isServerError = !!digest;
+    const message = isServerError ? 'A server error occurred. Reload to try again.' : 'Reload to try again, or go back.';
+    (0, _handleisrerror.handleISRError)({
+        error
+    });
     return /*#__PURE__*/ (0, _jsxruntime.jsxs)("html", {
         id: "__next_error__",
         children: [
-            /*#__PURE__*/ (0, _jsxruntime.jsx)("head", {}),
+            /*#__PURE__*/ (0, _jsxruntime.jsx)("head", {
+                children: /*#__PURE__*/ (0, _jsxruntime.jsx)("style", {
+                    dangerouslySetInnerHTML: {
+                        __html: _errorstyles.errorThemeCss
+                    }
+                })
+            }),
             /*#__PURE__*/ (0, _jsxruntime.jsxs)("body", {
                 children: [
-                    /*#__PURE__*/ (0, _jsxruntime.jsx)(_handleisrerror.HandleISRError, {
-                        error: error
-                    }),
                     /*#__PURE__*/ (0, _jsxruntime.jsx)("div", {
-                        style: styles.error,
+                        style: _errorstyles.errorStyles.container,
                         children: /*#__PURE__*/ (0, _jsxruntime.jsxs)("div", {
+                            style: _errorstyles.errorStyles.card,
                             children: [
-                                /*#__PURE__*/ (0, _jsxruntime.jsxs)("h2", {
-                                    style: styles.text,
+                                /*#__PURE__*/ (0, _jsxruntime.jsx)(_errorstyles.WarningIcon, {}),
+                                /*#__PURE__*/ (0, _jsxruntime.jsx)("h1", {
+                                    style: _errorstyles.errorStyles.title,
+                                    children: "This page couldn’t load"
+                                }),
+                                /*#__PURE__*/ (0, _jsxruntime.jsx)("p", {
+                                    style: _errorstyles.errorStyles.message,
+                                    children: message
+                                }),
+                                /*#__PURE__*/ (0, _jsxruntime.jsxs)("div", {
+                                    style: _errorstyles.errorStyles.buttonGroup,
                                     children: [
-                                        "Application error: a ",
-                                        digest ? 'server' : 'client',
-                                        "-side exception has occurred while loading ",
-                                        window.location.hostname,
-                                        " (see the",
-                                        ' ',
-                                        digest ? 'server logs' : 'browser console',
-                                        " for more information)."
+                                        /*#__PURE__*/ (0, _jsxruntime.jsx)("form", {
+                                            style: _errorstyles.errorStyles.form,
+                                            children: /*#__PURE__*/ (0, _jsxruntime.jsx)("button", {
+                                                type: "submit",
+                                                style: _errorstyles.errorStyles.button,
+                                                children: "Reload"
+                                            })
+                                        }),
+                                        !isServerError && /*#__PURE__*/ (0, _jsxruntime.jsx)("button", {
+                                            type: "button",
+                                            style: _errorstyles.errorStyles.buttonSecondary,
+                                            onClick: ()=>{
+                                                if (window.history.length > 1) {
+                                                    window.history.back();
+                                                } else {
+                                                    window.location.href = '/';
+                                                }
+                                            },
+                                            children: "Back"
+                                        })
                                     ]
-                                }),
-                                digest ? /*#__PURE__*/ (0, _jsxruntime.jsx)("p", {
-                                    style: styles.text,
-                                    children: `Digest: ${digest}`
-                                }) : null
+                                })
                             ]
                         })
+                    }),
+                    digest && /*#__PURE__*/ (0, _jsxruntime.jsxs)("p", {
+                        style: _errorstyles.errorStyles.digestFooter,
+                        children: [
+                            "ERROR ",
+                            digest
+                        ]
                     })
                 ]
             })