Skip to content

Spike/storefront components #6725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bkrmendy wants to merge 5 commits into
base: master
Choose a base branch
from
+23 −15
Open

Spike/storefront components #6725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87c7a46
add sfc script to head
bkrmendy Jan 29, 2025
e1eb2d1
add react-dom/server as built-in dep
bkrmendy Jan 29, 2025
9d65dd4
reinstate non-html, lowercase elements
bkrmendy Jan 30, 2025
6ec1278
Revert "add react-dom/server as built-in dep"
bkrmendy Jan 30, 2025
78c52bb
Revert "Revert "add react-dom/server as built-in dep""
bkrmendy Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions editor/src/components/canvas/ui-jsx-canvas-renderer/ui-jsx-canvas-element-renderer-utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,12 +812,9 @@ function renderJSXElement(
[UTOPIA_PATH_KEY]: optionalMap(EP.toString, elementPath),
}

const looksLikeReactIntrinsicButNotHTML = elementIsIntrinsic && !elementIsBaseHTML

const finalProps =
looksLikeReactIntrinsicButNotHTML || elementIsFragment
? filterDataProps(propsIncludingElementPath)
: propsIncludingElementPath
const finalProps = elementIsFragment
? filterDataProps(propsIncludingElementPath)
: propsIncludingElementPath

if (!elementIsFragment && FinalElement == null) {
throw canvasMissingJSXElementError(jsxFactoryFunctionName, code, jsx, filePath, highlightBounds)
Expand Down
6 changes: 6 additions & 0 deletions editor/src/core/es-modules/package-manager/built-in-dependencies-list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import * as RemixServerRuntime from '@remix-run/server-runtime'
import * as Hydrogen from '@shopify/hydrogen'
import React from 'react' // this is imported like this so that the monkey patching will run
import * as ReactDOM from 'react-dom'
import * as ReactDOMServer from 'react-dom/server'
import * as ReactRouter from 'react-router'
import * as ReactJsxRuntime from 'react/jsx-runtime'
import * as UtopiaAPI from 'utopia-api'
Expand Down Expand Up @@ -75,6 +76,11 @@ export function createBuiltInDependenciesList(
builtInDependency('react/jsx-runtime', ReactJsxRuntime, editorPackageJSON.dependencies.react),
builtInDependency('react', React, editorPackageJSON.dependencies.react),
builtInDependency('react-dom', ReactDOM, editorPackageJSON.dependencies['react-dom']),
builtInDependency(
'react-dom/server',
ReactDOMServer,
editorPackageJSON.dependencies['react-dom'],
),
builtInDependency(
'@emotion/react',
EmotionReact,
Expand Down
5 changes: 5 additions & 0 deletions editor/src/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
<script defer type="module" src="/editor-entry-point.tsx"></script>
<% } %>

<script
type="module"
src="https://shopify.github.io/storefront-components/standalone-library.js"
></script>

<!--preloadVSCode-->

<!--preloadProjectDependencies-->
Expand Down
18 changes: 9 additions & 9 deletions editor/src/utils/canvas-react-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ export function makeCanvasElementPropsSafe(props: any): any {
}

function shouldIncludeDataUID(type: any): boolean {
if (typeof type === 'string') {
const elementIsIntrinsic = firstLetterIsLowerCase(type)
const elementIsBaseHTML = isIntrinsicHTMLElementString(type)
// Looks like an intrinsic element (div/span/etc), but isn't a recognised
// React intrinsic HTML element.
if (elementIsIntrinsic && !elementIsBaseHTML) {
return false
}
}
// if (typeof type === 'string') {
// const elementIsIntrinsic = firstLetterIsLowerCase(type)
// const elementIsBaseHTML = isIntrinsicHTMLElementString(type)
// // Looks like an intrinsic element (div/span/etc), but isn't a recognised
// // React intrinsic HTML element.
// if (elementIsIntrinsic && !elementIsBaseHTML) {
// return false
// }
// }
return true
}

Expand Down