@weaverse/hydrogen 1.0.40 → 1.0.42

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import React, { ForwardRefExoticComponent } from 'react';
-import { ElementSchema, WeaverseElement } from '@weaverse/react';
 import { LoaderArgs, AppLoadContext } from '@shopify/remix-oxygen';
+import { ElementSchema, WeaverseElement, Weaverse, WeaverseItemStore } from '@weaverse/react';
+export * from '@weaverse/react';
 
 /**
  * Declare local additions to `AppLoadContext` to include the session utilities we injected in `server.ts`.
@@ -16,26 +17,36 @@ declare module '@shopify/remix-oxygen' {
 }
 type WeaverseLoaderArgs = LoaderArgs & {
     data: any;
-    config: {
+    configs: {
         projectId: string;
         weaverseHost: string;
     };
 };
-interface HydrogenComponentSchema extends ElementSchema {
-    isSection?: boolean;
+type ComponentFlags = Partial<Record<'isSection', boolean>>;
+interface HydrogenComponentSchema extends Omit<ElementSchema, 'parentTypes' | 'flags'> {
+    flags?: ComponentFlags;
 }
 interface HydrogenComponentProps<T = unknown> extends WeaverseElement {
     loaderData?: T;
     children?: React.JSX.Element[];
 }
+interface WeaverseHydrogen extends Omit<Weaverse, 'itemInstances'> {
+    itemInstances: Map<string | number, HydrogenComponentInstance>;
+}
+interface HydrogenComponentInstance extends Omit<WeaverseItemStore, '_flags'> {
+    get _element(): HTMLElement | null;
+    get _flags(): ComponentFlags;
+    get Element(): WeaverseElement | undefined;
+}
 interface HydrogenComponent<T = HydrogenComponentProps> {
     default: ForwardRefExoticComponent<T>;
-    schema: ElementSchema;
+    schema: HydrogenComponentSchema;
     loader?: (args: WeaverseLoaderArgs) => Promise<unknown>;
 }
 type HydrogenPageConfigs = {
     projectId: string;
     weaverseHost: string;
+    version?: string;
     isDesignMode?: boolean;
     [key: string]: any;
 };
@@ -64,4 +75,4 @@ interface WeaverseHydrogenRootProps {
 }
 declare let WeaverseHydrogenRoot: (props: WeaverseHydrogenRootProps) => React.JSX.Element;
 
-export { HydrogenComponent, HydrogenComponentProps, HydrogenComponentSchema, HydrogenPageConfigs, HydrogenPageData, TODO, WeaverseHydrogenRoot, WeaverseLoaderArgs, fetchWithServerCache, weaverseLoader };
+export { ComponentFlags, HydrogenComponent, HydrogenComponentInstance, HydrogenComponentProps, HydrogenComponentSchema, HydrogenPageConfigs, HydrogenPageData, TODO, WeaverseHydrogen, WeaverseHydrogenRoot, WeaverseLoaderArgs, fetchWithServerCache, weaverseLoader };

package/dist/index.js

@@ -17,6 +17,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
   // If the importer is in node compatibility mode or this is not an ESM
   // file that has been converted to a CommonJS file using a Babel-
@@ -591,7 +592,7 @@ var WeaverseItemStore = class {
     let defaultCss = this.Element?.defaultCss || {};
     let currentCss = this._data.css || {};
     let css = merge(defaultCss, currentCss);
-    let defaultData = { ...this.Element?.Component?.defaultProps };
+    let defaultData = { ...this.Element?.Component?.defaultProps, ...this.Element?.extraData || {} };
     return { ...defaultData, ...this._data, css };
   }
 };
@@ -635,6 +636,7 @@ var Weaverse = class {
     this.platformType = "shopify-section";
     this.isPreviewMode = false;
     this.ssrMode = false;
+    this.elementSchemas = [];
     this.mediaBreakPoints = {
       desktop: "all",
       // max-width need to subtract 0.02px to prevent bug https://getbootstrap.com/docs/5.1/layout/breakpoints/#max-width
@@ -739,7 +741,7 @@ function useStudio(weaverseCore) {
     if (weaverseCore.isDesignMode && isIframe && !window.weaverseStudioInitialized) {
       window.weaverseStudioInitialized = true;
       let host = weaverseCore.weaverseHost;
-      let version = Date.now();
+      let version = weaverseCore.weaverseVersion || Date.now();
       loadScript(`${host}/assets/studio/studio-bridge.js?v=${version}`).then(
         () => {
           window?.createWeaverseStudioBridge(weaverseCore);
@@ -861,7 +863,7 @@ async function weaverseLoader(args, components) {
                   context,
                   params,
                   request,
-                  config: configs
+                  configs
                 })
               };
             } catch (err) {
@@ -881,6 +883,7 @@ async function weaverseLoader(args, components) {
 }
 
 // src/index.tsx
+__reExport(src_exports, require("@weaverse/react"), module.exports);
 var WeaverseHydrogenRoot = (props) => {
   let { components, data } = props;
   let weaverse = createWeaverseHydrogenContext(data, components);

package/dist/index.mjs

@@ -555,7 +555,7 @@ var WeaverseItemStore = class {
     let defaultCss = this.Element?.defaultCss || {};
     let currentCss = this._data.css || {};
     let css = merge(defaultCss, currentCss);
-    let defaultData = { ...this.Element?.Component?.defaultProps };
+    let defaultData = { ...this.Element?.Component?.defaultProps, ...this.Element?.extraData || {} };
     return { ...defaultData, ...this._data, css };
   }
 };
@@ -599,6 +599,7 @@ var Weaverse = class {
     this.platformType = "shopify-section";
     this.isPreviewMode = false;
     this.ssrMode = false;
+    this.elementSchemas = [];
     this.mediaBreakPoints = {
       desktop: "all",
       // max-width need to subtract 0.02px to prevent bug https://getbootstrap.com/docs/5.1/layout/breakpoints/#max-width
@@ -703,7 +704,7 @@ function useStudio(weaverseCore) {
     if (weaverseCore.isDesignMode && isIframe && !window.weaverseStudioInitialized) {
       window.weaverseStudioInitialized = true;
       let host = weaverseCore.weaverseHost;
-      let version = Date.now();
+      let version = weaverseCore.weaverseVersion || Date.now();
       loadScript(`${host}/assets/studio/studio-bridge.js?v=${version}`).then(
         () => {
           window?.createWeaverseStudioBridge(weaverseCore);
@@ -825,7 +826,7 @@ async function weaverseLoader(args, components) {
                   context,
                   params,
                   request,
-                  config: configs
+                  configs
                 })
               };
             } catch (err) {
@@ -845,6 +846,7 @@ async function weaverseLoader(args, components) {
 }
 
 // src/index.tsx
+export * from "@weaverse/react";
 var WeaverseHydrogenRoot = (props) => {
   let { components, data } = props;
   let weaverse = createWeaverseHydrogenContext(data, components);

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.40",
+  "version": "1.0.42",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -32,10 +32,10 @@
   "name": "@weaverse/hydrogen",
   "author": "Weaverse Team",
   "dependencies": {
-    "@shopify/hydrogen": "2023.4.0",
-    "@weaverse/react": "1.0.40"
+    "@shopify/hydrogen": "2023.4.1",
+    "@weaverse/react": "1.0.42"
   },
   "devDependencies": {
-    "@shopify/remix-oxygen": "^1.0.5"
+    "@shopify/remix-oxygen": "^1.0.6"
   }
 }