Merge branch 'main' into dependabot/npm_and_yarn/aws-sdk/util-dynamod…

…b-3.490.0
Shopify · Jan 24, 2024 · bb2f9ca · bb2f9ca
2 parents f94bc19 + 7407227
commit bb2f9ca
Show file tree

Hide file tree

Showing 70 changed files with 15,275 additions and 4,652 deletions.
diff --git a/.changeset/brave-points-cross.md b/.changeset/brave-points-cross.md
@@ -0,0 +1,5 @@
+---
+'@shopify/shopify-app-remix': patch
+---
+
+Fixes a bug that was causing external redirects to fail in remix actions
diff --git a/.changeset/dirty-starfishes-accept.md b/.changeset/dirty-starfishes-accept.md
@@ -0,0 +1,5 @@
+---
+'@shopify/shopify-app-remix': patch
+---
+
+Minor refactor in login.ts to use new URL util method from shopify-api-js
diff --git a/.changeset/dry-meals-hear.md b/.changeset/dry-meals-hear.md
@@ -0,0 +1,17 @@
+---
+'@shopify/shopify-app-session-storage-postgresql': patch
+'@shopify/shopify-app-session-storage-test-utils': patch
+'@shopify/shopify-app-session-storage-dynamodb': patch
+'@shopify/shopify-app-session-storage-mongodb': patch
+'@shopify/shopify-app-session-storage-memory': patch
+'@shopify/shopify-app-session-storage-prisma': patch
+'@shopify/shopify-app-session-storage-sqlite': patch
+'@shopify/shopify-app-session-storage-mysql': patch
+'@shopify/shopify-app-session-storage-redis': patch
+'@shopify/shopify-app-session-storage-kv': patch
+'@shopify/shopify-app-session-storage': patch
+'@shopify/shopify-app-express': patch
+'@shopify/shopify-app-remix': patch
+---
+
+Improved and simplified package.json dependencies
diff --git a/.changeset/famous-knives-fix.md b/.changeset/famous-knives-fix.md
@@ -0,0 +1,17 @@
+---
+'@shopify/shopify-app-session-storage-postgresql': patch
+'@shopify/shopify-app-session-storage-test-utils': patch
+'@shopify/shopify-app-session-storage-dynamodb': patch
+'@shopify/shopify-app-session-storage-mongodb': patch
+'@shopify/shopify-app-session-storage-memory': patch
+'@shopify/shopify-app-session-storage-prisma': patch
+'@shopify/shopify-app-session-storage-sqlite': patch
+'@shopify/shopify-app-session-storage-mysql': patch
+'@shopify/shopify-app-session-storage-redis': patch
+'@shopify/shopify-app-session-storage-kv': patch
+'@shopify/shopify-app-session-storage': patch
+'@shopify/shopify-app-express': patch
+'@shopify/shopify-app-remix': patch
+---
+
+Bump shopify-api version from 9.0.1 to 9.0.2
diff --git a/.changeset/ninety-rivers-worry.md b/.changeset/ninety-rivers-worry.md
@@ -0,0 +1,5 @@
+---
+'@shopify/shopify-app-session-storage-prisma': major
+---
+
+Updated the dependency on `prisma` to v5+. This package itself has no breaking changes, but you'll need to update your app's dependency on Prisma as well as this package.
diff --git a/.changeset/pink-horses-unite.md b/.changeset/pink-horses-unite.md
@@ -0,0 +1,5 @@
+---
+'@shopify/shopify-app-remix': minor
+---
+
+Add new embedded authorization strategy relying on Shopify managed install and OAuth token exchange
diff --git a/.changeset/polite-birds-unite.md b/.changeset/polite-birds-unite.md
@@ -0,0 +1,5 @@
+---
+'@shopify/shopify-app-express': patch
+---
+
+Replaced query() internal call in the GraphQL client with request()
diff --git a/.changeset/smart-windows-smash.md b/.changeset/smart-windows-smash.md
@@ -0,0 +1,5 @@
+---
+'@shopify/shopify-app-remix': patch
+---
+
+Handle webhook registration throttling error
diff --git a/.changeset/stale-glasses-reply.md b/.changeset/stale-glasses-reply.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/wild-bottles-explode.md b/.changeset/wild-bottles-explode.md
@@ -0,0 +1,5 @@
+---
+'@shopify/shopify-app-remix': patch
+---
+
+Use 'body' field from GraphqlQueryError when logging session validation error
diff --git a/package.json b/package.json
@@ -11,8 +11,8 @@
     "clean": "rimraf ./packages/*/build .loom"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.26.1",
-    "@jest/types": "^29.6.1",
+    "@changesets/cli": "^2.27.1",
+    "@jest/types": "^29.6.3",
     "@shopify/eslint-plugin": "^42.1.0",
     "@shopify/loom": "^1.0.2",
     "@shopify/loom-cli": "^1.1.0",
@@ -22,12 +22,16 @@
     "@shopify/loom-plugin-prettier": "^2.0.1",
     "@shopify/prettier-config": "^1.1.2",
     "@shopify/typescript-configs": "^5.1.0",
+    "@types/jest": "^29.5.1",
     "eslint": "^8.55.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "jest": "^29.1.0",
     "jest-fetch-mock": "^3.0.3",
     "jest-runner-eslint": "^2.0.0",
