@weaverse/hydrogen 2.2.2 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.mts +7 -9
- package/dist/index.d.ts +7 -9
- package/dist/index.js +40 -25
- package/dist/index.mjs +26 -11
- package/package.json +32 -32
package/dist/index.d.mts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ElementData, ElementSchema, BasicInput, WeaverseElement, WeaverseCoreParams, WeaverseProjectDataType, Weaverse, PlatformTypeEnum, WeaverseItemStore } from '@weaverse/react';
|
|
1
|
+
import { ElementData, ElementSchema, BasicInput, WeaverseElement, WeaverseCoreParams, WeaverseProjectDataType, WeaverseResourcePickerData, Weaverse, PlatformTypeEnum, WeaverseItemStore } from '@weaverse/react';
|
|
2
2
|
export { WeaverseImage } from '@weaverse/react';
|
|
3
3
|
import { NavigateFunction } from '@remix-run/react';
|
|
4
4
|
import { createWithCache, Storefront } from '@shopify/hydrogen';
|
|
@@ -31,11 +31,6 @@ declare let STORE_PAGES: {
|
|
|
31
31
|
PAGE: string;
|
|
32
32
|
BLOG: string;
|
|
33
33
|
ARTICLE: string;
|
|
34
|
-
CART: string;
|
|
35
|
-
CUSTOMER: string;
|
|
36
|
-
SEARCH: string;
|
|
37
|
-
NOT_FOUND: string;
|
|
38
|
-
PASSWORD: string;
|
|
39
34
|
CUSTOM: string;
|
|
40
35
|
};
|
|
41
36
|
|
|
@@ -56,7 +51,7 @@ declare class WeaverseClient {
|
|
|
56
51
|
countries?: WeaverseClientArgs['countries'];
|
|
57
52
|
constructor(args: WeaverseClientArgs);
|
|
58
53
|
fetchWithCache: <T>(url: string, options: FetchWithCacheOptions) => Promise<T>;
|
|
59
|
-
loadThemeSettings: (strategy?: AllCacheOptions) => Promise<
|
|
54
|
+
loadThemeSettings: (strategy?: AllCacheOptions) => Promise<any>;
|
|
60
55
|
loadPage: (params?: LoadPageParams) => Promise<WeaverseLoaderData | null>;
|
|
61
56
|
execComponentLoader: (item: HydrogenComponentData) => Promise<HydrogenComponentData>;
|
|
62
57
|
}
|
|
@@ -256,7 +251,6 @@ type LoadPageParams = PageAssignmentParams & {
|
|
|
256
251
|
type FetchProjectRequestBody = {
|
|
257
252
|
projectId: string;
|
|
258
253
|
url: string;
|
|
259
|
-
countries?: Localizations;
|
|
260
254
|
i18n?: I18nLocale;
|
|
261
255
|
params?: PageAssignmentParams;
|
|
262
256
|
isDesignMode?: boolean;
|
|
@@ -294,6 +288,10 @@ type RootRouteData = {
|
|
|
294
288
|
};
|
|
295
289
|
[key: string]: any;
|
|
296
290
|
};
|
|
291
|
+
type WeaverseProduct = WeaverseResourcePickerData;
|
|
292
|
+
type WeaverseCollection = WeaverseResourcePickerData;
|
|
293
|
+
type WeaverseBlog = WeaverseResourcePickerData;
|
|
294
|
+
type WeaverseArticle = WeaverseResourcePickerData;
|
|
297
295
|
declare global {
|
|
298
296
|
interface Window {
|
|
299
297
|
__weaverse: WeaverseHydrogen;
|
|
@@ -330,4 +328,4 @@ declare class WeaverseHydrogenItem extends WeaverseItemStore {
|
|
|
330
328
|
set data(update: HydrogenComponentData);
|
|
331
329
|
}
|
|
332
330
|
|
|
333
|
-
export { AllCacheOptions, ComponentLoaderArgs, FetchProjectPayload, FetchProjectRequestBody, FetchWithCacheOptions, HydrogenComponent, HydrogenComponentData, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeEnv, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenThemeSettings, HydrogenToolbarAction, I18nLocale, InspectorGroup, LoadPageParams, Locale, Localizations, PageAssignmentParams, PageType, PublicEnv, RootRouteData, RouteLoaderArgs, ThemeSettingsStore, WeaverseClient, WeaverseClientArgs, WeaverseHydrogen, WeaverseHydrogenItem, WeaverseHydrogenParams, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseProjectConfigs, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, useThemeSettings, withWeaverse };
|
|
331
|
+
export { AllCacheOptions, ComponentLoaderArgs, FetchProjectPayload, FetchProjectRequestBody, FetchWithCacheOptions, HydrogenComponent, HydrogenComponentData, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeEnv, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenThemeSettings, HydrogenToolbarAction, I18nLocale, InspectorGroup, LoadPageParams, Locale, Localizations, PageAssignmentParams, PageType, PublicEnv, RootRouteData, RouteLoaderArgs, ThemeSettingsStore, WeaverseArticle, WeaverseBlog, WeaverseClient, WeaverseClientArgs, WeaverseCollection, WeaverseHydrogen, WeaverseHydrogenItem, WeaverseHydrogenParams, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseProduct, WeaverseProjectConfigs, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, useThemeSettings, withWeaverse };
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ElementData, ElementSchema, BasicInput, WeaverseElement, WeaverseCoreParams, WeaverseProjectDataType, Weaverse, PlatformTypeEnum, WeaverseItemStore } from '@weaverse/react';
|
|
1
|
+
import { ElementData, ElementSchema, BasicInput, WeaverseElement, WeaverseCoreParams, WeaverseProjectDataType, WeaverseResourcePickerData, Weaverse, PlatformTypeEnum, WeaverseItemStore } from '@weaverse/react';
|
|
2
2
|
export { WeaverseImage } from '@weaverse/react';
|
|
3
3
|
import { NavigateFunction } from '@remix-run/react';
|
|
4
4
|
import { createWithCache, Storefront } from '@shopify/hydrogen';
|
|
@@ -31,11 +31,6 @@ declare let STORE_PAGES: {
|
|
|
31
31
|
PAGE: string;
|
|
32
32
|
BLOG: string;
|
|
33
33
|
ARTICLE: string;
|
|
34
|
-
CART: string;
|
|
35
|
-
CUSTOMER: string;
|
|
36
|
-
SEARCH: string;
|
|
37
|
-
NOT_FOUND: string;
|
|
38
|
-
PASSWORD: string;
|
|
39
34
|
CUSTOM: string;
|
|
40
35
|
};
|
|
41
36
|
|
|
@@ -56,7 +51,7 @@ declare class WeaverseClient {
|
|
|
56
51
|
countries?: WeaverseClientArgs['countries'];
|
|
57
52
|
constructor(args: WeaverseClientArgs);
|
|
58
53
|
fetchWithCache: <T>(url: string, options: FetchWithCacheOptions) => Promise<T>;
|
|
59
|
-
loadThemeSettings: (strategy?: AllCacheOptions) => Promise<
|
|
54
|
+
loadThemeSettings: (strategy?: AllCacheOptions) => Promise<any>;
|
|
60
55
|
loadPage: (params?: LoadPageParams) => Promise<WeaverseLoaderData | null>;
|
|
61
56
|
execComponentLoader: (item: HydrogenComponentData) => Promise<HydrogenComponentData>;
|
|
62
57
|
}
|
|
@@ -256,7 +251,6 @@ type LoadPageParams = PageAssignmentParams & {
|
|
|
256
251
|
type FetchProjectRequestBody = {
|
|
257
252
|
projectId: string;
|
|
258
253
|
url: string;
|
|
259
|
-
countries?: Localizations;
|
|
260
254
|
i18n?: I18nLocale;
|
|
261
255
|
params?: PageAssignmentParams;
|
|
262
256
|
isDesignMode?: boolean;
|
|
@@ -294,6 +288,10 @@ type RootRouteData = {
|
|
|
294
288
|
};
|
|
295
289
|
[key: string]: any;
|
|
296
290
|
};
|
|
291
|
+
type WeaverseProduct = WeaverseResourcePickerData;
|
|
292
|
+
type WeaverseCollection = WeaverseResourcePickerData;
|
|
293
|
+
type WeaverseBlog = WeaverseResourcePickerData;
|
|
294
|
+
type WeaverseArticle = WeaverseResourcePickerData;
|
|
297
295
|
declare global {
|
|
298
296
|
interface Window {
|
|
299
297
|
__weaverse: WeaverseHydrogen;
|
|
@@ -330,4 +328,4 @@ declare class WeaverseHydrogenItem extends WeaverseItemStore {
|
|
|
330
328
|
set data(update: HydrogenComponentData);
|
|
331
329
|
}
|
|
332
330
|
|
|
333
|
-
export { AllCacheOptions, ComponentLoaderArgs, FetchProjectPayload, FetchProjectRequestBody, FetchWithCacheOptions, HydrogenComponent, HydrogenComponentData, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeEnv, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenThemeSettings, HydrogenToolbarAction, I18nLocale, InspectorGroup, LoadPageParams, Locale, Localizations, PageAssignmentParams, PageType, PublicEnv, RootRouteData, RouteLoaderArgs, ThemeSettingsStore, WeaverseClient, WeaverseClientArgs, WeaverseHydrogen, WeaverseHydrogenItem, WeaverseHydrogenParams, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseProjectConfigs, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, useThemeSettings, withWeaverse };
|
|
331
|
+
export { AllCacheOptions, ComponentLoaderArgs, FetchProjectPayload, FetchProjectRequestBody, FetchWithCacheOptions, HydrogenComponent, HydrogenComponentData, HydrogenComponentLoaderFunction, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageAssignment, HydrogenPageConfigs, HydrogenPageData, HydrogenProjectConfig, HydrogenProjectType, HydrogenThemeEnv, HydrogenThemeInfo, HydrogenThemeSchema, HydrogenThemeSettings, HydrogenToolbarAction, I18nLocale, InspectorGroup, LoadPageParams, Locale, Localizations, PageAssignmentParams, PageType, PublicEnv, RootRouteData, RouteLoaderArgs, ThemeSettingsStore, WeaverseArticle, WeaverseBlog, WeaverseClient, WeaverseClientArgs, WeaverseCollection, WeaverseHydrogen, WeaverseHydrogenItem, WeaverseHydrogenParams, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderData, WeaverseLoaderRequestInfo, WeaverseProduct, WeaverseProjectConfigs, WeaverseStorefrontData, WeaverseStudioQueries, WeaverseThemeConfigs, getRequestQueries, getSelectedProductOptions, getWeaverseConfigs, useThemeSettings, withWeaverse };
|
package/dist/index.js
CHANGED
|
@@ -42,12 +42,12 @@ __export(src_exports, {
|
|
|
42
42
|
withWeaverse: () => withWeaverse
|
|
43
43
|
});
|
|
44
44
|
module.exports = __toCommonJS(src_exports);
|
|
45
|
-
var
|
|
45
|
+
var import_react12 = require("@weaverse/react");
|
|
46
46
|
|
|
47
47
|
// src/WeaverseHydrogenRoot.tsx
|
|
48
|
-
var
|
|
49
|
-
var
|
|
50
|
-
var
|
|
48
|
+
var import_react9 = require("@remix-run/react");
|
|
49
|
+
var import_react10 = require("@weaverse/react");
|
|
50
|
+
var import_react11 = __toESM(require("react"));
|
|
51
51
|
var import_react_error_boundary = require("react-error-boundary");
|
|
52
52
|
|
|
53
53
|
// src/context.ts
|
|
@@ -131,6 +131,7 @@ function useStudio(weaverse) {
|
|
|
131
131
|
|
|
132
132
|
// src/hooks/use-theme-settings.ts
|
|
133
133
|
var import_react7 = require("react");
|
|
134
|
+
var import_react8 = require("@weaverse/react");
|
|
134
135
|
var ThemeSettingsStore = class _ThemeSettingsStore {
|
|
135
136
|
static settings = null;
|
|
136
137
|
listeners = [];
|
|
@@ -139,13 +140,13 @@ var ThemeSettingsStore = class _ThemeSettingsStore {
|
|
|
139
140
|
publicEnv;
|
|
140
141
|
constructor(data) {
|
|
141
142
|
let { theme, countries, schema, publicEnv } = data || {};
|
|
142
|
-
if (
|
|
143
|
-
_ThemeSettingsStore.settings = theme || {};
|
|
144
|
-
} else {
|
|
143
|
+
if (import_react8.isBrowser && _ThemeSettingsStore.settings) {
|
|
145
144
|
_ThemeSettingsStore.settings = {
|
|
146
145
|
...theme,
|
|
147
146
|
..._ThemeSettingsStore.settings
|
|
148
147
|
};
|
|
148
|
+
} else {
|
|
149
|
+
_ThemeSettingsStore.settings = theme || {};
|
|
149
150
|
}
|
|
150
151
|
this.countries = countries;
|
|
151
152
|
this.schema = schema;
|
|
@@ -187,22 +188,22 @@ function useThemeSettings() {
|
|
|
187
188
|
}
|
|
188
189
|
|
|
189
190
|
// src/WeaverseHydrogenRoot.tsx
|
|
190
|
-
var WeaverseHydrogenRoot = (0,
|
|
191
|
+
var WeaverseHydrogenRoot = (0, import_react11.memo)(
|
|
191
192
|
({
|
|
192
193
|
errorComponent: ErrorComponent = FallbackError,
|
|
193
194
|
components
|
|
194
195
|
}) => {
|
|
195
|
-
let loaderData = (0,
|
|
196
|
+
let loaderData = (0, import_react9.useLoaderData)();
|
|
196
197
|
let data = loaderData?.weaverseData;
|
|
197
198
|
if (data) {
|
|
198
199
|
if (data instanceof Promise) {
|
|
199
|
-
return /* @__PURE__ */
|
|
200
|
-
return /* @__PURE__ */
|
|
200
|
+
return /* @__PURE__ */ import_react11.default.createElement(import_react_error_boundary.ErrorBoundary, { fallbackRender: ErrorComponent }, /* @__PURE__ */ import_react11.default.createElement(import_react11.Suspense, null, /* @__PURE__ */ import_react11.default.createElement(import_react9.Await, { resolve: data }, (resolvedData) => {
|
|
201
|
+
return /* @__PURE__ */ import_react11.default.createElement(RenderRoot, { data: resolvedData, components });
|
|
201
202
|
})));
|
|
202
203
|
}
|
|
203
|
-
return /* @__PURE__ */
|
|
204
|
+
return /* @__PURE__ */ import_react11.default.createElement(RenderRoot, { data, components });
|
|
204
205
|
}
|
|
205
|
-
return /* @__PURE__ */
|
|
206
|
+
return /* @__PURE__ */ import_react11.default.createElement(
|
|
206
207
|
ErrorComponent,
|
|
207
208
|
{
|
|
208
209
|
error: { message: "No Weaverse data return from route loader!" }
|
|
@@ -214,17 +215,17 @@ function RenderRoot(props) {
|
|
|
214
215
|
let { data, components } = props;
|
|
215
216
|
let weaverse = createWeaverseInstance(data, components);
|
|
216
217
|
useStudio(weaverse);
|
|
217
|
-
return /* @__PURE__ */
|
|
218
|
+
return /* @__PURE__ */ import_react11.default.createElement(import_react10.WeaverseRoot, { context: weaverse });
|
|
218
219
|
}
|
|
219
220
|
function withWeaverse(Component) {
|
|
220
221
|
return (props) => {
|
|
221
|
-
let
|
|
222
|
-
let themeSettingsStore = new ThemeSettingsStore(weaverseTheme);
|
|
223
|
-
return /* @__PURE__ */
|
|
222
|
+
let loaderData = (0, import_react9.useRouteLoaderData)("root");
|
|
223
|
+
let themeSettingsStore = new ThemeSettingsStore(loaderData?.weaverseTheme);
|
|
224
|
+
return /* @__PURE__ */ import_react11.default.createElement(ThemeProvider.Provider, { value: themeSettingsStore }, /* @__PURE__ */ import_react11.default.createElement(Component, { ...props }));
|
|
224
225
|
};
|
|
225
226
|
}
|
|
226
227
|
function FallbackError({ error }) {
|
|
227
|
-
return /* @__PURE__ */
|
|
228
|
+
return /* @__PURE__ */ import_react11.default.createElement("div", null, error?.message || "An unexpected error occurred");
|
|
228
229
|
}
|
|
229
230
|
|
|
230
231
|
// src/weaverse-client.ts
|
|
@@ -232,7 +233,7 @@ var import_hydrogen = require("@shopify/hydrogen");
|
|
|
232
233
|
|
|
233
234
|
// package.json
|
|
234
235
|
var package_default = {
|
|
235
|
-
version: "2.
|
|
236
|
+
version: "2.3.0",
|
|
236
237
|
license: "MIT",
|
|
237
238
|
main: "dist/index.js",
|
|
238
239
|
typings: "dist/index.d.ts",
|
|
@@ -266,12 +267,12 @@ var package_default = {
|
|
|
266
267
|
author: "Weaverse Team",
|
|
267
268
|
dependencies: {
|
|
268
269
|
"@remix-run/react": "1.19.1",
|
|
269
|
-
"@shopify/hydrogen": "2023.7.
|
|
270
|
-
"@weaverse/react": "2.
|
|
270
|
+
"@shopify/hydrogen": "2023.7.11",
|
|
271
|
+
"@weaverse/react": "2.3.0",
|
|
271
272
|
"react-error-boundary": "^4.0.11"
|
|
272
273
|
},
|
|
273
274
|
devDependencies: {
|
|
274
|
-
"@shopify/remix-oxygen": "^1.1.
|
|
275
|
+
"@shopify/remix-oxygen": "^1.1.7"
|
|
275
276
|
}
|
|
276
277
|
};
|
|
277
278
|
|
|
@@ -381,7 +382,7 @@ var WeaverseClient = class {
|
|
|
381
382
|
if (isDesignMode) {
|
|
382
383
|
res = await fetch(`${weaverseHost}/${API}/${projectId}/configs`, {
|
|
383
384
|
method: "POST"
|
|
384
|
-
});
|
|
385
|
+
}).then((res2) => res2.json());
|
|
385
386
|
} else {
|
|
386
387
|
res = await this.fetchWithCache(
|
|
387
388
|
`${weaverseHost}/${API}/${projectId}/configs`,
|
|
@@ -389,6 +390,20 @@ var WeaverseClient = class {
|
|
|
389
390
|
);
|
|
390
391
|
}
|
|
391
392
|
let data = res || {};
|
|
393
|
+
if (data?.theme && this.themeSchema?.inspector) {
|
|
394
|
+
let defaultThemeSettings = {};
|
|
395
|
+
this.themeSchema.inspector.forEach(({ inputs }) => {
|
|
396
|
+
inputs.forEach(({ name, defaultValue }) => {
|
|
397
|
+
if (typeof name === "string" && defaultValue) {
|
|
398
|
+
defaultThemeSettings[name] = defaultValue;
|
|
399
|
+
}
|
|
400
|
+
});
|
|
401
|
+
});
|
|
402
|
+
data.theme = {
|
|
403
|
+
...defaultThemeSettings,
|
|
404
|
+
...data.theme
|
|
405
|
+
};
|
|
406
|
+
}
|
|
392
407
|
if (this.configs.isDesignMode) {
|
|
393
408
|
data = {
|
|
394
409
|
...data,
|
|
@@ -497,7 +512,7 @@ function getSelectedProductOptions(request) {
|
|
|
497
512
|
}
|
|
498
513
|
|
|
499
514
|
// src/index.ts
|
|
500
|
-
var WeaverseHydrogen = class extends
|
|
515
|
+
var WeaverseHydrogen = class extends import_react12.Weaverse {
|
|
501
516
|
platformType = "shopify-hydrogen";
|
|
502
517
|
pageId;
|
|
503
518
|
internal;
|
|
@@ -524,7 +539,7 @@ var WeaverseHydrogen = class extends import_react11.Weaverse {
|
|
|
524
539
|
});
|
|
525
540
|
}
|
|
526
541
|
};
|
|
527
|
-
var WeaverseHydrogenItem = class extends
|
|
542
|
+
var WeaverseHydrogenItem = class extends import_react12.WeaverseItemStore {
|
|
528
543
|
constructor(initialData, weaverse) {
|
|
529
544
|
super(initialData, weaverse);
|
|
530
545
|
let { data, ...rest } = initialData;
|
package/dist/index.mjs
CHANGED
|
@@ -5,7 +5,7 @@ import {
|
|
|
5
5
|
} from "@weaverse/react";
|
|
6
6
|
|
|
7
7
|
// src/WeaverseHydrogenRoot.tsx
|
|
8
|
-
import { Await, useLoaderData } from "@remix-run/react";
|
|
8
|
+
import { Await, useLoaderData, useRouteLoaderData } from "@remix-run/react";
|
|
9
9
|
import { WeaverseRoot } from "@weaverse/react";
|
|
10
10
|
import React, { memo, Suspense } from "react";
|
|
11
11
|
import { ErrorBoundary } from "react-error-boundary";
|
|
@@ -91,6 +91,7 @@ function useStudio(weaverse) {
|
|
|
91
91
|
|
|
92
92
|
// src/hooks/use-theme-settings.ts
|
|
93
93
|
import { useSyncExternalStore } from "react";
|
|
94
|
+
import { isBrowser as isBrowser2 } from "@weaverse/react";
|
|
94
95
|
var ThemeSettingsStore = class _ThemeSettingsStore {
|
|
95
96
|
static settings = null;
|
|
96
97
|
listeners = [];
|
|
@@ -99,13 +100,13 @@ var ThemeSettingsStore = class _ThemeSettingsStore {
|
|
|
99
100
|
publicEnv;
|
|
100
101
|
constructor(data) {
|
|
101
102
|
let { theme, countries, schema, publicEnv } = data || {};
|
|
102
|
-
if (
|
|
103
|
-
_ThemeSettingsStore.settings = theme || {};
|
|
104
|
-
} else {
|
|
103
|
+
if (isBrowser2 && _ThemeSettingsStore.settings) {
|
|
105
104
|
_ThemeSettingsStore.settings = {
|
|
106
105
|
...theme,
|
|
107
106
|
..._ThemeSettingsStore.settings
|
|
108
107
|
};
|
|
108
|
+
} else {
|
|
109
|
+
_ThemeSettingsStore.settings = theme || {};
|
|
109
110
|
}
|
|
110
111
|
this.countries = countries;
|
|
111
112
|
this.schema = schema;
|
|
@@ -178,8 +179,8 @@ function RenderRoot(props) {
|
|
|
178
179
|
}
|
|
179
180
|
function withWeaverse(Component) {
|
|
180
181
|
return (props) => {
|
|
181
|
-
let
|
|
182
|
-
let themeSettingsStore = new ThemeSettingsStore(weaverseTheme);
|
|
182
|
+
let loaderData = useRouteLoaderData("root");
|
|
183
|
+
let themeSettingsStore = new ThemeSettingsStore(loaderData?.weaverseTheme);
|
|
183
184
|
return /* @__PURE__ */ React.createElement(ThemeProvider.Provider, { value: themeSettingsStore }, /* @__PURE__ */ React.createElement(Component, { ...props }));
|
|
184
185
|
};
|
|
185
186
|
}
|
|
@@ -192,7 +193,7 @@ import { createWithCache } from "@shopify/hydrogen";
|
|
|
192
193
|
|
|
193
194
|
// package.json
|
|
194
195
|
var package_default = {
|
|
195
|
-
version: "2.
|
|
196
|
+
version: "2.3.0",
|
|
196
197
|
license: "MIT",
|
|
197
198
|
main: "dist/index.js",
|
|
198
199
|
typings: "dist/index.d.ts",
|
|
@@ -226,12 +227,12 @@ var package_default = {
|
|
|
226
227
|
author: "Weaverse Team",
|
|
227
228
|
dependencies: {
|
|
228
229
|
"@remix-run/react": "1.19.1",
|
|
229
|
-
"@shopify/hydrogen": "2023.7.
|
|
230
|
-
"@weaverse/react": "2.
|
|
230
|
+
"@shopify/hydrogen": "2023.7.11",
|
|
231
|
+
"@weaverse/react": "2.3.0",
|
|
231
232
|
"react-error-boundary": "^4.0.11"
|
|
232
233
|
},
|
|
233
234
|
devDependencies: {
|
|
234
|
-
"@shopify/remix-oxygen": "^1.1.
|
|
235
|
+
"@shopify/remix-oxygen": "^1.1.7"
|
|
235
236
|
}
|
|
236
237
|
};
|
|
237
238
|
|
|
@@ -341,7 +342,7 @@ var WeaverseClient = class {
|
|
|
341
342
|
if (isDesignMode) {
|
|
342
343
|
res = await fetch(`${weaverseHost}/${API}/${projectId}/configs`, {
|
|
343
344
|
method: "POST"
|
|
344
|
-
});
|
|
345
|
+
}).then((res2) => res2.json());
|
|
345
346
|
} else {
|
|
346
347
|
res = await this.fetchWithCache(
|
|
347
348
|
`${weaverseHost}/${API}/${projectId}/configs`,
|
|
@@ -349,6 +350,20 @@ var WeaverseClient = class {
|
|
|
349
350
|
);
|
|
350
351
|
}
|
|
351
352
|
let data = res || {};
|
|
353
|
+
if (data?.theme && this.themeSchema?.inspector) {
|
|
354
|
+
let defaultThemeSettings = {};
|
|
355
|
+
this.themeSchema.inspector.forEach(({ inputs }) => {
|
|
356
|
+
inputs.forEach(({ name, defaultValue }) => {
|
|
357
|
+
if (typeof name === "string" && defaultValue) {
|
|
358
|
+
defaultThemeSettings[name] = defaultValue;
|
|
359
|
+
}
|
|
360
|
+
});
|
|
361
|
+
});
|
|
362
|
+
data.theme = {
|
|
363
|
+
...defaultThemeSettings,
|
|
364
|
+
...data.theme
|
|
365
|
+
};
|
|
366
|
+
}
|
|
352
367
|
if (this.configs.isDesignMode) {
|
|
353
368
|
data = {
|
|
354
369
|
...data,
|
package/package.json
CHANGED
|
@@ -1,43 +1,43 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version"
|
|
3
|
-
"license"
|
|
4
|
-
"main"
|
|
5
|
-
"typings"
|
|
6
|
-
"module"
|
|
7
|
-
"publishConfig"
|
|
8
|
-
"access"
|
|
2
|
+
"version": "2.3.0",
|
|
3
|
+
"license": "MIT",
|
|
4
|
+
"main": "dist/index.js",
|
|
5
|
+
"typings": "dist/index.d.ts",
|
|
6
|
+
"module": "dist/index.mjs",
|
|
7
|
+
"publishConfig": {
|
|
8
|
+
"access": "public"
|
|
9
9
|
},
|
|
10
|
-
"files"
|
|
10
|
+
"files": [
|
|
11
11
|
"dist/*"
|
|
12
12
|
],
|
|
13
|
-
"engines"
|
|
14
|
-
"node"
|
|
13
|
+
"engines": {
|
|
14
|
+
"node": ">=16"
|
|
15
15
|
},
|
|
16
|
-
"scripts"
|
|
17
|
-
"start"
|
|
18
|
-
"dev"
|
|
19
|
-
"build"
|
|
20
|
-
"clean"
|
|
21
|
-
"prepublish"
|
|
16
|
+
"scripts": {
|
|
17
|
+
"start": "npm run dev",
|
|
18
|
+
"dev": "tsup src/index.ts --format esm,cjs --dts --outDir dist --watch --external @remix-run/react,@shopify/hydrogen",
|
|
19
|
+
"build": "tsup src/index.ts --format esm,cjs --dts --outDir dist --external @remix-run/react,@shopify/hydrogen",
|
|
20
|
+
"clean": "rimraf dist",
|
|
21
|
+
"prepublish": "npm run build"
|
|
22
22
|
},
|
|
23
|
-
"peerDependencies"
|
|
24
|
-
"react"
|
|
25
|
-
"react-dom"
|
|
23
|
+
"peerDependencies": {
|
|
24
|
+
"react": ">=18",
|
|
25
|
+
"react-dom": ">=18"
|
|
26
26
|
},
|
|
27
|
-
"prettier"
|
|
28
|
-
"printWidth"
|
|
29
|
-
"semi"
|
|
30
|
-
"singleQuote"
|
|
27
|
+
"prettier": {
|
|
28
|
+
"printWidth": 80,
|
|
29
|
+
"semi": false,
|
|
30
|
+
"singleQuote": true
|
|
31
31
|
},
|
|
32
|
-
"name"
|
|
33
|
-
"author"
|
|
34
|
-
"dependencies"
|
|
35
|
-
"@remix-run/react"
|
|
36
|
-
"@shopify/hydrogen"
|
|
37
|
-
"@weaverse/react"
|
|
38
|
-
"react-error-boundary"
|
|
32
|
+
"name": "@weaverse/hydrogen",
|
|
33
|
+
"author": "Weaverse Team",
|
|
34
|
+
"dependencies": {
|
|
35
|
+
"@remix-run/react": "1.19.1",
|
|
36
|
+
"@shopify/hydrogen": "2023.7.11",
|
|
37
|
+
"@weaverse/react": "2.3.0",
|
|
38
|
+
"react-error-boundary": "^4.0.11"
|
|
39
39
|
},
|
|
40
|
-
"devDependencies"
|
|
41
|
-
"@shopify/remix-oxygen"
|
|
40
|
+
"devDependencies": {
|
|
41
|
+
"@shopify/remix-oxygen": "^1.1.7"
|
|
42
42
|
}
|
|
43
43
|
}
|