refactor(admin-ui): Depend on @vendure/common rather than using ts paths

packages/admin-ui/package.json

@@ -8,7 +8,6 @@
     "build": "yarn reset-extensions && ng build --prod",
     "build:library": "node scripts/set-version.js && node scripts/build-public-api.js && ng build vendure-admin-lib --prod",
     "watch": "ng build --watch=true",
-    "build:compiler": "tsc -p tsconfig.compiler.json",
     "test": "ng test --watch=false --browsers=ChromeHeadlessCI --progress=false",
     "lint": "tslint --fix",
     "reset-extensions": "rimraf ./src/app/extensions/modules && rimraf ./src/app/extensions/*.generated && rimraf ./src/app/extensions/*.temp",
@@ -18,14 +17,14 @@
   "publishConfig": {
     "access": "public"
   },
-  "main": "library/bundles/vendure-admin-ui.umd.js",
-  "module": "library/fesm5/vendure-admin-ui.js",
-  "es2015": "library/fesm2015/vendure-admin-ui.js",
-  "esm5": "library/esm5/vendure-admin-ui.js",
-  "esm2015": "library/esm2015/vendure-admin-ui.js",
-  "fesm5": "library/fesm5/vendure-admin-ui.js",
-  "fesm2015": "library/fesm2015/vendure-admin-ui.js",
-  "typings": "library/vendure-admin-ui.d.ts",
+  "main": "./library/bundles/vendure-admin-ui.umd.js",
+  "module": "./library/fesm5/vendure-admin-ui.js",
+  "es2015": "./library/fesm2015/vendure-admin-ui.js",
+  "esm5": "./library/esm5/vendure-admin-ui.js",
+  "esm2015": "./library/esm2015/vendure-admin-ui.js",
+  "fesm5": "./library/fesm5/vendure-admin-ui.js",
+  "fesm2015": "./library/fesm2015/vendure-admin-ui.js",
+  "typings": "./library/vendure-admin-ui.d.ts",
   "sideEffects": false,
   "dependencies": {
     "@angular/animations": "^9.0.2",

packages/admin-ui/scripts/build-public-api.js

@@ -6,10 +6,10 @@ const path = require('path');
 // builder process.
 
 console.log('Generating public api...');
-const SOURCES_DIR = path.join(__dirname, 'src/app');
+const SOURCES_DIR = path.join(__dirname, '/../src/app');
 const APP_SOURCE_FILE_PATTERN = /\.(pipe|service|component|module|routes|directive|guard|config)\.ts$/;
 const files = [];
-const publicApiFilePath = path.join(__dirname, 'src');
+const publicApiFilePath = path.join(__dirname, '/../src');
 forMatchingFiles(SOURCES_DIR, APP_SOURCE_FILE_PATTERN, filename => {
     const relativeFilename = '.' + filename.replace(publicApiFilePath, '')
         .replace(/\\/g, '/')
@@ -18,7 +18,7 @@ forMatchingFiles(SOURCES_DIR, APP_SOURCE_FILE_PATTERN, filename => {
 });
 
 const header = `// This file was generated by the build-public-api.ts script\n`;
-const fileContents = header + files.map(f => `export * from '${f}';`).join('\n');
+const fileContents = header + files.map(f => `export * from '${f}';`).join('\n') + '\n';
 fs.writeFileSync(path.join(publicApiFilePath, 'public-api.ts'), fileContents, 'utf8');
 console.log('Done!');
 

packages/admin-ui/src/app/app.config.ts

@@ -1,4 +1,4 @@
-import { AdminUiConfig } from 'shared/shared-types';
+import { AdminUiConfig } from '@vendure/common/lib/shared-types';
 
 import { LanguageCode } from './common/generated-types';
 

packages/admin-ui/src/app/catalog/components/asset-list/asset-list.component.ts

@@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { SortOrder } from '@vendure/common/lib/generated-shop-types';
 import { PaginationInstance } from 'ngx-pagination';
 import { combineLatest, Observable } from 'rxjs';
 import { debounceTime, map, takeUntil } from 'rxjs/operators';
-import { SortOrder } from 'shared/generated-shop-types';
 
 import { BaseListComponent } from '../../../common/base-list.component';
 import { GetAssetList } from '../../../common/generated-types';

packages/admin-ui/src/app/catalog/components/facet-detail/facet-detail.component.ts

@@ -2,10 +2,10 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { normalizeString } from '@vendure/common/lib/normalize-string';
+import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 import { combineLatest, EMPTY, forkJoin, Observable } from 'rxjs';
 import { map, mergeMap, switchMap, take } from 'rxjs/operators';
-import { normalizeString } from 'shared/normalize-string';
-import { notNullOrUndefined } from 'shared/shared-utils';
 
 import { BaseDetailComponent } from '../../../common/base-detail.component';
 import {

packages/admin-ui/src/app/catalog/components/generate-product-variants/generate-product-variants.component.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, OnInit, Output } from '@angular/core';
-import { generateAllCombinations } from 'shared/shared-utils';
+import { generateAllCombinations } from '@vendure/common/lib/shared-utils';
 
 import { CurrencyCode } from '../../../common/generated-types';
 import { DataService } from '../../../data/providers/data.service';

packages/admin-ui/src/app/catalog/components/option-value-input/option-value-input.component.ts

@@ -9,7 +9,7 @@ import {
     ViewChild,
 } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { unique } from 'shared/unique';
+import { unique } from '@vendure/common/lib/unique';
 
 export const OPTION_VALUE_INPUT_VALUE_ACCESSOR: Provider = {
     provide: NG_VALUE_ACCESSOR,

packages/admin-ui/src/app/catalog/components/product-assets/product-assets.component.ts

@@ -11,7 +11,7 @@ import {
     Output,
     ViewChild,
 } from '@angular/core';
-import { unique } from 'shared/unique';
+import { unique } from '@vendure/common/lib/unique';
 
 import { Asset } from '../../../common/generated-types';
 import { AssetPickerDialogComponent } from '../../../shared/components/asset-picker-dialog/asset-picker-dialog.component';

packages/admin-ui/src/app/catalog/components/product-detail/product-detail.component.ts

@@ -3,6 +3,10 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { normalizeString } from '@vendure/common/lib/normalize-string';
+import { DEFAULT_CHANNEL_CODE } from '@vendure/common/lib/shared-constants';
+import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
+import { unique } from '@vendure/common/lib/unique';
 import { combineLatest, EMPTY, merge, Observable } from 'rxjs';
 import {
     distinctUntilChanged,
@@ -13,11 +17,6 @@ import {
     takeUntil,
     withLatestFrom,
 } from 'rxjs/operators';
-import { normalizeString } from 'shared/normalize-string';
-import { DEFAULT_CHANNEL_CODE } from 'shared/shared-constants';
-import { notNullOrUndefined } from 'shared/shared-utils';
-import { unique } from 'shared/unique';
-import { IGNORE_CAN_DEACTIVATE_GUARD } from 'src/app/shared/providers/routing/can-deactivate-detail-guard';
 
 import { BaseDetailComponent } from '../../../common/base-detail.component';
 import {
@@ -39,6 +38,7 @@ import { NotificationService } from '../../../core/providers/notification/notifi
 import { DataService } from '../../../data/providers/data.service';
 import { ServerConfigService } from '../../../data/server-config';
 import { ModalService } from '../../../shared/providers/modal/modal.service';
+import { IGNORE_CAN_DEACTIVATE_GUARD } from '../../../shared/providers/routing/can-deactivate-detail-guard';
 import { ProductDetailService } from '../../providers/product-detail.service';
 import { ApplyFacetDialogComponent } from '../apply-facet-dialog/apply-facet-dialog.component';
 import { AssignProductsToChannelDialogComponent } from '../assign-products-to-channel-dialog/assign-products-to-channel-dialog.component';

packages/admin-ui/src/app/catalog/components/product-search-input/product-search-input.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
 import { NgSelectComponent, SELECTION_MODEL_FACTORY } from '@ng-select/ng-select';
-import { notNullOrUndefined } from 'shared/shared-utils';
+import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 
 import { SearchProducts } from '../../../common/generated-types';
 

packages/admin-ui/src/app/catalog/components/product-variants-editor/product-variants-editor.component.ts

@@ -1,10 +1,10 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { normalizeString } from '@vendure/common/lib/normalize-string';
+import { generateAllCombinations, notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 import { EMPTY, forkJoin, Observable, of } from 'rxjs';
 import { filter, map, mergeMap, switchMap, take } from 'rxjs/operators';
-import { normalizeString } from 'shared/normalize-string';
-import { generateAllCombinations, notNullOrUndefined } from 'shared/shared-utils';
 
 import { DeactivateAware } from '../../../common/deactivate-aware';
 import {

packages/admin-ui/src/app/catalog/components/product-variants-list/product-variants-list.component.ts

@@ -11,8 +11,8 @@ import {
     SimpleChanges,
 } from '@angular/core';
 import { FormArray } from '@angular/forms';
+import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 import { Subscription } from 'rxjs';
-import { notNullOrUndefined } from 'shared/shared-utils';
 
 import {
     CustomFieldConfig,

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

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { normalizeString } from 'shared/normalize-string';
+import { normalizeString } from '@vendure/common/lib/normalize-string';
 
 import { ProductVariant, UpdateProductOptionInput } from '../../../common/generated-types';
 import { createUpdatedTranslatable } from '../../../common/utilities/create-updated-translatable';

packages/admin-ui/src/app/catalog/providers/product-detail.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
+import { normalizeString } from '@vendure/common/lib/normalize-string';
+import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 import { BehaviorSubject, forkJoin, Observable, of, throwError } from 'rxjs';
 import { map, mergeMap, shareReplay, skip, switchMap } from 'rxjs/operators';
-import { normalizeString } from 'shared/normalize-string';
-import { notNullOrUndefined } from 'shared/shared-utils';
 
 import {
     CreateProductInput,

packages/admin-ui/src/app/common/base-entity-resolver.ts

@@ -6,10 +6,10 @@ import {
     Router,
     RouterStateSnapshot,
 } from '@angular/router';
+import { Type } from '@vendure/common/lib/shared-types';
+import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 import { Observable, of } from 'rxjs';
 import { filter, map, shareReplay, take, takeUntil } from 'rxjs/operators';
-import { Type } from 'shared/shared-types';
-import { notNullOrUndefined } from 'shared/shared-utils';
 
 export interface EntityResolveData<R> extends ResolveData {
     entity: Type<BaseEntityResolver<R>>;

packages/admin-ui/src/app/common/utilities/create-updated-translatable.spec.ts

@@ -1,4 +1,4 @@
-import { DeepPartial } from 'shared/shared-types';
+import { DeepPartial } from '@vendure/common/lib/shared-types';
 
 import { CustomFieldConfig, LanguageCode, ProductWithVariants } from '../generated-types';
 

packages/admin-ui/src/app/common/utilities/create-updated-translatable.ts

@@ -1,5 +1,5 @@
-import { CustomFieldsObject, CustomFieldType } from 'shared/shared-types';
-import { assertNever } from 'shared/shared-utils';
+import { CustomFieldsObject, CustomFieldType } from '@vendure/common/lib/shared-types';
+import { assertNever } from '@vendure/common/lib/shared-utils';
 
 import { CustomFieldConfig, LanguageCode } from '../generated-types';
 

packages/admin-ui/src/app/common/utilities/get-default-config-arg-value.ts

@@ -1,5 +1,5 @@
-import { ConfigArgType } from 'shared/shared-types';
-import { assertNever } from 'shared/shared-utils';
+import { ConfigArgType } from '@vendure/common/lib/shared-types';
+import { assertNever } from '@vendure/common/lib/shared-utils';
 
 import { ConfigArg, ConfigArgDefinition } from '../generated-types';
 

packages/admin-ui/src/app/core/components/breadcrumb/breadcrumb.component.spec.ts

@@ -3,8 +3,8 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testin
 import { By } from '@angular/platform-browser';
 import { Resolve, Router, Routes } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
+import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { notNullOrUndefined } from 'shared/shared-utils';
 
 import { MockTranslatePipe } from '../../../../testing/translate.pipe.mock';
 import { DataService } from '../../../data/providers/data.service';

packages/admin-ui/src/app/core/components/channel-switcher/channel-switcher.component.ts

@@ -1,9 +1,9 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { DEFAULT_CHANNEL_CODE } from '@vendure/common/lib/shared-constants';
+import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
-import { DEFAULT_CHANNEL_CODE } from 'shared/shared-constants';
-import { notNullOrUndefined } from 'shared/shared-utils';
 
 import { CurrentUserChannel } from '../../../common/generated-types';
 import { DataService } from '../../../data/providers/data.service';

packages/admin-ui/src/app/core/providers/auth/auth.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
+import { DEFAULT_CHANNEL_CODE } from '@vendure/common/lib/shared-constants';
 import { Observable, of } from 'rxjs';
 import { catchError, mapTo, mergeMap, switchMap } from 'rxjs/operators';
-import { DEFAULT_CHANNEL_CODE } from 'shared/shared-constants';
 
 import { CurrentUserChannel, CurrentUserFragment, SetAsLoggedIn } from '../../../common/generated-types';
 import { DataService } from '../../../data/providers/data.service';

packages/admin-ui/src/app/core/providers/custom-field-component/custom-field-component.service.ts

@@ -6,7 +6,7 @@ import {
     Injector,
 } from '@angular/core';
 import { FormControl } from '@angular/forms';
-import { Type } from 'shared/shared-types';
+import { Type } from '@vendure/common/lib/shared-types';
 
 import { CustomFields, CustomFieldsFragment } from '../../../common/generated-types';
 export type CustomFieldConfig = CustomFieldsFragment;

packages/admin-ui/src/app/customer/components/customer-detail/customer-detail.component.ts

@@ -2,9 +2,9 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 import { forkJoin, Observable, Subject } from 'rxjs';
 import { filter, map, merge, mergeMap, shareReplay, take } from 'rxjs/operators';
-import { notNullOrUndefined } from 'shared/shared-utils';
 
 import { BaseDetailComponent } from '../../../common/base-detail.component';
 import {

packages/admin-ui/src/app/customer/components/customer-list/customer-list.component.ts

@@ -1,8 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
+import { SortOrder } from '@vendure/common/lib/generated-shop-types';
 import { debounceTime, takeUntil } from 'rxjs/operators';
-import { SortOrder } from 'shared/generated-shop-types';
 
 import { BaseListComponent } from '../../../common/base-list.component';
 import { GetCustomerList } from '../../../common/generated-types';

packages/admin-ui/src/app/data/omit-typename-link.ts

@@ -1,5 +1,5 @@
+import { omit } from '@vendure/common/lib/omit';
 import { ApolloLink } from 'apollo-link';
-import { omit } from 'shared/omit';
 
 /**
  * The "__typename" property added by Apollo Client causes errors when posting the entity

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

@@ -1,6 +1,6 @@
+import { pick } from '@vendure/common/lib/pick';
 import { from } from 'rxjs';
 import { bufferCount, concatMap } from 'rxjs/operators';
-import { pick } from 'shared/pick';
 
 import {
     CollectionFilterParameter,

packages/admin-ui/src/app/data/providers/facet-data.service.ts

@@ -1,4 +1,4 @@
-import { pick } from 'shared/pick';
+import { pick } from '@vendure/common/lib/pick';
 
 import {
     CreateFacet,

packages/admin-ui/src/app/data/providers/interceptor.ts

@@ -9,10 +9,10 @@ import {
 import { Injectable, Injector } from '@angular/core';
 import { Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { DEFAULT_AUTH_TOKEN_HEADER_KEY } from '@vendure/common/lib/shared-constants';
+import { AdminUiConfig } from '@vendure/common/lib/shared-types';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
-import { DEFAULT_AUTH_TOKEN_HEADER_KEY } from 'shared/shared-constants';
-import { AdminUiConfig } from 'shared/shared-types';
 
 import { getAppConfig } from '../../app.config';
 import { AuthService } from '../../core/providers/auth/auth.service';

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

@@ -1,4 +1,4 @@
-import { pick } from 'shared/pick';
+import { pick } from '@vendure/common/lib/pick';
 
 import {
     AddOptionGroupToProduct,

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

@@ -1,5 +1,5 @@
+import { pick } from '@vendure/common/lib/pick';
 import { FetchPolicy } from 'apollo-client';
-import { pick } from 'shared/pick';
 
 import {
     AddMembersToZone,

packages/admin-ui/src/app/data/query-result.ts

@@ -1,8 +1,8 @@
+import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 import { Apollo, QueryRef } from 'apollo-angular';
 import { ApolloQueryResult, NetworkStatus } from 'apollo-client';
 import { merge, Observable, Subject } from 'rxjs';
 import { distinctUntilChanged, filter, finalize, map, skip, take, takeUntil, tap } from 'rxjs/operators';
-import { notNullOrUndefined } from 'shared/shared-utils';
 
 import { GetUserStatus } from '../common/generated-types';
 

packages/admin-ui/src/app/data/utils/remove-readonly-custom-fields.ts

@@ -1,6 +1,6 @@
 import { CustomFieldConfig } from '@vendure/common/lib/generated-types';
+import { simpleDeepClone } from '@vendure/common/lib/simple-deep-clone';
 import { DocumentNode, getOperationAST, NamedTypeNode, TypeNode } from 'graphql';
-import { simpleDeepClone } from 'shared/simple-deep-clone';
 
 const CREATE_ENTITY_REGEX = /Create([A-Za-z]+)Input/;
 const UPDATE_ENTITY_REGEX = /Update([A-Za-z]+)Input/;

packages/admin-ui/src/app/order/components/line-fulfillment/line-fulfillment.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { unique } from 'shared/unique';
+import { unique } from '@vendure/common/lib/unique';
 
 import { OrderDetail } from '../../../common/generated-types';
 

packages/admin-ui/src/app/order/components/order-detail/order-detail.component.ts

@@ -2,9 +2,9 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { FormGroup } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { omit } from '@vendure/common/lib/omit';
 import { Observable, of, Subject } from 'rxjs';
 import { startWith, switchMap, take } from 'rxjs/operators';
-import { omit } from 'shared/omit';
 
 import { BaseDetailComponent } from '../../../common/base-detail.component';
 import {

packages/admin-ui/src/app/order/components/order-payment-card/order-payment-card.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
-import { CurrencyCode } from 'shared/generated-types';
+import { CurrencyCode } from '@vendure/common/lib/generated-types';
 
 import { OrderDetail } from '../../../common/generated-types';
 

packages/admin-ui/src/app/settings/components/channel-detail/channel-detail.component.ts

@@ -2,9 +2,9 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { DEFAULT_CHANNEL_CODE } from '@vendure/common/lib/shared-constants';
 import { Observable } from 'rxjs';
 import { map, mergeMap, take } from 'rxjs/operators';
-import { DEFAULT_CHANNEL_CODE } from 'shared/shared-constants';
 
 import { BaseDetailComponent } from '../../../common/base-detail.component';
 import {

packages/admin-ui/src/app/settings/components/channel-list/channel-list.component.ts

@@ -1,8 +1,8 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { DEFAULT_CHANNEL_CODE } from '@vendure/common/lib/shared-constants';
 import { EMPTY, Observable, Subject } from 'rxjs';
 import { mergeMap, startWith, switchMap } from 'rxjs/operators';
-import { DEFAULT_CHANNEL_CODE } from 'shared/shared-constants';
 
 import { Channel } from '../../../common/generated-types';
 import { NotificationService } from '../../../core/providers/notification/notification.service';

packages/admin-ui/src/app/settings/components/payment-method-detail/payment-method-detail.component.ts

@@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { ConfigArgSubset, ConfigArgType } from '@vendure/common/lib/shared-types';
 import { mergeMap, take } from 'rxjs/operators';
-import { ConfigArgSubset, ConfigArgType } from 'shared/shared-types';
 
 import { BaseDetailComponent } from '../../../common/base-detail.component';
 import { ConfigArg, PaymentMethod, UpdatePaymentMethodInput } from '../../../common/generated-types';

packages/admin-ui/src/app/settings/components/role-detail/role-detail.component.ts

@@ -2,9 +2,9 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { normalizeString } from '@vendure/common/lib/normalize-string';
 import { Observable } from 'rxjs';
 import { mergeMap, take } from 'rxjs/operators';
-import { normalizeString } from 'shared/normalize-string';
 
 import { BaseDetailComponent } from '../../../common/base-detail.component';
 import {

packages/admin-ui/src/app/settings/components/role-list/role-list.component.ts

@@ -1,9 +1,9 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { CUSTOMER_ROLE_CODE, SUPER_ADMIN_ROLE_CODE } from '@vendure/common/lib/shared-constants';
 import { EMPTY } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { CUSTOMER_ROLE_CODE, SUPER_ADMIN_ROLE_CODE } from 'shared/shared-constants';
 
 import { BaseListComponent } from '../../../common/base-list.component';
 import { GetRoles, Role } from '../../../common/generated-types';

packages/admin-ui/src/app/settings/components/shipping-method-detail/shipping-method-detail.component.ts

@@ -2,9 +2,9 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { normalizeString } from '@vendure/common/lib/normalize-string';
 import { combineLatest, merge, Observable, of, Subject } from 'rxjs';
 import { mergeMap, switchMap, take, takeUntil } from 'rxjs/operators';
-import { normalizeString } from 'shared/normalize-string';
 
 import { BaseDetailComponent } from '../../../common/base-detail.component';
 import {

packages/admin-ui/src/app/shared/components/action-bar-items/action-bar-items.component.ts

@@ -8,9 +8,9 @@ import {
     SimpleChanges,
 } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { assertNever } from '@vendure/common/lib/shared-utils';
 import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
-import { assertNever } from 'shared/shared-utils';
 
 import { ActionBarItem } from '../../../core/providers/nav-builder/nav-builder-types';
 import { NavBuilderService } from '../../../core/providers/nav-builder/nav-builder.service';

packages/admin-ui/src/app/shared/components/asset-file-input/asset-file-input.component.ts

@@ -7,7 +7,7 @@ import {
     OnInit,
     Output,
 } from '@angular/core';
-import { notNullOrUndefined } from 'shared/shared-utils';
+import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 
 /**
  * A component for selecting files to upload as new Assets.

packages/admin-ui/src/app/shared/components/channel-assignment-control/channel-assignment-control.component.ts

@@ -1,8 +1,8 @@
 import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { DEFAULT_CHANNEL_CODE } from '@vendure/common/lib/shared-constants';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { DEFAULT_CHANNEL_CODE } from 'shared/shared-constants';
 
 import { CurrentUserChannel } from '../../../common/generated-types';
 import { DataService } from '../../../data/providers/data.service';

packages/admin-ui/src/app/shared/components/channel-badge/channel-badge.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { DEFAULT_CHANNEL_CODE } from 'shared/shared-constants';
+import { DEFAULT_CHANNEL_CODE } from '@vendure/common/lib/shared-constants';
 
 @Component({
     selector: 'vdr-channel-badge',

packages/admin-ui/src/app/shared/components/configurable-input/configurable-input.component.ts

@@ -20,10 +20,10 @@ import {
     Validator,
     Validators,
 } from '@angular/forms';
+import { StringFieldOption } from '@vendure/common/lib/generated-types';
+import { ConfigArgType } from '@vendure/common/lib/shared-types';
+import { assertNever } from '@vendure/common/lib/shared-utils';
 import { Subscription } from 'rxjs';
-import { StringFieldOption } from 'shared/generated-types';
-import { ConfigArgType } from 'shared/shared-types';
-import { assertNever } from 'shared/shared-utils';
 
 import {
     ConfigArg,

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

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { Type } from 'shared/shared-types';
+import { Type } from '@vendure/common/lib/shared-types';
 
 import { CurrencyNamePipe } from '../../pipes/currency-name.pipe';
 import { AffixedInputComponent } from '../affixed-input/affixed-input.component';

packages/admin-ui/src/app/shared/components/extension-host/extension-host.service.ts

@@ -1,9 +1,9 @@
 import { Injectable, OnDestroy } from '@angular/core';
 import { ExtensionMesssage, MessageResponse } from '@vendure/common/lib/extension-host-types';
+import { assertNever } from '@vendure/common/lib/shared-utils';
 import { parse } from 'graphql';
 import { merge, Observer, Subject } from 'rxjs';
 import { filter, takeUntil } from 'rxjs/operators';
-import { assertNever } from 'shared/shared-utils';
 
 import { NotificationService } from '../../../core/providers/notification/notification.service';
 import { DataService } from '../../../data/providers/data.service';

packages/admin-ui/src/app/shared/directives/if-default-channel-active.directive.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, Directive, Input, TemplateRef, ViewContainerRef } from '@angular/core';
+import { DEFAULT_CHANNEL_CODE } from '@vendure/common/lib/shared-constants';
 import { tap } from 'rxjs/operators';
-import { DEFAULT_CHANNEL_CODE } from 'shared/shared-constants';
 
 import { UserStatus } from '../../common/generated-types';
 import { DataService } from '../../data/providers/data.service';

packages/admin-ui/src/app/shared/pipes/channel-label.pipe.ts

@@ -1,6 +1,6 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
-import { DEFAULT_CHANNEL_CODE } from 'shared/shared-constants';
+import { DEFAULT_CHANNEL_CODE } from '@vendure/common/lib/shared-constants';
 
 @Pipe({
     name: 'channelCodeToLabel',

packages/admin-ui/src/app/shared/providers/modal/modal.service.ts

@@ -1,7 +1,7 @@
 import { ComponentFactoryResolver, Injectable, ViewContainerRef } from '@angular/core';
+import { Type } from '@vendure/common/lib/shared-types';
 import { from, Observable, of } from 'rxjs';
 import { map, mergeMap } from 'rxjs/operators';
-import { Type } from 'shared/shared-types';
 
 import { OverlayHostService } from '../../../core/providers/overlay-host/overlay-host.service';
 import { ModalDialogComponent } from '../../components/modal-dialog/modal-dialog.component';

packages/admin-ui/src/app/shared/shared.module.ts

@@ -5,8 +5,11 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { ClarityModule } from '@clr/angular';
+import '@clr/icons';
+import '@clr/icons/shapes/all-shapes';
 import { NgSelectModule } from '@ng-select/ng-select';
 import { TranslateModule } from '@ngx-translate/core';
+import '@webcomponents/custom-elements/custom-elements.min.js';
 import { NgxPaginationModule } from 'ngx-pagination';
 
 import { ActionBarItemsComponent } from './components/action-bar-items/action-bar-items.component';
@@ -77,66 +80,6 @@ import { SortPipe } from './pipes/sort.pipe';
 import { StringToColorPipe } from './pipes/string-to-color.pipe';
 import { ModalService } from './providers/modal/modal.service';
 import { CanDeactivateDetailGuard } from './providers/routing/can-deactivate-detail-guard';
-/*import {
-    AffixedInputComponent,
-    AssetFileInputComponent,
-    AssetGalleryComponent,
-    AssetPickerDialogComponent,
-    AssetPreviewComponent,
-    AssetPreviewDialogComponent,
-    AssetPreviewPipe,
-    ChannelAssignmentControlComponent,
-    ChannelBadgeComponent,
-    ChannelLabelPipe,
-    ChipComponent,
-    ConfigurableInputComponent,
-    CurrencyInputComponent,
-    CurrencyNamePipe,
-    CustomerLabelComponent,
-    CustomFieldControlComponent,
-    CustomFieldLabelPipe,
-    DataTableColumnComponent,
-    DataTableComponent,
-    DatetimePickerComponent,
-    DialogButtonsDirective,
-    DialogComponentOutletComponent,
-    DialogTitleDirective,
-    DropdownComponent,
-    DropdownItemDirective,
-    DropdownMenuComponent,
-    DropdownTriggerDirective,
-    EntityInfoComponent,
-    ExtensionHostComponent,
-    ExternalImageDialogComponent,
-    FacetValueChipComponent,
-    FacetValueSelectorComponent,
-    FileSizePipe,
-    FocalPointControlComponent,
-    FormattedAddressComponent,
-    FormFieldComponent,
-    FormFieldControlDirective,
-    FormItemComponent,
-    IfDefaultChannelActiveDirective,
-    IfMultichannelDirective,
-    IfPermissionsDirective,
-    ItemsPerPageControlsComponent,
-    LabeledDataComponent,
-    LanguageSelectorComponent,
-    LinkDialogComponent,
-    ModalDialogComponent,
-    ObjectTreeComponent,
-    OrderStateLabelComponent,
-    PaginationControlsComponent,
-    PercentageSuffixInputComponent,
-    RichTextEditorComponent,
-    SelectToggleComponent,
-    SentenceCasePipe,
-    SimpleDialogComponent,
-    SortPipe,
-    StringToColorPipe,
-    TableRowActionComponent,
-    TitleInputComponent,
-} from './shared-declarations';*/
 
 const IMPORTS = [
     ClarityModule,

packages/admin-ui/src/polyfills.ts

@@ -74,12 +74,3 @@ import 'zone.js/dist/zone'; // Included with Angular CLI.
 /***************************************************************************************************
  * APPLICATION IMPORTS
  */
-import '@clr/icons';
-import '@clr/icons/shapes/chart-shapes';
-import '@clr/icons/shapes/commerce-shapes';
-import '@clr/icons/shapes/essential-shapes';
-import '@clr/icons/shapes/media-shapes';
-import '@clr/icons/shapes/technology-shapes';
-import '@clr/icons/shapes/travel-shapes';
-import '@clr/icons/shapes/social-shapes';
-import '@webcomponents/custom-elements/custom-elements.min.js';

packages/admin-ui/src/public-api.ts

@@ -1,5 +1,6 @@
 // This file was generated by the build-public-api.ts script
 export * from './app/app.component';
+export * from './app/app.config';
 export * from './app/app.module';
 export * from './app/app.routes';
 export * from './app/catalog/catalog.module';

packages/admin-ui/src/tsconfig.app.json

@@ -5,8 +5,7 @@
 },
   "files": [
     "main.ts",
-    "polyfills.ts",
-    "public-api.ts"
+    "polyfills.ts"
   ],
   "include": [
     "src/**/*.d.ts"

packages/admin-ui/tsconfig.json

@@ -25,10 +25,6 @@
       "es2017",
       "dom",
       "esnext.asynciterable"
-    ],
-    "paths": {
-      "shared/*": ["../common/lib/*"],
-      "@vendure/admin-ui/src/*": ["./src/*"]
-    }
+    ]
   }
 }

yarn.lock

@@ -187,6 +187,11 @@
   resolved "https://registry.npmjs.org/@angular/common/-/common-9.0.2.tgz#767c659b4a34c478009a40373ca1ebb84091c0b4"
   integrity sha512-KYOov8fg5WX/bAMkemlcAZxqiq/6ga1BoxjaiZXBj07KDq8i5Nwcm6RmNkeDByCuXd2UHVm1w5t897wEUi6fnw==
 
+"@angular/common@^9.0.4":
+  version "9.0.4"
+  resolved "https://registry.npmjs.org/@angular/common/-/common-9.0.4.tgz#7d168b22c5c43e72112d0a19242eca22b62bb4f3"
+  integrity sha512-F3qoYrceEdCd5SlgObcbSIIdKfRXgyTBO2gbbArQHFe4GvewkH3isTn5uqAF6sfJlb7rXWZGrD6C3d9brw/fEw==
+
 "@angular/compiler-cli@^9.0.2":
   version "9.0.2"
   resolved "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.0.2.tgz#41868d23f2d062e072c9cff267c835151d237e8c"
@@ -221,6 +226,11 @@
   resolved "https://registry.npmjs.org/@angular/core/-/core-9.0.2.tgz#250093b6a4d3137e2cc30e73e6cee919f1386165"
   integrity sha512-ccVPR6RZo2s9O9phO0TJ60QZ0WA7qfUMzo0xnpBW0XGcbTzLEn9upvs+0PX64f9UpnHz/MQo0wsqYvTLuoz7Yw==
 
+"@angular/core@^9.0.4":
+  version "9.0.4"
+  resolved "https://registry.npmjs.org/@angular/core/-/core-9.0.4.tgz#6baa5ec6c594b47de541e47f4aa37241adec393a"
+  integrity sha512-6RqQb1GO2uglSlgiGbxhvy8plztZtABCWLRn0X+T1PnrxoqgxqA5WkKJjGxao+1M/ECW1V0fw4Xy7DE6KvAJwQ==
+
 "@angular/forms@^9.0.2":
   version "9.0.2"
   resolved "https://registry.npmjs.org/@angular/forms/-/forms-9.0.2.tgz#917e8f85a2f358bbcdf1b1946b7afa6f5460b5ed"
@@ -236,11 +246,21 @@
   resolved "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.0.2.tgz#1ed55756abd29830c2952f07c5fdea6be0b33acc"
   integrity sha512-RJa+Y83hIFcf7pFcbbaCi7M5Y9nUUcQVuazWbQtiUe+BY5pikyug4RsF2B10pctcxb6LFLElfmkvatmmwEQ9aQ==
 
+"@angular/platform-browser-dynamic@^9.0.4":
+  version "9.0.4"
+  resolved "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.0.4.tgz#343bd43fe00a279a737e02c16dd8790dc0da93a8"
+  integrity sha512-9vAn2QH07khuF4n7kyMJzgE6l30Yxg1AGd8GtOfa/4nbna+EZxFVYOkto9bpv4uEwDr9o7QrFLplko9a8xs7kg==
+
 "@angular/platform-browser@^9.0.2":
   version "9.0.2"
   resolved "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.0.2.tgz#159456404b35f4c86ecf64ecc2b427389ede057d"
   integrity sha512-RMivdtJtspYLH/96AzLwLj3v0O9ck0sL6R1uh5JacfBkmedqJzmLn+AOxTdjaGdIpFtw9tisT+0Aw/nkG14vlA==
 
+"@angular/platform-browser@^9.0.4":
+  version "9.0.4"
+  resolved "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.0.4.tgz#03853b435c3b964660727ac9d7e15912c920cdb8"
+  integrity sha512-mbiqmw0rDGPxEgKVgDuK7yZvtgjJmzpMGBYAMwkQ9YIE0SoA5XP0NvZiFkHZqDXwLgCv2IJ/kvkhfCBwnBKCXQ==
+
 "@angular/router@^9.0.2":
   version "9.0.2"
   resolved "https://registry.npmjs.org/@angular/router/-/router-9.0.2.tgz#f33a56b16966eabdb7b24ae484d9577d47fe117f"
@@ -1099,20 +1119,20 @@
     typescript "^3.6.3"
     yargs "^14.0.0"
 
-"@clr/angular@^3.0.0-rc.1":
-  version "3.0.0-rc.1"
-  resolved "https://registry.npmjs.org/@clr/angular/-/angular-3.0.0-rc.1.tgz#bdfcf6d6ffd667b0804ff9247dca493e03b1b955"
-  integrity sha512-Jsd6xz4HoVsQeo5RMQ9am53xod/c5rzMvx/EGWkromcGfITypbq1YtYvW9PeUUy3aE4oddh/ac2pP93y0QhKUQ==
+"@clr/angular@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/@clr/angular/-/angular-3.0.0.tgz#23d4cccad89c06ea32d322268678a7f3c942a32c"
+  integrity sha512-8GJLCmKvDag7/hogjjDZsv8u1MrHQ7XKvyecf/2esEo8761Buu6IuXjo3p9703Xb58D98/Iv2rkrm1k7AYzSFw==
 
 "@clr/city@^1.0.0":
   version "1.1.0"
   resolved "https://registry.npmjs.org/@clr/city/-/city-1.1.0.tgz#4a444cd12c626d66ffadab27e9d09bb3c8eca352"
   integrity sha512-R+C4uywmXoTD01LINOt3O0cBRviQdbAVNxdVvOyuO3+rM9bvFroF7UZY0R1ue/xvKXlqJrEkNKZQODeKjzaAhA==
 
-"@clr/core@^3.0.0-rc.1":
-  version "3.0.0-rc.1"
-  resolved "https://registry.npmjs.org/@clr/core/-/core-3.0.0-rc.1.tgz#592f77f097c0d9108a936c74d4989ff7cc9e68b6"
-  integrity sha512-duqg2mb2VGya1gTNPYCZ4Fqvcu4Dj7iAJ/m0hOZXJCoz718RNED++kg6y8qKi5jfrHAHqnmPdG/aYtW9/d3SJQ==
+"@clr/core@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/@clr/core/-/core-3.0.0.tgz#938d4901ee1a9de107fe80c0bde20aac1b3029ea"
+  integrity sha512-YwzW/Pj222h2o1oL00ectH9B5ir3EcmcBMxaI0KWWp4Aciy/I7NvWQ15UStM7/bAX6Qli1YGvkTj1mB8AKaYUQ==
   dependencies:
     css-vars-ponyfill "^2.1.2"
     lit-element "^2.2.1"
@@ -1125,10 +1145,10 @@
     "@webcomponents/shadycss" "^1.9.3"
     "@webcomponents/webcomponentsjs" "^2.4.0"
 
-"@clr/icons@^3.0.0-rc.1":
-  version "3.0.0-rc.1"
-  resolved "https://registry.npmjs.org/@clr/icons/-/icons-3.0.0-rc.1.tgz#151917834753bd1b1b0f70e5eb6671be9c6336ff"
-  integrity sha512-lhsk7z+gOgTk8GViwNtiNrZippGNBCM7oEJFz59oWaWJzOpK9Y86ixog8k+7BjZnGrxy4w+FEjisYipGvQYkRQ==
+"@clr/icons@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/@clr/icons/-/icons-3.0.0.tgz#d8faa0b9c8d33a48db8db6e422d1e7c1b343d84f"
+  integrity sha512-3gNVHjze/+uGafyLWZ7mEQbkI24VAnOJoUZTn7XMir7FYbuxIutunUYP0XbK3A5j/F/8LtfEc1g6ArVa9is2xA==
 
 "@clr/ui@^3.0.0-rc.1":
   version "3.0.0-rc.1"