Server updates

content/.obsidian/.gitignore

@@ -0,0 +1 @@
+workspace.json

content/Community.md

@@ -1 +1,6 @@
 Macrostrat is part of a broad geoinformatics ecosystem.
+
+
+## Cool Earth observing websites
+
+https://earth.nullschool.net: weather and ocean-circulation visualizations

package.json

@@ -14,6 +14,7 @@
     "server:prod": "NODE_NO_WARNINGS=1 NODE_ENV=production yarn run server",
     "dev:storybook": "yarn workspace @macrostrat/storybook run dev",
     "start": "yarn run build && yarn run server",
+    "test:runtime": "tsx tests/test-urls.ts",
     "test": "vitest"
   },
   "workspaces": [
@@ -146,9 +147,9 @@
     "use-debounce": "^9.0.4",
     "use-react-router-breadcrumbs": "^3.2.1",
     "use-resize-observer": "^9.1.0",
-    "vike": "^0.4.172",
-    "vike-react": "^0.4.11",
-    "vite": "^5.2.11",
+    "vike": "^0.4.177",
+    "vike-react": "^0.4.15",
+    "vite": "^5.3.2",
     "vite-plugin-cesium": "^1.2.22",
     "vite-plugin-inspect": "^0.8.4",
     "zustand": "^4.5.1"

packages/globe-dev/src/index.ts

@@ -7,7 +7,7 @@ import {
 import hyper from "@macrostrat/hyper";
 import { MapPosition } from "@macrostrat/mapbox-utils";
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Link } from "~/renderer/Link";
+import { Link } from "~/components/navigation/link-component";
 import CesiumView from "./cesium-view";
 
 import {

packages/settings/utils.ts

@@ -8,7 +8,7 @@ export function getRuntimeConfig(
   if (activeEnv === "server") {
     // We are running on the server, try to get directly from process.env
     val = process.env["VITE_" + key];
-  } else {
+  } else if (window.env !== undefined) {
     // We are running on the client and have access to window.env
     val = window.env[key];
   }

packages/sift/src/js/components/Column.tsx

@@ -1,7 +1,7 @@
 import h from "@macrostrat/hyper";
 import React from "react";
 import { useParams } from "react-router-dom";
-import { Link as VikeLink } from "~/renderer/Link";
+import { Link as VikeLink } from "~/components/navigation/link-component";
 import Chart from "./Chart";
 import Footer from "./Footer";
 import { SiftLink } from "./Link";
@@ -285,13 +285,13 @@ class _Column extends React.Component {
           <PrevalentTaxa data={this.state.prevalentTaxa} />
 
           <StratColumn data={this.state.units} />
-          <VikeLink
+          <LinkComponent
             href={"/columns/" + this.state.properties.col_id}
             target="_blank"
             className="normalize-link alternate-column"
           >
             Alternate column view
-          </VikeLink>
+          </LinkComponent>
         </div>
 
         <Footer data={this.state.refs} />

packages/text-toolchain/src/index.ts

@@ -20,8 +20,6 @@ export default function viteTextToolchain({
   const [pageIndex, permalinkIndex] = buildPageIndex(contentDir, wikiPrefix);
   const permalinks = Object.keys(permalinkIndex);
 
-  console.log(pageIndex, permalinkIndex);
-
   const include = [join(contentDir, "**/*.md"), "**/*.mdx"];
 
   return mdx({

server/index.ts

@@ -66,7 +66,7 @@ async function startServer() {
 
   app.use(compression());
   app.use(cookieParser());
-
+  //
   if (isProduction) {
     app.use(sirv(`${root}/dist/client`));
     // Special case for cesium files at /cesium prefix
@@ -94,7 +94,7 @@ async function startServer() {
     process.env.VITE_MACROSTRAT_TILESERVER_DOMAIN,
     process.env.VITE_MACROSTRAT_INSTANCE
   );
-
+  //
   /**
    * Vike route
    *

server/vike-handler.ts

@@ -9,10 +9,10 @@ const environment = synthesizeConfigFromEnvironment();
 export async function vikeHandler<
   Context extends Record<string | number | symbol, unknown>
 >(request: Request, context?: Context): Promise<Response> {
-  const baseContext = context ?? {};
   const user = await getUserFromCookie(request);
+
   const pageContextInit = {
-    ...baseContext,
+    ...context,
     urlOriginal: request.url,
     environment,
     user,
@@ -21,7 +21,11 @@ export async function vikeHandler<
   const pageContext = await renderPage(pageContextInit);
   const response = pageContext.httpResponse;
 
-  return new Response(response?.getReadableWebStream(), {
+  const { readable, writable } = new TransformStream();
+
+  response?.pipe(writable);
+
+  return new Response(readable, {
     status: response?.statusCode,
     headers: response?.headers,
   });

src/_providers.client/index.ts

@@ -0,0 +1,9 @@
+import h from "@macrostrat/hyper";
+import { resolvePattern, onDemand } from "~/_utils";
+import { GeologicPatternProvider } from "@macrostrat/column-components";
+// Import the pattern provider if on the client side
+// This is a wrapper around the GeologicPatternProvider from column-components
+
+export function PatternProvider({ children }) {
+  return h(GeologicPatternProvider, { resolvePattern }, children);
+}

src/renderer/auth.ts → src/_providers/auth.ts

@@ -4,7 +4,7 @@ import {
   AsyncAuthAction,
 } from "@macrostrat/auth-components";
 import h from "@macrostrat/hyper";
-import { ingestPrefix } from "@macrostrat-web/settings";
+import { ingestPrefix } from "../../packages/settings";
 
 async function authTransformer(
   action: AuthAction | AsyncAuthAction
@@ -25,11 +25,11 @@ async function authTransformer(
     case "logout":
       // Delete the token from the session
       try {
-        const response = await fetch(
-          `${ingestPrefix}/security/logout`,
-          { method: "POST", credentials: "include"}
-        );
-        if(response.ok){
+        const response = await fetch(`${ingestPrefix}/security/logout`, {
+          method: "POST",
+          credentials: "include",
+        });
+        if (response.ok) {
           return { type: "logout" };
         } else {
           throw new Error("Failed to logout");
@@ -55,12 +55,12 @@ export function AuthProvider(props) {
 export async function fetchUser() {
   const response = await fetch(`${ingestPrefix}/security/me`, {
     method: "GET",
-    credentials: "include"
+    credentials: "include",
   });
-  if(response.ok){
+  if (response.ok) {
     const user = await response.json();
-    return user
+    return user;
   } else {
     throw new Error("Failed to get user status");
   }
-}
+}

src/_providers/index.ts

@@ -1,7 +1,2 @@
-import { GeologicPatternProvider } from "@macrostrat/column-components";
-import h from "@macrostrat/hyper";
-import { resolvePattern } from "~/_utils";
-
-export function PatternProvider({ children }) {
-  return h(GeologicPatternProvider, { resolvePattern }, children);
-}
+export * from "./postgrest";
+export * from "./auth";

src/renderer/client-only.ts → src/_utils/client-only.ts

@@ -3,7 +3,7 @@ import loadable from "@loadable/component";
 import h from "@macrostrat/hyper";
 import { Suspense, useEffect, useMemo, useState } from "react";
 
-function ClientOnly(props) {
+export function ClientOnly(props) {
   const fallback = props.fallback || Spinner;
   const [Component, setComponent] = useState(null);
   const rest = useMemo(() => {
@@ -19,5 +19,3 @@ function ClientOnly(props) {
 
   return h(Suspense, { fallback: fallback }, element);
 }
-
-export { ClientOnly };

src/_utils/index.ts

@@ -17,3 +17,5 @@ export function loadableElement(func, props = null) {
 export function resolvePattern(name: string | number) {
   return `//visualization-assets.s3.amazonaws.com/geologic-patterns/svg/${name}.svg`;
 }
+
+export * from "./client-only";