Skip to content

Commit

Permalink
Merge branch 'develop-next-major' into epic/CXSPA-2897
Browse files Browse the repository at this point in the history
# Conflicts:
#	feature-libs/asm/package.json
#	feature-libs/customer-ticketing/package.json
#	feature-libs/order/package.json
#	feature-libs/pdf-invoices/package.json
#	feature-libs/product-configurator/package.json
#	feature-libs/requested-delivery-date/package.json
#	feature-libs/smartedit/package.json
#	feature-libs/tracking/package.json
#	feature-libs/user/package.json
#	integration-libs/cdc/package.json
#	integration-libs/cds/package.json
#	integration-libs/digital-payments/package.json
#	integration-libs/s4om/package.json
#	integration-libs/segment-refs/package.json
#	projects/schematics/src/dependencies.json
  • Loading branch information
kpawelczak committed Oct 23, 2023
2 parents 03191df + 9090f16 commit 9a6ef32
Show file tree
Hide file tree
Showing 36 changed files with 296 additions and 296 deletions.
10 changes: 5 additions & 5 deletions core-libs/setup/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/setup",
"version": "6.5.0",
"version": "6.6.0-1",
"description": "Includes features that makes Spartacus and it's setup easier and streamlined.",
"keywords": [
"spartacus",
Expand All @@ -20,10 +20,10 @@
},
"peerDependencies": {
"@angular/core": "^15.2.9",
"@spartacus/cart": "6.5.0",
"@spartacus/core": "6.5.0",
"@spartacus/order": "6.5.0",
"@spartacus/user": "6.5.0"
"@spartacus/cart": "6.6.0-1",
"@spartacus/core": "6.6.0-1",
"@spartacus/order": "6.6.0-1",
"@spartacus/user": "6.6.0-1"
},
"optionalDependencies": {
"@angular/platform-server": "^15.2.9",
Expand Down
18 changes: 9 additions & 9 deletions feature-libs/asm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/asm",
"version": "6.5.0",
"version": "6.6.0-1",
"description": "ASM feature library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -33,14 +33,14 @@
"@ng-select/ng-select": "^10.0.3",
"@ngrx/effects": "^15.3.0",
"@ngrx/store": "^15.3.0",
"@spartacus/cart": "6.5.0",
"@spartacus/core": "6.5.0",
"@spartacus/order": "6.5.0",
"@spartacus/schematics": "6.5.0",
"@spartacus/storefinder": "6.5.0",
"@spartacus/storefront": "6.5.0",
"@spartacus/styles": "6.5.0",
"@spartacus/user": "6.5.0",
"@spartacus/cart": "6.6.0-1",
"@spartacus/core": "6.6.0-1",
"@spartacus/order": "6.6.0-1",
"@spartacus/schematics": "6.6.0-1",
"@spartacus/storefinder": "6.6.0-1",
"@spartacus/storefront": "6.6.0-1",
"@spartacus/styles": "6.6.0-1",
"@spartacus/user": "6.6.0-1",
"rxjs": "^7.8.0"
},
"publishConfig": {
Expand Down
12 changes: 6 additions & 6 deletions feature-libs/cart/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/cart",
"version": "6.5.0",
"version": "6.6.0-1",
"description": "",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -37,11 +37,11 @@
"@ng-select/ng-select": "^10.0.3",
"@ngrx/effects": "^15.3.0",
"@ngrx/store": "^15.3.0",
"@spartacus/core": "6.5.0",
"@spartacus/schematics": "6.5.0",
"@spartacus/storefront": "6.5.0",
"@spartacus/styles": "6.5.0",
"@spartacus/user": "6.5.0",
"@spartacus/core": "6.6.0-1",
"@spartacus/schematics": "6.6.0-1",
"@spartacus/storefront": "6.6.0-1",
"@spartacus/styles": "6.6.0-1",
"@spartacus/user": "6.6.0-1",
"bootstrap": "^4.6.2",
"rxjs": "^7.8.0"
},
Expand Down
16 changes: 8 additions & 8 deletions feature-libs/checkout/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/checkout",
"version": "6.5.0",
"version": "6.6.0-1",
"description": "Checkout feature library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -32,13 +32,13 @@
"@angular/router": "^15.2.9",
"@ng-select/ng-select": "^10.0.3",
"@ngrx/store": "^15.3.0",
"@spartacus/cart": "6.5.0",
"@spartacus/core": "6.5.0",
"@spartacus/order": "6.5.0",
"@spartacus/schematics": "6.5.0",
"@spartacus/storefront": "6.5.0",
"@spartacus/styles": "6.5.0",
"@spartacus/user": "6.5.0",
"@spartacus/cart": "6.6.0-1",
"@spartacus/core": "6.6.0-1",
"@spartacus/order": "6.6.0-1",
"@spartacus/schematics": "6.6.0-1",
"@spartacus/storefront": "6.6.0-1",
"@spartacus/styles": "6.6.0-1",
"@spartacus/user": "6.6.0-1",
"bootstrap": "^4.6.2",
"rxjs": "^7.8.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
},
}), provideConfig(<FeaturesConfig>{
features: {
level: '6.5'
level: '6.6'
}
}), provideConfig(defaultB2bOccConfig)]
})
Expand Down Expand Up @@ -506,7 +506,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
},
}), provideConfig(<FeaturesConfig>{
features: {
level: '6.5'
level: '6.6'
}
}), provideConfig(defaultB2bOccConfig)]
})
Expand Down
12 changes: 6 additions & 6 deletions feature-libs/customer-ticketing/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/customer-ticketing",
"version": "6.5.0",
"version": "6.6.0-1",
"description": "Customer-Ticketing library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -30,11 +30,11 @@
"@angular/core": "^15.2.9",
"@angular/forms": "^15.2.9",
"@angular/router": "^15.2.9",
"@spartacus/cart": "6.5.0",
"@spartacus/core": "6.5.0",
"@spartacus/schematics": "6.5.0",
"@spartacus/storefront": "6.5.0",
"@spartacus/styles": "6.5.0",
"@spartacus/cart": "6.6.0-1",
"@spartacus/core": "6.6.0-1",
"@spartacus/schematics": "6.6.0-1",
"@spartacus/storefront": "6.6.0-1",
"@spartacus/styles": "6.6.0-1",
"rxjs": "^7.8.0"
},
"publishConfig": {
Expand Down
16 changes: 8 additions & 8 deletions feature-libs/order/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/order",
"version": "6.5.0",
"version": "6.6.0-1",
"description": "Order feature library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -33,13 +33,13 @@
"@ng-select/ng-select": "^10.0.3",
"@ngrx/effects": "^15.3.0",
"@ngrx/store": "^15.3.0",
"@spartacus/cart": "6.5.0",
"@spartacus/core": "6.5.0",
"@spartacus/pdf-invoices": "6.5.0",
"@spartacus/schematics": "6.5.0",
"@spartacus/storefront": "6.5.0",
"@spartacus/styles": "6.5.0",
"@spartacus/user": "6.5.0",
"@spartacus/cart": "6.6.0-1",
"@spartacus/core": "6.6.0-1",
"@spartacus/pdf-invoices": "6.6.0-1",
"@spartacus/schematics": "6.6.0-1",
"@spartacus/storefront": "6.6.0-1",
"@spartacus/styles": "6.6.0-1",
"@spartacus/user": "6.6.0-1",
"rxjs": "^7.8.0"
},
"publishConfig": {
Expand Down
16 changes: 8 additions & 8 deletions feature-libs/organization/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/organization",
"version": "6.5.0",
"version": "6.6.0-1",
"description": "Organization library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -33,13 +33,13 @@
"@ng-select/ng-select": "^10.0.3",
"@ngrx/effects": "^15.3.0",
"@ngrx/store": "^15.3.0",
"@spartacus/cart": "6.5.0",
"@spartacus/core": "6.5.0",
"@spartacus/order": "6.5.0",
"@spartacus/schematics": "6.5.0",
"@spartacus/storefront": "6.5.0",
"@spartacus/styles": "6.5.0",
"@spartacus/user": "6.5.0",
"@spartacus/cart": "6.6.0-1",
"@spartacus/core": "6.6.0-1",
"@spartacus/order": "6.6.0-1",
"@spartacus/schematics": "6.6.0-1",
"@spartacus/storefront": "6.6.0-1",
"@spartacus/styles": "6.6.0-1",
"@spartacus/user": "6.6.0-1",
"bootstrap": "^4.6.2",
"rxjs": "^7.8.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
},
}), provideConfig(<FeaturesConfig>{
features: {
level: '6.5'
level: '6.6'
}
}), provideConfig(defaultB2bOccConfig)]
})
Expand Down Expand Up @@ -266,7 +266,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
},
}), provideConfig(<FeaturesConfig>{
features: {
level: '6.5'
level: '6.6'
}
}), provideConfig(defaultB2bOccConfig)]
})
Expand Down Expand Up @@ -481,7 +481,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
},
}), provideConfig(<FeaturesConfig>{
features: {
level: '6.5'
level: '6.6'
}
}), provideConfig(defaultB2bOccConfig)]
})
Expand Down Expand Up @@ -696,7 +696,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
},
}), provideConfig(<FeaturesConfig>{
features: {
level: '6.5'
level: '6.6'
}
}), provideConfig(defaultB2bOccConfig)]
})
Expand Down Expand Up @@ -911,7 +911,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
},
}), provideConfig(<FeaturesConfig>{
features: {
level: '6.5'
level: '6.6'
}
}), provideConfig(defaultB2bOccConfig)]
})
Expand Down
10 changes: 5 additions & 5 deletions feature-libs/pdf-invoices/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/pdf-invoices",
"version": "6.5.0",
"version": "6.6.0-1",
"description": "Invoices library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -29,10 +29,10 @@
"@angular/common": "^15.2.9",
"@angular/core": "^15.2.9",
"@angular/forms": "^15.2.9",
"@spartacus/core": "6.5.0",
"@spartacus/schematics": "6.5.0",
"@spartacus/storefront": "6.5.0",
"@spartacus/styles": "6.5.0",
"@spartacus/core": "6.6.0-1",
"@spartacus/schematics": "6.6.0-1",
"@spartacus/storefront": "6.6.0-1",
"@spartacus/styles": "6.6.0-1",
"rxjs": "^7.8.0"
},
"publishConfig": {
Expand Down
18 changes: 9 additions & 9 deletions feature-libs/pickup-in-store/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/pickup-in-store",
"version": "6.5.0",
"version": "6.6.0-1",
"description": "",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -32,14 +32,14 @@
"@angular/router": "^15.2.9",
"@ngrx/effects": "^15.3.0",
"@ngrx/store": "^15.3.0",
"@spartacus/cart": "6.5.0",
"@spartacus/core": "6.5.0",
"@spartacus/order": "6.5.0",
"@spartacus/schematics": "6.5.0",
"@spartacus/storefinder": "6.5.0",
"@spartacus/storefront": "6.5.0",
"@spartacus/styles": "6.5.0",
"@spartacus/user": "6.5.0",
"@spartacus/cart": "6.6.0-1",
"@spartacus/core": "6.6.0-1",
"@spartacus/order": "6.6.0-1",
"@spartacus/schematics": "6.6.0-1",
"@spartacus/storefinder": "6.6.0-1",
"@spartacus/storefront": "6.6.0-1",
"@spartacus/styles": "6.6.0-1",
"@spartacus/user": "6.6.0-1",
"bootstrap": "^4.6.2",
"rxjs": "^7.8.0"
},
Expand Down
16 changes: 8 additions & 8 deletions feature-libs/product-configurator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/product-configurator",
"version": "6.5.0",
"version": "6.6.0-1",
"description": "Product configurator feature library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -33,13 +33,13 @@
"@ng-select/ng-select": "^10.0.3",
"@ngrx/effects": "^15.3.0",
"@ngrx/store": "^15.3.0",
"@spartacus/cart": "6.5.0",
"@spartacus/checkout": "6.5.0",
"@spartacus/core": "6.5.0",
"@spartacus/order": "6.5.0",
"@spartacus/schematics": "6.5.0",
"@spartacus/storefront": "6.5.0",
"@spartacus/styles": "6.5.0",
"@spartacus/cart": "6.6.0-1",
"@spartacus/checkout": "6.6.0-1",
"@spartacus/core": "6.6.0-1",
"@spartacus/order": "6.6.0-1",
"@spartacus/schematics": "6.6.0-1",
"@spartacus/storefront": "6.6.0-1",
"@spartacus/styles": "6.6.0-1",
"rxjs": "^7.8.0"
},
"publishConfig": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
},
}), provideConfig(<FeaturesConfig>{
features: {
level: '6.5'
level: '6.6'
}
}), provideConfig(defaultB2bOccConfig)]
})
Expand Down Expand Up @@ -303,7 +303,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
},
}), provideConfig(<FeaturesConfig>{
features: {
level: '6.5'
level: '6.6'
}
}), provideConfig(defaultB2bOccConfig)]
})
Expand Down Expand Up @@ -534,7 +534,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
},
}), provideConfig(<FeaturesConfig>{
features: {
level: '6.5'
level: '6.6'
}
})]
})
Expand Down
10 changes: 5 additions & 5 deletions feature-libs/product/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/product",
"version": "6.5.0",
"version": "6.6.0-1",
"description": "Product library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -29,10 +29,10 @@
"@angular/common": "^15.2.9",
"@angular/core": "^15.2.9",
"@angular/router": "^15.2.9",
"@spartacus/core": "6.5.0",
"@spartacus/schematics": "6.5.0",
"@spartacus/storefront": "6.5.0",
"@spartacus/styles": "6.5.0",
"@spartacus/core": "6.6.0-1",
"@spartacus/schematics": "6.6.0-1",
"@spartacus/storefront": "6.6.0-1",
"@spartacus/styles": "6.6.0-1",
"bootstrap": "^4.6.2",
"rxjs": "^7.8.0"
},
Expand Down
Loading

0 comments on commit 9a6ef32

Please sign in to comment.