feat: bumped moltin sdk in all repos and d2c output

.changeset/gold-buttons-joke.md

@@ -0,0 +1,9 @@
+---
+"@elasticpath/react-shopper-hooks": patch
+"@elasticpath/composable-common": patch
+"composable-cli": patch
+"@elasticpath/d2c-schematics": patch
+"@elasticpath/shopper-common": patch
+---
+
+bumped moltin sdk in all repos and d2c output

.changeset/lemon-badgers-draw.md

@@ -0,0 +1,5 @@
+---
+"@elasticpath/d2c-schematics": patch
+---
+
+bumped hooks and common dep version

.github/workflows/generate-examples.yml

@@ -1,17 +1,18 @@
 name: Generate Examples
 
 on:
-  push:
-    branches-ignore:
-      - main
-      - changeset-release/main
+#  push:
+#    branches-ignore:
+#      - main
+#      - changeset-release/main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   generate-examples:
+    if: github.event_name == 'deployment_status' && github.event.deployment_status.state == 'success'
     name: Create latest examples
     runs-on: ubuntu-latest
     outputs:
@@ -160,6 +161,8 @@ jobs:
         run: pnpm test:e2e
         id: examples-e2e-tests
         continue-on-error: true
+        env:
+          BASE_URL: ${{ github.event.deployment_status.environment_url }}
 
       - name: Upload test results
         if: always()

.github/workflows/run-e2e.yml

@@ -0,0 +1,41 @@
+name: Run e2e tests
+
+on:
+  deployment_status:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  run-e2es:
+    if: github.event_name == 'deployment_status' && github.event.deployment_status.state == 'success' && github.event.deployment_status.environment == 'Preview – composable-frontend-simple'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
+      - uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: pnpm install && npx playwright install --with-deps
+
+      - name: Make .env.test file
+        run: |
+          echo "NEXT_PUBLIC_EPCC_CLIENT_ID=${{secrets.E2E_NEXT_PUBLIC_EPCC_CLIENT_ID}}" > ./examples/simple/.env.test
+          echo "EPCC_CLIENT_SECRET=${{secrets.E2E_EPCC_CLIENT_SECRET}}" >> ./examples/simple/.env.test
+          echo "NEXT_PUBLIC_EPCC_ENDPOINT_URL=${{secrets.E2E_NEXT_PUBLIC_EPCC_ENDPOINT_URL}}" >> ./examples/simple/.env.test
+          echo "NEXT_PUBLIC_COOKIE_PREFIX_KEY=${{secrets.E2E_NEXT_PUBLIC_COOKIE_PREFIX_KEY}}" >> ./examples/simple/.env.test
+          echo "SITE_NAME=${{secrets.E2E_SITE_NAME}}" >> ./examples/simple/.env.test
+
+      - name: Run tests
+        run: pnpm test:e2e
+        env:
+          BASE_URL: ${{ github.event.deployment_status.environment_url }}
+
+      - name: Upload test results
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-results-${{ github.sha }}-${{ github.run_number }}
+          path: examples/simple/test-results

examples/algolia/e2e/home-page.spec.ts

