diff --git a/nx.json b/nx.json index f4cf052df4c..79e140023d7 100644 --- a/nx.json +++ b/nx.json @@ -1,34 +1,34 @@ { - "extends": "@nrwl/workspace/presets/npm.json", - "npmScope": "woocommerce-monorepo", - "tasksRunnerOptions": { - "default": { - "runner": "@nrwl/workspace/tasks-runners/default", - "options": { - "cacheableOperations": [ - "build", - "test", - "lint", - "package" - ] - } - } - }, - "targetDependencies": { - "build": [ - { - "target": "build", - "projects": "dependencies" - } - ], - "package": [ - { - "target": "package", - "projects": "dependencies" - } - ] - }, - "affected": { - "defaultBase": "trunk" - } + "extends": "@nrwl/workspace/presets/npm.json", + "npmScope": "woocommerce-monorepo", + "tasksRunnerOptions": { + "default": { + "runner": "@nrwl/workspace/tasks-runners/default", + "options": { + "cacheableOperations": [ + "build", + "test", + "lint", + "package" + ] + } + } + }, + "targetDependencies": { + "build": [ + { + "target": "build", + "projects": "dependencies" + } + ], + "package": [ + { + "target": "package", + "projects": "dependencies" + } + ] + }, + "affected": { + "defaultBase": "trunk" + } } diff --git a/packages/js/admin-e2e-tests/tsconfig.json b/packages/js/admin-e2e-tests/tsconfig.json index 0957caa0bac..b71c7906e5a 100644 --- a/packages/js/admin-e2e-tests/tsconfig.json +++ b/packages/js/admin-e2e-tests/tsconfig.json @@ -1,8 +1,8 @@ { - "extends": "../tsconfig.json", - "compilerOptions": { - "composite": true, - "rootDir": "src", - "outDir": "build" - } + "extends": "../tsconfig.json", + "compilerOptions": { + "composite": true, + "rootDir": "src", + "outDir": "build" + } } diff --git a/packages/js/api/tsconfig.json b/packages/js/api/tsconfig.json index 5567fce84ed..8ef7d238961 100644 --- a/packages/js/api/tsconfig.json +++ b/packages/js/api/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "types": [ "node", "jest", "axios", "create-hmac" ], - "rootDir": "src", - "outDir": "dist", - "target": "es5" - }, - "include": [ "src/" ] + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "types": [ "node", "jest", "axios", "create-hmac" ], + "rootDir": "src", + "outDir": "dist", + "target": "es5" + }, + "include": [ "src/" ] } diff --git a/packages/js/components/tsconfig-cjs.json b/packages/js/components/tsconfig-cjs.json index 2876a008ecc..38d1275d76d 100644 --- a/packages/js/components/tsconfig-cjs.json +++ b/packages/js/components/tsconfig-cjs.json @@ -1,6 +1,6 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "outDir": "build" + } } \ No newline at end of file diff --git a/packages/js/csv-export/tsconfig-cjs.json b/packages/js/csv-export/tsconfig-cjs.json index 2876a008ecc..38d1275d76d 100644 --- a/packages/js/csv-export/tsconfig-cjs.json +++ b/packages/js/csv-export/tsconfig-cjs.json @@ -1,6 +1,6 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "outDir": "build" + } } \ No newline at end of file diff --git a/packages/js/currency/tsconfig-cjs.json b/packages/js/currency/tsconfig-cjs.json index 04a2967c800..8befc236c91 100644 --- a/packages/js/currency/tsconfig-cjs.json +++ b/packages/js/currency/tsconfig-cjs.json @@ -1,7 +1,7 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "declaration": true, - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "declaration": true, + "outDir": "build" + } } \ No newline at end of file diff --git a/packages/js/customer-effort-score/tsconfig-cjs.json b/packages/js/customer-effort-score/tsconfig-cjs.json index 2876a008ecc..38d1275d76d 100644 --- a/packages/js/customer-effort-score/tsconfig-cjs.json +++ b/packages/js/customer-effort-score/tsconfig-cjs.json @@ -1,6 +1,6 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "outDir": "build" + } } \ No newline at end of file diff --git a/packages/js/data/tsconfig-cjs.json b/packages/js/data/tsconfig-cjs.json index 2876a008ecc..38d1275d76d 100644 --- a/packages/js/data/tsconfig-cjs.json +++ b/packages/js/data/tsconfig-cjs.json @@ -1,6 +1,6 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "outDir": "build" + } } \ No newline at end of file diff --git a/packages/js/date/tsconfig-cjs.json b/packages/js/date/tsconfig-cjs.json index 2876a008ecc..38d1275d76d 100644 --- a/packages/js/date/tsconfig-cjs.json +++ b/packages/js/date/tsconfig-cjs.json @@ -1,6 +1,6 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "outDir": "build" + } } \ No newline at end of file diff --git a/packages/js/e2e-core-tests/installFiles/default-test-config.json b/packages/js/e2e-core-tests/installFiles/default-test-config.json index c67465ed4ba..af124f00066 100644 --- a/packages/js/e2e-core-tests/installFiles/default-test-config.json +++ b/packages/js/e2e-core-tests/installFiles/default-test-config.json @@ -1,195 +1,195 @@ { - "url": "http://localhost:8084/", - "users": { - "admin": { - "username": "admin", - "password": "password" - }, - "customer": { - "username": "customer", - "password": "password" - } - }, - "products": { - "simple": { - "name": "Simple product" - }, - "variable": { - "name": "Variable Product with Three Attributes", - "defaultAttributes": [ - { - "id": 0, - "name": "Size", - "option": "Medium" - }, - { - "id": 0, - "name": "Colour", - "option": "Blue" - } - ], - "attributes": [ - { - "id": 0, - "name": "Colour", - "isVisibleOnProductPage": true, - "isForVariations": true, - "options": [ - "Red", - "Green", - "Blue" - ], - "sortOrder": 0 - }, - { - "id": 0, - "name": "Size", - "isVisibleOnProductPage": true, - "isForVariations": true, - "options": [ - "Small", - "Medium", - "Large" - ], - "sortOrder": 0 - }, - { - "id": 0, - "name": "Logo", - "isVisibleOnProductPage": true, - "isForVariations": true, - "options": [ - "Woo", - "WordPress" - ], - "sortOrder": 0 - } - ] - }, - "variations": [ - { - "regularPrice": "19.99", - "attributes": [ - { - "name": "Size", - "option": "Large" - }, - { - "name": "Colour", - "option": "Red" - } - ] - }, - { - "regularPrice": "18.99", - "attributes": [ - { - "name": "Size", - "option": "Medium" - }, - { - "name": "Colour", - "option": "Green" - } - ] - }, - { - "regularPrice": "17.99", - "attributes": [ - { - "name": "Size", - "option": "Small" - }, - { - "name": "Colour", - "option": "Blue" - } - ] - } - ], - "grouped": { - "name": "Grouped Product with Three Children", - "groupedProducts": [ - { - "name": "Base Unit", - "regularPrice": "29.99" - }, - { - "name": "Add-on A", - "regularPrice": "11.95" - }, - { - "name": "Add-on B", - "regularPrice": "18.97" - } - ] - }, - "external": { - "name": "External product", - "regularPrice": "24.99", - "buttonText": "Buy now", - "externalUrl": "https://wordpress.org/plugins/woocommerce" - } - }, - "coupons": { - "percentage": { - "code": "20percent", - "discountType": "percent", - "amount": "20.00" - } - }, - "addresses": { - "admin": { - "store": { - "email": "admin@woocommercecoree2etestsuite.com", - "firstname": "John", - "lastname": "Doe", - "company": "Automattic", - "country": "United States (US)", - "addressfirstline": "addr 1", - "addresssecondline": "addr 2", - "countryandstate": "United States (US) — California", - "city": "San Francisco", - "state": "CA", - "postcode": "94107" - } - }, - "customer": { - "billing": { - "firstname": "John", - "lastname": "Doe", - "company": "Automattic", - "country": "United States (US)", - "addressfirstline": "addr 1", - "addresssecondline": "addr 2", - "city": "San Francisco", - "state": "CA", - "postcode": "94107", - "phone": "123456789", - "email": "john.doe@example.com" - }, - "shipping": { - "firstname": "John", - "lastname": "Doe", - "company": "Automattic", - "country": "United States (US)", - "addressfirstline": "addr 1", - "addresssecondline": "addr 2", - "city": "San Francisco", - "state": "CA", - "postcode": "94107" - } - } - }, - "orders": { - "basicPaidOrder": { - "paymentMethod": "cod", - "status": "processing", - "billing": { - "firstName": "John", - "lastName": "Doe", - "email": "john.doe@example.com" - } - } - } + "url": "http://localhost:8084/", + "users": { + "admin": { + "username": "admin", + "password": "password" + }, + "customer": { + "username": "customer", + "password": "password" + } + }, + "products": { + "simple": { + "name": "Simple product" + }, + "variable": { + "name": "Variable Product with Three Attributes", + "defaultAttributes": [ + { + "id": 0, + "name": "Size", + "option": "Medium" + }, + { + "id": 0, + "name": "Colour", + "option": "Blue" + } + ], + "attributes": [ + { + "id": 0, + "name": "Colour", + "isVisibleOnProductPage": true, + "isForVariations": true, + "options": [ + "Red", + "Green", + "Blue" + ], + "sortOrder": 0 + }, + { + "id": 0, + "name": "Size", + "isVisibleOnProductPage": true, + "isForVariations": true, + "options": [ + "Small", + "Medium", + "Large" + ], + "sortOrder": 0 + }, + { + "id": 0, + "name": "Logo", + "isVisibleOnProductPage": true, + "isForVariations": true, + "options": [ + "Woo", + "WordPress" + ], + "sortOrder": 0 + } + ] + }, + "variations": [ + { + "regularPrice": "19.99", + "attributes": [ + { + "name": "Size", + "option": "Large" + }, + { + "name": "Colour", + "option": "Red" + } + ] + }, + { + "regularPrice": "18.99", + "attributes": [ + { + "name": "Size", + "option": "Medium" + }, + { + "name": "Colour", + "option": "Green" + } + ] + }, + { + "regularPrice": "17.99", + "attributes": [ + { + "name": "Size", + "option": "Small" + }, + { + "name": "Colour", + "option": "Blue" + } + ] + } + ], + "grouped": { + "name": "Grouped Product with Three Children", + "groupedProducts": [ + { + "name": "Base Unit", + "regularPrice": "29.99" + }, + { + "name": "Add-on A", + "regularPrice": "11.95" + }, + { + "name": "Add-on B", + "regularPrice": "18.97" + } + ] + }, + "external": { + "name": "External product", + "regularPrice": "24.99", + "buttonText": "Buy now", + "externalUrl": "https://wordpress.org/plugins/woocommerce" + } + }, + "coupons": { + "percentage": { + "code": "20percent", + "discountType": "percent", + "amount": "20.00" + } + }, + "addresses": { + "admin": { + "store": { + "email": "admin@woocommercecoree2etestsuite.com", + "firstname": "John", + "lastname": "Doe", + "company": "Automattic", + "country": "United States (US)", + "addressfirstline": "addr 1", + "addresssecondline": "addr 2", + "countryandstate": "United States (US) — California", + "city": "San Francisco", + "state": "CA", + "postcode": "94107" + } + }, + "customer": { + "billing": { + "firstname": "John", + "lastname": "Doe", + "company": "Automattic", + "country": "United States (US)", + "addressfirstline": "addr 1", + "addresssecondline": "addr 2", + "city": "San Francisco", + "state": "CA", + "postcode": "94107", + "phone": "123456789", + "email": "john.doe@example.com" + }, + "shipping": { + "firstname": "John", + "lastname": "Doe", + "company": "Automattic", + "country": "United States (US)", + "addressfirstline": "addr 1", + "addresssecondline": "addr 2", + "city": "San Francisco", + "state": "CA", + "postcode": "94107" + } + } + }, + "orders": { + "basicPaidOrder": { + "paymentMethod": "cod", + "status": "processing", + "billing": { + "firstName": "John", + "lastName": "Doe", + "email": "john.doe@example.com" + } + } + } } diff --git a/packages/js/e2e-core-tests/installFiles/scaffold-tests.json b/packages/js/e2e-core-tests/installFiles/scaffold-tests.json index 7d95b03587d..b4b56b60449 100644 --- a/packages/js/e2e-core-tests/installFiles/scaffold-tests.json +++ b/packages/js/e2e-core-tests/installFiles/scaffold-tests.json @@ -1,138 +1,138 @@ { - "active": [ - { - "name": "front-end", - "description": "Shopper tests", - "testFiles": [ - { - "name": "cart-begin", - "functions": [ "runCartPageTest" ] - }, { - "name": "cart-calculate-shipping", - "functions": [ "runCartCalculateShippingTest" ] - }, { - "name": "cart-coupons", - "functions": [ "runCartApplyCouponsTest" ] - }, { - "name": "checkout-begin", - "functions": [ "runCheckoutPageTest" ] - }, { - "name": "checkout-coupons", - "functions": [ "runCheckoutApplyCouponsTest" ] - }, { - "name": "checkout-create-account", - "functions": [ "runCheckoutCreateAccountTest" ] - }, { - "name": "checkout-login-account", - "functions": [ "runCheckoutLoginAccountTest" ] - }, { - "name": "my-account-create-account", - "functions": [ "runMyAccountCreateAccountTest" ] - }, { - "name": "my-account-pay-order", - "functions": [ "runMyAccountPayOrderTest" ] - }, { - "name": "my-account", - "functions": [ "runMyAccountPageTest" ] - }, { - "name": "order-email-receiving", - "functions": [ "runOrderEmailReceivingTest" ] - }, { - "name": "product-browse-search-sort", - "functions": [ "runProductBrowseSearchSortTest" ] - }, { - "name": "single-product-page", - "functions": [ "runSingleProductPageTest" ] - }, { - "name": "variable-product-updates", - "functions": [ "runVariableProductUpdateTest" ] - } - ] - }, { - "name": "rest-api", - "description": "REST API tests", - "testFiles": [ - { - "name": "api", - "functions": [ "runApiTests" ] - } - ] - }, { - "name": "wp-admin", - "description": "Merchant tests", - "testFiles": [ - { - "name": "create-coupon", - "functions": [ "runCreateCouponTest" ] - }, { - "name": "create-order", - "functions": [ "runCreateOrderTest" ] - }, { - "name": "create-shipping-classes", - "functions": [ "runAddShippingClassesTest" ] - }, { - "name": "create-shipping-zones", - "functions": [ "runAddNewShippingZoneTest" ] - }, { - "name": "create-simple-product", - "functions": [ "runAddSimpleProductTest" ] - }, { - "name": "create-variable-product", - "functions": [ "runAddVariableProductTest" ] - }, { - "name": "order-coupon", - "functions": [ "runOrderApplyCouponTest" ] - }, { - "name": "order-customer-payment-page", - "functions": [ "runMerchantOrdersCustomerPaymentPage" ] - }, { - "name": "order-edit", - "functions": [ "runEditOrderTest" ] - }, { - "name": "order-emails", - "functions": [ "runMerchantOrderEmailsTest" ] - }, { - "name": "order-refund", - "functions": [ "runOrderRefundTest" ] - }, { - "name": "order-searching", - "functions": [ "runOrderSearchingTest" ] - }, { - "name": "order-status-filters", - "functions": [ "runOrderStatusFiltersTest" ] - }, { - "name": "product-edit", - "functions": [ "runProductEditDetailsTest" ] - }, { - "name": "product-import-csv", - "functions": [ "runImportProductsTest" ] - }, { - "name": "product-search", - "functions": [ "runProductSearchTest" ] - }, { - "name": "update-general-settings", - "functions": [ "runUpdateGeneralSettingsTest" ] - }, { - "name": "update-product-settings", - "functions": [ "runProductSettingsTest" ] - }, { - "name": "update-tax-settings", - "functions": [ "runTaxSettingsTest" ] - }, { - "name": "wccom-connect", - "functions": [ "runInitiateWccomConnectionTest" ] - } - ] - } - ], - "deprecated": [ - { - "name": "example-folder", - "testFiles": [ - { "name": "any-filename-to-deprecate" } - ] - } - ] + "active": [ + { + "name": "front-end", + "description": "Shopper tests", + "testFiles": [ + { + "name": "cart-begin", + "functions": [ "runCartPageTest" ] + }, { + "name": "cart-calculate-shipping", + "functions": [ "runCartCalculateShippingTest" ] + }, { + "name": "cart-coupons", + "functions": [ "runCartApplyCouponsTest" ] + }, { + "name": "checkout-begin", + "functions": [ "runCheckoutPageTest" ] + }, { + "name": "checkout-coupons", + "functions": [ "runCheckoutApplyCouponsTest" ] + }, { + "name": "checkout-create-account", + "functions": [ "runCheckoutCreateAccountTest" ] + }, { + "name": "checkout-login-account", + "functions": [ "runCheckoutLoginAccountTest" ] + }, { + "name": "my-account-create-account", + "functions": [ "runMyAccountCreateAccountTest" ] + }, { + "name": "my-account-pay-order", + "functions": [ "runMyAccountPayOrderTest" ] + }, { + "name": "my-account", + "functions": [ "runMyAccountPageTest" ] + }, { + "name": "order-email-receiving", + "functions": [ "runOrderEmailReceivingTest" ] + }, { + "name": "product-browse-search-sort", + "functions": [ "runProductBrowseSearchSortTest" ] + }, { + "name": "single-product-page", + "functions": [ "runSingleProductPageTest" ] + }, { + "name": "variable-product-updates", + "functions": [ "runVariableProductUpdateTest" ] + } + ] + }, { + "name": "rest-api", + "description": "REST API tests", + "testFiles": [ + { + "name": "api", + "functions": [ "runApiTests" ] + } + ] + }, { + "name": "wp-admin", + "description": "Merchant tests", + "testFiles": [ + { + "name": "create-coupon", + "functions": [ "runCreateCouponTest" ] + }, { + "name": "create-order", + "functions": [ "runCreateOrderTest" ] + }, { + "name": "create-shipping-classes", + "functions": [ "runAddShippingClassesTest" ] + }, { + "name": "create-shipping-zones", + "functions": [ "runAddNewShippingZoneTest" ] + }, { + "name": "create-simple-product", + "functions": [ "runAddSimpleProductTest" ] + }, { + "name": "create-variable-product", + "functions": [ "runAddVariableProductTest" ] + }, { + "name": "order-coupon", + "functions": [ "runOrderApplyCouponTest" ] + }, { + "name": "order-customer-payment-page", + "functions": [ "runMerchantOrdersCustomerPaymentPage" ] + }, { + "name": "order-edit", + "functions": [ "runEditOrderTest" ] + }, { + "name": "order-emails", + "functions": [ "runMerchantOrderEmailsTest" ] + }, { + "name": "order-refund", + "functions": [ "runOrderRefundTest" ] + }, { + "name": "order-searching", + "functions": [ "runOrderSearchingTest" ] + }, { + "name": "order-status-filters", + "functions": [ "runOrderStatusFiltersTest" ] + }, { + "name": "product-edit", + "functions": [ "runProductEditDetailsTest" ] + }, { + "name": "product-import-csv", + "functions": [ "runImportProductsTest" ] + }, { + "name": "product-search", + "functions": [ "runProductSearchTest" ] + }, { + "name": "update-general-settings", + "functions": [ "runUpdateGeneralSettingsTest" ] + }, { + "name": "update-product-settings", + "functions": [ "runProductSettingsTest" ] + }, { + "name": "update-tax-settings", + "functions": [ "runTaxSettingsTest" ] + }, { + "name": "wccom-connect", + "functions": [ "runInitiateWccomConnectionTest" ] + } + ] + } + ], + "deprecated": [ + { + "name": "example-folder", + "testFiles": [ + { "name": "any-filename-to-deprecate" } + ] + } + ] } diff --git a/packages/js/e2e-environment/config/custom-environment-variables.json b/packages/js/e2e-environment/config/custom-environment-variables.json index d70733fda3a..f21c7a8e3c1 100644 --- a/packages/js/e2e-environment/config/custom-environment-variables.json +++ b/packages/js/e2e-environment/config/custom-environment-variables.json @@ -1,14 +1,14 @@ { - "url": "SMOKE_TEST_URL", - "users": { - "admin": { - "username": "SMOKE_TEST_ADMIN_USER", - "password": "SMOKE_TEST_ADMIN_PASSWORD", - "email": "SMOKE_TEST_ADMIN_USER_EMAIL" - }, - "customer": { - "username": "SMOKE_TEST_CUSTOMER_USER", - "password": "SMOKE_TEST_CUSTOMER_PASSWORD" - } - } + "url": "SMOKE_TEST_URL", + "users": { + "admin": { + "username": "SMOKE_TEST_ADMIN_USER", + "password": "SMOKE_TEST_ADMIN_PASSWORD", + "email": "SMOKE_TEST_ADMIN_USER_EMAIL" + }, + "customer": { + "username": "SMOKE_TEST_CUSTOMER_USER", + "password": "SMOKE_TEST_CUSTOMER_PASSWORD" + } + } } diff --git a/packages/js/e2e-environment/config/default/default.json b/packages/js/e2e-environment/config/default/default.json index cf613320940..86767409dc1 100644 --- a/packages/js/e2e-environment/config/default/default.json +++ b/packages/js/e2e-environment/config/default/default.json @@ -1,208 +1,208 @@ { - "url": "http://localhost:8084/", - "appName": "woocommerce_e2e", - "users": { - "admin": { - "username": "admin", - "password": "password" - }, - "customer": { - "username": "customer", - "password": "password" - } - }, - "products": { - "simple": { - "name": "Simple product" - }, - "variable": { - "name": "Variable Product with Three Attributes", - "defaultAttributes": [ - { - "id": 0, - "name": "Size", - "option": "Medium" + "url": "http://localhost:8084/", + "appName": "woocommerce_e2e", + "users": { + "admin": { + "username": "admin", + "password": "password" }, - { - "id": 0, - "name": "Colour", - "option": "Blue" + "customer": { + "username": "customer", + "password": "password" } - ], - "attributes": [ - { - "id": 0, - "name": "Colour", - "isVisibleOnProductPage": true, - "isForVariations": true, - "options": [ - "Red", - "Green", - "Blue" - ], - "sortOrder": 0 + }, + "products": { + "simple": { + "name": "Simple product" }, - { - "id": 0, - "name": "Size", - "isVisibleOnProductPage": true, - "isForVariations": true, - "options": [ - "Small", - "Medium", - "Large" - ], - "sortOrder": 0 + "variable": { + "name": "Variable Product with Three Attributes", + "defaultAttributes": [ + { + "id": 0, + "name": "Size", + "option": "Medium" + }, + { + "id": 0, + "name": "Colour", + "option": "Blue" + } + ], + "attributes": [ + { + "id": 0, + "name": "Colour", + "isVisibleOnProductPage": true, + "isForVariations": true, + "options": [ + "Red", + "Green", + "Blue" + ], + "sortOrder": 0 + }, + { + "id": 0, + "name": "Size", + "isVisibleOnProductPage": true, + "isForVariations": true, + "options": [ + "Small", + "Medium", + "Large" + ], + "sortOrder": 0 + }, + { + "id": 0, + "name": "Logo", + "isVisibleOnProductPage": true, + "isForVariations": true, + "options": [ + "Woo", + "WordPress" + ], + "sortOrder": 0 + } + ] }, - { - "id": 0, - "name": "Logo", - "isVisibleOnProductPage": true, - "isForVariations": true, - "options": [ - "Woo", - "WordPress" - ], - "sortOrder": 0 + "variations": [ + { + "regularPrice": "19.99", + "attributes": [ + { + "name": "Size", + "option": "Large" + }, + { + "name": "Colour", + "option": "Red" + } + ] + }, + { + "regularPrice": "18.99", + "attributes": [ + { + "name": "Size", + "option": "Medium" + }, + { + "name": "Colour", + "option": "Green" + } + ] + }, + { + "regularPrice": "17.99", + "attributes": [ + { + "name": "Size", + "option": "Small" + }, + { + "name": "Colour", + "option": "Blue" + } + ] + } + ], + "grouped": { + "name": "Grouped Product with Three Children", + "groupedProducts": [ + { + "name": "Base Unit", + "regularPrice": "29.99" + }, + { + "name": "Add-on A", + "regularPrice": "11.95" + }, + { + "name": "Add-on B", + "regularPrice": "18.97" + } + ] + }, + "external": { + "name": "External product", + "regularPrice": "24.99", + "buttonText": "Buy now", + "externalUrl": "https://wordpress.org/plugins/woocommerce" } - ] }, - "variations": [ - { - "regularPrice": "19.99", - "attributes": [ - { - "name": "Size", - "option": "Large" - }, - { - "name": "Colour", - "option": "Red" - } - ] - }, - { - "regularPrice": "18.99", - "attributes": [ - { - "name": "Size", - "option": "Medium" - }, - { - "name": "Colour", - "option": "Green" - } - ] - }, - { - "regularPrice": "17.99", - "attributes": [ - { - "name": "Size", - "option": "Small" - }, - { - "name": "Colour", - "option": "Blue" - } - ] - } - ], - "grouped": { - "name": "Grouped Product with Three Children", - "groupedProducts": [ - { - "name": "Base Unit", - "regularPrice": "29.99" - }, - { - "name": "Add-on A", - "regularPrice": "11.95" - }, - { - "name": "Add-on B", - "regularPrice": "18.97" + "coupons": { + "percentage": { + "code": "20percent", + "discountType": "percent", + "amount": "20.00" } - ] }, - "external": { - "name": "External product", - "regularPrice": "24.99", - "buttonText": "Buy now", - "externalUrl": "https://wordpress.org/plugins/woocommerce" - } - }, - "coupons": { - "percentage": { - "code": "20percent", - "discountType": "percent", - "amount": "20.00" - } - }, - "addresses": { - "admin": { - "store": { - "email": "admin@woocommercecoree2etestsuite.com", - "firstname": "John", - "lastname": "Doe", - "company": "Automattic", - "country": "United States (US)", - "addressfirstline": "addr 1", - "addresssecondline": "addr 2", - "countryandstate": "United States (US) — California", - "city": "San Francisco", - "state": "CA", - "postcode": "94107" - } + "addresses": { + "admin": { + "store": { + "email": "admin@woocommercecoree2etestsuite.com", + "firstname": "John", + "lastname": "Doe", + "company": "Automattic", + "country": "United States (US)", + "addressfirstline": "addr 1", + "addresssecondline": "addr 2", + "countryandstate": "United States (US) — California", + "city": "San Francisco", + "state": "CA", + "postcode": "94107" + } + }, + "customer": { + "billing": { + "firstname": "John", + "lastname": "Doe", + "company": "Automattic", + "country": "United States (US)", + "addressfirstline": "addr 1", + "addresssecondline": "addr 2", + "city": "San Francisco", + "state": "CA", + "postcode": "94107", + "phone": "123456789", + "email": "john.doe@example.com" + }, + "shipping": { + "firstname": "John", + "lastname": "Doe", + "company": "Automattic", + "country": "United States (US)", + "addressfirstline": "addr 1", + "addresssecondline": "addr 2", + "city": "San Francisco", + "state": "CA", + "postcode": "94107" + } + } }, - "customer": { - "billing": { - "firstname": "John", - "lastname": "Doe", - "company": "Automattic", - "country": "United States (US)", - "addressfirstline": "addr 1", - "addresssecondline": "addr 2", - "city": "San Francisco", - "state": "CA", - "postcode": "94107", - "phone": "123456789", - "email": "john.doe@example.com" - }, - "shipping": { - "firstname": "John", - "lastname": "Doe", - "company": "Automattic", - "country": "United States (US)", - "addressfirstline": "addr 1", - "addresssecondline": "addr 2", - "city": "San Francisco", - "state": "CA", - "postcode": "94107" - } + "orders": { + "basicPaidOrder": { + "paymentMethod": "cod", + "status": "processing", + "billing": { + "firstName": "John", + "lastName": "Doe", + "email": "john.doe@example.com" + } + } + }, + "onboardingwizard": { + "industry": "Test industry", + "numberofproducts": "1 - 10", + "sellingelsewhere": "No" + }, + "settings": { + "shipping": { + "zonename": "United States", + "zoneregions": "United States (US)", + "shippingmethod": "Free shipping" + } } - }, - "orders": { - "basicPaidOrder": { - "paymentMethod": "cod", - "status": "processing", - "billing": { - "firstName": "John", - "lastName": "Doe", - "email": "john.doe@example.com" - } - } - }, - "onboardingwizard": { - "industry": "Test industry", - "numberofproducts": "1 - 10", - "sellingelsewhere": "No" - }, - "settings": { - "shipping": { - "zonename": "United States", - "zoneregions": "United States (US)", - "shippingmethod": "Free shipping" - } - } -} +} \ No newline at end of file diff --git a/packages/js/experimental/tsconfig-cjs.json b/packages/js/experimental/tsconfig-cjs.json index 2876a008ecc..38d1275d76d 100644 --- a/packages/js/experimental/tsconfig-cjs.json +++ b/packages/js/experimental/tsconfig-cjs.json @@ -1,6 +1,6 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "outDir": "build" + } } \ No newline at end of file diff --git a/packages/js/explat/tsconfig-cjs.json b/packages/js/explat/tsconfig-cjs.json index 2876a008ecc..38d1275d76d 100644 --- a/packages/js/explat/tsconfig-cjs.json +++ b/packages/js/explat/tsconfig-cjs.json @@ -1,6 +1,6 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "outDir": "build" + } } \ No newline at end of file diff --git a/packages/js/js-tests/tsconfig-cjs.json b/packages/js/js-tests/tsconfig-cjs.json index 9dc1d924313..035d2318baf 100644 --- a/packages/js/js-tests/tsconfig-cjs.json +++ b/packages/js/js-tests/tsconfig-cjs.json @@ -1,6 +1,6 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "outDir": "build" + } } diff --git a/packages/js/js-tests/tsconfig.json b/packages/js/js-tests/tsconfig.json index e60932eff8a..de3e7cba931 100644 --- a/packages/js/js-tests/tsconfig.json +++ b/packages/js/js-tests/tsconfig.json @@ -1,8 +1,8 @@ { - "extends": "../tsconfig.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build-module", - "composite": true - } + "extends": "../tsconfig.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build-module", + "composite": true + } } diff --git a/packages/js/navigation/tsconfig-cjs.json b/packages/js/navigation/tsconfig-cjs.json index 2876a008ecc..38d1275d76d 100644 --- a/packages/js/navigation/tsconfig-cjs.json +++ b/packages/js/navigation/tsconfig-cjs.json @@ -1,6 +1,6 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "outDir": "build" + } } \ No newline at end of file diff --git a/packages/js/notices/tsconfig-cjs.json b/packages/js/notices/tsconfig-cjs.json index 2876a008ecc..38d1275d76d 100644 --- a/packages/js/notices/tsconfig-cjs.json +++ b/packages/js/notices/tsconfig-cjs.json @@ -1,6 +1,6 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "outDir": "build" + } } \ No newline at end of file diff --git a/packages/js/number/tsconfig-cjs.json b/packages/js/number/tsconfig-cjs.json index 04a2967c800..8befc236c91 100644 --- a/packages/js/number/tsconfig-cjs.json +++ b/packages/js/number/tsconfig-cjs.json @@ -1,7 +1,7 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "declaration": true, - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "declaration": true, + "outDir": "build" + } } \ No newline at end of file diff --git a/packages/js/onboarding/tsconfig-cjs.json b/packages/js/onboarding/tsconfig-cjs.json index 2876a008ecc..38d1275d76d 100644 --- a/packages/js/onboarding/tsconfig-cjs.json +++ b/packages/js/onboarding/tsconfig-cjs.json @@ -1,6 +1,6 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "outDir": "build" + } } \ No newline at end of file diff --git a/packages/js/tracks/tsconfig-cjs.json b/packages/js/tracks/tsconfig-cjs.json index 2876a008ecc..38d1275d76d 100644 --- a/packages/js/tracks/tsconfig-cjs.json +++ b/packages/js/tracks/tsconfig-cjs.json @@ -1,6 +1,6 @@ { - "extends": "../tsconfig-cjs", - "compilerOptions": { - "outDir": "build" - } + "extends": "../tsconfig-cjs", + "compilerOptions": { + "outDir": "build" + } } \ No newline at end of file diff --git a/packages/js/tsconfig-cjs.json b/packages/js/tsconfig-cjs.json index 834e23576a6..32006453e32 100644 --- a/packages/js/tsconfig-cjs.json +++ b/packages/js/tsconfig-cjs.json @@ -1,12 +1,12 @@ { - "extends": "./tsconfig", - "compilerOptions": { - "target": "es6", - "module": "commonjs", - "declaration": false, - "declarationMap": false, - "declarationDir": null, - "outDir": "build", - "composite": false - } + "extends": "./tsconfig", + "compilerOptions": { + "target": "es6", + "module": "commonjs", + "declaration": false, + "declarationMap": false, + "declarationDir": null, + "outDir": "build", + "composite": false + } } \ No newline at end of file diff --git a/plugins/woocommerce/bin/composer/mozart/composer.json b/plugins/woocommerce/bin/composer/mozart/composer.json index 67927d6a65c..262334d51ee 100644 --- a/plugins/woocommerce/bin/composer/mozart/composer.json +++ b/plugins/woocommerce/bin/composer/mozart/composer.json @@ -1,10 +1,10 @@ { - "require-dev": { - "coenjacobs/mozart": "dev-master" - }, - "config": { - "platform": { - "php": "7.3" - } - } + "require-dev": { + "coenjacobs/mozart": "dev-master" + }, + "config": { + "platform": { + "php": "7.3" + } + } } diff --git a/plugins/woocommerce/bin/composer/phpcs/composer.json b/plugins/woocommerce/bin/composer/phpcs/composer.json index 42ccdec2e26..232bae80f4d 100644 --- a/plugins/woocommerce/bin/composer/phpcs/composer.json +++ b/plugins/woocommerce/bin/composer/phpcs/composer.json @@ -1,13 +1,13 @@ { - "require-dev": { - "woocommerce/woocommerce-sniffs": "^0.1.3" - }, - "config": { - "platform": { - "php": "7.0" - }, - "allow-plugins": { - "dealerdirect/phpcodesniffer-composer-installer": true - } - } + "require-dev": { + "woocommerce/woocommerce-sniffs": "^0.1.3" + }, + "config": { + "platform": { + "php": "7.0" + }, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } + } } diff --git a/plugins/woocommerce/bin/composer/phpunit/composer.json b/plugins/woocommerce/bin/composer/phpunit/composer.json index eafc2dcd6e3..0ae65072a93 100644 --- a/plugins/woocommerce/bin/composer/phpunit/composer.json +++ b/plugins/woocommerce/bin/composer/phpunit/composer.json @@ -1,12 +1,12 @@ { - "minimum-stability": "dev", - "prefer-stable": true, - "require-dev": { - "phpunit/phpunit": "6.5.14" - }, - "config": { - "platform": { - "php": "7.0" - } - } + "minimum-stability": "dev", + "prefer-stable": true, + "require-dev": { + "phpunit/phpunit": "6.5.14" + }, + "config": { + "platform": { + "php": "7.0" + } + } } diff --git a/plugins/woocommerce/bin/composer/wp/composer.json b/plugins/woocommerce/bin/composer/wp/composer.json index 8bdc6a5ca57..c9bc47aed8b 100644 --- a/plugins/woocommerce/bin/composer/wp/composer.json +++ b/plugins/woocommerce/bin/composer/wp/composer.json @@ -1,12 +1,12 @@ { - "minimum-stability": "dev", - "prefer-stable": true, - "require-dev": { - "wp-cli/i18n-command": "^2.2" - }, - "config": { - "platform": { - "php": "7.0" - } - } + "minimum-stability": "dev", + "prefer-stable": true, + "require-dev": { + "wp-cli/i18n-command": "^2.2" + }, + "config": { + "platform": { + "php": "7.0" + } + } } diff --git a/plugins/woocommerce/lib/composer.json b/plugins/woocommerce/lib/composer.json index f3fa6563375..5eae8f19b85 100644 --- a/plugins/woocommerce/lib/composer.json +++ b/plugins/woocommerce/lib/composer.json @@ -1,41 +1,41 @@ { - "name": "woocommerce/woocommerce-lib", - "description": "A package for hiding re-namespaced dependencies and executing them", - "prefer-stable": true, - "minimum-stability": "dev", - "require": { - "php": ">=7.0", - "psr/container": "^1.0" - }, - "require-dev": { - "league/container": "3.3.5" - }, - "config": { - "platform": { - "php": "7.0" - } - }, - "scripts": { - "post-install-cmd": [ - "\"../vendor/bin/mozart\" compose" - ], - "post-update-cmd": [ - "\"../vendor/bin/mozart\" compose" - ] - }, - "extra": { - "mozart": { - "dep_namespace": "Automattic\\WooCommerce\\Vendor\\", - "dep_directory": "/packages/", - "packages": [ - "league/container" - ], - "excluded_packages": [ - "psr/container" - ], - "classmap_directory": "/classes/", - "classmap_prefix": "WC_Vendor_", - "delete_vendor_directories": true - } - } + "name": "woocommerce/woocommerce-lib", + "description": "A package for hiding re-namespaced dependencies and executing them", + "prefer-stable": true, + "minimum-stability": "dev", + "require": { + "php": ">=7.0", + "psr/container": "^1.0" + }, + "require-dev": { + "league/container": "3.3.5" + }, + "config": { + "platform": { + "php": "7.0" + } + }, + "scripts": { + "post-install-cmd": [ + "\"../vendor/bin/mozart\" compose" + ], + "post-update-cmd": [ + "\"../vendor/bin/mozart\" compose" + ] + }, + "extra": { + "mozart": { + "dep_namespace": "Automattic\\WooCommerce\\Vendor\\", + "dep_directory": "/packages/", + "packages": [ + "league/container" + ], + "excluded_packages": [ + "psr/container" + ], + "classmap_directory": "/classes/", + "classmap_prefix": "WC_Vendor_", + "delete_vendor_directories": true + } + } } diff --git a/plugins/woocommerce/tests/e2e/config/default.json b/plugins/woocommerce/tests/e2e/config/default.json index 130d12b5c1e..bfec99fc3ef 100644 --- a/plugins/woocommerce/tests/e2e/config/default.json +++ b/plugins/woocommerce/tests/e2e/config/default.json @@ -1,211 +1,211 @@ { - "url": "http://localhost:8086/", - "users": { - "admin": { - "username": "admin", - "password": "password" - }, - "customer": { - "username": "customer", - "password": "password" - } - }, - "products": { - "simple": { - "name": "Simple product" - }, - "variable": { - "name": "Variable Product with Three Attributes", - "defaultAttributes": [ - { - "id": 0, - "name": "Size", - "option": "Medium" - }, - { - "id": 0, - "name": "Colour", - "option": "Blue" - } - ], - "attributes": [ - { - "id": 0, - "name": "Colour", - "isVisibleOnProductPage": true, - "isForVariations": true, - "options": [ - "Red", - "Green", - "Blue" - ], - "sortOrder": 0 - }, - { - "id": 0, - "name": "Size", - "isVisibleOnProductPage": true, - "isForVariations": true, - "options": [ - "Small", - "Medium", - "Large" - ], - "sortOrder": 0 - }, - { - "id": 0, - "name": "Logo", - "isVisibleOnProductPage": true, - "isForVariations": true, - "options": [ - "Woo", - "WordPress" - ], - "sortOrder": 0 - } - ] - }, - "variations": [ - { - "regularPrice": "19.99", - "attributes": [ - { - "name": "Size", - "option": "Large" - }, - { - "name": "Colour", - "option": "Red" - } - ] - }, - { - "regularPrice": "18.99", - "attributes": [ - { - "name": "Size", - "option": "Medium" - }, - { - "name": "Colour", - "option": "Green" - } - ] - }, - { - "regularPrice": "17.99", - "attributes": [ - { - "name": "Size", - "option": "Small" - }, - { - "name": "Colour", - "option": "Blue" - } - ] - } - ], - "grouped": { - "name": "Grouped Product with Three Children", - "groupedProducts": [ - { - "name": "Base Unit", - "regularPrice": "29.99" - }, - { - "name": "Add-on A", - "regularPrice": "11.95" - }, - { - "name": "Add-on B", - "regularPrice": "18.97" - } - ] - }, - "external": { - "name": "External product", - "regularPrice": "24.99", - "buttonText": "Buy now", - "externalUrl": "https://wordpress.org/plugins/woocommerce" - } - }, - "coupons": { - "percentage": { - "code": "20percent", - "discountType": "percent", - "amount": "20.00" - } - }, - "addresses": { - "admin": { - "store": { - "email": "admin@woocommercecoree2etestsuite.com", - "firstname": "John", - "lastname": "Doe", - "company": "Automattic", - "country": "United States (US)", - "addressfirstline": "addr 1", - "addresssecondline": "addr 2", - "countryandstate": "United States (US) — California", - "city": "San Francisco", - "state": "CA", - "postcode": "94107" - } - }, - "customer": { - "billing": { - "firstname": "John", - "lastname": "Doe", - "company": "Automattic", - "country": "United States (US)", - "addressfirstline": "addr 1", - "addresssecondline": "addr 2", - "city": "San Francisco", - "state": "CA", - "postcode": "94107", - "phone": "123456789", - "email": "john.doe@example.com" - }, - "shipping": { - "firstname": "John", - "lastname": "Doe", - "company": "Automattic", - "country": "United States (US)", - "addressfirstline": "addr 1", - "addresssecondline": "addr 2", - "city": "San Francisco", - "state": "CA", - "postcode": "94107" - } - } - }, - "orders": { - "basicPaidOrder": { - "paymentMethod": "cod", - "status": "processing", - "billing": { - "firstName": "John", - "lastName": "Doe", - "email": "john.doe@example.com" - } - } - }, - "onboardingwizard": { - "industry": "Test industry", - "numberofproducts": "1 - 10", - "sellingelsewhere": "No", - "sellingOnAnotherPlatform": "Yes, on another platform", - "number_employees": "< 10", - "revenue": "Up to $2,500.00", - "other_platform_name": "Etsy" - }, - "settings": { - "shipping": { - "zonename": "United States", - "zoneregions": "United States (US)", - "shippingmethod": "Free shipping" - } - } + "url": "http://localhost:8086/", + "users": { + "admin": { + "username": "admin", + "password": "password" + }, + "customer": { + "username": "customer", + "password": "password" + } + }, + "products": { + "simple": { + "name": "Simple product" + }, + "variable": { + "name": "Variable Product with Three Attributes", + "defaultAttributes": [ + { + "id": 0, + "name": "Size", + "option": "Medium" + }, + { + "id": 0, + "name": "Colour", + "option": "Blue" + } + ], + "attributes": [ + { + "id": 0, + "name": "Colour", + "isVisibleOnProductPage": true, + "isForVariations": true, + "options": [ + "Red", + "Green", + "Blue" + ], + "sortOrder": 0 + }, + { + "id": 0, + "name": "Size", + "isVisibleOnProductPage": true, + "isForVariations": true, + "options": [ + "Small", + "Medium", + "Large" + ], + "sortOrder": 0 + }, + { + "id": 0, + "name": "Logo", + "isVisibleOnProductPage": true, + "isForVariations": true, + "options": [ + "Woo", + "WordPress" + ], + "sortOrder": 0 + } + ] + }, + "variations": [ + { + "regularPrice": "19.99", + "attributes": [ + { + "name": "Size", + "option": "Large" + }, + { + "name": "Colour", + "option": "Red" + } + ] + }, + { + "regularPrice": "18.99", + "attributes": [ + { + "name": "Size", + "option": "Medium" + }, + { + "name": "Colour", + "option": "Green" + } + ] + }, + { + "regularPrice": "17.99", + "attributes": [ + { + "name": "Size", + "option": "Small" + }, + { + "name": "Colour", + "option": "Blue" + } + ] + } + ], + "grouped": { + "name": "Grouped Product with Three Children", + "groupedProducts": [ + { + "name": "Base Unit", + "regularPrice": "29.99" + }, + { + "name": "Add-on A", + "regularPrice": "11.95" + }, + { + "name": "Add-on B", + "regularPrice": "18.97" + } + ] + }, + "external": { + "name": "External product", + "regularPrice": "24.99", + "buttonText": "Buy now", + "externalUrl": "https://wordpress.org/plugins/woocommerce" + } + }, + "coupons": { + "percentage": { + "code": "20percent", + "discountType": "percent", + "amount": "20.00" + } + }, + "addresses": { + "admin": { + "store": { + "email": "admin@woocommercecoree2etestsuite.com", + "firstname": "John", + "lastname": "Doe", + "company": "Automattic", + "country": "United States (US)", + "addressfirstline": "addr 1", + "addresssecondline": "addr 2", + "countryandstate": "United States (US) — California", + "city": "San Francisco", + "state": "CA", + "postcode": "94107" + } + }, + "customer": { + "billing": { + "firstname": "John", + "lastname": "Doe", + "company": "Automattic", + "country": "United States (US)", + "addressfirstline": "addr 1", + "addresssecondline": "addr 2", + "city": "San Francisco", + "state": "CA", + "postcode": "94107", + "phone": "123456789", + "email": "john.doe@example.com" + }, + "shipping": { + "firstname": "John", + "lastname": "Doe", + "company": "Automattic", + "country": "United States (US)", + "addressfirstline": "addr 1", + "addresssecondline": "addr 2", + "city": "San Francisco", + "state": "CA", + "postcode": "94107" + } + } + }, + "orders": { + "basicPaidOrder": { + "paymentMethod": "cod", + "status": "processing", + "billing": { + "firstName": "John", + "lastName": "Doe", + "email": "john.doe@example.com" + } + } + }, + "onboardingwizard": { + "industry": "Test industry", + "numberofproducts": "1 - 10", + "sellingelsewhere": "No", + "sellingOnAnotherPlatform": "Yes, on another platform", + "number_employees": "< 10", + "revenue": "Up to $2,500.00", + "other_platform_name": "Etsy" + }, + "settings": { + "shipping": { + "zonename": "United States", + "zoneregions": "United States (US)", + "shippingmethod": "Free shipping" + } + } } diff --git a/plugins/woocommerce/tsconfig.json b/plugins/woocommerce/tsconfig.json index ad584a964d0..9b3bbd62d1c 100644 --- a/plugins/woocommerce/tsconfig.json +++ b/plugins/woocommerce/tsconfig.json @@ -1,7 +1,7 @@ { - "extends": "../../tsconfig.base.json", - "references": [ - { "path": "../../packages/js/api" } - ], - "files": [] + "extends": "../../tsconfig.base.json", + "references": [ + { "path": "../../packages/js/api" } + ], + "files": [] } diff --git a/renovate.json b/renovate.json index e119457e471..6d0e6c5bfc9 100644 --- a/renovate.json +++ b/renovate.json @@ -1,21 +1,21 @@ { - "extends": [ - "config:base" - ], - "packageRules": [ - { - "packageNames": ["automattic/jetpack-autoloader"], - "rangeStrategy": "bump" - }, - { - "depTypeList": ["devDependencies"], - "extends": ["schedule:monthly"] - } - ], - "ignoreDeps": [ - "woocommerce/action-scheduler", - "woocommerce/woocommerce-admin", - "woocommerce/woocommerce-blocks", - "woocommerce/woocommerce-rest-api" - ] + "extends": [ + "config:base" + ], + "packageRules": [ + { + "packageNames": ["automattic/jetpack-autoloader"], + "rangeStrategy": "bump" + }, + { + "depTypeList": ["devDependencies"], + "extends": ["schedule:monthly"] + } + ], + "ignoreDeps": [ + "woocommerce/action-scheduler", + "woocommerce/woocommerce-admin", + "woocommerce/woocommerce-blocks", + "woocommerce/woocommerce-rest-api" + ] } diff --git a/tools/monorepo-merge/package.json b/tools/monorepo-merge/package.json index 6c77de9a334..68399c5bae0 100644 --- a/tools/monorepo-merge/package.json +++ b/tools/monorepo-merge/package.json @@ -1,65 +1,65 @@ { - "name": "monorepo-merge", - "version": "0.0.0", - "description": "A tool for merging repositories into the WooCommerce Monorepo.", - "author": "Automattic", - "bin": { - "monorepo-merge": "./bin/run" - }, - "homepage": "https://github.com/woocommerce/woocommerce", - "license": "GPLv2", - "main": "dist/index.js", - "repository": "woocommerce/woocommerce", - "files": [ - "/bin", - "/dist", - "/npm-shrinkwrap.json", - "/oclif.manifest.json" - ], - "dependencies": { - "@oclif/core": "^1", - "@oclif/plugin-help": "^5", - "@oclif/plugin-plugins": "^2.0.1", - "@octokit/graphql": "4.8.0" - }, - "devDependencies": { - "@types/node": "^16.9.4", - "eslint": "^7.32.0", - "globby": "^11", - "jscodeshift": "^0.13.1", - "oclif": "^2", - "shx": "^0.3.3", - "ts-node": "^10.2.1", - "tslib": "^2.3.1", - "typescript": "^4.4.3" - }, - "oclif": { - "bin": "monorepo-merge", - "dirname": "monorepo-merge", - "commands": "./dist/commands", - "plugins": [ - "@oclif/plugin-help", - "@oclif/plugin-plugins" - ], - "topicSeparator": " ", - "topics": { - "merge": { - "description": "Merges other repositories into the monorepo." - }, - "transfer-issues": { - "description": "Transfers issues from other repositories into the monorepo." - } - } - }, - "scripts": { - "build": "shx rm -rf dist && tsc -b", - "lint": "eslint . --ext .ts --config .eslintrc", - "postpack": "shx rm -f oclif.manifest.json", - "posttest": "pnpm lint", - "prepack": "pnpm build && oclif manifest" - }, - "engines": { - "node": ">=12.0.0" - }, - "types": "dist/index.d.ts" + "name": "monorepo-merge", + "version": "0.0.0", + "description": "A tool for merging repositories into the WooCommerce Monorepo.", + "author": "Automattic", + "bin": { + "monorepo-merge": "./bin/run" + }, + "homepage": "https://github.com/woocommerce/woocommerce", + "license": "GPLv2", + "main": "dist/index.js", + "repository": "woocommerce/woocommerce", + "files": [ + "/bin", + "/dist", + "/npm-shrinkwrap.json", + "/oclif.manifest.json" + ], + "dependencies": { + "@oclif/core": "^1", + "@oclif/plugin-help": "^5", + "@oclif/plugin-plugins": "^2.0.1", + "@octokit/graphql": "4.8.0" + }, + "devDependencies": { + "@types/node": "^16.9.4", + "eslint": "^7.32.0", + "globby": "^11", + "jscodeshift": "^0.13.1", + "oclif": "^2", + "shx": "^0.3.3", + "ts-node": "^10.2.1", + "tslib": "^2.3.1", + "typescript": "^4.4.3" + }, + "oclif": { + "bin": "monorepo-merge", + "dirname": "monorepo-merge", + "commands": "./dist/commands", + "plugins": [ + "@oclif/plugin-help", + "@oclif/plugin-plugins" + ], + "topicSeparator": " ", + "topics": { + "merge": { + "description": "Merges other repositories into the monorepo." + }, + "transfer-issues": { + "description": "Transfers issues from other repositories into the monorepo." + } + } + }, + "scripts": { + "build": "shx rm -rf dist && tsc -b", + "lint": "eslint . --ext .ts --config .eslintrc", + "postpack": "shx rm -f oclif.manifest.json", + "posttest": "pnpm lint", + "prepack": "pnpm build && oclif manifest" + }, + "engines": { + "node": ">=12.0.0" + }, + "types": "dist/index.d.ts" } diff --git a/tools/monorepo-merge/tsconfig.json b/tools/monorepo-merge/tsconfig.json index ef3349912e2..1944eb9fbc6 100644 --- a/tools/monorepo-merge/tsconfig.json +++ b/tools/monorepo-merge/tsconfig.json @@ -1,17 +1,17 @@ { - "compilerOptions": { - "declaration": true, - "importHelpers": true, - "module": "commonjs", - "outDir": "dist", - "rootDir": "src", - "strict": true, - "target": "es2019", - "typeRoots": [ + "compilerOptions": { + "declaration": true, + "importHelpers": true, + "module": "commonjs", + "outDir": "dist", + "rootDir": "src", + "strict": true, + "target": "es2019", + "typeRoots": [ "./node_modules/@types" ], - }, - "include": [ - "src/**/*" - ] -} + }, + "include": [ + "src/**/*" + ] +} \ No newline at end of file diff --git a/tsconfig.base.json b/tsconfig.base.json index b92f8e572ec..8981ebd216f 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1,43 +1,43 @@ { - "compilerOptions": { - "allowJs": true, - "checkJs": true, - "allowSyntheticDefaultImports": true, - "jsx": "preserve", - "target": "es6", - "module": "commonjs", - "incremental": true, - "declaration": true, - "declarationMap": true, - "composite": true, - "emitDeclarationOnly": false, - "isolatedModules": true, + "compilerOptions": { + "allowJs": true, + "checkJs": true, + "allowSyntheticDefaultImports": true, + "jsx": "preserve", + "target": "es6", + "module": "commonjs", + "incremental": true, + "declaration": true, + "declarationMap": true, + "composite": true, + "emitDeclarationOnly": false, + "isolatedModules": true, - /* Strict Type-Checking Options */ - "strict": true, + /* Strict Type-Checking Options */ + "strict": true, - /* Additional Checks */ - "noUnusedLocals": true, - "noUnusedParameters": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, + /* Additional Checks */ + "noUnusedLocals": true, + "noUnusedParameters": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, - /* Module Resolution Options */ - "moduleResolution": "node", + /* Module Resolution Options */ + "moduleResolution": "node", - /* This needs to be false so our types are possible to consume without setting this */ - "esModuleInterop": false, - "resolveJsonModule": true - }, + /* This needs to be false so our types are possible to consume without setting this */ + "esModuleInterop": false, + "resolveJsonModule": true + }, - /* - We set files: [] here so that running tsc against this config does not pick up anything, - but only delegates the tsc command execution to the projects specified in references[] - More at: https://www.typescriptlang.org/docs/handbook/project-references.html - */ - "files": [], + /* + We set files: [] here so that running tsc against this config does not pick up anything, + but only delegates the tsc command execution to the projects specified in references[] + More at: https://www.typescriptlang.org/docs/handbook/project-references.html + */ + "files": [], - "references": [ + "references": [ { "path": "./plugins/woocommerce/" }, { "path": "./plugins/woocommerce-admin/" }, { "path": "./packages/js/admin-e2e-tests" }, @@ -56,5 +56,5 @@ { "path": "./packages/js/number" }, { "path": "./packages/js/onboarding" }, { "path": "./packages/js/tracks" } - ] + ] } diff --git a/workspace.json b/workspace.json index 858a8b8a264..8df78cb36fd 100644 --- a/workspace.json +++ b/workspace.json @@ -1,33 +1,33 @@ { - "version": 2, - "projects": { - "@woocommerce/api": "packages/js/api", - "@woocommerce/api-core-tests": "packages/js/api-core-tests", - "@woocommerce/e2e-builds": "packages/js/e2e-builds", - "@woocommerce/e2e-core-tests": "packages/js/e2e-core-tests", - "@woocommerce/e2e-environment": "packages/js/e2e-environment", - "@woocommerce/e2e-utils": "packages/js/e2e-utils", - "woocommerce": "plugins/woocommerce", - "woocommerce-admin": "plugins/woocommerce-admin", - "woocommerce-legacy-assets": "plugins/woocommerce/legacy", - "woocommerce-beta-tester": "plugins/woocommerce-beta-tester", - "@woocommerce/admin-e2e-tests": "packages/js/admin-e2e-tests", - "@woocommerce/components": "packages/js/components", - "@woocommerce/csv-export": "packages/js/csv-export", - "@woocommerce/currency": "packages/js/currency", - "@woocommerce/customer-effort-score": "packages/js/customer-effort-score", - "@woocommerce/data": "packages/js/data", - "@woocommerce/date": "packages/js/date", - "@woocommerce/dependency-extraction-webpack-plugin": "packages/js/dependency-extraction-webpack-plugin", - "@woocommerce/eslint-plugin": "packages/js/eslint-plugin", - "@woocommerce/experimental": "packages/js/experimental", - "@woocommerce/explat": "packages/js/explat", - "@woocommerce/js-tests": "packages/js/js-tests", - "@woocommerce/navigation": "packages/js/navigation", - "@woocommerce/notices": "packages/js/notices", - "@woocommerce/number": "packages/js/number", - "@woocommerce/onboarding": "packages/js/onboarding", - "@woocommerce/style-build": "packages/js/style-build", - "@woocommerce/tracks": "packages/js/tracks" - } + "version": 2, + "projects": { + "@woocommerce/api": "packages/js/api", + "@woocommerce/api-core-tests": "packages/js/api-core-tests", + "@woocommerce/e2e-builds": "packages/js/e2e-builds", + "@woocommerce/e2e-core-tests": "packages/js/e2e-core-tests", + "@woocommerce/e2e-environment": "packages/js/e2e-environment", + "@woocommerce/e2e-utils": "packages/js/e2e-utils", + "woocommerce": "plugins/woocommerce", + "woocommerce-admin": "plugins/woocommerce-admin", + "woocommerce-legacy-assets": "plugins/woocommerce/legacy", + "woocommerce-beta-tester": "plugins/woocommerce-beta-tester", + "@woocommerce/admin-e2e-tests": "packages/js/admin-e2e-tests", + "@woocommerce/components": "packages/js/components", + "@woocommerce/csv-export": "packages/js/csv-export", + "@woocommerce/currency": "packages/js/currency", + "@woocommerce/customer-effort-score": "packages/js/customer-effort-score", + "@woocommerce/data": "packages/js/data", + "@woocommerce/date": "packages/js/date", + "@woocommerce/dependency-extraction-webpack-plugin": "packages/js/dependency-extraction-webpack-plugin", + "@woocommerce/eslint-plugin": "packages/js/eslint-plugin", + "@woocommerce/experimental": "packages/js/experimental", + "@woocommerce/explat": "packages/js/explat", + "@woocommerce/js-tests": "packages/js/js-tests", + "@woocommerce/navigation": "packages/js/navigation", + "@woocommerce/notices": "packages/js/notices", + "@woocommerce/number": "packages/js/number", + "@woocommerce/onboarding": "packages/js/onboarding", + "@woocommerce/style-build": "packages/js/style-build", + "@woocommerce/tracks": "packages/js/tracks" + } } \ No newline at end of file