@evershop/evershop 2.0.0 → 2.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bin/evershop.js +1 -1
- package/dist/bin/evershop.js.map +1 -1
- package/dist/bin/lib/startCronProcess.d.ts +1 -0
- package/dist/bin/lib/startCronProcess.js +28 -0
- package/dist/bin/lib/startCronProcess.js.map +1 -0
- package/dist/bin/lib/startSubscriberProcess.d.ts +1 -0
- package/dist/bin/lib/startSubscriberProcess.js +27 -0
- package/dist/bin/lib/startSubscriberProcess.js.map +1 -0
- package/dist/bin/lib/startUp.js +16 -35
- package/dist/bin/lib/startUp.js.map +1 -1
- package/dist/bin/lib/watch/effect.d.ts +1 -1
- package/dist/bin/lib/watch/effect.js +14 -1
- package/dist/bin/lib/watch/effect.js.map +1 -1
- package/dist/bin/lib/watch/processors/index.js +9 -1
- package/dist/bin/lib/watch/processors/index.js.map +1 -1
- package/dist/bin/lib/watch/processors/restartCronJob.d.ts +1 -0
- package/dist/bin/lib/watch/processors/restartCronJob.js +4 -0
- package/dist/bin/lib/watch/processors/restartCronJob.js.map +1 -0
- package/dist/bin/lib/watch/processors/restartSubscriber.d.ts +1 -0
- package/dist/bin/lib/watch/processors/restartSubscriber.js +4 -0
- package/dist/bin/lib/watch/processors/restartSubscriber.js.map +1 -0
- package/dist/components/common/Title.js.map +1 -1
- package/dist/components/frontStore/checkout/checkout/payment/paymentStep/StepContent.d.ts +1 -3
- package/dist/components/frontStore/checkout/checkout/payment/paymentStep/StepContent.js +4 -5
- package/dist/components/frontStore/checkout/checkout/payment/paymentStep/StepContent.js.map +1 -1
- package/dist/components/frontStore/checkout/checkout/shipment/StepContent.d.ts +1 -3
- package/dist/components/frontStore/checkout/checkout/shipment/StepContent.js +2 -3
- package/dist/components/frontStore/checkout/checkout/shipment/StepContent.js.map +1 -1
- package/dist/components/frontStore/customer/address/addressForm/AddressForm.d.ts +1 -3
- package/dist/components/frontStore/customer/address/addressForm/AddressForm.js +11 -44
- package/dist/components/frontStore/customer/address/addressForm/AddressForm.js.map +1 -1
- package/dist/components/frontStore/customer/address/addressForm/Index.d.ts +1 -3
- package/dist/components/frontStore/customer/address/addressForm/Index.js +3 -4
- package/dist/components/frontStore/customer/address/addressForm/Index.js.map +1 -1
- package/dist/components/frontStore/customer/address/addressForm/NameAndTelephone.d.ts +1 -5
- package/dist/components/frontStore/customer/address/addressForm/NameAndTelephone.js +14 -20
- package/dist/components/frontStore/customer/address/addressForm/NameAndTelephone.js.map +1 -1
- package/dist/components/frontStore/customer/address/addressForm/ProvinceAndPostcode.d.ts +1 -5
- package/dist/components/frontStore/customer/address/addressForm/ProvinceAndPostcode.js +8 -12
- package/dist/components/frontStore/customer/address/addressForm/ProvinceAndPostcode.js.map +1 -1
- package/dist/lib/log/logger.js +0 -7
- package/dist/lib/log/logger.js.map +1 -1
- package/dist/lib/util/{filterOperationMapp.js → filterOperationMap.js} +1 -1
- package/dist/lib/util/filterOperationMap.js.map +1 -0
- package/dist/lib/util/isPlainObject.d.ts +6 -0
- package/dist/lib/util/isPlainObject.js +13 -0
- package/dist/lib/util/isPlainObject.js.map +1 -0
- package/dist/lib/util/validateConfiguration.js +1 -1
- package/dist/lib/util/validateConfiguration.js.map +1 -1
- package/dist/lib/webpack/createBaseConfig.js +1 -1
- package/dist/lib/webpack/createBaseConfig.js.map +1 -1
- package/dist/modules/base/api/global/[apiResponse]apiErrorHandler.js +4 -1
- package/dist/modules/base/api/global/[apiResponse]apiErrorHandler.js.map +1 -1
- package/dist/modules/base/bootstrap.js +1 -1
- package/dist/modules/base/bootstrap.js.map +1 -1
- package/dist/modules/base/pages/global/[response]errorHandler.js +4 -1
- package/dist/modules/base/pages/global/[response]errorHandler.js.map +1 -1
- package/dist/modules/catalog/bootstrap.js +1 -1
- package/dist/modules/catalog/bootstrap.js.map +1 -1
- package/dist/modules/catalog/services/AttributeGroupCollection.js +1 -1
- package/dist/modules/catalog/services/AttributeGroupCollection.js.map +1 -1
- package/dist/modules/catalog/services/registerDefaultAttributeCollectionFilters.js +1 -1
- package/dist/modules/catalog/services/registerDefaultAttributeCollectionFilters.js.map +1 -1
- package/dist/modules/catalog/services/registerDefaultCategoryCollectionFilters.js +1 -1
- package/dist/modules/catalog/services/registerDefaultCategoryCollectionFilters.js.map +1 -1
- package/dist/modules/catalog/services/registerDefaultCollectionCollectionFilters.js +1 -1
- package/dist/modules/catalog/services/registerDefaultCollectionCollectionFilters.js.map +1 -1
- package/dist/modules/catalog/services/registerDefaultProductCollectionFilters.js +1 -1
- package/dist/modules/catalog/services/registerDefaultProductCollectionFilters.js.map +1 -1
- package/dist/modules/checkout/api/addCartAddress/saveAddress.js +11 -2
- package/dist/modules/checkout/api/addCartAddress/saveAddress.js.map +1 -1
- package/dist/modules/checkout/api/addCartItem/addItemToCart.js +1 -1
- package/dist/modules/checkout/api/addCartItem/addItemToCart.js.map +1 -1
- package/dist/modules/checkout/api/addMineCartItem/[detectCurrentCart]addItemToCart.js +1 -1
- package/dist/modules/checkout/api/addMineCartItem/[detectCurrentCart]addItemToCart.js.map +1 -1
- package/dist/modules/checkout/bootstrap.js +1 -1
- package/dist/modules/checkout/bootstrap.js.map +1 -1
- package/dist/modules/checkout/pages/frontStore/checkout/PaymentStep.d.ts +2 -6
- package/dist/modules/checkout/pages/frontStore/checkout/PaymentStep.js +2 -8
- package/dist/modules/checkout/pages/frontStore/checkout/PaymentStep.js.map +1 -1
- package/dist/modules/checkout/pages/frontStore/checkout/ShipmentStep.d.ts +2 -6
- package/dist/modules/checkout/pages/frontStore/checkout/ShipmentStep.js +2 -8
- package/dist/modules/checkout/pages/frontStore/checkout/ShipmentStep.js.map +1 -1
- package/dist/modules/cms/api/fileUpload/[context]multerFile[auth].js +2 -2
- package/dist/modules/cms/api/fileUpload/[context]multerFile[auth].js.map +1 -1
- package/dist/modules/cms/api/folderCreate/[context]validatePath[auth].js +3 -2
- package/dist/modules/cms/api/folderCreate/[context]validatePath[auth].js.map +1 -1
- package/dist/modules/cms/bootstrap.js +1 -1
- package/dist/modules/cms/bootstrap.js.map +1 -1
- package/dist/modules/cms/services/browFiles.d.ts +11 -1
- package/dist/modules/cms/services/browFiles.js.map +1 -1
- package/dist/modules/cms/services/createFolder.d.ts +5 -1
- package/dist/modules/cms/services/createFolder.js +1 -0
- package/dist/modules/cms/services/createFolder.js.map +1 -1
- package/dist/modules/cms/services/deleteFile.d.ts +5 -1
- package/dist/modules/cms/services/deleteFile.js +2 -2
- package/dist/modules/cms/services/deleteFile.js.map +1 -1
- package/dist/modules/cms/services/getMulter.d.ts +2 -1
- package/dist/modules/cms/services/index.d.ts +4 -0
- package/dist/modules/cms/services/index.js +5 -0
- package/dist/modules/cms/services/index.js.map +1 -0
- package/dist/modules/cms/services/registerDefaultPageCollectionFilters.js +1 -1
- package/dist/modules/cms/services/registerDefaultPageCollectionFilters.js.map +1 -1
- package/dist/modules/cms/services/registerDefaultWidgetCollectionFilters.js +1 -1
- package/dist/modules/cms/services/registerDefaultWidgetCollectionFilters.js.map +1 -1
- package/dist/modules/cms/services/uploadFile.d.ts +12 -1
- package/dist/modules/cms/services/uploadFile.js +2 -1
- package/dist/modules/cms/services/uploadFile.js.map +1 -1
- package/dist/modules/customer/bootstrap.js +0 -73
- package/dist/modules/customer/bootstrap.js.map +1 -1
- package/dist/modules/customer/pages/frontStore/account/Addresses.d.ts +2 -6
- package/dist/modules/customer/pages/frontStore/account/Addresses.js +2 -8
- package/dist/modules/customer/pages/frontStore/account/Addresses.js.map +1 -1
- package/dist/modules/customer/services/customer/address/{addressValidator.d.ts → addressValidators.d.ts} +6 -4
- package/dist/modules/customer/services/customer/address/addressValidators.js +105 -0
- package/dist/modules/customer/services/customer/address/addressValidators.js.map +1 -0
- package/dist/modules/customer/services/customer/address/createCustomerAddress.d.ts +1 -1
- package/dist/modules/customer/services/customer/address/createCustomerAddress.js +5 -2
- package/dist/modules/customer/services/customer/address/createCustomerAddress.js.map +1 -1
- package/dist/modules/customer/services/customer/address/deleteCustomerAddress.d.ts +1 -1
- package/dist/modules/customer/services/customer/address/updateCustomerAddress.d.ts +1 -1
- package/dist/modules/customer/services/customer/address/updateCustomerAddress.js +5 -2
- package/dist/modules/customer/services/customer/address/updateCustomerAddress.js.map +1 -1
- package/dist/modules/customer/services/index.d.ts +2 -2
- package/dist/modules/customer/services/index.js +2 -2
- package/dist/modules/customer/services/index.js.map +1 -1
- package/dist/modules/customer/services/registerDefaultCustomerCollectionFilters.js +1 -1
- package/dist/modules/customer/services/registerDefaultCustomerCollectionFilters.js.map +1 -1
- package/dist/modules/customer/services/registerDefaultCustomerGroupCollectionFilters.js +1 -1
- package/dist/modules/customer/services/registerDefaultCustomerGroupCollectionFilters.js.map +1 -1
- package/dist/modules/oms/bootstrap.js +1 -1
- package/dist/modules/oms/bootstrap.js.map +1 -1
- package/dist/modules/oms/services/registerDefaultOrderCollectionFilters.js +1 -1
- package/dist/modules/oms/services/registerDefaultOrderCollectionFilters.js.map +1 -1
- package/dist/modules/promotion/services/registerDefaultCouponCollectionFilters.js +1 -1
- package/dist/modules/promotion/services/registerDefaultCouponCollectionFilters.js.map +1 -1
- package/dist/modules/tax/bootstrap.js +1 -1
- package/dist/modules/tax/bootstrap.js.map +1 -1
- package/dist/modules/tax/services/registerDefaultTaxClassCollectionFilters.js +1 -1
- package/dist/modules/tax/services/registerDefaultTaxClassCollectionFilters.js.map +1 -1
- package/dist/types/componentLayout.d.ts +4 -0
- package/dist/types/componentLayout.js +2 -0
- package/dist/types/componentLayout.js.map +1 -0
- package/dist/types/graphqlFilter.d.ts +6 -0
- package/dist/types/graphqlFilter.js +2 -0
- package/dist/types/graphqlFilter.js.map +1 -0
- package/dist/types/index.d.ts +5 -0
- package/dist/types/index.js +5 -0
- package/dist/types/index.js.map +1 -1
- package/dist/types/request.d.ts +11 -11
- package/dist/types/response.d.ts +1 -0
- package/package.json +13 -4
- package/dist/lib/util/filterOperationMapp.js.map +0 -1
- package/dist/lib/util/index.d.ts +0 -11
- package/dist/lib/util/index.js +0 -12
- package/dist/lib/util/index.js.map +0 -1
- package/dist/modules/customer/graphql/types/Customer/CustomerSetting.graphql +0 -3
- package/dist/modules/customer/graphql/types/Customer/CustomerSetting.resolvers.d.ts +0 -6
- package/dist/modules/customer/graphql/types/Customer/CustomerSetting.resolvers.js +0 -7
- package/dist/modules/customer/graphql/types/Customer/CustomerSetting.resolvers.js.map +0 -1
- package/dist/modules/customer/services/customer/address/addressValidator.js +0 -22
- package/dist/modules/customer/services/customer/address/addressValidator.js.map +0 -1
- /package/dist/lib/util/{filterOperationMapp.d.ts → filterOperationMap.d.ts} +0 -0
package/dist/bin/evershop.js
CHANGED
package/dist/bin/evershop.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evershop.js","sourceRoot":"","sources":["../../src/bin/evershop.js"],"names":[],"mappings":";AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;AAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1B,IAAI,CAAC;IACH,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACxB,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;QAC7B,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"evershop.js","sourceRoot":"","sources":["../../src/bin/evershop.js"],"names":[],"mappings":";AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;AAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1B,IAAI,CAAC;IACH,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACxB,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;QAC7B,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACjC,CAAC;SAAM,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QAC/B,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACrC,CAAC;SAAM,IAAI,OAAO,KAAK,aAAa,EAAE,CAAC;QACrC,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,OAAO,KAAK,qBAAqB,EAAE,CAAC;QAC7C,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAC3C,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;AACH,CAAC;AAAC,OAAO,CAAC,EAAE,CAAC;IACX,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AACD,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,UAAU,SAAS;IACjD,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AACH,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;IAC7C,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,CAAC,KAAK,CAAC,wBAAwB,MAAM,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function startCronProcess(context: any): any;
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import { fileURLToPath } from 'url';
|
|
3
|
+
import spawn from 'cross-spawn';
|
|
4
|
+
import { error } from '../../lib/log/logger.js';
|
|
5
|
+
import isDevelopmentMode from '../../lib/util/isDevelopmentMode.js';
|
|
6
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
7
|
+
const __dirname = path.dirname(__filename);
|
|
8
|
+
export function startCronProcess(context) {
|
|
9
|
+
// Spawn the child process to manage scheduled jobs
|
|
10
|
+
const jobArgs = [path.resolve(__dirname, '../../lib/cronjob/cronjob.js')];
|
|
11
|
+
if (isDevelopmentMode() || process.argv.includes('--debug')) {
|
|
12
|
+
jobArgs.push('--debug');
|
|
13
|
+
}
|
|
14
|
+
const jobChild = spawn('node', jobArgs, {
|
|
15
|
+
stdio: 'inherit',
|
|
16
|
+
env: {
|
|
17
|
+
...process.env,
|
|
18
|
+
bootstrapContext: JSON.stringify(context),
|
|
19
|
+
ALLOW_CONFIG_MUTATIONS: true
|
|
20
|
+
}
|
|
21
|
+
});
|
|
22
|
+
jobChild.on('error', (err) => {
|
|
23
|
+
error(`Error spawning job processor: ${err}`);
|
|
24
|
+
});
|
|
25
|
+
jobChild.unref();
|
|
26
|
+
return jobChild;
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=startCronProcess.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"startCronProcess.js","sourceRoot":"","sources":["../../../src/bin/lib/startCronProcess.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AACpE,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAE3C,MAAM,UAAU,gBAAgB,CAAC,OAAO;IACtC,mDAAmD;IACnD,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,8BAA8B,CAAC,CAAC,CAAC;IAC1E,IAAI,iBAAiB,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1B,CAAC;IACD,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE;QACtC,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE;YACH,GAAG,OAAO,CAAC,GAAG;YACd,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACzC,sBAAsB,EAAE,IAAI;SAC7B;KACF,CAAC,CAAC;IACH,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;QAC3B,KAAK,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function startSubscriberProcess(context: any): any;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import { fileURLToPath } from 'url';
|
|
3
|
+
import spawn from 'cross-spawn';
|
|
4
|
+
import { error } from '../../lib/log/logger.js';
|
|
5
|
+
import isDevelopmentMode from '../../lib/util/isDevelopmentMode.js';
|
|
6
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
7
|
+
const __dirname = path.dirname(__filename);
|
|
8
|
+
export function startSubscriberProcess(context) {
|
|
9
|
+
const args = [path.resolve(__dirname, '../../lib/event/event-manager.js')];
|
|
10
|
+
if (isDevelopmentMode() || process.argv.includes('--debug')) {
|
|
11
|
+
args.push('--debug');
|
|
12
|
+
}
|
|
13
|
+
const child = spawn('node', args, {
|
|
14
|
+
stdio: 'inherit',
|
|
15
|
+
env: {
|
|
16
|
+
...process.env,
|
|
17
|
+
bootstrapContext: JSON.stringify(context),
|
|
18
|
+
ALLOW_CONFIG_MUTATIONS: true
|
|
19
|
+
}
|
|
20
|
+
});
|
|
21
|
+
child.on('error', (err) => {
|
|
22
|
+
error(`Error spawning event processor: ${err}`);
|
|
23
|
+
});
|
|
24
|
+
child.unref();
|
|
25
|
+
return child;
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=startSubscriberProcess.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"startSubscriberProcess.js","sourceRoot":"","sources":["../../../src/bin/lib/startSubscriberProcess.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AACpE,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAE3C,MAAM,UAAU,sBAAsB,CAAC,OAAO;IAC5C,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC,CAAC;IAC3E,IAAI,iBAAiB,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE;QAChC,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE;YACH,GAAG,OAAO,CAAC,GAAG;YACd,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACzC,sBAAsB,EAAE,IAAI;SAC7B;KACF,CAAC,CAAC;IAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;QACxB,KAAK,CAAC,mCAAmC,GAAG,EAAE,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,KAAK,EAAE,CAAC;IACd,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/dist/bin/lib/startUp.js
CHANGED
|
@@ -17,6 +17,8 @@ import { getCoreModules } from './loadModules.js';
|
|
|
17
17
|
import { normalizePort } from './normalizePort.js';
|
|
18
18
|
import { onError } from './onError.js';
|
|
19
19
|
import { onListening } from './onListening.js';
|
|
20
|
+
import { startCronProcess } from './startCronProcess.js';
|
|
21
|
+
import { startSubscriberProcess } from './startSubscriberProcess.js';
|
|
20
22
|
const __filename = fileURLToPath(import.meta.url);
|
|
21
23
|
const __dirname = path.dirname(__filename);
|
|
22
24
|
export const start = async function start(context, cb) {
|
|
@@ -62,43 +64,12 @@ export const start = async function start(context, cb) {
|
|
|
62
64
|
server.on('error', onError);
|
|
63
65
|
server.listen(port);
|
|
64
66
|
// Spawn the child process to manage events
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
args.push('--debug');
|
|
68
|
-
}
|
|
69
|
-
const child = spawn('node', args, {
|
|
70
|
-
stdio: 'inherit',
|
|
71
|
-
env: {
|
|
72
|
-
...process.env,
|
|
73
|
-
bootstrapContext: JSON.stringify(context),
|
|
74
|
-
ALLOW_CONFIG_MUTATIONS: true
|
|
75
|
-
}
|
|
76
|
-
});
|
|
77
|
-
child.on('error', (err) => {
|
|
78
|
-
error(`Error spawning event processor: ${err}`);
|
|
79
|
-
});
|
|
80
|
-
child.unref();
|
|
81
|
-
// Spawn the child process to manage scheduled jobs
|
|
82
|
-
const jobArgs = [path.resolve(__dirname, '../../lib/cronjob/cronjob.js')];
|
|
83
|
-
if (isDevelopmentMode() || process.argv.includes('--debug')) {
|
|
84
|
-
jobArgs.push('--debug');
|
|
85
|
-
}
|
|
86
|
-
const jobChild = spawn('node', jobArgs, {
|
|
87
|
-
stdio: 'inherit',
|
|
88
|
-
env: {
|
|
89
|
-
...process.env,
|
|
90
|
-
bootstrapContext: JSON.stringify(context),
|
|
91
|
-
ALLOW_CONFIG_MUTATIONS: true
|
|
92
|
-
}
|
|
93
|
-
});
|
|
94
|
-
jobChild.on('error', (err) => {
|
|
95
|
-
error(`Error spawning job processor: ${err}`);
|
|
96
|
-
});
|
|
97
|
-
jobChild.unref();
|
|
67
|
+
let subscriberChild = startSubscriberProcess(context);
|
|
68
|
+
let jobChild = startCronProcess(context);
|
|
98
69
|
process.on('exit', (code) => {
|
|
99
70
|
// Cleanup child processes on exit
|
|
100
|
-
if (
|
|
101
|
-
|
|
71
|
+
if (subscriberChild && subscriberChild.pid) {
|
|
72
|
+
subscriberChild.kill('SIGTERM');
|
|
102
73
|
}
|
|
103
74
|
if (jobChild && jobChild.pid) {
|
|
104
75
|
jobChild.kill('SIGTERM');
|
|
@@ -108,5 +79,15 @@ export const start = async function start(context, cb) {
|
|
|
108
79
|
process.send('RESTART_ME');
|
|
109
80
|
}
|
|
110
81
|
});
|
|
82
|
+
process.on('RESTART_CRONJOB', () => {
|
|
83
|
+
debug('Restarting the cron job process');
|
|
84
|
+
jobChild.kill('SIGTERM');
|
|
85
|
+
jobChild = startCronProcess(context);
|
|
86
|
+
});
|
|
87
|
+
process.on('RESTART_SUBSCRIBER', () => {
|
|
88
|
+
debug('Restarting the subscriber process');
|
|
89
|
+
subscriberChild.kill('SIGTERM');
|
|
90
|
+
subscriberChild = startSubscriberProcess(context);
|
|
91
|
+
});
|
|
111
92
|
};
|
|
112
93
|
//# sourceMappingURL=startUp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startUp.js","sourceRoot":"","sources":["../../../src/bin/lib/startUp.js"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"startUp.js","sourceRoot":"","sources":["../../../src/bin/lib/startUp.js"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Application } from 'express';
|
|
2
2
|
import { Event } from './watchHandler.js';
|
|
3
|
-
export type Effect = 'restart' | 'add_middleware' | 'remove_middleware' | 'update_middleware' | 'add_component' | 'remove_component' | 'update_component' | 'add_api_route' | 'remove_api_route' | 'update_api_route' | 'add_admin_route' | 'remove_admin_route' | 'update_admin_route' | 'add_front_store_route' | 'remove_front_store_route' | 'update_front_store_route' | 'update_graphql' | 'unknown';
|
|
3
|
+
export type Effect = 'restart' | 'restart_cronjob' | 'restart_event' | 'add_middleware' | 'remove_middleware' | 'update_middleware' | 'add_component' | 'remove_component' | 'update_component' | 'add_api_route' | 'remove_api_route' | 'update_api_route' | 'add_admin_route' | 'remove_admin_route' | 'update_admin_route' | 'add_front_store_route' | 'remove_front_store_route' | 'update_front_store_route' | 'update_graphql' | 'unknown';
|
|
4
4
|
export declare function detectEffect(event: Event): Effect;
|
|
5
5
|
export declare function applyEffects(events: Event[], app: Application): void;
|
|
@@ -2,6 +2,7 @@ import { existsSync } from 'fs';
|
|
|
2
2
|
import { basename, dirname } from 'path';
|
|
3
3
|
import { minimatch } from 'minimatch';
|
|
4
4
|
import { has } from '../../../bin/dev/register.js';
|
|
5
|
+
import { getEnabledJobs } from '../../../lib/cronjob/jobManager.js';
|
|
5
6
|
import { debug, error } from '../../../lib/log/logger.js';
|
|
6
7
|
import { getRoute } from '../../../lib/router/Router.js';
|
|
7
8
|
import { broadcast } from './broadcast.js';
|
|
@@ -14,6 +15,7 @@ function isValidRouteFolder(name) {
|
|
|
14
15
|
return segments.every((segment) => /^[a-zA-Z]+$/.test(segment));
|
|
15
16
|
}
|
|
16
17
|
export function detectEffect(event) {
|
|
18
|
+
const jobs = getEnabledJobs();
|
|
17
19
|
if (isRestartRequired(event)) {
|
|
18
20
|
return 'restart'; // No specific effect, just a restart required
|
|
19
21
|
}
|
|
@@ -138,6 +140,15 @@ export function detectEffect(event) {
|
|
|
138
140
|
minimatch(event.path.toString(), '**/*/*.resolvers.+(ts|js)')) {
|
|
139
141
|
return 'update_graphql'; // GraphQL schema or resolvers file
|
|
140
142
|
}
|
|
143
|
+
else if (minimatch(event.path.toString(), '**/subscribers/**/*.+(ts|js)')) {
|
|
144
|
+
return 'restart_event';
|
|
145
|
+
}
|
|
146
|
+
// Check if the file is a job file
|
|
147
|
+
else if (event.path &&
|
|
148
|
+
jobs.some((job) => job.resolve ===
|
|
149
|
+
event.path.toString().replace('src', 'dist').replace(/\.ts$/, '.js'))) {
|
|
150
|
+
return 'restart_cronjob';
|
|
151
|
+
}
|
|
141
152
|
else if (isSrc(event.path.toString())) {
|
|
142
153
|
const distPath = event.path
|
|
143
154
|
.toString()
|
|
@@ -185,7 +196,9 @@ export function applyEffects(events, app) {
|
|
|
185
196
|
}
|
|
186
197
|
}
|
|
187
198
|
// Call broadcast to notify all clients about the changes if there are any known effects
|
|
188
|
-
if (events.some((e) => e.effect &&
|
|
199
|
+
if (events.some((e) => e.effect &&
|
|
200
|
+
!['unknown', 'restart_cronjob', 'restart_event'].includes(e.effect) &&
|
|
201
|
+
!e.effect.includes('component'))) {
|
|
189
202
|
debug('Broadcasting changes to all clients');
|
|
190
203
|
broadcast();
|
|
191
204
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effect.js","sourceRoot":"","sources":["../../../../src/bin/lib/watch/effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"effect.js","sourceRoot":"","sources":["../../../../src/bin/lib/watch/effect.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,8 @@ import { addFrontStoreRoute } from './addFrontStoreRoute.js';
|
|
|
5
5
|
import { addMiddleware } from './addMiddleware.js';
|
|
6
6
|
import { deleteARoute } from './deleteARoute.js';
|
|
7
7
|
import { removeMiddleware } from './removeMiddleware.js';
|
|
8
|
+
import { restartCronJob } from './restartCronJob.js';
|
|
9
|
+
import { restartSubscriber } from './restartSubscriber.js';
|
|
8
10
|
import { updateAdminRoute } from './updateAdminRoute.js';
|
|
9
11
|
import { updateApiRoute } from './updateApiRoute.js';
|
|
10
12
|
import { updateFrontStoreRoute } from './updateFrontStoreRoute.js';
|
|
@@ -25,6 +27,12 @@ export const processors = {
|
|
|
25
27
|
// No operation for update_component, as it is handled by the compiler}
|
|
26
28
|
},
|
|
27
29
|
add_component: addComponent,
|
|
28
|
-
update_graphql: () => { }
|
|
30
|
+
update_graphql: () => { },
|
|
31
|
+
restart_cronjob: () => {
|
|
32
|
+
restartCronJob();
|
|
33
|
+
},
|
|
34
|
+
restart_event: () => {
|
|
35
|
+
restartSubscriber();
|
|
36
|
+
}
|
|
29
37
|
};
|
|
30
38
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/bin/lib/watch/processors/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAMnE,MAAM,CAAC,MAAM,UAAU,GAAc;IACnC,aAAa,EAAE,WAAW;IAC1B,gBAAgB,EAAE,cAAc;IAChC,qBAAqB,EAAE,kBAAkB;IACzC,wBAAwB,EAAE,qBAAqB;IAC/C,eAAe,EAAE,aAAa;IAC9B,kBAAkB,EAAE,gBAAgB;IACpC,gBAAgB,EAAE,YAAY;IAC9B,kBAAkB,EAAE,YAAY;IAChC,wBAAwB,EAAE,YAAY;IACtC,cAAc,EAAE,aAAa;IAC7B,iBAAiB,EAAE,gBAAgB;IACnC,iBAAiB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC3B,gBAAgB,EAAE,GAAG,EAAE;QACrB,uEAAuE;IACzE,CAAC;IACD,aAAa,EAAE,YAAY;IAC3B,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/bin/lib/watch/processors/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAMnE,MAAM,CAAC,MAAM,UAAU,GAAc;IACnC,aAAa,EAAE,WAAW;IAC1B,gBAAgB,EAAE,cAAc;IAChC,qBAAqB,EAAE,kBAAkB;IACzC,wBAAwB,EAAE,qBAAqB;IAC/C,eAAe,EAAE,aAAa;IAC9B,kBAAkB,EAAE,gBAAgB;IACpC,gBAAgB,EAAE,YAAY;IAC9B,kBAAkB,EAAE,YAAY;IAChC,wBAAwB,EAAE,YAAY;IACtC,cAAc,EAAE,aAAa;IAC7B,iBAAiB,EAAE,gBAAgB;IACnC,iBAAiB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC3B,gBAAgB,EAAE,GAAG,EAAE;QACrB,uEAAuE;IACzE,CAAC;IACD,aAAa,EAAE,YAAY;IAC3B,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,eAAe,EAAE,GAAG,EAAE;QACpB,cAAc,EAAE,CAAC;IACnB,CAAC;IACD,aAAa,EAAE,GAAG,EAAE;QAClB,iBAAiB,EAAE,CAAC;IACtB,CAAC;CACF,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function restartCronJob(): void;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"restartCronJob.js","sourceRoot":"","sources":["../../../../../src/bin/lib/watch/processors/restartCronJob.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc;IAC3B,OAA+B,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;AAC3D,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function restartSubscriber(): void;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"restartSubscriber.js","sourceRoot":"","sources":["../../../../../src/bin/lib/watch/processors/restartSubscriber.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB;IAC9B,OAA+B,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAC9D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Title.js","sourceRoot":"","sources":["../../../src/components/common/Title.jsx"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Title.js","sourceRoot":"","sources":["../../../src/components/common/Title.jsx"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,EAAE,KAAK,EAAE;IACrC,OAAO,mCAAQ,KAAK,CAAS,CAAC;AAChC,CAAC;AAED,KAAK,CAAC,SAAS,GAAG;IAChB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;CACnC,CAAC"}
|
|
@@ -1,15 +1,13 @@
|
|
|
1
|
-
export function StepContent({ cart: { billingAddress, addBillingAddressApi, addPaymentMethodApi }
|
|
1
|
+
export function StepContent({ cart: { billingAddress, addBillingAddressApi, addPaymentMethodApi } }: {
|
|
2
2
|
cart: {
|
|
3
3
|
billingAddress: any;
|
|
4
4
|
addBillingAddressApi: any;
|
|
5
5
|
addPaymentMethodApi: any;
|
|
6
6
|
};
|
|
7
|
-
customerAddressSchema: any;
|
|
8
7
|
}): React.JSX.Element;
|
|
9
8
|
export namespace StepContent {
|
|
10
9
|
namespace propTypes {
|
|
11
10
|
let cart: any;
|
|
12
|
-
let customerAddressSchema: any;
|
|
13
11
|
}
|
|
14
12
|
}
|
|
15
13
|
import React from 'react';
|
|
@@ -35,7 +35,7 @@ const QUERY = `
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
`;
|
|
38
|
-
export function StepContent({ cart: { billingAddress, addBillingAddressApi, addPaymentMethodApi }
|
|
38
|
+
export function StepContent({ cart: { billingAddress, addBillingAddressApi, addPaymentMethodApi } }) {
|
|
39
39
|
var _a, _b;
|
|
40
40
|
const { completeStep } = useCheckoutStepsDispatch();
|
|
41
41
|
const [useShippingAddress, setUseShippingAddress] = useState(!billingAddress);
|
|
@@ -98,9 +98,9 @@ export function StepContent({ cart: { billingAddress, addBillingAddressApi, addP
|
|
|
98
98
|
React.createElement("h4", { className: "mb-4 mt-12" }, _('Billing Address')),
|
|
99
99
|
React.createElement(BillingAddress, { useShippingAddress: useShippingAddress, setUseShippingAddress: setUseShippingAddress }),
|
|
100
100
|
useShippingAddress === false && (React.createElement("div", { style: { display: 'block' } },
|
|
101
|
-
React.createElement(CustomerAddressForm, { areaId: "checkoutBillingAddressForm", address: billingAddress || data.cart.shippingAddress
|
|
101
|
+
React.createElement(CustomerAddressForm, { areaId: "checkoutBillingAddressForm", address: billingAddress || data.cart.shippingAddress }))),
|
|
102
102
|
useShippingAddress === true && (React.createElement("div", { style: { display: 'none' } },
|
|
103
|
-
React.createElement(CustomerAddressForm, { areaId: "checkoutBillingAddressForm", address: data.cart.shippingAddress
|
|
103
|
+
React.createElement(CustomerAddressForm, { areaId: "checkoutBillingAddressForm", address: data.cart.shippingAddress }))),
|
|
104
104
|
React.createElement("h4", { className: "mb-4 mt-12" }, _('Payment Method')),
|
|
105
105
|
paymentMethods && paymentMethods.length > 0 && (React.createElement(React.Fragment, null,
|
|
106
106
|
React.createElement("div", { className: "divide-y border rounded border-divider px-8 mb-8" }, paymentMethods.map((method) => (React.createElement("div", { key: method.code, className: "border-divider payment-method-list" },
|
|
@@ -145,7 +145,6 @@ StepContent.propTypes = {
|
|
|
145
145
|
}),
|
|
146
146
|
addBillingAddressApi: PropTypes.string.isRequired,
|
|
147
147
|
addPaymentMethodApi: PropTypes.string.isRequired
|
|
148
|
-
}).isRequired
|
|
149
|
-
customerAddressSchema: PropTypes.object.isRequired
|
|
148
|
+
}).isRequired
|
|
150
149
|
};
|
|
151
150
|
//# sourceMappingURL=StepContent.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StepContent.js","sourceRoot":"","sources":["../../../../../../../src/components/frontStore/checkout/checkout/payment/paymentStep/StepContent.jsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,yBAAyB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,MAAM,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AACpD,OAAO,OAAO,MAAM,4BAA4B,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,6EAA6E,CAAC;AAC7G,OAAO,mBAAmB,MAAM,2DAA2D,CAAC;AAC5F,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,CAAC,EAAE,MAAM,6CAA6C,CAAC;AAEhE,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;CAsBb,CAAC;AACF,MAAM,UAAU,WAAW,CAAC,EAC1B,IAAI,EAAE,EAAE,cAAc,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"StepContent.js","sourceRoot":"","sources":["../../../../../../../src/components/frontStore/checkout/checkout/payment/paymentStep/StepContent.jsx"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
export function StepContent({ addShippingAddressApi, shipmentInfo, setShipmentInfo,
|
|
1
|
+
export function StepContent({ addShippingAddressApi, shipmentInfo, setShipmentInfo, addresses }: {
|
|
2
2
|
addShippingAddressApi: any;
|
|
3
3
|
shipmentInfo: any;
|
|
4
4
|
setShipmentInfo: any;
|
|
5
|
-
customerAddressSchema: any;
|
|
6
5
|
addresses: any;
|
|
7
6
|
}): React.JSX.Element;
|
|
8
7
|
export namespace StepContent {
|
|
@@ -11,7 +10,6 @@ export namespace StepContent {
|
|
|
11
10
|
let setShipmentInfo: any;
|
|
12
11
|
let shipmentInfo: any;
|
|
13
12
|
let step: any;
|
|
14
|
-
let customerAddressSchema: any;
|
|
15
13
|
let addresses: any;
|
|
16
14
|
}
|
|
17
15
|
namespace defaultProps {
|
|
@@ -31,7 +31,7 @@ const QUERY = `
|
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
`;
|
|
34
|
-
export function StepContent({ addShippingAddressApi, shipmentInfo, setShipmentInfo,
|
|
34
|
+
export function StepContent({ addShippingAddressApi, shipmentInfo, setShipmentInfo, addresses }) {
|
|
35
35
|
const { cartId } = useCheckout();
|
|
36
36
|
const client = useClient();
|
|
37
37
|
React.useEffect(() => {
|
|
@@ -89,7 +89,7 @@ export function StepContent({ addShippingAddressApi, shipmentInfo, setShipmentIn
|
|
|
89
89
|
toast.error(response.error.message);
|
|
90
90
|
}
|
|
91
91
|
} },
|
|
92
|
-
React.createElement(CustomerAddressForm, { areaId: "checkoutShippingAddressForm", address: shipmentInfo.address
|
|
92
|
+
React.createElement(CustomerAddressForm, { areaId: "checkoutShippingAddressForm", address: shipmentInfo.address }),
|
|
93
93
|
React.createElement("input", { type: "hidden", name: "type", value: "shipping" }))));
|
|
94
94
|
}
|
|
95
95
|
StepContent.propTypes = {
|
|
@@ -119,7 +119,6 @@ StepContent.propTypes = {
|
|
|
119
119
|
isCompleted: PropTypes.bool,
|
|
120
120
|
isEditing: PropTypes.bool
|
|
121
121
|
}).isRequired,
|
|
122
|
-
customerAddressSchema: PropTypes.object.isRequired,
|
|
123
122
|
addresses: PropTypes.arrayOf(PropTypes.shape({
|
|
124
123
|
uuid: PropTypes.string.isRequired,
|
|
125
124
|
fullName: PropTypes.string.isRequired,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StepContent.js","sourceRoot":"","sources":["../../../../../../src/components/frontStore/checkout/checkout/shipment/StepContent.jsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AACpF,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AACpD,OAAO,mBAAmB,MAAM,2DAA2D,CAAC;AAC5F,OAAO,OAAO,MAAM,OAAO,CAAC;AAC5B,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,CAAC,EAAE,MAAM,0CAA0C,CAAC;AAE7D,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;CAsBb,CAAC;AAEF,MAAM,UAAU,WAAW,CAAC,EAC1B,qBAAqB,EACrB,YAAY,EACZ,eAAe,EACf,
|
|
1
|
+
{"version":3,"file":"StepContent.js","sourceRoot":"","sources":["../../../../../../src/components/frontStore/checkout/checkout/shipment/StepContent.jsx"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
export function CustomerAddressForm({ allowCountries, address, formId, areaId
|
|
1
|
+
export function CustomerAddressForm({ allowCountries, address, formId, areaId }: {
|
|
2
2
|
allowCountries: any;
|
|
3
3
|
address?: {} | undefined;
|
|
4
4
|
formId?: string | undefined;
|
|
5
5
|
areaId?: string | undefined;
|
|
6
|
-
customerAddressSchema: any;
|
|
7
6
|
}): React.JSX.Element;
|
|
8
7
|
export namespace CustomerAddressForm {
|
|
9
8
|
namespace propTypes {
|
|
@@ -11,7 +10,6 @@ export namespace CustomerAddressForm {
|
|
|
11
10
|
let allowCountries: any;
|
|
12
11
|
let areaId: any;
|
|
13
12
|
let formId: any;
|
|
14
|
-
let customerAddressSchema: any;
|
|
15
13
|
}
|
|
16
14
|
namespace defaultProps {
|
|
17
15
|
let address_1: {};
|
|
@@ -6,26 +6,7 @@ import { ProvinceAndPostcode } from '@components/frontStore/customer/address/add
|
|
|
6
6
|
import PropTypes from 'prop-types';
|
|
7
7
|
import React from 'react';
|
|
8
8
|
import { _ } from '../../../../../lib/locale/translate/_.js';
|
|
9
|
-
function
|
|
10
|
-
if (schema && Array.isArray(schema.required)) {
|
|
11
|
-
return schema.required.includes(fieldName);
|
|
12
|
-
}
|
|
13
|
-
return false;
|
|
14
|
-
}
|
|
15
|
-
function getErrorMessage(schema, fieldName, defaultMessage) {
|
|
16
|
-
if (schema && schema.errorMessage) {
|
|
17
|
-
if (schema.errorMessage[fieldName]) {
|
|
18
|
-
return schema.errorMessage[fieldName];
|
|
19
|
-
}
|
|
20
|
-
else {
|
|
21
|
-
return defaultMessage;
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
else {
|
|
25
|
-
return defaultMessage;
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
export function CustomerAddressForm({ allowCountries, address = {}, formId = 'customerAddressForm', areaId = 'customerAddressForm', customerAddressSchema }) {
|
|
9
|
+
export function CustomerAddressForm({ allowCountries, address = {}, formId = 'customerAddressForm', areaId = 'customerAddressForm' }) {
|
|
29
10
|
const [selectedCountry, setSelectedCountry] = React.useState(() => {
|
|
30
11
|
var _a;
|
|
31
12
|
const country = (_a = address === null || address === void 0 ? void 0 : address.country) === null || _a === void 0 ? void 0 : _a.code;
|
|
@@ -45,9 +26,7 @@ export function CustomerAddressForm({ allowCountries, address = {}, formId = 'cu
|
|
|
45
26
|
{
|
|
46
27
|
component: { default: NameAndTelephone },
|
|
47
28
|
props: {
|
|
48
|
-
address
|
|
49
|
-
getErrorMessage: (fieldName, defaultMessage) => getErrorMessage(customerAddressSchema, fieldName, defaultMessage),
|
|
50
|
-
isFieldRequired: (fieldName, defaultMessage) => isFieldRequired(customerAddressSchema, fieldName, defaultMessage)
|
|
29
|
+
address
|
|
51
30
|
},
|
|
52
31
|
sortOrder: 10
|
|
53
32
|
},
|
|
@@ -60,14 +39,12 @@ export function CustomerAddressForm({ allowCountries, address = {}, formId = 'cu
|
|
|
60
39
|
formId,
|
|
61
40
|
label: _('Address'),
|
|
62
41
|
placeholder: _('Address'),
|
|
63
|
-
validationRules:
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
]
|
|
70
|
-
: []
|
|
42
|
+
validationRules: [
|
|
43
|
+
{
|
|
44
|
+
rule: 'notEmpty',
|
|
45
|
+
message: _('Address is required')
|
|
46
|
+
}
|
|
47
|
+
]
|
|
71
48
|
},
|
|
72
49
|
sortOrder: 20
|
|
73
50
|
},
|
|
@@ -79,14 +56,7 @@ export function CustomerAddressForm({ allowCountries, address = {}, formId = 'cu
|
|
|
79
56
|
value: address === null || address === void 0 ? void 0 : address.city,
|
|
80
57
|
label: _('City'),
|
|
81
58
|
placeholder: _('City'),
|
|
82
|
-
validationRules:
|
|
83
|
-
? [
|
|
84
|
-
{
|
|
85
|
-
rule: 'notEmpty',
|
|
86
|
-
message: getErrorMessage(customerAddressSchema, 'city', _('City is required'))
|
|
87
|
-
}
|
|
88
|
-
]
|
|
89
|
-
: []
|
|
59
|
+
validationRules: []
|
|
90
60
|
},
|
|
91
61
|
sortOrder: 40
|
|
92
62
|
},
|
|
@@ -105,9 +75,7 @@ export function CustomerAddressForm({ allowCountries, address = {}, formId = 'cu
|
|
|
105
75
|
props: {
|
|
106
76
|
address,
|
|
107
77
|
allowCountries,
|
|
108
|
-
selectedCountry
|
|
109
|
-
getErrorMessage: (fieldName, defaultMessage) => getErrorMessage(customerAddressSchema, fieldName, defaultMessage),
|
|
110
|
-
isFieldRequired: (fieldName, defaultMessage) => isFieldRequired(customerAddressSchema, fieldName, defaultMessage)
|
|
78
|
+
selectedCountry
|
|
111
79
|
},
|
|
112
80
|
sortOrder: 60
|
|
113
81
|
}
|
|
@@ -136,8 +104,7 @@ CustomerAddressForm.propTypes = {
|
|
|
136
104
|
}))
|
|
137
105
|
})).isRequired,
|
|
138
106
|
areaId: PropTypes.string,
|
|
139
|
-
formId: PropTypes.string
|
|
140
|
-
customerAddressSchema: PropTypes.object.isRequired
|
|
107
|
+
formId: PropTypes.string
|
|
141
108
|
};
|
|
142
109
|
CustomerAddressForm.defaultProps = {
|
|
143
110
|
address: {},
|