@weaverse/hydrogen 3.0.0 → 3.1.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 +0 -5
- package/dist/index.d.ts +0 -5
- package/dist/index.js +7 -5
- package/dist/index.mjs +13 -6
- package/package.json +5 -5
package/dist/index.d.mts
CHANGED
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -99,9 +99,10 @@ function createCachedWeaverseInstance(params) {
|
|
|
99
99
|
if (!weaverse) {
|
|
100
100
|
weaverse = new WeaverseHydrogen(params);
|
|
101
101
|
window.__weaverses[params.pageId] = weaverse;
|
|
102
|
-
}
|
|
102
|
+
}
|
|
103
|
+
if (weaverse?.isDesignMode) {
|
|
103
104
|
weaverse.requestInfo = params.requestInfo;
|
|
104
|
-
window.weaverseStudio?.
|
|
105
|
+
window.weaverseStudio?.refreshStudio(params);
|
|
105
106
|
}
|
|
106
107
|
return weaverse;
|
|
107
108
|
}
|
|
@@ -197,12 +198,13 @@ var import_react8 = require("@weaverse/react");
|
|
|
197
198
|
var import_react9 = require("react");
|
|
198
199
|
function useStudio(weaverse) {
|
|
199
200
|
let { revalidate } = (0, import_react7.useRevalidator)();
|
|
201
|
+
const navigation = (0, import_react7.useNavigation)();
|
|
200
202
|
let { pathname, search } = (0, import_react7.useLocation)();
|
|
201
203
|
let navigate = (0, import_react7.useNavigate)();
|
|
202
204
|
let themeSettingsStore = useThemeContext();
|
|
203
205
|
let { isDesignMode, weaverseHost, weaverseVersion } = weaverse;
|
|
204
206
|
(0, import_react9.useEffect)(() => {
|
|
205
|
-
if (isDesignMode) {
|
|
207
|
+
if (navigation.state === "idle" && isDesignMode) {
|
|
206
208
|
weaverse.internal = {
|
|
207
209
|
...weaverse.internal,
|
|
208
210
|
navigate,
|
|
@@ -211,10 +213,10 @@ function useStudio(weaverse) {
|
|
|
211
213
|
};
|
|
212
214
|
let studioSrc = `${weaverseHost}/static/studio/hydrogen/index.js?v=${weaverseVersion}`;
|
|
213
215
|
(0, import_react8.loadScript)(studioSrc).then(() => {
|
|
214
|
-
window.weaverseStudio
|
|
216
|
+
window.weaverseStudio.init(weaverse);
|
|
215
217
|
}).catch(console.error);
|
|
216
218
|
}
|
|
217
|
-
}, [pathname, search]);
|
|
219
|
+
}, [pathname, search, navigation.state]);
|
|
218
220
|
}
|
|
219
221
|
|
|
220
222
|
// src/Effect.tsx
|
package/dist/index.mjs
CHANGED
|
@@ -64,9 +64,10 @@ function createCachedWeaverseInstance(params) {
|
|
|
64
64
|
if (!weaverse) {
|
|
65
65
|
weaverse = new WeaverseHydrogen(params);
|
|
66
66
|
window.__weaverses[params.pageId] = weaverse;
|
|
67
|
-
}
|
|
67
|
+
}
|
|
68
|
+
if (weaverse?.isDesignMode) {
|
|
68
69
|
weaverse.requestInfo = params.requestInfo;
|
|
69
|
-
window.weaverseStudio?.
|
|
70
|
+
window.weaverseStudio?.refreshStudio(params);
|
|
70
71
|
}
|
|
71
72
|
return weaverse;
|
|
72
73
|
}
|
|
@@ -157,17 +158,23 @@ function useThemeSettings() {
|
|
|
157
158
|
import { memo } from "react";
|
|
158
159
|
|
|
159
160
|
// src/hooks/use-studio.ts
|
|
160
|
-
import {
|
|
161
|
+
import {
|
|
162
|
+
useLocation,
|
|
163
|
+
useNavigate,
|
|
164
|
+
useRevalidator,
|
|
165
|
+
useNavigation
|
|
166
|
+
} from "@remix-run/react";
|
|
161
167
|
import { loadScript } from "@weaverse/react";
|
|
162
168
|
import { useEffect } from "react";
|
|
163
169
|
function useStudio(weaverse) {
|
|
164
170
|
let { revalidate } = useRevalidator();
|
|
171
|
+
const navigation = useNavigation();
|
|
165
172
|
let { pathname, search } = useLocation();
|
|
166
173
|
let navigate = useNavigate();
|
|
167
174
|
let themeSettingsStore = useThemeContext();
|
|
168
175
|
let { isDesignMode, weaverseHost, weaverseVersion } = weaverse;
|
|
169
176
|
useEffect(() => {
|
|
170
|
-
if (isDesignMode) {
|
|
177
|
+
if (navigation.state === "idle" && isDesignMode) {
|
|
171
178
|
weaverse.internal = {
|
|
172
179
|
...weaverse.internal,
|
|
173
180
|
navigate,
|
|
@@ -176,10 +183,10 @@ function useStudio(weaverse) {
|
|
|
176
183
|
};
|
|
177
184
|
let studioSrc = `${weaverseHost}/static/studio/hydrogen/index.js?v=${weaverseVersion}`;
|
|
178
185
|
loadScript(studioSrc).then(() => {
|
|
179
|
-
window.weaverseStudio
|
|
186
|
+
window.weaverseStudio.init(weaverse);
|
|
180
187
|
}).catch(console.error);
|
|
181
188
|
}
|
|
182
|
-
}, [pathname, search]);
|
|
189
|
+
}, [pathname, search, navigation.state]);
|
|
183
190
|
}
|
|
184
191
|
|
|
185
192
|
// src/Effect.tsx
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@weaverse/hydrogen",
|
|
3
3
|
"author": "Weaverse Team",
|
|
4
4
|
"description": "Components, hooks, and utilities for building Shopify Hydrogen websites with Weaverse",
|
|
5
|
-
"version": "3.
|
|
5
|
+
"version": "3.1.0",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"main": "dist/index.js",
|
|
8
8
|
"typings": "dist/index.d.ts",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
},
|
|
24
24
|
"peerDependencies": {
|
|
25
25
|
"@remix-run/react": "^2",
|
|
26
|
-
"@shopify/hydrogen": "
|
|
26
|
+
"@shopify/hydrogen": ">=2023",
|
|
27
27
|
"react": ">=18",
|
|
28
28
|
"react-dom": ">=18"
|
|
29
29
|
},
|
|
@@ -33,12 +33,12 @@
|
|
|
33
33
|
"singleQuote": true
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@weaverse/react": "3.
|
|
37
|
-
"react-error-boundary": "^4.0.
|
|
36
|
+
"@weaverse/react": "3.1.0",
|
|
37
|
+
"react-error-boundary": "^4.0.13"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@shopify/oxygen-workers-types": "^4.0.0",
|
|
41
|
-
"@shopify/remix-oxygen": "^2"
|
|
41
|
+
"@shopify/remix-oxygen": "^2.0.3"
|
|
42
42
|
},
|
|
43
43
|
"scripts": {
|
|
44
44
|
"start": "npm run dev",
|