Merge branch 'main' into lkostrowski/drop-legacy-deps

Author: lkostrowski

package.json

@@ -94,7 +94,6 @@
     "@saleor/macaw-ui-next": "npm:@saleor/macaw-ui@1.4.2",
     "@sentry/react": "^8.55.0",
     "@sentry/vite-plugin": "^2.23.1",
-    "@types/faker": "^5.5.9",
     "@uiw/react-color-hue": "0.0.34",
     "@uiw/react-color-saturation": "0.0.34",
     "apollo-upload-client": "^17.0.0",
@@ -107,7 +106,6 @@
     "dompurify": "^3.4.8",
     "downshift": "^6.1.12",
     "editorjs-inline-tool": "^0.4.0",
-    "faker": "^5.5.3",
     "fast-array-diff": "^0.2.0",
     "fuse.js": "^6.6.2",
     "graphiql": "^2.4.7",
@@ -150,6 +148,7 @@
     "@changesets/cli": "2.31.0",
     "@editorjs/embed": "2.7.6",
     "@eslint/js": "^9.39.1",
+    "@faker-js/faker": "^10.5.0",
     "@formatjs/cli": "^4.8.4",
     "@graphql-codegen/cli": "5.0.7",
     "@graphql-codegen/fragment-matcher": "5.1.0",

playwright/data/addresses.ts

