@akinon/projectzero 1.54.0 → 1.55.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @akinon/projectzero
 
+## 1.55.0
+
+### Minor Changes
+
+- 00ffde2: ZERO-2637: enhance create command with improved messaging
+
 ## 1.54.0
 
 ### Minor Changes

package/app-template/CHANGELOG.md

@@ -1,5 +1,32 @@
 # projectzeronext
 
+## 1.55.0
+
+### Minor Changes
+
+- 97b8bdc: ZERO-2724: Remove onClick event in shipping options component
+- 75080fd: ZERO-2630: Add max limit to postcode area
+- eecb282: ZERO-2607: Update address-related functions to include invalidateTag option
+
+### Patch Changes
+
+- Updated dependencies [1448a96]
+- Updated dependencies [75080fd]
+- Updated dependencies [eecb282]
+  - @akinon/next@1.55.0
+  - @akinon/pz-akifast@1.55.0
+  - @akinon/pz-b2b@1.55.0
+  - @akinon/pz-basket-gift-pack@1.55.0
+  - @akinon/pz-bkm@1.55.0
+  - @akinon/pz-checkout-gift-pack@1.55.0
+  - @akinon/pz-click-collect@1.55.0
+  - @akinon/pz-credit-payment@1.55.0
+  - @akinon/pz-gpay@1.55.0
+  - @akinon/pz-masterpass@1.55.0
+  - @akinon/pz-one-click-checkout@1.55.0
+  - @akinon/pz-otp@1.55.0
+  - @akinon/pz-pay-on-delivery@1.55.0
+
 ## 1.54.0
 
 ### Minor Changes

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.54.0",
+  "version": "1.55.0",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -22,19 +22,19 @@
     "prestart": "pz-prestart"
   },
   "dependencies": {
-    "@akinon/next": "1.54.0",
-    "@akinon/pz-akifast": "1.54.0",
-    "@akinon/pz-b2b": "1.54.0",
-    "@akinon/pz-basket-gift-pack": "1.54.0",
-    "@akinon/pz-bkm": "1.54.0",
-    "@akinon/pz-checkout-gift-pack": "1.54.0",
-    "@akinon/pz-click-collect": "1.54.0",
-    "@akinon/pz-credit-payment": "1.54.0",
-    "@akinon/pz-gpay": "1.54.0",
-    "@akinon/pz-masterpass": "1.54.0",
-    "@akinon/pz-one-click-checkout": "1.54.0",
-    "@akinon/pz-otp": "1.54.0",
-    "@akinon/pz-pay-on-delivery": "1.54.0",
+    "@akinon/next": "1.55.0",
+    "@akinon/pz-akifast": "1.55.0",
+    "@akinon/pz-b2b": "1.55.0",
+    "@akinon/pz-basket-gift-pack": "1.55.0",
+    "@akinon/pz-bkm": "1.55.0",
+    "@akinon/pz-checkout-gift-pack": "1.55.0",
+    "@akinon/pz-click-collect": "1.55.0",
+    "@akinon/pz-credit-payment": "1.55.0",
+    "@akinon/pz-gpay": "1.55.0",
+    "@akinon/pz-masterpass": "1.55.0",
+    "@akinon/pz-one-click-checkout": "1.55.0",
+    "@akinon/pz-otp": "1.55.0",
+    "@akinon/pz-pay-on-delivery": "1.55.0",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -59,7 +59,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.54.0",
+    "@akinon/eslint-plugin-projectzero": "1.55.0",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/src/app/[commerce]/[locale]/[currency]/account/address/page.tsx

@@ -17,7 +17,7 @@ export default function Page() {
   const [addAddress] = useAddAddressMutation();
 
   const onSubmit = async (data) => {
-    await addAddress(data);
+    await addAddress({ ...data, invalidateTag: 'Addresses' });
     setIsNewAddressModalOpen(false);
   };
 

package/app-template/src/views/account/address-card.tsx

@@ -27,13 +27,13 @@ export const AddressCard = (props: Props) => {
   const [isRemoveAddressModalOpen, setRemoveAddressModalOpen] = useState(false);
 
   const onSubmit = async (data) => {
-    await editAddress(data);
+    await editAddress({ ...data, invalidateTag: 'Addresses' });
     setIsEditAddressModalOpen(false);
   };
 
   const handleRemoveAddress = async (pk: number) => {
     try {
-      await removeAddress(pk)
+      await removeAddress({ id: pk, invalidateTag: 'Addresses' })
         .unwrap()
         .then(() => setRemoveAddressModalOpen(false))
         .catch((err) => console.error(err));

package/app-template/src/views/account/address-form.tsx

@@ -31,7 +31,7 @@ interface Props {
   onSubmit: (data: any) => void;
 }
 
-const makeAddressFormSchema = (t, { phoneNumberLength }) =>
+const makeAddressFormSchema = (t, { phoneNumberLength, postCodeLength }) =>
   yup.object().shape({
     title: yup.string().required(t('account.address_book.form.error.required')),
     first_name: yup
@@ -65,8 +65,9 @@ const makeAddressFormSchema = (t, { phoneNumberLength }) =>
       .max(255, t('account.address_book.form.error.line_max')),
     postcode: yup
       .string()
-      .min(5, t('account.address_book.form.error.postcode_min'))
-      .max(5, t('account.address_book.form.error.postcode_max'))
+      .transform((value: string) => value.replace(/_/g, '').replace(/ /g, ''))
+      .min(postCodeLength, t('account.address_book.form.error.postcode_min'))
+      .max(postCodeLength, t('account.address_book.form.error.postcode_max'))
       .required(t('account.address_book.form.error.required')),
     company_name: yup.string().nullable(),
     tax_no: yup.string().nullable(),
@@ -80,7 +81,8 @@ export const AddressForm = (props: Props) => {
   const { data, onSubmit } = props;
   const config = useAppSelector((state) => state.config);
   const addressFormSchema = makeAddressFormSchema(t, {
-    phoneNumberLength: config.user_phone_format.length
+    phoneNumberLength: config.user_phone_format.length,
+    postCodeLength: config.user_post_code_format.length
   });
   const {
     register,
@@ -322,12 +324,15 @@ export const AddressForm = (props: Props) => {
         )}
       </label>
       <Input
-        type="number"
         label={t('account.address_book.form.post_code.placeholder')}
         {...register('postcode')}
         error={errors.postcode}
         data-testid="address-form-post-code"
         required
+        format={config.user_post_code_format.replaceAll(/\9/g, '#')}
+        control={control}
+        mask="_"
+        allowEmptyFormatting
       />
       {selectedFormType === AddressType.company && (
         <>

package/app-template/src/views/checkout/steps/shipping/address-box.tsx

@@ -85,7 +85,7 @@ const AddressBox = ({
   };
 
   const onSubmit = (data) => {
-    editAddress(data)
+    editAddress({ ...data, invalidateTag: 'Addresses' })
       .unwrap()
       .then((editAddressResponse) => {
         handleAddressClick(addressType, editAddressResponse);
@@ -96,7 +96,7 @@ const AddressBox = ({
   };
 
   const handleRemoveAddress = async (addressPk: number) => {
-    await removeAddress(addressPk);
+    await removeAddress({ id: addressPk, invalidateTag: 'Addresses' });
     setRemoveAddressModalOpen(false);
     dispatch(resetCheckoutState());
 

package/app-template/src/views/checkout/steps/shipping/addresses.tsx

@@ -77,7 +77,7 @@ const Addresses = () => {
   }, [billing_and_shipping_same]);
 
   const onSubmit = (data) => {
-    addAddress(data)
+    addAddress({ ...data, invalidateTag: 'Addresses' })
       .unwrap()
       .then((addAddressResponse) => {
         if (addressList.length === 0) {

package/app-template/src/views/checkout/steps/shipping/shipping-options.tsx

@@ -43,9 +43,6 @@ const ShippingOptions = () => {
                 onChange={() => {
                   setShippingOption(option.pk);
                 }}
-                onClick={() => {
-                  setShippingOption(option?.pk);
-                }}
                 data-testid={`checkout-shipping-option-${option.pk}`}
               >
                 {option.name}

package/commands/create.ts

@@ -3,6 +3,7 @@ import * as fs from 'fs';
 import * as readline from 'readline';
 import { slugify } from '../utils';
 
+const { execSync } = require('child_process');
 const loadingSpinner = require('loading-spinner');
 
 interface Question {
@@ -139,7 +140,8 @@ export default async (): Promise<void> => {
   const answers = await getAnswers();
   const brandName =
     answers.brandName === '.' ? path.basename(workingDir) : answers.brandName;
-  const projectDir = path.resolve(workingDir, slugify(brandName));
+  const projectDir = answers.brandName === '.' ? workingDir : path.resolve(workingDir, slugify(brandName));
+  const relativeProjectDir = answers.brandName === '.' ? '.' : slugify(brandName);
 
   if (!fs.existsSync(projectDir)) {
     fs.mkdirSync(projectDir, { recursive: true });
@@ -174,12 +176,34 @@ export default async (): Promise<void> => {
     name: slugify(brandName)
   });
 
+
+  console.log('\x1b[34m%s\x1b[0m', '\n🚀 Installing packages...\n');
+
+  execSync(`cd ${relativeProjectDir} && yarn install`, { stdio: 'ignore' });
+
   loadingSpinner.stop();
 
-  console.log(
-    '\x1b[32m%s\x1b[0m',
-    `\n ✓ ${answers.brandName} project is ready.\n`
-  );
+  const successMessage = `
+✨ ${brandName} project is ready at \x1b[4m${projectDir}\x1b[0m
+
+Within the directory, the following commands are available:
+
+  \x1b[35m$ yarn dev\x1b[0m
+    \x1b[32mLaunches the development server.\x1b[0m
+
+  \x1b[35m$ yarn build\x1b[0m
+    \x1b[32mCompiles the app into static files for production.\x1b[0m
+
+  \x1b[35m$ yarn start\x1b[0m
+    \x1b[32mRuns the production server.\x1b[0m
+`;
+
+  const getStartedMessage = answers.brandName === '.'
+    ? 'To get started, you can type:\n\n  \x1b[35m$ yarn dev\x1b[0m\n'
+    : `To get started, you can type:\n\n  \x1b[35m$ cd ${relativeProjectDir}\x1b[0m\n  \x1b[35m$ yarn dev\x1b[0m\n`;
 
+  console.log('\x1b[32m%s\x1b[0m', successMessage);
+  console.log('\x1b[36m%s\x1b[0m', getStartedMessage);
+  console.log('\x1b[33m%s\x1b[0m', 'Project setup is complete\n');
   console.log('\x1b[33m%s\x1b[0m', 'Project Zero - Akinon\n');
 };

package/dist/commands/create.js

@@ -39,6 +39,7 @@ const path_1 = __importDefault(require("path"));
 const fs = __importStar(require("fs"));
 const readline = __importStar(require("readline"));
 const utils_1 = require("../utils");
+const { execSync } = require('child_process');
 const loadingSpinner = require('loading-spinner');
 const workingDir = path_1.default.resolve(process.cwd());
 const rl = readline.createInterface({
@@ -131,7 +132,8 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     const answers = yield getAnswers();
     const brandName = answers.brandName === '.' ? path_1.default.basename(workingDir) : answers.brandName;
-    const projectDir = path_1.default.resolve(workingDir, (0, utils_1.slugify)(brandName));
+    const projectDir = answers.brandName === '.' ? workingDir : path_1.default.resolve(workingDir, (0, utils_1.slugify)(brandName));
+    const relativeProjectDir = answers.brandName === '.' ? '.' : (0, utils_1.slugify)(brandName);
     if (!fs.existsSync(projectDir)) {
         fs.mkdirSync(projectDir, { recursive: true });
     }
@@ -154,7 +156,28 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     updateFileContents(path_1.default.join(projectDir, 'package.json'), {
         name: (0, utils_1.slugify)(brandName)
     });
+    console.log('\x1b[34m%s\x1b[0m', '\n🚀 Installing packages...\n');
+    execSync(`cd ${relativeProjectDir} && yarn install`, { stdio: 'ignore' });
     loadingSpinner.stop();
-    console.log('\x1b[32m%s\x1b[0m', `\n ✓ ${answers.brandName} project is ready.\n`);
+    const successMessage = `
+✨ ${brandName} project is ready at \x1b[4m${projectDir}\x1b[0m
+
+Within the directory, the following commands are available:
+
+  \x1b[35m$ yarn dev\x1b[0m
+    \x1b[32mLaunches the development server.\x1b[0m
+
+  \x1b[35m$ yarn build\x1b[0m
+    \x1b[32mCompiles the app into static files for production.\x1b[0m
+
+  \x1b[35m$ yarn start\x1b[0m
+    \x1b[32mRuns the production server.\x1b[0m
+`;
+    const getStartedMessage = answers.brandName === '.'
+        ? 'To get started, you can type:\n\n  \x1b[35m$ yarn dev\x1b[0m\n'
+        : `To get started, you can type:\n\n  \x1b[35m$ cd ${relativeProjectDir}\x1b[0m\n  \x1b[35m$ yarn dev\x1b[0m\n`;
+    console.log('\x1b[32m%s\x1b[0m', successMessage);
+    console.log('\x1b[36m%s\x1b[0m', getStartedMessage);
+    console.log('\x1b[33m%s\x1b[0m', 'Project setup is complete\n');
     console.log('\x1b[33m%s\x1b[0m', 'Project Zero - Akinon\n');
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.54.0",
+  "version": "1.55.0",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {