@agnostack/next-shopify 1.6.0-alpha.1 → 1.6.0-alpha.11
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/CHANGELOG.md +71 -0
- package/dist/helpers/auth.js +1 -1
- package/dist/helpers/auth.js.map +1 -1
- package/dist/helpers/callback.js +11 -9
- package/dist/helpers/callback.js.map +1 -1
- package/dist/utils/shopify.d.ts +3 -11
- package/dist/utils/shopify.js +80 -27
- package/dist/utils/shopify.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,74 @@
|
|
|
1
|
+
# [1.6.0-alpha.11](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.10...v1.6.0-alpha.11) (2023-05-17)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* add logging ([0a6848f](https://github.com/agnostack/next-shopify/commit/0a6848f1dd51cda45ba75e950bcdcb40387905dc))
|
|
7
|
+
|
|
8
|
+
# [1.6.0-alpha.10](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.9...v1.6.0-alpha.10) (2023-05-17)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* add logging ([831f4d9](https://github.com/agnostack/next-shopify/commit/831f4d9cc72b4b16bf829344bdfc7a60b5c0c1d9))
|
|
14
|
+
|
|
15
|
+
# [1.6.0-alpha.9](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.8...v1.6.0-alpha.9) (2023-05-17)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Bug Fixes
|
|
19
|
+
|
|
20
|
+
* add logging ([9d725f6](https://github.com/agnostack/next-shopify/commit/9d725f604de8e270ebc4aa539da0232936f3d40e))
|
|
21
|
+
* add logging ([95718c1](https://github.com/agnostack/next-shopify/commit/95718c17c2dfec8c548004b28e652bbd31085c9c))
|
|
22
|
+
|
|
23
|
+
# [1.6.0-alpha.8](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.7...v1.6.0-alpha.8) (2023-05-17)
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
### Bug Fixes
|
|
27
|
+
|
|
28
|
+
* add logging ([37d6d95](https://github.com/agnostack/next-shopify/commit/37d6d95da5ff54eeef48a16de3d7664d7f57695f))
|
|
29
|
+
|
|
30
|
+
# [1.6.0-alpha.7](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.6...v1.6.0-alpha.7) (2023-05-16)
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
### Bug Fixes
|
|
34
|
+
|
|
35
|
+
* add logging ([c44158b](https://github.com/agnostack/next-shopify/commit/c44158be1c9afd151e7b77fbf5eee3061eac8276))
|
|
36
|
+
|
|
37
|
+
# [1.6.0-alpha.6](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.5...v1.6.0-alpha.6) (2023-05-16)
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
### Bug Fixes
|
|
41
|
+
|
|
42
|
+
* add logging ([1114232](https://github.com/agnostack/next-shopify/commit/1114232b163c674c38c1ff590a06a26692579dcc))
|
|
43
|
+
|
|
44
|
+
# [1.6.0-alpha.5](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.4...v1.6.0-alpha.5) (2023-05-16)
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
### Bug Fixes
|
|
48
|
+
|
|
49
|
+
* add logging ([118103c](https://github.com/agnostack/next-shopify/commit/118103c5e2925729758286b0756b81e68c23de2e))
|
|
50
|
+
|
|
51
|
+
# [1.6.0-alpha.4](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.3...v1.6.0-alpha.4) (2023-05-16)
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
### Features
|
|
55
|
+
|
|
56
|
+
* add logging ([dcaf35a](https://github.com/agnostack/next-shopify/commit/dcaf35a49546e2d80484439a7acdaa645e911b77))
|
|
57
|
+
|
|
58
|
+
# [1.6.0-alpha.3](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.2...v1.6.0-alpha.3) (2023-05-16)
|
|
59
|
+
|
|
60
|
+
|
|
61
|
+
### Features
|
|
62
|
+
|
|
63
|
+
* add logging ([5330b23](https://github.com/agnostack/next-shopify/commit/5330b233fec7d33c2fdb8d785e910c70084a4b1b))
|
|
64
|
+
|
|
65
|
+
# [1.6.0-alpha.2](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.1...v1.6.0-alpha.2) (2023-05-16)
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
### Bug Fixes
|
|
69
|
+
|
|
70
|
+
* add logging ([51a1359](https://github.com/agnostack/next-shopify/commit/51a1359da93329a1eac494d928780a9d44820a05))
|
|
71
|
+
|
|
1
72
|
# [1.6.0-alpha.1](https://github.com/agnostack/next-shopify/compare/v1.5.5-alpha.2...v1.6.0-alpha.1) (2023-05-16)
|
|
2
73
|
|
|
3
74
|
|
package/dist/helpers/auth.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const utils_1 = require("../utils");
|
|
4
4
|
const authHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
5
5
|
try {
|
|
6
|
-
return utils_1.getRedirectUrl(serverRuntimeConfig, { req, res });
|
|
6
|
+
return utils_1.getRedirectUrl(serverRuntimeConfig, { req, res, registerHandlers: true });
|
|
7
7
|
// TODO OLD/Remove
|
|
8
8
|
// const authredurectUrl = getRedirectUrl(serverRuntimeConfig, {
|
|
9
9
|
// req,
|
package/dist/helpers/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/helpers/auth.js"],"names":[],"mappings":";;AAAA,oCAAyC;AAEzC,MAAM,UAAU,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,mBAAmB,EAAE,EAAE,EAAE;IAC7D,IAAI;QACF,OAAO,sBAAc,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/helpers/auth.js"],"names":[],"mappings":";;AAAA,oCAAyC;AAEzC,MAAM,UAAU,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,mBAAmB,EAAE,EAAE,EAAE;IAC7D,IAAI;QACF,OAAO,sBAAc,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAA;QAEhF,kBAAkB;QAClB,gEAAgE;QAChE,SAAS;QACT,SAAS;QACT,KAAK;QAEL,WAAW;QACX,qBAAqB;QACrB,kCAAkC;QAClC,IAAI;KACL;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,YAAY,GAAG,2BAA2B,CAAA;QAChD,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;QAElC,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAEzC,kBAAkB;QAClB,WAAW;QACX,qBAAqB;QACrB,2BAA2B;QAC3B,IAAI;KACL;AACH,CAAC,CAAA;AAED,kBAAe,UAAU,CAAA"}
|
package/dist/helpers/callback.js
CHANGED
|
@@ -4,7 +4,7 @@ const shopify_api_1 = require("@shopify/shopify-api");
|
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
5
|
const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
6
6
|
var _a;
|
|
7
|
-
const { PAGE_PATHS
|
|
7
|
+
const { PAGE_PATHS } = serverRuntimeConfig; // APP_WEBHOOKS, PAYMENT_CONFIG
|
|
8
8
|
const { shop, host } = req.query;
|
|
9
9
|
if (utils_1.stringEmpty(shop) || utils_1.stringEmpty(host)) {
|
|
10
10
|
// HMMM: why is this a 303 (rather than a 302 or or anything)??
|
|
@@ -21,18 +21,20 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
21
21
|
const sessionStorage = utils_1.getSessionStorage(serverRuntimeConfig, shop);
|
|
22
22
|
const authPayload = { rawRequest: req, rawResponse: res };
|
|
23
23
|
const { session } = await shopify.auth.callback(authPayload); // .Auth.validateAuthCallback(req, res, req.query)
|
|
24
|
+
console.log('session:', session);
|
|
24
25
|
await sessionStorage.store(session.toObject());
|
|
25
|
-
await
|
|
26
|
+
// await registerWebhooks(serverRuntimeConfig, APP_WEBHOOKS, session)
|
|
26
27
|
// TODO: explore objectToQuerystring
|
|
27
28
|
const embeddedURL = await shopify.auth.getEmbeddedAppUrl(authPayload);
|
|
28
29
|
redirectUrl = `${embeddedURL}?${new URLSearchParams(req.query).toString()}`;
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}
|
|
30
|
+
console.log('redirectUrl:', redirectUrl);
|
|
31
|
+
// if (PAYMENT_CONFIG?.required) {
|
|
32
|
+
// const billingManager = new BillingManager(shopify, session, serverRuntimeConfig)
|
|
33
|
+
// const confirmationUrl = await billingManager.ensureBilling()
|
|
34
|
+
// if (stringNotEmpty(confirmationUrl)) {
|
|
35
|
+
// redirectUrl = confirmationUrl
|
|
36
|
+
// }
|
|
37
|
+
// }
|
|
36
38
|
}
|
|
37
39
|
catch (error) {
|
|
38
40
|
const errorMessage = 'Error handling callback route';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/helpers/callback.js"],"names":[],"mappings":";;AAAA,sDAAyG;AAEzG,oCAYiB;AAEjB,MAAM,cAAc,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,mBAAmB,EAAE,EAAE,EAAE;;IACjE,MAAM,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/helpers/callback.js"],"names":[],"mappings":"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"}
|
package/dist/utils/shopify.d.ts
CHANGED
|
@@ -6,16 +6,7 @@ export function getSessionStorage(serverRuntimeConfig: any, _shop: any): {
|
|
|
6
6
|
deleteMany: (ids: any) => Promise<void>;
|
|
7
7
|
find: (__shop: any) => Promise<any[]>;
|
|
8
8
|
};
|
|
9
|
-
export function generatePaymentConfig(
|
|
10
|
-
type: any;
|
|
11
|
-
required: boolean;
|
|
12
|
-
test: boolean;
|
|
13
|
-
name: string;
|
|
14
|
-
price: {
|
|
15
|
-
amount: any;
|
|
16
|
-
currencyCode: any;
|
|
17
|
-
};
|
|
18
|
-
};
|
|
9
|
+
export function generatePaymentConfig(): {};
|
|
19
10
|
export function getVerifiedSession({ req, res, shop, serverRuntimeConfig }: {
|
|
20
11
|
req: any;
|
|
21
12
|
res: any;
|
|
@@ -23,11 +14,12 @@ export function getVerifiedSession({ req, res, shop, serverRuntimeConfig }: {
|
|
|
23
14
|
serverRuntimeConfig: any;
|
|
24
15
|
}): Promise<any>;
|
|
25
16
|
export function registerWebhooks(serverRuntimeConfig: any, webhookRegistry: any, session: any): Promise<[any, any, any, any, any, any, any, any, any, any][]>;
|
|
17
|
+
export function addWebhookHandlers(serverRuntimeConfig: any, shopify: any): Promise<any>;
|
|
26
18
|
export function getRedirectUrl(props: any, { req, res, query: _query, }: {
|
|
27
19
|
req: any;
|
|
28
20
|
res: any;
|
|
29
21
|
query: any;
|
|
30
|
-
}):
|
|
22
|
+
}): Promise<any>;
|
|
31
23
|
export function getAuthErrorResponse({ error, shop, serverRuntimeConfig }: {
|
|
32
24
|
error: any;
|
|
33
25
|
shop: any;
|
package/dist/utils/shopify.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getAuthErrorResponse = exports.getRedirectUrl = exports.registerWebhooks = exports.getVerifiedSession = exports.generatePaymentConfig = exports.getSessionStorage = exports.getInitializedShopify = void 0;
|
|
3
|
+
exports.getAuthErrorResponse = exports.getRedirectUrl = exports.addWebhookHandlers = exports.registerWebhooks = exports.getVerifiedSession = exports.generatePaymentConfig = exports.getSessionStorage = exports.getInitializedShopify = void 0;
|
|
4
4
|
require("@shopify/shopify-api/adapters/node");
|
|
5
5
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
6
6
|
// // TODO validate if we still need a custom/local beginAuth
|
|
@@ -54,34 +54,49 @@ const getSessionStorage = (serverRuntimeConfig, _shop) => {
|
|
|
54
54
|
};
|
|
55
55
|
};
|
|
56
56
|
exports.getSessionStorage = getSessionStorage;
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
57
|
+
// eslint-disable-next-line arrow-body-style
|
|
58
|
+
const generatePaymentConfig = () => {
|
|
59
|
+
return {};
|
|
60
|
+
/*
|
|
61
|
+
const {
|
|
62
|
+
name,
|
|
63
|
+
price,
|
|
64
|
+
currency = 'USD',
|
|
65
|
+
type = BILLING_INTERVALS.ONE_TIME,
|
|
66
|
+
} = ensureObject(paymentConfig)
|
|
67
|
+
const { debugMode, environment } = ensureObject(data)
|
|
68
|
+
|
|
69
|
+
if (objectEmpty(paymentConfig) || stringEmpty(environment)) {
|
|
70
|
+
return undefined
|
|
62
71
|
}
|
|
63
|
-
|
|
72
|
+
|
|
73
|
+
const notProduction = (environment !== 'production')
|
|
74
|
+
|
|
64
75
|
// TODO ensure this logic is correct
|
|
65
|
-
let test = environment !== 'production'
|
|
76
|
+
let test = environment !== 'production'
|
|
66
77
|
if (debugMode) {
|
|
67
|
-
|
|
78
|
+
test = true
|
|
68
79
|
}
|
|
80
|
+
|
|
69
81
|
const _paymentConfig = {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
}
|
|
82
|
+
type,
|
|
83
|
+
required: (environment !== 'development'),
|
|
84
|
+
test,
|
|
85
|
+
name: `${name}${notProduction ? ` - ${environment}` : ''} - ${unsnakecase(type)}`,
|
|
86
|
+
price: {
|
|
87
|
+
amount: price,
|
|
88
|
+
currencyCode: currency,
|
|
89
|
+
},
|
|
90
|
+
}
|
|
91
|
+
|
|
79
92
|
console.log(`>>> ~ _paymentConfig`, {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
})
|
|
84
|
-
|
|
93
|
+
_paymentConfig,
|
|
94
|
+
debugMode,
|
|
95
|
+
debugEnv: process.env.DEBUG,
|
|
96
|
+
})
|
|
97
|
+
|
|
98
|
+
return _paymentConfig
|
|
99
|
+
*/
|
|
85
100
|
};
|
|
86
101
|
exports.generatePaymentConfig = generatePaymentConfig;
|
|
87
102
|
const getVerifiedSession = async ({ req, res, shop, serverRuntimeConfig }) => {
|
|
@@ -136,9 +151,16 @@ const getVerifiedSession = async ({ req, res, shop, serverRuntimeConfig }) => {
|
|
|
136
151
|
};
|
|
137
152
|
exports.getVerifiedSession = getVerifiedSession;
|
|
138
153
|
const registerTopicWebhook = async ({ serverRuntimeConfig, webhook, topic, session }) => {
|
|
154
|
+
console.log('session:', session);
|
|
139
155
|
console.log('registerTopicWebhook');
|
|
156
|
+
console.log('topic:', topic);
|
|
140
157
|
const shopify = exports.getInitializedShopify(serverRuntimeConfig, session === null || session === void 0 ? void 0 : session.shop);
|
|
141
|
-
|
|
158
|
+
console.log('shopify:', shopify);
|
|
159
|
+
const webhookResponse = display_1.ensureObject(await shopify.webhooks.register({ session }));
|
|
160
|
+
console.log('webhookResponse:', webhookResponse);
|
|
161
|
+
if (display_1.objectEmpty(webhookResponse)) {
|
|
162
|
+
return;
|
|
163
|
+
}
|
|
142
164
|
// TODO validate this is the correct conditional
|
|
143
165
|
if (!webhookResponse[topic][0].success) {
|
|
144
166
|
throw new Error(`Failed to register ${webhook.path} on topic: ${topic} webhook`, webhookResponse.result);
|
|
@@ -146,20 +168,45 @@ const registerTopicWebhook = async ({ serverRuntimeConfig, webhook, topic, sessi
|
|
|
146
168
|
// TODO validate this is the correct conditional
|
|
147
169
|
return webhookResponse[topic][0].success;
|
|
148
170
|
};
|
|
171
|
+
const handleWebhookRequest = async (topic, shop, webhookRequestBody, webhookId, apiVersion) => {
|
|
172
|
+
// const sessionId = shopify.session.getOfflineId({ shop })
|
|
173
|
+
console.log('handleWebhookRequest topic:', topic);
|
|
174
|
+
console.log('handleWebhookRequest shop:', shop);
|
|
175
|
+
console.log('handleWebhookRequest webhookRequestBody:', webhookRequestBody);
|
|
176
|
+
console.log('handleWebhookRequest webhookId:', webhookId);
|
|
177
|
+
console.log('handleWebhookRequest apiVersion:', apiVersion);
|
|
178
|
+
// console.log('handleWebhookRequest sessionId:', sessionId)
|
|
179
|
+
// Fetch the session from storage and process the webhook event
|
|
180
|
+
return;
|
|
181
|
+
};
|
|
149
182
|
const registerWebhooks = async (serverRuntimeConfig, webhookRegistry, session) => {
|
|
150
183
|
console.log('registerWebhooks');
|
|
151
184
|
return Promise.all(Object.entries(webhookRegistry).map(async ([topic, webhooks]) => (Promise.all(webhooks.map(async (webhook) => registerTopicWebhook({ serverRuntimeConfig, webhook, topic, session }))))));
|
|
152
185
|
};
|
|
153
186
|
exports.registerWebhooks = registerWebhooks;
|
|
154
|
-
const
|
|
187
|
+
const addWebhookHandlers = async (serverRuntimeConfig, shopify) => {
|
|
188
|
+
const { APP_WEBHOOKS } = serverRuntimeConfig;
|
|
189
|
+
return shopify.webhooks.addHandlers(Object.entries(APP_WEBHOOKS).reduce((__payload, [topic, webhooks]) => (Object.assign(Object.assign({}, __payload), { [topic]: {
|
|
190
|
+
deliveryMethod: shopify_api_1.DeliveryMethod.Http,
|
|
191
|
+
callbackUrl: webhooks.path,
|
|
192
|
+
callback: handleWebhookRequest,
|
|
193
|
+
} }))));
|
|
194
|
+
};
|
|
195
|
+
exports.addWebhookHandlers = addWebhookHandlers;
|
|
196
|
+
const getRedirectUrl = async (props, { req, res, query: _query,
|
|
197
|
+
// registerHandlers = false,
|
|
198
|
+
}) => {
|
|
155
199
|
var _a;
|
|
156
200
|
console.log('getRedirectUrl');
|
|
157
|
-
const { API_URLS, PAGE_PATHS } = props;
|
|
201
|
+
const { API_URLS, API_PATHS, PAGE_PATHS } = props;
|
|
158
202
|
const query = (_a = _query !== null && _query !== void 0 ? _query : req.query) !== null && _a !== void 0 ? _a : {};
|
|
159
203
|
console.log('query:', query);
|
|
160
204
|
const { embedded, host, shop: _shop } = query !== null && query !== void 0 ? query : {};
|
|
161
205
|
const shopify = exports.getInitializedShopify(props, _shop);
|
|
162
206
|
console.log('shopify initialized', shopify);
|
|
207
|
+
// if (registerHandlers) {
|
|
208
|
+
// await addWebhookHandlers(props, shopify)
|
|
209
|
+
// }
|
|
163
210
|
const shop = shopify.utils.sanitizeShop(_shop);
|
|
164
211
|
console.log('shop:', shop);
|
|
165
212
|
if (display_1.stringEmpty(shop)) {
|
|
@@ -178,7 +225,13 @@ const getRedirectUrl = (props, { req, res, query: _query, }) => {
|
|
|
178
225
|
}
|
|
179
226
|
// TODO validate if we still need a custom/local beginAuth
|
|
180
227
|
console.log('begin auth');
|
|
181
|
-
return shopify.auth.begin({
|
|
228
|
+
return shopify.auth.begin({
|
|
229
|
+
shop,
|
|
230
|
+
callbackPath: API_PATHS[constants_1.API_ROUTE_NAMES.AUTH_CALLBACK],
|
|
231
|
+
isOnline: true,
|
|
232
|
+
rawRequest: req,
|
|
233
|
+
rawResponse: res,
|
|
234
|
+
});
|
|
182
235
|
};
|
|
183
236
|
exports.getRedirectUrl = getRedirectUrl;
|
|
184
237
|
const getAuthErrorResponse = ({ error, shop, serverRuntimeConfig }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "1.6.0-alpha.
|
|
3
|
+
"version": "1.6.0-alpha.11",
|
|
4
4
|
"author": "agnoStack Dev <developers@agnostack.com> (https://agnostack.com)",
|
|
5
5
|
"owner": "agnoStack",
|
|
6
6
|
"description": "Please contact agnoStack via info@agnostack.com for any questions",
|