[NG] fix places that imported from a barrel, and update schematics to…

… handle breaking change in angular.json format from CLI (#2650) fixes #2648 Signed-off-by: Jeremy Wilken <[email protected]>
vmware-archive · Sep 13, 2018 · 1e9b7af · 1e9b7af
1 parent a3df444
commit 1e9b7af
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 23 deletions.
diff --git a/src/clr-angular/button/button-group/button-group.ts b/src/clr-angular/button/button-group/button-group.ts
@@ -9,7 +9,7 @@ import { Component, ContentChildren, ElementRef, HostListener, Input, QueryList
 import { Point } from '../../popover/common/popover';
 import { CLR_MENU_POSITIONS } from '../../popover/dropdown/menu-positions';
 import { ButtonInGroupService } from '../providers/button-in-group.service';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 import { ClrButton } from './button';
 

diff --git a/src/clr-angular/data/datagrid/datagrid-action-overflow.ts b/src/clr-angular/data/datagrid/datagrid-action-overflow.ts
@@ -8,7 +8,7 @@ import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core
 import { Point } from '../../popover/common/popover';
 
 import { RowActionService } from './providers/row-action-service';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 @Component({
   selector: 'clr-dg-action-overflow',

diff --git a/src/clr-angular/data/datagrid/datagrid-column-toggle.ts b/src/clr-angular/data/datagrid/datagrid-column-toggle.ts
@@ -13,7 +13,7 @@ import { ClrDatagridColumnToggleTitle } from './datagrid-column-toggle-title';
 import { DatagridHideableColumnModel } from './datagrid-hideable-column.model';
 import { ColumnToggleButtonsService } from './providers/column-toggle-buttons.service';
 import { HideableColumnService } from './providers/hideable-column.service';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 @Component({
   selector: 'clr-dg-column-toggle',

diff --git a/src/clr-angular/data/datagrid/datagrid-filter.ts b/src/clr-angular/data/datagrid/datagrid-filter.ts
@@ -12,7 +12,7 @@ import { ClrDatagridFilterInterface } from './interfaces/filter.interface';
 import { CustomFilter } from './providers/custom-filter';
 import { FiltersProvider, RegisteredFilter } from './providers/filters';
 import { DatagridFilterRegistrar } from './utils/datagrid-filter-registrar';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 /**
  * Custom filter that can be added in any column to override the default object property string filter.

diff --git a/src/clr-angular/data/datagrid/datagrid-row.ts b/src/clr-angular/data/datagrid/datagrid-row.ts
@@ -15,7 +15,7 @@ import { ExpandableRowsCount } from './providers/global-expandable-rows';
 import { HideableColumnService } from './providers/hideable-column.service';
 import { RowActionService } from './providers/row-action-service';
 import { Selection, SelectionType } from './providers/selection';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 let nbRow: number = 0;
 

diff --git a/src/clr-angular/data/datagrid/datagrid.ts b/src/clr-angular/data/datagrid/datagrid.ts
@@ -34,7 +34,7 @@ import { Sort } from './providers/sort';
 import { StateDebouncer } from './providers/state-debouncer.provider';
 import { StateProvider } from './providers/state.provider';
 import { DatagridRenderOrganizer } from './render/render-organizer';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 @Component({
   selector: 'clr-datagrid',

diff --git a/src/clr-angular/data/stack-view/stack-block.ts b/src/clr-angular/data/stack-view/stack-block.ts
@@ -5,7 +5,7 @@
  */
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { Component, EventEmitter, HostBinding, Input, OnInit, Optional, Output, SkipSelf } from '@angular/core';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 @Component({
   selector: 'clr-stack-block',

diff --git a/src/clr-angular/data/tree-view/tree-node.ts b/src/clr-angular/data/tree-view/tree-node.ts
@@ -24,7 +24,7 @@ import { LoadingListener } from '../../utils/loading/loading-listener';
 import { AbstractTreeSelection } from './abstract-tree-selection';
 import { clrTreeSelectionProviderFactory } from './providers/tree-selection.provider';
 import { TreeSelectionService } from './providers/tree-selection.service';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 @Component({
   selector: 'clr-tree-node',

diff --git a/src/clr-angular/emphasis/alert/alert.ts b/src/clr-angular/emphasis/alert/alert.ts
@@ -8,7 +8,7 @@ import { ChangeDetectorRef, Component, EventEmitter, Input, Optional, Output } f
 // providers
 import { AlertIconAndTypesService } from './providers/icon-and-types.service';
 import { MultiAlertService } from './providers/multi-alert.service';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 @Component({
   selector: 'clr-alert',

diff --git a/src/clr-angular/emphasis/alert/alerts-pager.ts b/src/clr-angular/emphasis/alert/alerts-pager.ts
@@ -8,7 +8,7 @@ import { Subscription } from 'rxjs';
 
 import { ClrAlert } from './alert';
 import { MultiAlertService } from './providers/multi-alert.service';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 @Component({
   selector: 'clr-alerts-pager',

diff --git a/src/clr-angular/emphasis/alert/providers/icon-and-types.service.ts b/src/clr-angular/emphasis/alert/providers/icon-and-types.service.ts
@@ -8,7 +8,7 @@ import { Injectable } from '@angular/core';
 
 import { AlertInfoObject } from '../utils/alert-info-object';
 import { ALERT_TYPES } from '../utils/alert-types';
-import { ClrCommonStrings } from '../../../utils/i18n';
+import { ClrCommonStrings } from '../../../utils/i18n/common-strings.interface';
 
 @Injectable()
 export class AlertIconAndTypesService {

diff --git a/src/clr-angular/forms/datepicker/date-container.ts b/src/clr-angular/forms/datepicker/date-container.ts
@@ -15,7 +15,7 @@ import { DateIOService } from './providers/date-io.service';
 import { DateNavigationService } from './providers/date-navigation.service';
 import { DatepickerEnabledService } from './providers/datepicker-enabled.service';
 import { LocaleHelperService } from './providers/locale-helper.service';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 @Component({
   selector: 'clr-date-container',

diff --git a/src/clr-angular/forms/datepicker/daypicker.ts b/src/clr-angular/forms/datepicker/daypicker.ts
@@ -8,7 +8,7 @@ import { Component } from '@angular/core';
 import { DateNavigationService } from './providers/date-navigation.service';
 import { LocaleHelperService } from './providers/locale-helper.service';
 import { ViewManagerService } from './providers/view-manager.service';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 @Component({ selector: 'clr-daypicker', templateUrl: './daypicker.html', host: { '[class.daypicker]': 'true' } })
 export class ClrDaypicker {

diff --git a/src/clr-angular/forms/datepicker/yearpicker.ts b/src/clr-angular/forms/datepicker/yearpicker.ts
@@ -11,7 +11,7 @@ import { YearRangeModel } from './model/year-range.model';
 import { DateNavigationService } from './providers/date-navigation.service';
 import { DatepickerFocusService } from './providers/datepicker-focus.service';
 import { ViewManagerService } from './providers/view-manager.service';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 @Component({
   selector: 'clr-yearpicker',

diff --git a/src/clr-angular/forms/password/password-container.ts b/src/clr-angular/forms/password/password-container.ts
@@ -16,7 +16,7 @@ import { ControlIdService } from '../common/providers/control-id.service';
 import { FocusService } from '../common/providers/focus.service';
 import { LayoutService } from '../common/providers/layout.service';
 import { NgControlService } from '../common/providers/ng-control.service';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 /* tslint:disable-next-line:variable-name */
 export const ToggleService = new InjectionToken<any>(undefined);

diff --git a/src/clr-angular/layout/tabs/tabs.ts b/src/clr-angular/layout/tabs/tabs.ts
@@ -11,7 +11,7 @@ import { IfOpenService } from '../../utils/conditional/if-open.service';
 import { TabsService } from './providers/tabs.service';
 import { ClrTabLink } from './tab-link.directive';
 import { TABS_ID, TABS_ID_PROVIDER } from './tabs-id.provider';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 @Component({
   selector: 'clr-tabs',

diff --git a/src/clr-angular/layout/vertical-nav/vertical-nav-group.ts b/src/clr-angular/layout/vertical-nav/vertical-nav-group.ts
@@ -13,7 +13,7 @@ import { Expand } from '../../utils/expand/providers/expand';
 import { VerticalNavGroupRegistrationService } from './providers/vertical-nav-group-registration.service';
 import { VerticalNavGroupService } from './providers/vertical-nav-group.service';
 import { VerticalNavService } from './providers/vertical-nav.service';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 const EXPANDED_STATE: string = 'expanded';
 const COLLAPSED_STATE: string = 'collapsed';

diff --git a/src/clr-angular/layout/vertical-nav/vertical-nav.ts b/src/clr-angular/layout/vertical-nav/vertical-nav.ts
@@ -10,7 +10,7 @@ import { Subscription } from 'rxjs';
 import { VerticalNavGroupRegistrationService } from './providers/vertical-nav-group-registration.service';
 import { VerticalNavIconService } from './providers/vertical-nav-icon.service';
 import { VerticalNavService } from './providers/vertical-nav.service';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 @Component({
   selector: 'clr-vertical-nav',

diff --git a/src/clr-angular/modal/modal.ts b/src/clr-angular/modal/modal.ts
@@ -19,7 +19,7 @@ import {
 
 import { FocusTrapDirective } from '../utils/focus-trap/focus-trap.directive';
 import { ScrollingService } from '../utils/scrolling/scrolling-service';
-import { ClrCommonStrings } from '../utils/i18n';
+import { ClrCommonStrings } from '../utils/i18n/common-strings.interface';
 
 @Component({
   selector: 'clr-modal',

diff --git a/src/clr-angular/popover/signpost/signpost-content.ts b/src/clr-angular/popover/signpost/signpost-content.ts
@@ -9,7 +9,7 @@ import { AbstractPopover } from '../common/abstract-popover';
 import { POPOVER_HOST_ANCHOR } from '../common/popover-host-anchor.token';
 
 import { SIGNPOST_POSITIONS } from './signpost-positions';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 // aka where the arrow / pointer is at in relation to the anchor
 const POSITIONS: string[] = [

diff --git a/src/clr-angular/popover/signpost/signpost.ts b/src/clr-angular/popover/signpost/signpost.ts
@@ -9,7 +9,7 @@ import { IfOpenService } from '../../utils/conditional/if-open.service';
 import { POPOVER_HOST_ANCHOR } from '../common/popover-host-anchor.token';
 
 import { ClrSignpostTrigger } from './signpost-trigger';
-import { ClrCommonStrings } from '../../utils/i18n';
+import { ClrCommonStrings } from '../../utils/i18n/common-strings.interface';
 
 @Component({
   selector: 'clr-signpost',

diff --git a/src/schematics/src/add/index.ts b/src/schematics/src/add/index.ts
@@ -150,8 +150,10 @@ export default function(options: ComponentOptions): Rule {
         return;
       }
 
-      const scripts = json.projects[project].architect.build.options.scripts;
-      const styles = json.projects[project].architect.build.options.styles;
+      const target = json.projects[project].targets ? json.projects[project].targets : json.projects[project].architect;
+
+      const scripts = target.build.options.scripts;
+      const styles = target.build.options.styles;
 
       const scriptsSearch = scripts.join('|');
       const stylesSearch = styles.join('|');