Merge branch 'main' of https://github.com/concrete-utopia/hydrogen-may

concrete-utopia · May 8, 2024 · ce050b7 · ce050b7
2 parents 0f3a394 + 4901949
commit ce050b7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 174 deletions.
diff --git a/app/root.jsx b/app/root.jsx
@@ -11,8 +11,11 @@ import {
   isRouteErrorResponse,
 } from '@remix-run/react';
 import favicon from './assets/favicon.svg';
-import resetStyles from './styles/reset.css?url';
-import appStyles from './styles/app.css?url';
+
+// Utopia TODO – fix this
+// import resetStyles from './styles/reset.css?url'
+// import appStyles from './styles/app.css?url'
+
 import {Layout} from '~/components/Layout';
 
 /**
@@ -35,8 +38,8 @@ export const shouldRevalidate = ({formMethod, currentUrl, nextUrl}) => {
 
 export function links() {
   return [
-    {rel: 'stylesheet', href: resetStyles},
-    {rel: 'stylesheet', href: appStyles},
+    // { rel: 'stylesheet', href: resetStyles },
+    // { rel: 'stylesheet', href: appStyles },
     {
       rel: 'preconnect',
       href: 'https://cdn.shopify.com',

diff --git a/utopia/antd.utopia.js b/utopia/antd.utopia.js
diff --git a/utopia/storyboard.js b/utopia/storyboard.js
@@ -1,25 +1,26 @@
-import * as React from 'react';
-import {Storyboard, RemixScene} from 'utopia-api';
+import * as React from 'react'
+import { Storyboard, RemixScene } from 'utopia-api'
 
-import {getLoadContext} from '../server';
-import {Image} from '@shopify/hydrogen';
+import { getLoadContext } from '../server-context-getter'
+import { Image } from '@shopify/hydrogen'
 
 const contextGetter = getLoadContext(
   {
     PUBLIC_STORE_DOMAIN: 'praiseful-pear.myshopify.com',
-    PUBLIC_STOREFRONT_API_TOKEN: '541564e540184b9648c529272ffa4b53',
+    PUBLIC_STOREFRONT_API_TOKEN:
+      '541564e540184b9648c529272ffa4b53',
   },
   {
     waitUntil: () => {},
   },
   // Demo cart ID obtained from https://mock.shop/create-cart
   'gid://shopify/Cart/Z2NwLXVzLWNlbnRyYWwxOjAxSEhKQ0I3RFoySlY3Mk5ORlhUVEo2RjhU',
-);
+)
 
 export var storyboard = (
   <Storyboard>
     <RemixScene
-      data-label="Desktop"
+      data-label='Desktop'
       style={{
         position: 'absolute',
         width: 1440,
@@ -29,7 +30,7 @@ export var storyboard = (
         overflow: 'hidden',
       }}
       getLoadContext={contextGetter}
-      commentId="bjt"
+      commentId='bjt'
     />
   </Storyboard>
-);
+)