Skip to content

Commit ee0a374

Browse files
gatsbybotmrstorkpiehserhalp
authored
feat!(gatsby-source-shopify): upgrade from Shopify API version 2024-04 to 2025-01 (#39247) (#39252)
* feat!(gatsby-source-shopify): upgrade from Shopify API version 2024-04 to 2025-01 (#39247) * chore: sort the queried fields * feat: address breaking api changes when upgrading to 2024-07 * feat!: address breaking changes when upgrading to 2024-10 * fix: address breaking changes when upgrading to 2025-01 * fix: add deprecation message for fulfillmentOrdersOptIn * fix: make measurement a required field to match shopify api response * fix: object definition already in common * fix: add backwards compatibility for weight/weightUnit fields * fix: add deprecation messages for proxied quantities fields * test: update snapshots (cherry picked from commit 132013c) * chore: bump caniuse-lite * ci: pin pnpm used in pnpm integration tests to v9 (#39248) v10 has a lot of breaking changes: https://github.com/pnpm/pnpm/releases/tag/v10.0.0. * test: use branch/alias deploys for e2e test suite (#39222) * test: use branch/alias deploys for e2e test suite * test: use permalink url and not alias url --------- Co-authored-by: Michal Piechowiak <[email protected]> --------- Co-authored-by: Mateusz Bocian <[email protected]> Co-authored-by: Michal Piechowiak <[email protected]> Co-authored-by: Philippe Serhal <[email protected]>
1 parent bf0cd30 commit ee0a374

File tree

10 files changed

+110
-115
lines changed

10 files changed

+110
-115
lines changed

‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ jobs:
407407
command: rm package-lock.json
408408
working_directory: /tmp/e2e-tests/gatsby-pnpm
409409
- run: # Install pnpm
410-
command: npm install -g pnpm
410+
command: npm install -g pnpm@9
411411
working_directory: /tmp/e2e-tests/gatsby-pnpm
412412
- run: # Install start-server-and-test
413413
command: npm install -g start-server-and-test@^1.11.0

‎e2e-tests/adapters/scripts/deploy-and-run/netlify.mjs

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,16 @@ const npmScriptToRun = process.argv[2] || "test:netlify"
1818
// ensure clean build
1919
await execa(`npm`, [`run`, `clean`], { stdio: `inherit` })
2020

21+
const deployAlias = "gatsby-e2e-tests"
2122
const deployResults = await execa(
2223
"npx",
2324
[
2425
"ntl",
2526
"deploy",
2627
"--build",
2728
"--json",
29+
"--alias",
30+
deployAlias,
2831
"--message",
2932
deployTitle,
3033
process.env.EXTRA_NTL_CLI_ARGS ?? "--cwd=.",
@@ -47,7 +50,9 @@ if (deployResults.exitCode !== 0) {
4750

4851
const deployInfo = JSON.parse(deployResults.stdout)
4952

50-
const deployUrl = deployInfo.deploy_url + (process.env.PATH_PREFIX ?? ``)
53+
const deployUrl =
54+
`https://${deployInfo.deploy_id}--${deployInfo.site_name}.netlify.app` +
55+
(process.env.PATH_PREFIX ?? ``)
5156
process.env.DEPLOY_URL = deployUrl
5257

5358
console.log(`Deployed to ${deployUrl}`)

‎packages/gatsby-source-shopify/__tests__/__snapshots__/create-operations.ts.snap

+24-32
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,12 @@ Array [
298298
count
299299
precision
300300
}
301+
measurement {
302+
weight {
303+
unit
304+
value
305+
}
306+
}
301307
provinceCodeOfOrigin
302308
requiresShipping
303309
sku
@@ -347,7 +353,6 @@ Array [
347353
product {
348354
id
349355
}
350-
requiresShipping
351356
selectedOptions {
352357
name
353358
value
@@ -362,8 +367,6 @@ Array [
362367
taxable
363368
title
364369
updatedAt
365-
weight
366-
weightUnit
367370
metafields {
368371
edges {
369372
node {
@@ -596,12 +599,7 @@ Array [
596599
handle
597600
id
598601
inventoryManagement
599-
productBased
600602
serviceName
601-
shippingMethods {
602-
code
603-
label
604-
}
605603
type
606604
}
607605
fulfillsOnlineOrders
@@ -962,6 +960,12 @@ Array [
962960
count
963961
precision
964962
}
963+
measurement {
964+
weight {
965+
unit
966+
value
967+
}
968+
}
965969
provinceCodeOfOrigin
966970
requiresShipping
967971
sku
@@ -1011,7 +1015,6 @@ Array [
10111015
product {
10121016
id
10131017
}
1014-
requiresShipping
10151018
selectedOptions {
10161019
name
10171020
value
@@ -1026,8 +1029,6 @@ Array [
10261029
taxable
10271030
title
10281031
updatedAt
1029-
weight
1030-
weightUnit
10311032
metafields {
10321033
edges {
10331034
node {
@@ -1260,12 +1261,7 @@ Array [
12601261
handle
12611262
id
12621263
inventoryManagement
1263-
productBased
12641264
serviceName
1265-
shippingMethods {
1266-
code
1267-
label
1268-
}
12691265
type
12701266
}
12711267
fulfillsOnlineOrders
@@ -1626,6 +1622,12 @@ Array [
16261622
count
16271623
precision
16281624
}
1625+
measurement {
1626+
weight {
1627+
unit
1628+
value
1629+
}
1630+
}
16291631
provinceCodeOfOrigin
16301632
requiresShipping
16311633
sku
@@ -1675,7 +1677,6 @@ Array [
16751677
product {
16761678
id
16771679
}
1678-
requiresShipping
16791680
selectedOptions {
16801681
name
16811682
value
@@ -1690,8 +1691,6 @@ Array [
16901691
taxable
16911692
title
16921693
updatedAt
1693-
weight
1694-
weightUnit
16951694
metafields {
16961695
edges {
16971696
node {
@@ -1924,12 +1923,7 @@ Array [
19241923
handle
19251924
id
19261925
inventoryManagement
1927-
productBased
19281926
serviceName
1929-
shippingMethods {
1930-
code
1931-
label
1932-
}
19331927
type
19341928
}
19351929
fulfillsOnlineOrders
@@ -2290,6 +2284,12 @@ Array [
22902284
count
22912285
precision
22922286
}
2287+
measurement {
2288+
weight {
2289+
unit
2290+
value
2291+
}
2292+
}
22932293
provinceCodeOfOrigin
22942294
requiresShipping
22952295
sku
@@ -2339,7 +2339,6 @@ Array [
23392339
product {
23402340
id
23412341
}
2342-
requiresShipping
23432342
selectedOptions {
23442343
name
23452344
value
@@ -2354,8 +2353,6 @@ Array [
23542353
taxable
23552354
title
23562355
updatedAt
2357-
weight
2358-
weightUnit
23592356
metafields {
23602357
edges {
23612358
node {
@@ -2588,12 +2585,7 @@ Array [
25882585
handle
25892586
id
25902587
inventoryManagement
2591-
productBased
25922588
serviceName
2593-
shippingMethods {
2594-
code
2595-
label
2596-
}
25972589
type
25982590
}
25992591
fulfillsOnlineOrders

0 commit comments

Comments
 (0)