@@ -1,4 +1,4 @@
-import faker from "faker";
+import { faker } from "@faker-js/faker";
 
 export type AddressType = {
   addressUK: AddressFieldsType;
@@ -21,21 +21,21 @@ export type AddressFieldsType = {
 
 export const ADDRESS: AddressType = {
   addressUS: {
-    firstName: faker.name.firstName(),
-    lastName: faker.name.lastName(),
-    companyName: faker.company.companyName(),
+    firstName: faker.person.firstName(),
+    lastName: faker.person.lastName(),
+    companyName: faker.company.name(),
     phone: "+12125771133",
     addressLine1: "69 W 9th Street",
-    addressLine2: faker.address.county(),
+    addressLine2: faker.location.county(),
     city: "New York",
     zip: "10001",
     country: "United States of America",
     countryArea: "New York",
   },
   addressPL: {
-    firstName: faker.name.firstName(),
-    lastName: faker.name.lastName(),
-    companyName: faker.company.companyName(),
+    firstName: faker.person.firstName(),
+    lastName: faker.person.lastName(),
+    companyName: faker.company.name(),
     phone: "+48225042123",
     addressLine1: "Teczowa",
     addressLine2: "7",
@@ -45,9 +45,9 @@ export const ADDRESS: AddressType = {
     countryArea: "",
   },
   addressUK: {
-    firstName: faker.name.firstName(),
-    lastName: faker.name.lastName(),
-    companyName: faker.company.companyName(),
+    firstName: faker.person.firstName(),
+    lastName: faker.person.lastName(),
+    companyName: faker.company.name(),
     phone: "+445556667777",
     addressLine1: "Albert Street",
     addressLine2: "78/2",

playwright/pages/dialogs/editAttributeValueDialog.ts

@@ -1,5 +1,5 @@
 import type { Page } from "@playwright/test";
-import faker from "faker";
+import { faker } from "@faker-js/faker";
 
 export class EditAttributeValueDialog {
   readonly page: Page;

playwright/pages/discountsPage.ts

@@ -4,7 +4,7 @@ import { DeleteRuleDialog } from "@dialogs/deleteRuleDialog";
 import { BasePage } from "@pages/basePage";
 import { PromotionRuleDialog } from "@pages/dialogs/promotionRuleDialog";
 import type { Page } from "@playwright/test";
-import { date } from "faker";
+import { faker } from "@faker-js/faker";
 
 export class DiscountsPage extends BasePage {
   deleteDiscountDialog: DeleteDiscountDialog;
@@ -66,7 +66,7 @@ export class DiscountsPage extends BasePage {
   }
 
   async typeStartDate() {
-    await this.startDateInput.fill(date.recent().toISOString().split("T")[0]);
+    await this.startDateInput.fill(faker.date.recent().toISOString().split("T")[0]);
   }
 
   async typeStartHour() {
@@ -78,7 +78,7 @@ export class DiscountsPage extends BasePage {
   }
 
   async typeEndDate() {
-    await this.endDateInput.fill(date.future().toISOString().split("T")[0]);
+    await this.endDateInput.fill(faker.date.future().toISOString().split("T")[0]);
   }
 
   async typeEndHour() {

playwright/pages/pageElements/metadataSeoPage.ts

@@ -1,12 +1,12 @@
 import type { Page } from "@playwright/test";
-import * as faker from "faker";
+import { faker } from "@faker-js/faker";
 
-const metaDataName = `e2e-metaDataName-${faker.datatype.number()}`;
-const metaDataValue = `e2e-metaDataValue-${faker.datatype.number()}`;
-const privateMetaDataName = `e2e-privateMetaDataName-${faker.datatype.number()}`;
-const privateMetaDataValue = `e2e-privateMetaDataValue-${faker.datatype.number()}`;
-const seoEngineTitle = `e2e-seoSlugTitle-${faker.datatype.number()}`;
-const seoDescriptionText = `e2e-seoSlugDescription-${faker.datatype.number()}`;
+const metaDataName = `e2e-metaDataName-${faker.number.int(99999)}`;
+const metaDataValue = `e2e-metaDataValue-${faker.number.int(99999)}`;
+const privateMetaDataName = `e2e-privateMetaDataName-${faker.number.int(99999)}`;
+const privateMetaDataValue = `e2e-privateMetaDataValue-${faker.number.int(99999)}`;
+const seoEngineTitle = `e2e-seoSlugTitle-${faker.number.int(99999)}`;
+const seoDescriptionText = `e2e-seoSlugDescription-${faker.number.int(99999)}`;
 
 export class MetadataSeoPage {
   readonly page: Page;

playwright/pages/productPage.ts

@@ -7,11 +7,11 @@ import { ExportProductsDialog } from "@pages/dialogs/exportProductsDialog";
 import { MetadataSeoPage } from "@pages/pageElements/metadataSeoPage";
 import { RightSideDetailsPage } from "@pages/pageElements/rightSideDetailsSection";
 import { type Page } from "@playwright/test";
-import * as faker from "faker";
+import { faker } from "@faker-js/faker";
 import path from "path";
 
-const productName = `e2e-productName-${faker.datatype.number()}`;
-const productDescription = `e2e-productDescription-${faker.datatype.number()}`;
+const productName = `e2e-productName-${faker.number.int(99999)}`;
+const productDescription = `e2e-productDescription-${faker.number.int(99999)}`;
 
 export class ProductPage extends BasePage {
   readonly metadataSeoPage: MetadataSeoPage;

playwright/tests/attributes.spec.ts

@@ -2,7 +2,7 @@ import { ATTRIBUTES } from "@data/e2eTestData";
 import { AttributesPage } from "@pages/attributesPage";
 import { ConfigurationPage } from "@pages/configurationPage";
 import { expect } from "@playwright/test";
-import faker from "faker";
+import { faker } from "@faker-js/faker";
 import { test } from "utils/testWithPermission";
 
 test.use({ permissionName: "admin" });
@@ -15,7 +15,7 @@ test.beforeEach(({ page }) => {
   configurationPage = new ConfigurationPage(page);
 });
 
-const SALEOR_124_uuid = faker.datatype.uuid();
+const SALEOR_124_uuid = faker.string.uuid();
 const attributeClasses: ("PRODUCT_TYPE" | "PAGE_TYPE")[] = ["PRODUCT_TYPE", "PAGE_TYPE"];
 
 for (const attr of attributeClasses) {
@@ -53,7 +53,7 @@ for (const attr of attributeClasses) {
   }
 }
 
-const SALEOR_125_uuid = faker.datatype.uuid();
+const SALEOR_125_uuid = faker.string.uuid();
 
 for (const attr of attributeClasses) {
   for (const type of ATTRIBUTES.attributeTypesWithoutAbilityToAddValues.names) {
@@ -91,7 +91,7 @@ for (const attr of attributeClasses) {
   }
 }
 
-const SALEOR_126_uuid = faker.datatype.uuid();
+const SALEOR_126_uuid = faker.string.uuid();
 
 for (const attr of attributeClasses) {
   for (const entity of ATTRIBUTES.attributeReferencesEntities.names) {

playwright/tests/customers.spec.ts

@@ -7,7 +7,7 @@ import { DeleteAddressDialog } from "@pages/dialogs/deleteAddressDialog";
 import { AddressForm } from "@pages/forms/addressForm";
 import { GiftCardsPage } from "@pages/giftCardsPage";
 import { expect } from "@playwright/test";
-import faker from "faker";
+import { faker } from "@faker-js/faker";
 import { test } from "utils/testWithPermission";
 
 test.use({ permissionName: "admin" });
@@ -29,8 +29,8 @@ test.beforeEach(({ page }) => {
 });
 
 test("TC: SALEOR_199 Create customer #e2e #customer", async () => {
-  const firstName = faker.name.firstName();
-  const lastName = faker.name.lastName();
+  const firstName = faker.person.firstName();
+  const lastName = faker.person.lastName();
   const note = faker.lorem.sentence();
   const email = faker.internet.email();
 
@@ -57,8 +57,8 @@ test("TC: SALEOR_199 Create customer #e2e #customer", async () => {
 });
 
 test("TC: SALEOR_200 As an admin I should not be able to create customer with duplicated email #e2e #customer", async () => {
-  const firstName = faker.name.firstName();
-  const lastName = faker.name.lastName();
+  const firstName = faker.person.firstName();
+  const lastName = faker.person.lastName();
   const note = faker.lorem.sentence();
 
   await customersPage.goToCustomersListView();
@@ -79,8 +79,8 @@ test("TC: SALEOR_200 As an admin I should not be able to create customer with du
 });
 
 test("TC: SALEOR_201 Update customer account info #e2e #customer", async () => {
-  const firstName = faker.name.firstName();
-  const lastName = faker.name.lastName();
+  const firstName = faker.person.firstName();
+  const lastName = faker.person.lastName();
   const email = faker.internet.email();
   const note = faker.lorem.sentence();
 
@@ -212,7 +212,7 @@ test("TC: SALEOR_210 Delete customer's address #e2e #customer", async () => {
 });
 
 test("TC: SALEOR_207 Issue a new gift card for the customer #e2e #customer", async () => {
-  const amount = faker.datatype.number(1000).toPrecision(2).toString();
+  const amount = faker.number.int(1000).toPrecision(2).toString();
 
   await customersPage.gotoCustomerDetailsPage(CUSTOMERS.editCustomer.id);
   await customersPage.clickIssueNewGiftCard();

playwright/tests/discounts.spec.ts

@@ -1,7 +1,7 @@
 import { CATEGORIES, CHANNELS, COLLECTIONS, DISCOUNTS, PRODUCTS } from "@data/e2eTestData";
 import { DiscountsPage } from "@pages/discountsPage";
 import { expect } from "@playwright/test";
-import faker from "faker";
+import { faker } from "@faker-js/faker";
 import { test } from "utils/testWithPermission";
 
 test.use({ permissionName: "admin" });

playwright/tests/navigation.spec.ts

@@ -3,7 +3,7 @@ import { AddNavigationMenuItemDialog } from "@pages/dialogs/addNavigationMenuIte
 import { NavigationDetailsPage } from "@pages/navigationDetailsPage";
 import { NavigationPage } from "@pages/navigationPage";
 import { expect } from "@playwright/test";
-import faker from "faker";
+import { faker } from "@faker-js/faker";
 import { test } from "utils/testWithPermission";
 
 test.use({ permissionName: "admin" });
@@ -24,14 +24,14 @@ test("TC: SALEOR_194 Should create a new menu navigation with menu item #navigat
   await navigation.createMenuButton.click();
   await expect(navigation.createMenuDialogTitle).toBeVisible();
 
-  const menuName = faker.random.word();
+  const menuName = faker.lorem.word();
 
   await navigation.addNavigationMenuDialog.typeNewMenuName(menuName);
   await navigation.addNavigationMenuDialog.clickSaveButton();
   await navigationDetailsPage.clickCreateNewMenuItem();
   await expect(navigationDetailsPage.addMenuItemDialog).toBeVisible();
 
-  const menuItemName = faker.random.word();
+  const menuItemName = faker.lorem.word();
 
   await addNavigationMenuItemDialog.typeMenuItemName(menuItemName);
   await addNavigationMenuItemDialog.selectLinkTypeOption("Categories");
@@ -49,7 +49,7 @@ test.skip("TC: SALEOR_198 Should update existing menu #navigation #e2e", async (
 
   const menuItemToBeUpdated = NAVIGATION_ITEMS.navigationMenuToBeUpdated.menuItems[0];
   const menuItemToBeDeleted = NAVIGATION_ITEMS.navigationMenuToBeUpdated.menuItems[1];
-  const newItemName = faker.random.word();
+  const newItemName = faker.lorem.word();
 
   await navigationDetailsPage.clickEditMenuItemButton(menuItemToBeUpdated.name);
   await addNavigationMenuItemDialog.typeMenuItemName(newItemName);
@@ -61,7 +61,7 @@ test.skip("TC: SALEOR_198 Should update existing menu #navigation #e2e", async (
   await navigationDetailsPage.clickCreateNewMenuItem();
   await expect(navigationDetailsPage.addMenuItemDialog).toBeVisible();
 
-  const menuItemName = faker.random.word();
+  const menuItemName = faker.lorem.word();
 
   await addNavigationMenuItemDialog.typeMenuItemName(menuItemName);
   await addNavigationMenuItemDialog.selectLinkTypeOption("Categories");
@@ -75,7 +75,7 @@ test.skip("TC: SALEOR_198 Should update existing menu #navigation #e2e", async (
   await expect(navigationDetailsPage.menuItemList).toContainText(newItemName);
   await expect(navigationDetailsPage.menuItemList).not.toContainText(menuItemToBeDeleted.name);
 
-  const newName = faker.random.word();
+  const newName = faker.lorem.word();
 
   await navigationDetailsPage.fillName(newName);
   await navigationDetailsPage.clickSaveButton();