Fix Next.js build errors

saleor · Jan 10, 2025 · 1064c5b · 1064c5b
1 parent bc4b91a
commit 1064c5b
Showing 7 changed files with 94 additions and 106 deletions.
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "pnpm": ">=9.0.0 <10.0.0"
   },
   "dependencies": {
-    "@saleor/app-sdk": "0.0.0-pr-20250103130801",
+    "@saleor/app-sdk": "0.0.0-pr-20250109150409",
     "@saleor/macaw-ui": "1.1.10",
     "@urql/exchange-auth": "^1.0.0",
     "@vitejs/plugin-react": "4.2.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/api-v2/manifest/route.ts b/src/app/api-v2/manifest/route.ts
@@ -1,8 +1,8 @@
 import { createManifestHandler } from "@saleor/app-sdk/handlers/fetch-api";
 import { AppManifest } from "@saleor/app-sdk/types";
 import packageJson from "../../../../package.json";
-import { orderFilterShippingMethodsWebhook } from "../webhooks/order-filter-shipping-methods/route";
-import { orderCreatedWebhook } from "../webhooks/order-created/route";
+import { orderCreatedWebhook } from "../webhooks/order-created/webhook";
+import { orderFilterShippingMethodsWebhook } from "../webhooks/order-filter-shipping-methods/webhook";
 
 export const GET = createManifestHandler({
   manifestFactory({ appBaseUrl, request }) {

diff --git a/src/app/api-v2/webhooks/order-created/route.ts b/src/app/api-v2/webhooks/order-created/route.ts
@@ -1,53 +1,5 @@
-import { gql } from "urql";
-import { OrderCreatedWebhookPayloadFragment } from "../../../../../generated/graphql";
-import { saleorApp } from "../../../../saleor-app";
-import { SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/fetch-api";
 import { createClient } from "../../../../lib/create-graphq-client";
-
-/**
- * Example payload of the webhook. It will be transformed with graphql-codegen to Typescript type: OrderCreatedWebhookPayloadFragment
- */
-const OrderCreatedWebhookPayload = gql`
-  fragment OrderCreatedWebhookPayload on OrderCreated {
-    order {
-      userEmail
-      id
-      number
-      user {
-        email
-        firstName
-        lastName
-      }
-    }
-  }
-`;
-
-/**
- * Top-level webhook subscription query, that will be attached to the Manifest.
- * Saleor will use it to register webhook.
- */
-const OrderCreatedGraphqlSubscription = gql`
-  # Payload fragment must be included in the root query
-  ${OrderCreatedWebhookPayload}
-  subscription OrderCreated {
-    event {
-      ...OrderCreatedWebhookPayload
-    }
-  }
-`;
-
-/**
- * Create abstract Webhook. It decorates handler and performs security checks under the hood.
- *
- * orderCreatedWebhook.getWebhookManifest() must be called in api/manifest too!
- */
-export const orderCreatedWebhook = new SaleorAsyncWebhook<OrderCreatedWebhookPayloadFragment>({
-  name: "Order Created in Saleor",
-  webhookPath: "api-v2/webhooks/order-created",
-  event: "ORDER_CREATED",
-  apl: saleorApp.apl,
-  query: OrderCreatedGraphqlSubscription,
-});
+import { orderCreatedWebhook } from "./webhook";
 
 /**
  * Export decorated Request handler, which adds extra context
@@ -95,11 +47,3 @@ export const POST = orderCreatedWebhook.createHandler((request, ctx) => {
   return new Response("Accepted", { status: 200 });
 });
 
-/**
- * Disable body parser for this endpoint, so signature can be verified
- */
-export const config = {
-  api: {
-    bodyParser: false,
-  },
-};
diff --git a/src/app/api-v2/webhooks/order-created/webhook.ts b/src/app/api-v2/webhooks/order-created/webhook.ts
@@ -0,0 +1,49 @@
+import { gql } from "urql";
+import { OrderCreatedWebhookPayloadFragment } from "../../../../../generated/graphql";
+import { saleorApp } from "../../../../saleor-app";
+import { SaleorAsyncWebhook } from "@saleor/app-sdk/handlers/fetch-api";
+
+/**
+ * Example payload of the webhook. It will be transformed with graphql-codegen to Typescript type: OrderCreatedWebhookPayloadFragment
+ */
+const OrderCreatedWebhookPayload = gql`
+  fragment OrderCreatedWebhookPayload on OrderCreated {
+    order {
+      userEmail
+      id
+      number
+      user {
+        email
+        firstName
+        lastName
+      }
+    }
+  }
+`;
+
+/**
+ * Top-level webhook subscription query, that will be attached to the Manifest.
+ * Saleor will use it to register webhook.
+ */
+const OrderCreatedGraphqlSubscription = gql`
+  # Payload fragment must be included in the root query
+  ${OrderCreatedWebhookPayload}
+  subscription OrderCreated {
+    event {
+      ...OrderCreatedWebhookPayload
+    }
+  }
+`;
+
+/**
+ * Create abstract Webhook. It decorates handler and performs security checks under the hood.
+ *
+ * orderCreatedWebhook.getWebhookManifest() must be called in api/manifest too!
+ */
+export const orderCreatedWebhook = new SaleorAsyncWebhook<OrderCreatedWebhookPayloadFragment>({
+  name: "Order Created in Saleor",
+  webhookPath: "api-v2/webhooks/order-created",
+  event: "ORDER_CREATED",
+  apl: saleorApp.apl,
+  query: OrderCreatedGraphqlSubscription,
+});
diff --git a/src/app/api-v2/webhooks/order-filter-shipping-methods/route.ts b/src/app/api-v2/webhooks/order-filter-shipping-methods/route.ts
@@ -1,47 +1,7 @@
-import { gql } from "urql";
-import { SaleorSyncWebhook } from "@saleor/app-sdk/handlers/fetch-api";
-import { OrderFilterShippingMethodsPayloadFragment } from "../../../../../generated/graphql";
-import { saleorApp } from "../../../../saleor-app";
-
-const OrderFilterShippingMethodsPayload = gql`
-  fragment OrderFilterShippingMethodsPayload on OrderFilterShippingMethods {
-    order {
-      deliveryMethod {
-        ... on ShippingMethod {
-          id
-          name
-        }
-      }
-    }
-  }
-`;
-
-const OrderFilterShippingMethodsSubscription = gql`
-  ${OrderFilterShippingMethodsPayload}
-  subscription OrderFilterShippingMethods {
-    event {
-      ...OrderFilterShippingMethodsPayload
-    }
-  }
-`;
-
-export const orderFilterShippingMethodsWebhook =
-  new SaleorSyncWebhook<OrderFilterShippingMethodsPayloadFragment>({
-    name: "Order Filter Shipping Methods",
-    webhookPath: "api-v2/webhooks/order-filter-shipping-methods",
-    event: "ORDER_FILTER_SHIPPING_METHODS",
-    apl: saleorApp.apl,
-    query: OrderFilterShippingMethodsSubscription,
-  });
+import { orderFilterShippingMethodsWebhook } from "./webhook";
 
 export const POST = orderFilterShippingMethodsWebhook.createHandler((request, ctx) => {
   const { payload } = ctx;
   console.log("Order Filter Shipping Methods Webhook received with: ", payload);
   return new Response("{}", { status: 200 })
 });
-
-export const config = {
-  api: {
-    bodyParser: false,
-  },
-};
diff --git a/src/app/api-v2/webhooks/order-filter-shipping-methods/webhook.ts b/src/app/api-v2/webhooks/order-filter-shipping-methods/webhook.ts
@@ -0,0 +1,35 @@
+import { gql } from "urql";
+import { SaleorSyncWebhook } from "@saleor/app-sdk/handlers/fetch-api";
+import { OrderFilterShippingMethodsPayloadFragment } from "../../../../../generated/graphql";
+import { saleorApp } from "../../../../saleor-app";
+
+const OrderFilterShippingMethodsPayload = gql`
+  fragment OrderFilterShippingMethodsPayload on OrderFilterShippingMethods {
+    order {
+      deliveryMethod {
+        ... on ShippingMethod {
+          id
+          name
+        }
+      }
+    }
+  }
+`;
+
+const OrderFilterShippingMethodsSubscription = gql`
+  ${OrderFilterShippingMethodsPayload}
+  subscription OrderFilterShippingMethods {
+    event {
+      ...OrderFilterShippingMethodsPayload
+    }
+  }
+`;
+
+export const orderFilterShippingMethodsWebhook =
+  new SaleorSyncWebhook<OrderFilterShippingMethodsPayloadFragment>({
+    name: "Order Filter Shipping Methods",
+    webhookPath: "api-v2/webhooks/order-filter-shipping-methods",
+    event: "ORDER_FILTER_SHIPPING_METHODS",
+    apl: saleorApp.apl,
+    query: OrderFilterShippingMethodsSubscription,
+  });