+    "prettier": "^2.8.8",
     "rimraf": "^5.0.0",
     "ts-jest": "^29.1.0",
+    "tslib": "^2.6.2",
     "typescript": "^4.9.5"
   },
   "dependencies": {},

diff --git a/packages/shopify-app-express/package.json b/packages/shopify-app-express/package.json
@@ -30,27 +30,20 @@
     "Storefront API"
   ],
   "dependencies": {
-    "@shopify/shopify-api": "^9.0.1",
+    "@shopify/shopify-api": "^9.0.2",
     "@shopify/shopify-app-session-storage": "^2.0.3",
     "@shopify/shopify-app-session-storage-memory": "^2.0.3",
     "cookie-parser": "^1.4.6",
     "express": "^4.18.1",
-    "semver": "^7.5.4",
-    "tslib": "^2.6.2"
+    "semver": "^7.5.4"
   },
   "devDependencies": {
-    "@shopify/eslint-plugin": "^42.1.0",
-    "@shopify/prettier-config": "^1.1.2",
     "@types/compression": "^1.7.2",
     "@types/cookie-parser": "^1.4.3",
     "@types/express": "^4.17.16",
     "@types/jsonwebtoken": "^9.0.5",
-    "eslint": "^8.55.0",
-    "eslint-plugin-prettier": "^4.2.1",
     "jsonwebtoken": "^9.0.2",
-    "prettier": "^2.8.8",
-    "supertest": "^6.3.3",
-    "typescript": "^4.9.5"
+    "supertest": "^6.3.3"
   },
   "files": [
     "build/*",

diff --git a/packages/shopify-app-express/src/middlewares/has-valid-access-token.ts b/packages/shopify-app-express/src/middlewares/has-valid-access-token.ts
@@ -12,7 +12,7 @@ export async function hasValidAccessToken(
 ): Promise<boolean> {
   try {
     const client = new api.clients.Graphql({session});
-    await client.query({data: TEST_GRAPHQL_QUERY});
+    await client.request(TEST_GRAPHQL_QUERY);
     return true;
   } catch (error) {
     if (error instanceof HttpResponseError && error.response.code === 401) {

diff --git a/packages/shopify-app-remix/docs/build-docs.sh b/packages/shopify-app-remix/docs/build-docs.sh
@@ -1,10 +1,10 @@
-COMPILE_DOCS="yarn tsc --project docs/tsconfig.docs.json --types react --moduleResolution node  --target esNext  --module CommonJS && generate-docs --overridePath ./docs/typeOverride.json --input ./src  --output ./docs/generated && find . -name '*.doc.js' -delete"
-COMPILE_STATIC_PAGES="yarn tsc docs/staticPages/*.doc.ts --types react --moduleResolution node  --target esNext  --module CommonJS && generate-docs --isLandingPage --input ./docs/staticPages --output ./docs/generated && rm -rf docs/staticPages/*.doc.js"
+COMPILE_DOCS="yarn tsc --project docs/tsconfig.docs.json --types react --moduleResolution node  --target esNext  --module CommonJS && generate-docs --overridePath ./docs/typeOverride.json --input ./src  --declarationPath ../../node_modules/@shopify/shopify-api ../../node_modules/@shopify/polaris/build/ts --output ./docs/generated && find . -name '*.doc.js' -delete"
+COMPILE_STATIC_PAGES="yarn tsc docs/staticPages/*.doc.ts --types react --moduleResolution node  --target esNext  --module CommonJS && generate-docs --isLandingPage --input ./docs/staticPages --declarationPath ../../node_modules/@shopify/shopify-api ../../node_modules/@shopify/polaris/build/ts --output ./docs/generated && rm -rf docs/staticPages/*.doc.js"
 
 if [ "$1" = "isTest" ];
 then
-COMPILE_DOCS="yarn tsc --project docs/tsconfig.docs.json --types react --moduleResolution node  --target esNext  --module CommonJS && generate-docs --overridePath ./docs/typeOverride.json --input ./src --output ./docs/temp && find . -name '*.doc.js' -delete"
-COMPILE_STATIC_PAGES="yarn tsc docs/staticPages/*.doc.ts --types react --moduleResolution node  --target esNext  --module CommonJS && generate-docs --isLandingPage --input ./docs/staticPages  --output ./docs/temp && rm -rf docs/staticPages/*.doc.js"
+COMPILE_DOCS="yarn tsc --project docs/tsconfig.docs.json --types react --moduleResolution node  --target esNext  --module CommonJS && generate-docs --overridePath ./docs/typeOverride.json --input ./src --declarationPath ../../node_modules/@shopify/shopify-api ../../node_modules/@shopify/polaris/build/ts --output ./docs/temp && find . -name '*.doc.js' -delete"
+COMPILE_STATIC_PAGES="yarn tsc docs/staticPages/*.doc.ts --types react --moduleResolution node  --target esNext  --module CommonJS && generate-docs --isLandingPage --input ./docs/staticPages  --declarationPath ../../node_modules/@shopify/shopify-api ../../node_modules/@shopify/polaris/build/ts --output ./docs/temp && rm -rf docs/staticPages/*.doc.js"
 fi
 
 eval $COMPILE_DOCS