@@ -3,10 +3,6 @@ import { createD2CHomePage } from "./models/d2c-home-page";
 import { skipIfMissingCatalog } from "./util/missing-published-catalog";
 
 test.describe("Home Page", async () => {
-  test.beforeEach(async () => {
-    await skipIfMissingCatalog();
-  });
-
   test("should load home page", async ({ page }) => {
     const d2cHomePage = createD2CHomePage(page);
     await d2cHomePage.goto();

examples/algolia/e2e/models/d2c-cart-page.ts

@@ -1,6 +1,4 @@
 import type { Locator, Page } from "@playwright/test";
-import { expect } from "@playwright/test";
-import { getCartId } from "../util/get-cart-id";
 
 export interface D2CCartPage {
   readonly page: Page;
@@ -20,8 +18,6 @@ export function createD2CCartPage(page: Page): D2CCartPage {
     },
     async checkoutCart() {
       await checkoutBtn.click();
-      const cartId = await getCartId(page)();
-      await expect(page).toHaveURL(`/checkout/${cartId}`);
     },
   };
 }

examples/algolia/e2e/product-details-page.spec.ts

@@ -4,10 +4,6 @@ import { client } from "./util/epcc-client";
 import { skipIfMissingCatalog } from "./util/missing-published-catalog";
 
 test.describe("Product Details Page", async () => {
-  test.beforeEach(async () => {
-    await skipIfMissingCatalog();
-  });
-
   test("should add a simple product to cart", async ({ page }) => {
     const productDetailPage = createD2CProductDetailPage(page, client);
 

examples/algolia/package.json

@@ -21,11 +21,11 @@
   },
   "dependencies": {
     "@algolia/react-instantsearch-widget-color-refinement-list": "^1.4.7",
-    "@elasticpath/react-shopper-hooks": "^0.5.1",
-    "@elasticpath/shopper-common": "^0.1.1",
+    "@elasticpath/react-shopper-hooks": "workspace:^0.6.0",
+    "@elasticpath/shopper-common": "workspace:^0.2.0",
     "@headlessui/react": "^1.7.17",
     "@heroicons/react": "^2.0.18",
-    "@moltin/sdk": "^25.0.2",
+    "@moltin/sdk": "^27.0.0",
     "algoliasearch": "^4.14.2",
     "clsx": "^1.2.1",
     "cookies-next": "^4.0.0",

examples/algolia/playwright.config.ts

@@ -8,7 +8,7 @@ loadEnvConfig(process.env.PWD!);
 const PORT = process.env.PORT || 3000;
 
 // Set webServer.url and use.baseURL with the location of the WebServer respecting the correct set port
-const baseURL = `http://localhost:${PORT}`;
+const baseURL = process.env.BASE_URL ?? `http://localhost:${PORT}`;
 
 // Reference: https://playwright.dev/docs/test-configuration
 const config: PlaywrightTestConfig = {
@@ -60,23 +60,13 @@ const config: PlaywrightTestConfig = {
         ...devices["Desktop Firefox"],
       },
     },
-    {
-      name: "Desktop Safari",
-      use: {
-        ...devices["Desktop Safari"],
-      },
-    },
     // Test against mobile viewports.
     {
       name: "Mobile Chrome",
       use: {
         ...devices["Pixel 5"],
       },
     },
-    {
-      name: "Mobile Safari",
-      use: devices["iPhone 12"],
-    },
   ],
 };
 export default config;

examples/payments/e2e/checkout-flow.spec.ts

@@ -1,7 +1,6 @@
 import { test } from "@playwright/test";
 import { createD2CProductDetailPage } from "./models/d2c-product-detail-page";
 import { client } from "./util/epcc-client";
-import { skipIfMissingCatalog } from "./util/missing-published-catalog";
 import { createD2CCartPage } from "./models/d2c-cart-page";
 import { createD2CCheckoutPage } from "./models/d2c-checkout-page";
 import { gatewayIsEnabled } from "./util/gateway-is-enabled";
@@ -10,7 +9,6 @@ import { skipIfCIEnvironment } from "./util/skip-ci-env";
 test.describe("Checkout flow", async () => {
   test.beforeEach(async () => {
     skipIfCIEnvironment();
-    await skipIfMissingCatalog();
     await gatewayIsEnabled();
   });
 

examples/payments/e2e/home-page.spec.ts

@@ -3,10 +3,6 @@ import { createD2CHomePage } from "./models/d2c-home-page";
 import { skipIfMissingCatalog } from "./util/missing-published-catalog";
 
 test.describe("Home Page", async () => {
-  test.beforeEach(async () => {
-    await skipIfMissingCatalog();
-  });
-
   test("should load home page", async ({ page }) => {
     const d2cHomePage = createD2CHomePage(page);
     await d2cHomePage.goto();

examples/payments/e2e/models/d2c-cart-page.ts

@@ -1,6 +1,4 @@
 import type { Locator, Page } from "@playwright/test";
-import { expect } from "@playwright/test";
-import { getCartId } from "../util/get-cart-id";
 
 export interface D2CCartPage {
   readonly page: Page;
@@ -20,8 +18,6 @@ export function createD2CCartPage(page: Page): D2CCartPage {
     },
     async checkoutCart() {
       await checkoutBtn.click();
-      const cartId = await getCartId(page)();
-      await expect(page).toHaveURL(`/checkout/${cartId}`);
     },
   };
 }

examples/payments/e2e/models/d2c-checkout-page.ts

@@ -47,7 +47,9 @@ export function createD2CCheckoutPage(page: Page): D2CCheckoutPage {
     },
     async continueShopping() {
       await continueShoppingBtn.click();
-      await expect(page).toHaveURL(`/`);
+      await expect(
+        page.getByRole("heading", { name: "Your Elastic Path storefront" }),
+      ).toBeVisible();
     },
   };
 }

examples/payments/e2e/product-details-page.spec.ts

@@ -4,10 +4,6 @@ import { client } from "./util/epcc-client";
 import { skipIfMissingCatalog } from "./util/missing-published-catalog";
 
 test.describe("Product Details Page", async () => {
-  test.beforeEach(async () => {
-    await skipIfMissingCatalog();
-  });
-
   test("should add a simple product to cart", async ({ page }) => {
     const productDetailPage = createD2CProductDetailPage(page, client);
 

examples/payments/package.json

@@ -20,11 +20,11 @@
     "start:e2e": "NODE_ENV=test next start"
   },
   "dependencies": {
-    "@elasticpath/react-shopper-hooks": "^0.5.1",
-    "@elasticpath/shopper-common": "^0.1.1",
+    "@elasticpath/react-shopper-hooks": "workspace:^0.6.0",
+    "@elasticpath/shopper-common": "workspace:^0.2.0",
     "@headlessui/react": "^1.7.17",
     "@heroicons/react": "^2.0.18",
-    "@moltin/sdk": "^25.0.2",
+    "@moltin/sdk": "^27.0.0",
     "@stripe/react-stripe-js": "^2.3.0",
     "@stripe/stripe-js": "^2.1.6",
     "clsx": "^1.2.1",

examples/payments/playwright.config.ts

@@ -8,7 +8,7 @@ loadEnvConfig(process.env.PWD!);
 const PORT = process.env.PORT || 3000;
 
 // Set webServer.url and use.baseURL with the location of the WebServer respecting the correct set port
-const baseURL = `http://localhost:${PORT}`;
+const baseURL = process.env.BASE_URL ?? `http://localhost:${PORT}`;
 
 // Reference: https://playwright.dev/docs/test-configuration
 const config: PlaywrightTestConfig = {
@@ -60,23 +60,13 @@ const config: PlaywrightTestConfig = {
         ...devices["Desktop Firefox"],
       },
     },
-    {
-      name: "Desktop Safari",
-      use: {
-        ...devices["Desktop Safari"],
-      },
-    },
     // Test against mobile viewports.
     {
       name: "Mobile Chrome",
       use: {
         ...devices["Pixel 5"],
       },
     },
-    {
-      name: "Mobile Safari",
-      use: devices["iPhone 12"],
-    },
   ],
 };
 export default config;

examples/simple/e2e/checkout-flow.spec.ts

@@ -1,19 +1,10 @@
 import { test } from "@playwright/test";
 import { createD2CProductDetailPage } from "./models/d2c-product-detail-page";
 import { client } from "./util/epcc-client";
-import { skipIfMissingCatalog } from "./util/missing-published-catalog";
 import { createD2CCartPage } from "./models/d2c-cart-page";
 import { createD2CCheckoutPage } from "./models/d2c-checkout-page";
-import { gatewayIsEnabled } from "./util/gateway-is-enabled";
-import { skipIfCIEnvironment } from "./util/skip-ci-env";
 
 test.describe("Checkout flow", async () => {
-  test.beforeEach(async () => {
-    skipIfCIEnvironment();
-    await skipIfMissingCatalog();
-    await gatewayIsEnabled();
-  });
-
   test("should perform product checkout", async ({ page }) => {
     const productDetailPage = createD2CProductDetailPage(page, client);
     const cartPage = createD2CCartPage(page);
@@ -31,7 +22,7 @@ test.describe("Checkout flow", async () => {
 
     /* Enter information */
     await checkoutPage.enterInformation({
-      "Email Address": { value: "[email protected]", fieldType: "input" },
+      Email: { value: "[email protected]", fieldType: "input" },
       "First Name": { value: "Jim", fieldType: "input" },
       "Last Name": { value: "Brown", fieldType: "input" },
       "Street Address": { value: "Main Street", fieldType: "input" },

examples/simple/e2e/home-page.spec.ts

@@ -3,10 +3,6 @@ import { createD2CHomePage } from "./models/d2c-home-page";
 import { skipIfMissingCatalog } from "./util/missing-published-catalog";
 
 test.describe("Home Page", async () => {
-  test.beforeEach(async () => {
-    await skipIfMissingCatalog();
-  });
-
   test("should load home page", async ({ page }) => {
     const d2cHomePage = createD2CHomePage(page);
     await d2cHomePage.goto();

examples/simple/e2e/models/d2c-cart-page.ts

@@ -1,6 +1,4 @@
 import type { Locator, Page } from "@playwright/test";
-import { expect } from "@playwright/test";
-import { getCartId } from "../util/get-cart-id";
 
 export interface D2CCartPage {
   readonly page: Page;
@@ -20,8 +18,6 @@ export function createD2CCartPage(page: Page): D2CCartPage {
     },
     async checkoutCart() {
       await checkoutBtn.click();
-      const cartId = await getCartId(page)();
-      await expect(page).toHaveURL(`/checkout/${cartId}`);
     },
   };
 }

examples/simple/e2e/models/d2c-checkout-page.ts

@@ -47,7 +47,9 @@ export function createD2CCheckoutPage(page: Page): D2CCheckoutPage {
     },
     async continueShopping() {
       await continueShoppingBtn.click();
-      await expect(page).toHaveURL(`/`);
+      await expect(
+        page.getByRole("heading", { name: "Your Elastic Path storefront" }),
+      ).toBeVisible();
     },
   };
 }

examples/simple/e2e/product-details-page.spec.ts

@@ -4,10 +4,6 @@ import { client } from "./util/epcc-client";
 import { skipIfMissingCatalog } from "./util/missing-published-catalog";
 
 test.describe("Product Details Page", async () => {
-  test.beforeEach(async () => {
-    await skipIfMissingCatalog();
-  });
-
   test("should add a simple product to cart", async ({ page }) => {
     const productDetailPage = createD2CProductDetailPage(page, client);
 

examples/simple/package.json

@@ -20,9 +20,9 @@
     "start:e2e": "NODE_ENV=test next start"
   },
   "dependencies": {
-    "@moltin/sdk": "^25.0.2",
-    "@elasticpath/react-shopper-hooks": "^0.5.1",
-    "@elasticpath/shopper-common": "^0.1.1",
+    "@moltin/sdk": "^27.0.0",
+    "@elasticpath/react-shopper-hooks": "workspace:^0.6.0",
+    "@elasticpath/shopper-common": "workspace:^0.2.0",
     "clsx": "^1.2.1",
     "cookies-next": "^4.0.0",
     "focus-visible": "^5.2.0",
@@ -69,5 +69,5 @@
     "autoprefixer": "^10.4.14",
     "postcss": "^8.4.30",
     "prettier-plugin-tailwindcss": "^0.5.4"
- }
-}
+  }
+}