Merge branch 'main' into liz/return-401

Shopify · Dec 4, 2023 · a941ab8 · a941ab8
2 parents 9d0fc6f + 17ae60b
commit a941ab8
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 20 deletions.
diff --git a/.changeset/rare-mirrors-cry.md b/.changeset/rare-mirrors-cry.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 to ^8.1.1
diff --git a/packages/shopify-app-express/package.json b/packages/shopify-app-express/package.json
@@ -30,7 +30,7 @@
     "Storefront API"
   ],
   "dependencies": {
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1",
     "@shopify/shopify-app-session-storage-memory": "^2.0.1",
     "cookie-parser": "^1.4.6",

diff --git a/packages/shopify-app-remix/package.json b/packages/shopify-app-remix/package.json
@@ -68,7 +68,7 @@
   },
   "dependencies": {
     "@remix-run/server-runtime": "^2.0.0",
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1",
     "isbot": "^3.6.5",
     "semver": "^7.5.0",

diff --git a/packages/shopify-app-remix/src/server/config-types.ts b/packages/shopify-app-remix/src/server/config-types.ts
@@ -23,6 +23,7 @@ export interface AppConfigArg<
     | 'isEmbeddedApp'
     | 'apiVersion'
     | 'isCustomStoreApp'
+    | 'future'
   > {
   /**
    * The URL your app is running on.
@@ -224,7 +225,7 @@ export interface AppConfigArg<
 }
 
 export interface AppConfig<Storage extends SessionStorage = SessionStorage>
-  extends ApiConfig {
+  extends Omit<ApiConfig, 'future'> {
   canUseLoginForm: boolean;
   appUrl: string;
   auth: AuthConfig;

diff --git a/packages/shopify-app-remix/src/server/shopify-app.ts b/packages/shopify-app-remix/src/server/shopify-app.ts
@@ -147,6 +147,7 @@ function deriveApi(appConfig: AppConfigArg) {
     isEmbeddedApp: appConfig.isEmbeddedApp ?? true,
     apiVersion: appConfig.apiVersion ?? LATEST_API_VERSION,
     isCustomStoreApp: appConfig.distribution === AppDistribution.ShopifyAdmin,
+    future: {},
   });
 }
 

diff --git a/packages/shopify-app-session-storage-dynamodb/package.json b/packages/shopify-app-session-storage-dynamodb/package.json
@@ -37,13 +37,13 @@
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1"
   },
   "devDependencies": {
     "@shopify/eslint-plugin": "^42.1.0",
     "@shopify/prettier-config": "^1.1.2",
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1",
     "@shopify/shopify-app-session-storage-test-utils": "^1.0.1",
     "eslint": "^8.40.0",

diff --git a/packages/shopify-app-session-storage-kv/package.json b/packages/shopify-app-session-storage-kv/package.json
@@ -36,7 +36,7 @@
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1"
   },
   "devDependencies": {

diff --git a/packages/shopify-app-session-storage-memory/package.json b/packages/shopify-app-session-storage-memory/package.json
@@ -33,7 +33,7 @@
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1"
   },
   "devDependencies": {

diff --git a/packages/shopify-app-session-storage-mongodb/package.json b/packages/shopify-app-session-storage-mongodb/package.json
@@ -35,7 +35,7 @@
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1"
   },
   "devDependencies": {

diff --git a/packages/shopify-app-session-storage-mysql/package.json b/packages/shopify-app-session-storage-mysql/package.json
@@ -36,7 +36,7 @@
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1"
   },
   "devDependencies": {

diff --git a/packages/shopify-app-session-storage-postgresql/package.json b/packages/shopify-app-session-storage-postgresql/package.json
@@ -37,7 +37,7 @@
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1"
   },
   "devDependencies": {

diff --git a/packages/shopify-app-session-storage-prisma/package.json b/packages/shopify-app-session-storage-prisma/package.json
@@ -35,13 +35,13 @@
   },
   "peerDependencies": {
     "@prisma/client": "^4.13.0",
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1",
     "prisma": "^4.13.0"
   },
   "devDependencies": {
     "@prisma/client": "^4.13.0",
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1",
     "prisma": "^4.13.0",
     "@shopify/eslint-plugin": "^42.1.0",

diff --git a/packages/shopify-app-session-storage-redis/package.json b/packages/shopify-app-session-storage-redis/package.json
@@ -36,7 +36,7 @@
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1"
   },
   "devDependencies": {

diff --git a/packages/shopify-app-session-storage-sqlite/package.json b/packages/shopify-app-session-storage-sqlite/package.json
@@ -36,7 +36,7 @@
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1"
   },
   "devDependencies": {

diff --git a/packages/shopify-app-session-storage-test-utils/package.json b/packages/shopify-app-session-storage-test-utils/package.json
@@ -38,7 +38,7 @@
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@shopify/shopify-api": "^8.0.2",
+    "@shopify/shopify-api": "^8.1.1",
     "@shopify/shopify-app-session-storage": "^2.0.1"
   },
   "devDependencies": {

diff --git a/packages/shopify-app-session-storage/package.json b/packages/shopify-app-session-storage/package.json
@@ -34,7 +34,7 @@
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
-    "@shopify/shopify-api": "^8.0.2"
+    "@shopify/shopify-api": "^8.1.1"
   },
   "devDependencies": {
     "@shopify/eslint-plugin": "^42.1.0",

diff --git a/yarn.lock b/yarn.lock
@@ -3143,10 +3143,10 @@
     jest-matcher-utils "^26.6.2"
     react-reconciler "^0.28.0"
 
-"@shopify/shopify-api@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@shopify/shopify-api/-/shopify-api-8.0.2.tgz#765bf03cf0c953ca9c2cde0aae91fba45c6d5def"
-  integrity sha512-hvVLoEsYglE4GRqFhr9D6oMr2bV6tEdsD9PxuNZ6bYDptoD+kQFKsaP83jE1qtHhB3ve0DeevaVVYjS/2TU7MA==
+"@shopify/shopify-api@^8.1.1":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@shopify/shopify-api/-/shopify-api-8.1.1.tgz#d3f400a27d9fe2eaa7647bbd33134b75fe52463a"
+  integrity sha512-0JO3Mhv9Sb8VKPw/LUdacHJj9wbT/txyByr2TF03yjqoV++G3NxNMUAA1tcpoSvOAv20KlQjwpoFnXqBmPFW7Q==
   dependencies:
     "@shopify/network" "^3.2.1"
     compare-versions "^5.0.3"