chore: Update dependencies & fix imports

package.json

@@ -94,10 +94,10 @@
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
-    "eslint": "^8.35.0",
-    "eslint-config-prettier": "^8.7.0",
+    "eslint": "^8.41.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "^40.0.1",
+    "eslint-plugin-jsdoc": "^45.0.0",
     "eslint-plugin-prefer-arrow": "^1.2.3"
   }
 }

packages/admin-ui/.eslintrc.json

@@ -15,10 +15,13 @@
         "createDefaultProgram": true
       },
       "extends": [
-        "plugin:@angular-eslint/ng-cli-compat",
-        "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@angular-eslint/recommended",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
+      "plugins": [
+        "import"
+      ],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",

packages/admin-ui/package.json

@@ -31,18 +31,18 @@
         "@angular/router": "^16.0.3",
         "@apollo/client": "^3.7.9",
         "@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
-        "@cds/core": "^6.3.2",
-        "@clr/angular": "^15.1.0",
+        "@cds/core": "^6.4.2",
+        "@clr/angular": "^15.4.0",
         "@clr/core": "^4.0.15",
         "@clr/icons": "^13.0.2",
-        "@clr/ui": "^15.0.1",
+        "@clr/ui": "^15.4.0",
         "@messageformat/core": "^3.1.0",
         "@ng-select/ng-select": "^10.0.3",
         "@ngx-translate/core": "^14.0.0",
         "@ngx-translate/http-loader": "^7.0.0",
         "@vendure/common": "2.0.0-beta.2",
         "@webcomponents/custom-elements": "^1.5.1",
-        "apollo-angular": "^4.2.1",
+        "apollo-angular": "^5.0.0",
         "apollo-upload-client": "^17.0.0",
         "chartist": "^1.3.0",
         "codejar": "^3.7.0",
@@ -85,7 +85,7 @@
         "@typescript-eslint/parser": "^5.59.2",
         "@vendure/ngx-translate-extract": "^8.1.0",
         "cross-spawn": "^7.0.3",
-        "eslint": "^8.39.0",
+        "eslint": "^8.41.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-jsdoc": "^45.0.0",
         "eslint-plugin-prefer-arrow": "^1.2.3",

packages/admin-ui/src/lib/catalog/src/components/update-product-option-dialog/update-product-option-dialog.component.ts

@@ -5,9 +5,10 @@ import {
     LanguageCode,
     ProductVariantFragment,
     UpdateProductOptionInput,
+    createUpdatedTranslatable,
+    Dialog,
 } from '@vendure/admin-ui/core';
-import { createUpdatedTranslatable } from '@vendure/admin-ui/core';
-import { Dialog } from '@vendure/admin-ui/core';
+
 import { normalizeString } from '@vendure/common/lib/normalize-string';
 
 @Component({

packages/admin-ui/src/lib/catalog/src/providers/routing/product-variants-resolver.ts

@@ -1,8 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
-import { BaseEntityResolver } from '@vendure/admin-ui/core';
-import { GetProductVariantOptionsQuery } from '@vendure/admin-ui/core';
-import { DataService } from '@vendure/admin-ui/core';
+import { BaseEntityResolver, GetProductVariantOptionsQuery, DataService } from '@vendure/admin-ui/core';
 
 @Injectable({
     providedIn: 'root',
@@ -12,7 +10,7 @@ export class ProductVariantsResolver extends BaseEntityResolver<GetProductVarian
         super(
             router,
             {
-                __typename: 'Product' as 'Product',
+                __typename: 'Product' as const,
                 id: '',
                 createdAt: '',
                 updatedAt: '',

packages/admin-ui/src/lib/catalog/src/public_api.ts

@@ -21,6 +21,8 @@ export * from './components/collection-tree/collection-tree.component';
 export * from './components/collection-tree/collection-tree.service';
 export * from './components/collection-tree/collection-tree.types';
 export * from './components/confirm-variant-deletion-dialog/confirm-variant-deletion-dialog.component';
+export * from './components/create-product-option-group-dialog/create-product-option-group-dialog.component';
+export * from './components/create-product-variant-dialog/create-product-variant-dialog.component';
 export * from './components/facet-detail/facet-detail.component';
 export * from './components/facet-list/facet-list-bulk-actions';
 export * from './components/facet-list/facet-list.component';
@@ -37,9 +39,11 @@ export * from './components/product-variant-detail/product-variant-detail.graphq
 export * from './components/product-variant-list/product-list-bulk-actions';
 export * from './components/product-variant-list/product-variant-list.component';
 export * from './components/product-variant-list/product-variant-list.graphql';
+export * from './components/product-variant-quick-jump/product-variant-quick-jump.component';
 export * from './components/product-variants-editor/product-variants-editor.component';
 export * from './components/product-variants-table/product-variants-table.component';
 export * from './components/update-product-option-dialog/update-product-option-dialog.component';
 export * from './components/variant-price-detail/variant-price-detail.component';
 export * from './providers/product-detail/product-detail.service';
 export * from './providers/product-detail/replace-last';
+export * from './providers/routing/product-variants-resolver';

packages/admin-ui/src/lib/core/src/data/providers/administrator-data.service.ts

@@ -57,7 +57,7 @@ export class AdministratorDataService {
         >(DELETE_ADMINISTRATORS, { ids });
     }
 
-    getRoles(take: number = 10, skip: number = 0) {
+    getRoles(take = 10, skip = 0) {
         return this.baseDataService.query<Codegen.GetRolesQuery, Codegen.GetRolesQueryVariables>(GET_ROLES, {
             options: {
                 take,

packages/admin-ui/src/lib/core/src/data/providers/collection-data.service.ts

@@ -110,7 +110,7 @@ export class CollectionDataService {
         >(PREVIEW_COLLECTION_CONTENTS, { input, options });
     }
 
-    getCollectionContents(id: string, take: number = 10, skip: number = 0, filterTerm?: string) {
+    getCollectionContents(id: string, take = 10, skip = 0, filterTerm?: string) {
         const filter = filterTerm
             ? ({ name: { contains: filterTerm } } as Codegen.CollectionFilterParameter)
             : undefined;

packages/admin-ui/src/lib/core/src/data/providers/customer-data.service.ts

@@ -28,7 +28,7 @@ import { BaseDataService } from './base-data.service';
 export class CustomerDataService {
     constructor(private baseDataService: BaseDataService) {}
 
-    getCustomerList(take: number = 10, skip: number = 0, filterTerm?: string) {
+    getCustomerList(take = 10, skip = 0, filterTerm?: string) {
         const filter = filterTerm
             ? {
                   filter: {

packages/admin-ui/src/lib/core/src/data/providers/product-data.service.ts

@@ -55,7 +55,7 @@ import { BaseDataService } from './base-data.service';
 export class ProductDataService {
     constructor(private baseDataService: BaseDataService) {}
 
-    searchProducts(term: string, take: number = 10, skip: number = 0) {
+    searchProducts(term: string, take = 10, skip = 0) {
         return this.baseDataService.query<Codegen.SearchProductsQuery, Codegen.SearchProductsQueryVariables>(
             SEARCH_PRODUCTS,
             {
@@ -333,7 +333,7 @@ export class ProductDataService {
         });
     }
 
-    getAssetList(take: number = 10, skip: number = 0) {
+    getAssetList(take = 10, skip = 0) {
         return this.baseDataService.query<Codegen.GetAssetListQuery, Codegen.GetAssetListQueryVariables>(
             GET_ASSET_LIST,
             {

packages/admin-ui/src/lib/core/src/data/providers/settings-data.service.ts

@@ -209,7 +209,7 @@ export class SettingsDataService {
         });
     }
 
-    getTaxRatesSimple(take: number = 10, skip: number = 0, fetchPolicy?: FetchPolicy) {
+    getTaxRatesSimple(take = 10, skip = 0, fetchPolicy?: FetchPolicy) {
         return this.baseDataService.query<
             Codegen.GetTaxRateListSimpleQuery,
             Codegen.GetTaxRateListSimpleQueryVariables

packages/admin-ui/src/lib/core/src/providers/job-queue/job-queue.service.ts

@@ -58,7 +58,7 @@ export class JobQueueService implements OnDestroy {
     /**
      * After a given delay, checks the server for any active jobs.
      */
-    checkForJobs(delay: number = 1000) {
+    checkForJobs(delay = 1000) {
         timer(delay)
             .pipe(
                 switchMap(() => this.dataService.client.userStatus().mapSingle(data => data.userStatus)),

packages/admin-ui/src/lib/core/src/public_api.ts

@@ -21,6 +21,7 @@ export * from './common/utilities/interpolate-description';
 export * from './common/utilities/selection-manager';
 export * from './common/utilities/string-to-color';
 export * from './common/version';
+export * from './components/alerts/alerts.component';
 export * from './components/app-shell/app-shell.component';
 export * from './components/base-nav/base-nav.component';
 export * from './components/breadcrumb/breadcrumb.component';
@@ -71,6 +72,7 @@ export * from './data/utils/add-custom-fields';
 export * from './data/utils/get-server-location';
 export * from './data/utils/remove-readonly-custom-fields';
 export * from './data/utils/transform-relation-custom-field-inputs';
+export * from './providers/alerts/alerts.service';
 export * from './providers/auth/auth.service';
 export * from './providers/breadcrumb/breadcrumb.service';
 export * from './providers/bulk-action-registry/bulk-action-registry.service';
@@ -122,6 +124,8 @@ export * from './shared/components/bulk-action-menu/bulk-action-menu.component';
 export * from './shared/components/card/card.component';
 export * from './shared/components/channel-assignment-control/channel-assignment-control.component';
 export * from './shared/components/channel-badge/channel-badge.component';
+export * from './shared/components/chart/chart.component';
+export * from './shared/components/chart/tooltip-plugin';
 export * from './shared/components/chip/chip.component';
 export * from './shared/components/configurable-input/configurable-input.component';
 export * from './shared/components/currency-input/currency-input.component';
@@ -222,6 +226,7 @@ export * from './shared/components/tag-selector/tag-selector.component';
 export * from './shared/components/timeline-entry/timeline-entry.component';
 export * from './shared/components/title-input/title-input.component';
 export * from './shared/components/ui-extension-point/ui-extension-point.component';
+export * from './shared/components/zone-selector/zone-selector.component';
 export * from './shared/directives/disabled.directive';
 export * from './shared/directives/if-default-channel-active.directive';
 export * from './shared/directives/if-directive-base';

packages/admin-ui/src/lib/core/src/shared/components/chart/chart.component.ts

@@ -9,8 +9,7 @@ import {
     SimpleChanges,
     ViewChild,
 } from '@angular/core';
-import { easings, LineChart } from 'chartist';
-import { LineChartData } from 'chartist/dist/charts/LineChart/LineChart.types';
+import { easings, LineChart, LineChartData } from 'chartist';
 import { tooltipPlugin } from './tooltip-plugin';
 
 export interface ChartFormatOptions {

packages/admin-ui/src/lib/core/src/shared/components/chart/tooltip-plugin.ts

@@ -4,8 +4,7 @@
  */
 /* global Chartist */
 
-import { LineChart, PieChart } from 'chartist';
-import { DrawEvent } from 'chartist/dist/core/types';
+import { LineChart, PieChart, DrawEvent } from 'chartist';
 import { ChartFormatOptions } from './chart.component';
 
 const defaultOptions = {
@@ -72,7 +71,6 @@ export function tooltipPlugin(userOptions?: any) {
                     event: data,
                     x: data.element.getNode().getBoundingClientRect().x,
                 };
-                console.log(`drawpoint`);
             }
         });
 

packages/admin-ui/src/lib/core/src/shared/components/currency-input/currency-input.component.spec.ts

@@ -13,21 +13,19 @@ import { AffixedInputComponent } from '../affixed-input/affixed-input.component'
 import { CurrencyInputComponent } from './currency-input.component';
 
 describe('CurrencyInputComponent', () => {
-    beforeEach(
-        waitForAsync(() => {
-            TestBed.configureTestingModule({
-                imports: [FormsModule],
-                providers: [{ provide: DataService, useClass: MockDataService }],
-                declarations: [
-                    TestControlValueAccessorComponent,
-                    TestSimpleComponent,
-                    CurrencyInputComponent,
-                    AffixedInputComponent,
-                    LocaleCurrencyNamePipe,
-                ],
-            }).compileComponents();
-        }),
-    );
+    beforeEach(waitForAsync(() => {
+        TestBed.configureTestingModule({
+            imports: [FormsModule],
+            providers: [{ provide: DataService, useClass: MockDataService }],
+            declarations: [
+                TestControlValueAccessorComponent,
+                TestSimpleComponent,
+                CurrencyInputComponent,
+                AffixedInputComponent,
+                LocaleCurrencyNamePipe,
+            ],
+        }).compileComponents();
+    }));
 
     it('should display the price as decimal with a simple binding', fakeAsync(() => {
         const fixture = createAndRunChangeDetection(TestSimpleComponent);
@@ -113,7 +111,7 @@ describe('CurrencyInputComponent', () => {
     function createAndRunChangeDetection<T extends TestControlValueAccessorComponent | TestSimpleComponent>(
         component: Type<T>,
         priceValue = 123,
-        currencyCode: string = '',
+        currencyCode = '',
     ): ComponentFixture<T> {
         const fixture = TestBed.createComponent(component);
         if (fixture.componentInstance instanceof TestSimpleComponent && currencyCode) {

packages/admin-ui/src/lib/core/src/shared/components/zone-selector/zone-selector.component.ts

@@ -9,9 +9,10 @@ import {
 } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { NgSelectComponent } from '@ng-select/ng-select';
-import { GetZoneSelectorListDocument, GetZoneSelectorListQuery, ItemOf } from '@vendure/admin-ui/core';
 import { gql } from 'apollo-angular';
 import { Subject } from 'rxjs';
+import { ItemOf } from '../../../common/base-list.component';
+import { GetZoneSelectorListDocument, GetZoneSelectorListQuery } from '../../../common/generated-types';
 import { DataService } from '../../../data/providers/data.service';
 
 export const GET_ZONE_SELECTOR_LIST = gql`

packages/admin-ui/src/lib/core/src/shared/dynamic-form-inputs/relation-form-input/relation-card/relation-card.component.ts

@@ -1,5 +1,5 @@
-import { EventEmitter } from '@angular/core';
 import {
+    EventEmitter,
     ChangeDetectionStrategy,
     Component,
     ContentChild,

packages/admin-ui/src/lib/core/src/shared/pipes/file-size.pipe.ts

@@ -13,7 +13,7 @@ import { Pipe, PipeTransform } from '@angular/core';
  */
 @Pipe({ name: 'filesize' })
 export class FileSizePipe implements PipeTransform {
-    transform(value: number, useSiUnits: boolean = true): any {
+    transform(value: number, useSiUnits = true): any {
         if (typeof value !== 'number' && typeof value !== 'string') {
             return value;
         }

packages/admin-ui/src/lib/customer/src/public_api.ts

@@ -3,6 +3,7 @@ export * from './components/add-customer-to-group-dialog/add-customer-to-group-d
 export * from './components/address-card/address-card.component';
 export * from './components/address-detail-dialog/address-detail-dialog.component';
 export * from './components/customer-detail/customer-detail.component';
+export * from './components/customer-group-detail/customer-group-detail.component';
 export * from './components/customer-group-detail-dialog/customer-group-detail-dialog.component';
 export * from './components/customer-group-list/customer-group-list-bulk-actions';
 export * from './components/customer-group-list/customer-group-list.component';

packages/admin-ui/src/lib/dashboard/src/public_api.ts

@@ -5,6 +5,7 @@ export * from './dashboard.module';
 export * from './dashboard.routes';
 export * from './default-widgets';
 export * from './widgets/latest-orders-widget/latest-orders-widget.component';
+export * from './widgets/order-chart-widget/order-chart-widget.component';
 export * from './widgets/order-summary-widget/order-summary-widget.component';
 export * from './widgets/test-widget/test-widget.component';
 export * from './widgets/welcome-widget/welcome-widget.component';

packages/admin-ui/src/lib/dashboard/src/widgets/order-chart-widget/order-chart-widget.component.ts

@@ -1,10 +1,14 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { CurrencyCode, DataService, GetOrderChartDataDocument, MetricType } from '@vendure/admin-ui/core';
-import { pick } from '@vendure/common/lib/pick';
+import {
+    ChartEntry,
+    ChartFormatOptions,
+    DataService,
+    GetOrderChartDataDocument,
+    MetricType,
+} from '@vendure/admin-ui/core';
 import { gql } from 'apollo-angular';
-import { combineLatest, BehaviorSubject, Observable, switchMap } from 'rxjs';
+import { BehaviorSubject, combineLatest, Observable, switchMap } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { ChartEntry, ChartFormatOptions } from '../../../../core/src/shared/components/chart/chart.component';
 
 export const GET_ORDER_CHART_DATA = gql`
     query GetOrderChartData($refresh: Boolean, $types: [MetricType!]!) {

packages/admin-ui/src/lib/order/src/public_api.ts

@@ -12,6 +12,8 @@ export * from './components/line-fulfillment/line-fulfillment.component';
 export * from './components/line-refunds/line-refunds.component';
 export * from './components/modification-detail/modification-detail.component';
 export * from './components/order-custom-fields-card/order-custom-fields-card.component';
+export * from './components/order-data-table/order-data-table.component';
+export * from './components/order-data-table/order-total-column.component';
 export * from './components/order-detail/order-detail.component';
 export * from './components/order-editor/order-editor.component';
 export * from './components/order-edits-preview-dialog/order-edits-preview-dialog.component';

packages/admin-ui/src/lib/settings/src/providers/routing/profile-resolver.ts

@@ -10,7 +10,7 @@ export class ProfileResolver extends BaseEntityResolver<AdministratorFragment> {
         super(
             router,
             {
-                __typename: 'Administrator' as 'Administrator',
+                __typename: 'Administrator' as const,
                 id: '',
                 createdAt: '',
                 updatedAt: '',

packages/admin-ui/src/lib/settings/src/public_api.ts

@@ -35,11 +35,13 @@ export * from './components/tax-rate-list/tax-rate-list.component';
 export * from './components/test-address-form/test-address-form.component';
 export * from './components/test-order-builder/test-order-builder.component';
 export * from './components/test-shipping-methods/test-shipping-methods.component';
+export * from './components/zone-detail/zone-detail.component';
 export * from './components/zone-list/zone-list-bulk-actions';
 export * from './components/zone-list/zone-list.component';
 export * from './components/zone-member-list/zone-member-controls.directive';
 export * from './components/zone-member-list/zone-member-list-bulk-actions';
 export * from './components/zone-member-list/zone-member-list-header.directive';
 export * from './components/zone-member-list/zone-member-list.component';
+export * from './providers/routing/profile-resolver';
 export * from './settings.module';
 export * from './settings.routes';

packages/core/src/service/services/product.service.ts

@@ -12,7 +12,6 @@ import {
 } from '@vendure/common/lib/generated-types';
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { unique } from '@vendure/common/lib/unique';
-import { ProductVariant } from '@vendure/core';
 import { FindOptionsUtils, In, IsNull } from 'typeorm';
 
 import { RequestContext } from '../../api/common/request-context';
@@ -29,6 +28,7 @@ import { FacetValue } from '../../entity/facet-value/facet-value.entity';
 import { ProductTranslation } from '../../entity/product/product-translation.entity';
 import { Product } from '../../entity/product/product.entity';
 import { ProductOptionGroup } from '../../entity/product-option-group/product-option-group.entity';
+import { ProductVariant } from '../../entity/product-variant/product-variant.entity';
 import { EventBus } from '../../event-bus/event-bus';
 import { ProductChannelEvent } from '../../event-bus/events/product-channel-event';
 import { ProductEvent } from '../../event-bus/events/product-event';

yarn.lock

@@ -296,13 +296,6 @@
     "@angular-eslint/bundled-angular-compiler" "16.0.3"
     "@typescript-eslint/utils" "5.59.7"
 
-"@angular/animations@^15.2.1":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-15.2.8.tgz#11de2b0e7fc50918056bdc6d7545ea1864a8592d"
-  integrity sha512-I3xh8EASQ04s3qXQYpIORI0jFiFmvBQERBqS70TieTCIML7banOf9R3K7sAWB9frG5J0CEUwr+wtF47DCs/7eQ==
-  dependencies:
-    tslib "^2.3.0"
-
 "@angular/animations@^16.0.3":
   version "16.0.3"
   resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-16.0.3.tgz#63b71d8c88c2331a2ba5101b4b8a64ff686bd45c"
@@ -310,15 +303,6 @@
   dependencies:
     tslib "^2.3.0"
 
-"@angular/cdk@^15.2.1":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-15.2.8.tgz#f7da13abd6fb6a1355c02f5c02dc32bc679c4b1d"
-  integrity sha512-jiCoxfBFMH29IZIiPmVUzIWetfUNpMIvC20xYVF8RMM819vPogoObzwK4DN/sXcp/6oVbBzZFaYdijhhIt9soQ==
-  dependencies:
-    tslib "^2.3.0"
-  optionalDependencies:
-    parse5 "^7.1.2"
-
 "@angular/cdk@^16.0.2":
   version "16.0.2"
   resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-16.0.2.tgz#5215402a71e90a31863418d597de9714f413c08b"
@@ -376,13 +360,6 @@
     symbol-observable "4.0.0"
     yargs "17.7.2"
 
-"@angular/common@^15.2.1":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-15.2.8.tgz#7d60a4d906b41a852f31c63116ede1b87c84a7ad"
-  integrity sha512-yLDQihiRcVl38HrWMPbqgzOaSUw85AQH5BsGdjbS6BpoBQj3EXOpccCMFsuxOKxPG4toatgawNqrEnK0Jpv9Mw==
-  dependencies:
-    tslib "^2.3.0"
-
 "@angular/common@^16.0.3":
   version "16.0.3"
   resolved "https://registry.yarnpkg.com/@angular/common/-/common-16.0.3.tgz#0d550f3850cf3f63055b4cc5a6a9eb5738f8fe0c"
@@ -434,13 +411,6 @@
   dependencies:
     tslib "^2.3.0"
 
-"@angular/core@^15.2.1":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-15.2.8.tgz#6d7f8afa61be44b91e4b8737b39d7fdcb256a6ae"
-  integrity sha512-NDs+g4uM4EhyCvluf8a0YBCFXsDAEfCMHOD5cS00Bl+liTQ7JwtmepkWXMyjLB92irC9JaR79kdy4BoIKOh8WA==
-  dependencies:
-    tslib "^2.3.0"
-
 "@angular/core@^16.0.3":
   version "16.0.3"
   resolved "https://registry.yarnpkg.com/@angular/core/-/core-16.0.3.tgz#8d1600d4dc9c1af2e82435514bac003c227d7a6a"
@@ -448,13 +418,6 @@
   dependencies:
     tslib "^2.3.0"
 
-"@angular/forms@^15.2.1":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-15.2.8.tgz#f62a3ede067ddac24ed1b7dc5cefe9b4b0370be7"
-  integrity sha512-VyevVj20DdQWjAQUyiFTe+DAzqG9GqfAOWn376Y/lhPcwxAojXePTGNgtQud566/urDrNrP5haaLD6O36/3n+w==
-  dependencies:
-    tslib "^2.3.0"
-
 "@angular/forms@^16.0.3":
   version "16.0.3"
   resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-16.0.3.tgz#b3a0526b4ff6b477ff79cf65c2f75b4769962f17"
@@ -462,23 +425,11 @@
   dependencies:
     tslib "^2.3.0"
 
-"@angular/language-service@^15.2.1":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-15.2.8.tgz#f37fb8b020c9d0fccf1bb5b46db525b67084cc9c"
-  integrity sha512-3wlaJrpxe8ZLe7ZGIOs/Z++kgJMOHZCUvdXLyp/4t1ejULgUgW9yi7nGsemWnSzsUCjf7595BP1Cp1gA/J/1QQ==
-
 "@angular/language-service@^16.0.3":
   version "16.0.3"
   resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-16.0.3.tgz#bc518d0367b87f723530c47e87896421d09ad90c"
   integrity sha512-9uv72aJqrZll81llvLrSjxHs1kNQFZ0WfJzQn82sfuPEUiKyiU80IGXhQ2qWMfHfGIIETlSSOlgTgBRaXOfpSQ==
 
-"@angular/platform-browser-dynamic@^15.2.1":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.8.tgz#158d28298a6f38dc8a17c416eb2779afcafc16a7"
-  integrity sha512-75HyoZNibA3u/FvdK4Aw5KMzUmS/nDk5N8s7gfM09fe1resSPgFiW8JJEkr1xiUdA2WtSRbHs34y5rHLDe7n1Q==
-  dependencies:
-    tslib "^2.3.0"
-
 "@angular/platform-browser-dynamic@^16.0.3":
   version "16.0.3"
   resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.0.3.tgz#645301b4d6d73f02f8a93d84ef3d0902dc2246f3"
@@ -486,13 +437,6 @@
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-browser@^15.2.1":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-15.2.8.tgz#2400f732a020d59f17b9bf8c6c3f1fb065147328"
-  integrity sha512-8sKFUld54inj0FnQ1ydhFxnDgsbbf43W9FALye/5uEtLgwwE/ZvkNYMaQ7hq1JPuQRMDj3gJkFqaLeFjplpHDA==
-  dependencies:
-    tslib "^2.3.0"
-
 "@angular/platform-browser@^16.0.3":
   version "16.0.3"
   resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-16.0.3.tgz#19a5254b890da65379bc6bf90f9b9ceccc2c1956"
@@ -500,13 +444,6 @@
   dependencies:
     tslib "^2.3.0"
 
-"@angular/router@^15.2.1":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-15.2.8.tgz#99ebf83d34dae3ebe61097b43aded3743b49c5db"
-  integrity sha512-C62QBEeJSBTNTrQHZiklPrxwJwuENoZzWX22MMJ7dxl+7VjRgnmj8J7mcX9fLjHlL+mC3RvesMlX7sGZRQV1cg==
-  dependencies:
-    tslib "^2.3.0"
-
 "@angular/router@^16.0.3":
   version "16.0.3"
   resolved "https://registry.yarnpkg.com/@angular/router/-/router-16.0.3.tgz#1a0bc80bc779375dbe545ac4bfe358db72f9e6af"
@@ -2978,7 +2915,7 @@
   resolved "https://registry.yarnpkg.com/@cds/city/-/city-1.1.0.tgz#5b7323750d3d64671ce2e3a804bcf260fbea1154"
   integrity sha512-S9K+Q39BGOghyLHmR0Wdcmu1i1noSUk8HcvMj+3IaohZw02WFd99aPTQDHJeseXrXZP3CNovaSlePI0R11NcFg==
 
-"@cds/core@^6.3.2":
+"@cds/core@^6.4.2":
   version "6.4.2"
   resolved "https://registry.yarnpkg.com/@cds/core/-/core-6.4.2.tgz#78d3bac6aa91effc991572a79edcaeb75f80e066"
   integrity sha512-m18JDBenj8qL+msOZkYs3tn8Yq3w9FzbaKRN1FFjL/pp5S9w2wUXazuA+Kuin84LN72K/LAy3LyUVYMkZSqM7A==
@@ -2990,10 +2927,10 @@
     "@cds/city" "^1.1.0"
     modern-normalize "1.1.0"
 
-"@clr/angular@^15.1.0":
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/@clr/angular/-/angular-15.3.0.tgz#6e1af95e892fd05e4fc99c37fab70e454742795d"
-  integrity sha512-a0JCcH+Hp6b7KdafCSwAr8bDg5QIuY5WjEr3+xjiYT0PPRXozufPqv7yJyc58gx1T8A6R8NtxTvMoX/xKnJoFg==
+"@clr/angular@^15.4.0":
+  version "15.4.0"
+  resolved "https://registry.yarnpkg.com/@clr/angular/-/angular-15.4.0.tgz#e2f311fcd71153b1c521623f45c654fe6e99717f"
+  integrity sha512-6DaQUUV4cN0gZHVttN/o7Y7mtZmRFVG10NQsD0i8FP/o92BCjL/pO5+AvvSi5E/3ArMmuqlhVaSjpvsMfg9yww==
   dependencies:
     tslib "^2.3.0"
 
@@ -3025,10 +2962,10 @@
   resolved "https://registry.yarnpkg.com/@clr/icons/-/icons-13.0.2.tgz#600b530fe8e0d654de81f97d2b64db5905266eb6"
   integrity sha512-bdcSuFvQAbIIp8Q2Fm55BjHW5cawP4xEOkZf2IEIin0d9ViRcAJNjACBCOMDhx2up7nPZsXwN2gL8zJhL7TSZQ==
 
-"@clr/ui@^15.0.1":
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/@clr/ui/-/ui-15.3.0.tgz#e210ba83b9e130fb95ccf7bf93695dcd37dc0426"
-  integrity sha512-XyrFzTMJ1CMtnwNwev06BScaP9rGdDZpSGv2uIN/ysFwiSU2Sf45CAXYYGNW6F96PEHcYbpecJ28kUhV/q9a1w==
+"@clr/ui@^15.4.0":
+  version "15.4.0"
+  resolved "https://registry.yarnpkg.com/@clr/ui/-/ui-15.4.0.tgz#5eb9ae94efafb3ac740a9c576c6ecc525e6a4486"
+  integrity sha512-kixMm/RGUSbS41RPhULKu4dGjqoijve2MjJHbFSeqhYkdpWuKlbOK0wCn8wP7F5rQ7EY1JVxu2nzN3BzACmYxA==
 
 "@colors/colors@1.5.0":
   version "1.5.0"
@@ -3219,15 +3156,6 @@
     pump "^3.0.0"
     secure-json-parse "^2.1.0"
 
-"@es-joy/jsdoccomment@~0.37.0":
-  version "0.37.1"
-  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.37.1.tgz#fa32a41ba12097452693343e09ad4d26d157aedd"
-  integrity sha512-5vxWJ1gEkEF0yRd0O+uK6dHJf7adrxwQSX8PuRiPfFSAbNLnY0ZJfXaZucoz14Jj2N11xn2DnlEPwWRpYpvRjg==
-  dependencies:
-    comment-parser "1.3.1"
-    esquery "^1.5.0"
-    jsdoc-type-pratt-parser "~4.0.0"
-
 "@es-joy/jsdoccomment@~0.39.4":
   version "0.39.4"
   resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.39.4.tgz#6b8a62e9b3077027837728818d3c4389a898b392"
@@ -3469,21 +3397,6 @@
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.0.tgz#f6f729b02feee2c749f57e334b7a1b5f40a81724"
   integrity sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==
 
-"@eslint/eslintrc@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.2.tgz#01575e38707add677cf73ca1589abba8da899a02"
-  integrity sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.3.2"
-    espree "^9.5.1"
-    globals "^13.19.0"
-    ignore "^5.2.0"
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    minimatch "^3.1.2"
-    strip-json-comments "^3.1.1"
-
 "@eslint/eslintrc@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.3.tgz#4910db5505f4d503f27774bf356e3704818a0331"
@@ -3499,11 +3412,6 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.39.0":
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.39.0.tgz#58b536bcc843f4cd1e02a7e6171da5c040f4d44b"
-  integrity sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==
-
 "@eslint/js@8.41.0":
   version "8.41.0"
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.41.0.tgz#080321c3b68253522f7646b55b577dd99d2950b3"
@@ -6277,30 +6185,31 @@
 "@vendure/admin-ui@./packages/admin-ui/package":
   version "2.0.0-beta.2"
   dependencies:
-    "@angular/animations" "^15.2.1"
-    "@angular/cdk" "^15.2.1"
-    "@angular/common" "^15.2.1"
-    "@angular/core" "^15.2.1"
-    "@angular/forms" "^15.2.1"
-    "@angular/language-service" "^15.2.1"
-    "@angular/platform-browser" "^15.2.1"
-    "@angular/platform-browser-dynamic" "^15.2.1"
-    "@angular/router" "^15.2.1"
+    "@angular/animations" "^16.0.3"
+    "@angular/cdk" "^16.0.2"
+    "@angular/common" "^16.0.3"
+    "@angular/core" "^16.0.3"
+    "@angular/forms" "^16.0.3"
+    "@angular/language-service" "^16.0.3"
+    "@angular/platform-browser" "^16.0.3"
+    "@angular/platform-browser-dynamic" "^16.0.3"
+    "@angular/router" "^16.0.3"
     "@apollo/client" "^3.7.9"
     "@biesbjerg/ngx-translate-extract-marker" "^1.0.0"
-    "@cds/core" "^6.3.2"
-    "@clr/angular" "^15.1.0"
+    "@cds/core" "^6.4.2"
+    "@clr/angular" "^15.4.0"
     "@clr/core" "^4.0.15"
     "@clr/icons" "^13.0.2"
-    "@clr/ui" "^15.0.1"
+    "@clr/ui" "^15.4.0"
     "@messageformat/core" "^3.1.0"
     "@ng-select/ng-select" "^10.0.3"
     "@ngx-translate/core" "^14.0.0"
     "@ngx-translate/http-loader" "^7.0.0"
     "@vendure/common" "2.0.0-beta.2"
     "@webcomponents/custom-elements" "^1.5.1"
-    apollo-angular "^4.2.1"
+    apollo-angular "^5.0.0"
     apollo-upload-client "^17.0.0"
+    chartist "^1.3.0"
     codejar "^3.7.0"
     core-js "^3.29.0"
     dayjs "^1.10.4"
@@ -6322,7 +6231,7 @@
     prosemirror-tables "^1.3.2"
     rxjs "^7.8.0"
     tslib "^2.5.0"
-    zone.js "~0.12.0"
+    zone.js "~0.13.0"
 
 "@vendure/ngx-translate-extract@^8.1.0":
   version "8.1.0"
@@ -6988,10 +6897,10 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-apollo-angular@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-4.2.1.tgz#74f805195c3bf908b41a16ac3d0e5693faeb4739"
-  integrity sha512-lMFVZmw7hIa4+VGutoiUMwHWggXFiDhbsrnZddQYzfdV6lkJRjm0hANG0KxXoaoLqEqkGTHdq5DaMCdsp6E4rw==
+apollo-angular@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-5.0.0.tgz#24ee1ba28561f22397e5099a099cbc0298d2b9fe"
+  integrity sha512-g98CvEGmRkrfBcXQS+HwIDuSsDnxqg/7RB+N/ICXbXfnnbBNIVzQ+xSaawz6kOo04Rx7jtLQAjda6/69fhHMDQ==
   dependencies:
     tslib "^2.0.0"
 
@@ -10075,7 +9984,7 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-prettier@^8.7.0:
+eslint-config-prettier@^8.8.0:
   version "8.8.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
   integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
@@ -10117,19 +10026,6 @@ eslint-plugin-import@^2.27.5:
     semver "^6.3.0"
     tsconfig-paths "^3.14.1"
 
-eslint-plugin-jsdoc@^40.0.1:
-  version "40.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-40.3.0.tgz#75a91ab71c41bb797db05a32d9528ce3ab613e90"
-  integrity sha512-EhCqpzRkxoT2DUB4AnrU0ggBYvTh3bWrLZzQTupq6vSVE6XzNwJVKsOHa41GCoevnsWMBNmoDVjXWGqckjuG1g==
-  dependencies:
-    "@es-joy/jsdoccomment" "~0.37.0"
-    comment-parser "1.3.1"
-    debug "^4.3.4"
-    escape-string-regexp "^4.0.0"
-    esquery "^1.5.0"
-    semver "^7.3.8"
-    spdx-expression-parse "^3.0.1"
-
 eslint-plugin-jsdoc@^45.0.0:
   version "45.0.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-45.0.0.tgz#6be84e4842a7138cc571a907ea9c31c42eaac5c0"
@@ -10165,7 +10061,7 @@ eslint-scope@^7.0.0, eslint-scope@^7.2.0:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.0:
+eslint-visitor-keys@^3.3.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc"
   integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==
@@ -10175,53 +10071,7 @@ eslint-visitor-keys@^3.4.1:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
   integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
 
-eslint@^8.35.0:
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.39.0.tgz#7fd20a295ef92d43809e914b70c39fd5a23cf3f1"
-  integrity sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.4.0"
-    "@eslint/eslintrc" "^2.0.2"
-    "@eslint/js" "8.39.0"
-    "@humanwhocodes/config-array" "^0.11.8"
-    "@humanwhocodes/module-importer" "^1.0.1"
-    "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.3.2"
-    doctrine "^3.0.0"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.0"
-    eslint-visitor-keys "^3.4.0"
-    espree "^9.5.1"
-    esquery "^1.4.2"
-    esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
-    find-up "^5.0.0"
-    glob-parent "^6.0.2"
-    globals "^13.19.0"
-    grapheme-splitter "^1.0.4"
-    ignore "^5.2.0"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    is-path-inside "^3.0.3"
-    js-sdsl "^4.1.4"
-    js-yaml "^4.1.0"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash.merge "^4.6.2"
-    minimatch "^3.1.2"
-    natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
-    text-table "^0.2.0"
-
-eslint@^8.39.0:
+eslint@^8.41.0:
   version "8.41.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.41.0.tgz#3062ca73363b4714b16dbc1e60f035e6134b6f1c"
   integrity sha512-WQDQpzGBOP5IrXPo4Hc0814r4/v2rrIsB0rhT7jtunIalgg6gYXWhRMOejVO8yH21T/FGaxjmFjBMNqcIlmH1Q==
@@ -10266,15 +10116,6 @@ eslint@^8.39.0:
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
-espree@^9.5.1:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.1.tgz#4f26a4d5f18905bf4f2e0bd99002aab807e96dd4"
-  integrity sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==
-  dependencies:
-    acorn "^8.8.0"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.0"
-
 espree@^9.5.2:
   version "9.5.2"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
@@ -12978,11 +12819,6 @@ js-beautify@^1.6.14:
     glob "^8.0.3"
     nopt "^6.0.0"
 
-js-sdsl@^4.1.4:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.0.tgz#8b437dbe642daa95760400b602378ed8ffea8430"
-  integrity sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -20643,13 +20479,6 @@ zen-observable@0.8.15:
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==
 
-zone.js@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.12.0.tgz#a4a6e5fab6d34bd37d89c77e89ac2e6f4a3d2c30"
-  integrity sha512-XtC+I5dXU14HrzidAKBNMqneIVUykLEAA1x+v4KVrd6AUPWlwYORF8KgsVqvgdHiKZ4BkxxjvYi/ksEixTPR0Q==
-  dependencies:
-    tslib "^2.3.0"
-
 zone.js@~0.13.0:
   version "0.13.0"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.13.0.tgz#4c735cb8ef49312b58c0ad13451996dc2b202a6d"