From 082eaf6c7d2246b514709ee1ba4440e805255bdc Mon Sep 17 00:00:00 2001 From: Soumya Deb Date: Fri, 16 Feb 2018 17:57:25 +0530 Subject: [PATCH] perf(build): make AOT builds faster by loading templates with require Closes #2444 --- gulpfile.js | 22 ++++--------------- package.json | 1 - runtime/src/app/app.component.ts | 4 ++-- .../app/components/header/header.component.ts | 4 ++-- .../app/components/login/login.component.ts | 4 ++-- .../assignee-selector.component.ts | 4 ++-- .../components/assignee/assignee.component.ts | 4 ++-- src/app/components/card/card.component.ts | 4 ++-- .../dynamic-field/dynamic-field.component.ts | 4 ++-- .../group-types-panel.component.ts | 4 ++-- .../iteration-list-entry.component.ts | 4 ++-- .../iteration-tree.component.ts | 2 +- .../iterations-modal.component.ts | 4 ++-- .../iterations-panel.component.ts | 4 ++-- .../label-selector.component.ts | 4 ++-- src/app/components/labels/labels.component.ts | 4 ++-- .../markdown-control.component.ts | 4 ++-- src/app/components/modal/modal.component.ts | 4 ++-- .../planner-board/planner-board.component.ts | 4 ++-- .../planner-list/planner-list.component.ts | 4 ++-- .../side-panel/side-panel.component.ts | 4 ++-- src/app/components/switch/switch.component.ts | 4 ++-- .../toolbar-panel/toolbar-panel.component.ts | 4 ++-- .../typeahead-dropdown.component.ts | 4 ++-- .../work-item-cell.component.ts | 4 ++-- .../work-item-comment.component.ts | 4 ++-- .../work-item-create-selector.component.ts | 4 ++-- .../work-item-create.component.ts | 4 ++-- .../work-item-detail.component.ts | 4 ++-- .../work-item-iteration-modal.component.ts | 4 ++-- .../work-item-link.component.ts | 4 ++-- .../work-item-new-detail.component.ts | 4 ++-- .../work-item-quick-add.component.ts | 4 ++-- .../inlineinput/inlineinput.component.ts | 4 ++-- .../planner-layout.component.ts | 4 ++-- .../select-dropdown.component.ts | 4 ++-- 36 files changed, 71 insertions(+), 86 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 88941b22d..a21b8fb4b 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -23,7 +23,6 @@ var gulp = require('gulp') , lesshint = require('gulp-lesshint') , concat = require('gulp-concat-css') , srcmaps = require('gulp-sourcemaps') - , replace = require('gulp-string-replace') ; // Requirements with special treatments @@ -45,20 +44,7 @@ let mach = {}; // Serialized typescript compile and post-compile steps mach.transpileTS = function () { - return (gulp.series(function () { - return ngc('tsconfig.json'); - }, function () { - // FIXME: why do we need that? - // Replace templateURL/styleURL with require statements in js. - return gulp.src(['dist/app/**/*.js']) - .pipe(replace(/templateUrl:\s/g, "template: require(")) - .pipe(replace(/\.html',/g, ".html'),")) - .pipe(replace(/styleUrls: \[/g, "styles: [require(")) - .pipe(replace(/\.less']/g, ".css').toString()]")) - .pipe(gulp.dest(function (file) { - return file.base; // because of Angular 2's encapsulation, it's natural to save the css where the less-file was - })); - }))(); + return ngc('tsconfig.json'); } // Copy files to the distPath @@ -77,12 +63,12 @@ mach.transpileLESS = function (src, debug) { // paths: [ path.join(__dirname, 'less', 'includes') ] } return gulp.src(src) - .pipe(less({ - plugins: [autoprefix] - })) .pipe(lesshint({ configPath: './.lesshintrc' // Options })) + .pipe(less({ + plugins: [autoprefix] + })) .pipe(lesshint.reporter()) // Leave empty to use the default, "stylish" .pipe(lesshint.failOnError()) // Use this to fail the task on lint errors .pipe(srcmaps.init()) diff --git a/package.json b/package.json index 36b881ae1..00b2d3517 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,6 @@ "gulp-lesshint": "4.1.0", "gulp-ngc": "0.3.3", "gulp-sourcemaps": "2.6.4", - "gulp-string-replace": "1.0.0", "gulp-util": "3.0.8", "html-loader": "0.5.1", "html-webpack-plugin": "2.30.1", diff --git a/runtime/src/app/app.component.ts b/runtime/src/app/app.component.ts index ad7238ab4..333fdf4b6 100644 --- a/runtime/src/app/app.component.ts +++ b/runtime/src/app/app.component.ts @@ -8,8 +8,8 @@ import { GlobalSettings } from './shared/globals'; @Component({ selector: 'alm-app', encapsulation: ViewEncapsulation.None, - templateUrl: './app.component.html', - styleUrls: ['./app.component.less'], + template: require('./app.component.html'), + styles: [require('./app.component.css').toString()], providers: [GlobalSettings] }) export class AppComponent implements OnInit { diff --git a/runtime/src/app/components/header/header.component.ts b/runtime/src/app/components/header/header.component.ts index 0f72d5e47..716a320ad 100644 --- a/runtime/src/app/components/header/header.component.ts +++ b/runtime/src/app/components/header/header.component.ts @@ -10,8 +10,8 @@ import { MenuItem, ContextLink, SystemStatus, HeaderService } from 'osio-ngx-fra @Component({ selector: 'planner-header', - templateUrl: './header.component.html', - styleUrls: ['./header.component.less'], + template: require('./header.component.html'), + styles: [require('./header.component.css').toString()] }) export class HeaderComponent implements OnInit { diff --git a/runtime/src/app/components/login/login.component.ts b/runtime/src/app/components/login/login.component.ts index c6ed1d8d2..adfa94b3b 100644 --- a/runtime/src/app/components/login/login.component.ts +++ b/runtime/src/app/components/login/login.component.ts @@ -7,8 +7,8 @@ import { LoginService } from '../../services/login.service'; @Component({ selector: 'alm-login-form', - templateUrl: './login.component.html', - styleUrls: ['./login.component.less'], + template: require('./login.component.html'), + styles: [require('./login.component.css').toString()] }) export class LoginComponent implements OnInit { showError: boolean = false; diff --git a/src/app/components/assignee-selector/assignee-selector.component.ts b/src/app/components/assignee-selector/assignee-selector.component.ts index 05f1d76c7..d2348a9b6 100644 --- a/src/app/components/assignee-selector/assignee-selector.component.ts +++ b/src/app/components/assignee-selector/assignee-selector.component.ts @@ -23,8 +23,8 @@ import { WorkItemService } from '../../services/work-item.service'; @Component({ selector: 'assignee-selector', - templateUrl: './assignee-selector.component.html', - styleUrls: ['./assignee-selector.component.less'] + template: require('./assignee-selector.component.html'), + styles: [require('./assignee-selector.component.css').toString()] }) export class AssigneeSelectorComponent { diff --git a/src/app/components/assignee/assignee.component.ts b/src/app/components/assignee/assignee.component.ts index 6a08bd69b..b8840ac41 100644 --- a/src/app/components/assignee/assignee.component.ts +++ b/src/app/components/assignee/assignee.component.ts @@ -15,8 +15,8 @@ import { User } from 'ngx-login-client'; @Component({ selector: 'f8-assignee', - templateUrl: './assignee.component.html', - styleUrls: ['./assignee.component.less'] + template: require('./assignee.component.html'), + styles: [require('./assignee.component.css').toString()] }) export class AssigneesComponent implements OnInit { diff --git a/src/app/components/card/card.component.ts b/src/app/components/card/card.component.ts index 21cbfda1c..bb8eba20e 100644 --- a/src/app/components/card/card.component.ts +++ b/src/app/components/card/card.component.ts @@ -18,8 +18,8 @@ export class CardValue { @Component({ selector: 'card', - templateUrl: './card.component.html', - styleUrls: ['./card.component.less'] + template: require('./card.component.html'), + styles: [require('./card.component.css').toString()] }) export class CardComponent implements OnInit, OnDestroy { diff --git a/src/app/components/dynamic-field/dynamic-field.component.ts b/src/app/components/dynamic-field/dynamic-field.component.ts index a4daf7a6c..172aa7c7b 100644 --- a/src/app/components/dynamic-field/dynamic-field.component.ts +++ b/src/app/components/dynamic-field/dynamic-field.component.ts @@ -31,8 +31,8 @@ export class DynamicUpdateEvent { */ @Component({ selector: 'alm-dynamic-field', - templateUrl: './dynamic-field.component.html', - styleUrls: ['./dynamic-field.component.less'] + template: require('./dynamic-field.component.html'), + styles: [require('./dynamic-field.component.css').toString()] }) export class DynamicFieldComponent implements OnInit { diff --git a/src/app/components/group-types-panel/group-types-panel.component.ts b/src/app/components/group-types-panel/group-types-panel.component.ts index 2c928fc8c..7d1bd8a21 100644 --- a/src/app/components/group-types-panel/group-types-panel.component.ts +++ b/src/app/components/group-types-panel/group-types-panel.component.ts @@ -17,8 +17,8 @@ import { WorkItemType } from '../../models/work-item-type'; @Component({ selector: 'group-types', - templateUrl: './group-types-panel.component.html', - styleUrls: ['./group-types-panel.component.less'] + template: require('./group-types-panel.component.html'), + styles: [require('./group-types-panel.component.css').toString()] }) export class GroupTypesComponent implements OnInit, OnDestroy { diff --git a/src/app/components/iteration-list-entry/iteration-list-entry.component.ts b/src/app/components/iteration-list-entry/iteration-list-entry.component.ts index bea65557a..4db96b93c 100644 --- a/src/app/components/iteration-list-entry/iteration-list-entry.component.ts +++ b/src/app/components/iteration-list-entry/iteration-list-entry.component.ts @@ -32,8 +32,8 @@ import { IterationModel } from '../../models/iteration.model'; @Component({ encapsulation: ViewEncapsulation.None, selector: 'iteration-list-entry', - templateUrl: './iteration-list-entry.component.html', - styleUrls: ['./iteration-list-entry.component.less'], + template: require('./iteration-list-entry.component.html'), + styles: [require('./iteration-list-entry.component.css').toString()] }) export class IterationListEntryComponent implements OnInit, OnDestroy { //@Input() listItem: TreeListItemComponent; diff --git a/src/app/components/iteration-tree/iteration-tree.component.ts b/src/app/components/iteration-tree/iteration-tree.component.ts index 1110d8150..b8e33e86b 100644 --- a/src/app/components/iteration-tree/iteration-tree.component.ts +++ b/src/app/components/iteration-tree/iteration-tree.component.ts @@ -11,7 +11,7 @@ import { IterationModel } from '../../models/iteration.model'; @Component({ selector: 'iteration-tree', - templateUrl: './iteration-tree.component.html', + template: require('./iteration-tree.component.html') }) export class IterationTreeComponent { diff --git a/src/app/components/iterations-modal/iterations-modal.component.ts b/src/app/components/iterations-modal/iterations-modal.component.ts index 27c44e2bf..091a70af1 100644 --- a/src/app/components/iterations-modal/iterations-modal.component.ts +++ b/src/app/components/iterations-modal/iterations-modal.component.ts @@ -25,8 +25,8 @@ import { IterationModel } from '../../models/iteration.model'; @Component({ selector: 'fab-planner-iteration-modal', - templateUrl: './iterations-modal.component.html', - styleUrls: ['./iterations-modal.component.less'] + template: require('./iterations-modal.component.html'), + styles: [require('./iterations-modal.component.css').toString()] }) export class FabPlannerIterationModalComponent implements OnInit, OnDestroy, OnChanges { diff --git a/src/app/components/iterations-panel/iterations-panel.component.ts b/src/app/components/iterations-panel/iterations-panel.component.ts index e79d90581..858aecfb9 100644 --- a/src/app/components/iterations-panel/iterations-panel.component.ts +++ b/src/app/components/iterations-panel/iterations-panel.component.ts @@ -22,8 +22,8 @@ import { IterationTreeComponent } from '../iteration-tree/iteration-tree.compone @Component({ encapsulation: ViewEncapsulation.None, selector: 'fab-planner-iteration', - templateUrl: './iterations-panel.component.html', - styleUrls: ['./iterations-panel.component.less'] + template: require('./iterations-panel.component.html'), + styles: [require('./iterations-panel.component.css').toString()] }) export class IterationComponent implements OnInit, OnDestroy, OnChanges { diff --git a/src/app/components/label-selector/label-selector.component.ts b/src/app/components/label-selector/label-selector.component.ts index cdcf6000b..6aaa02a68 100644 --- a/src/app/components/label-selector/label-selector.component.ts +++ b/src/app/components/label-selector/label-selector.component.ts @@ -20,8 +20,8 @@ import { @Component({ selector: 'label-selector', - templateUrl: './label-selector.component.html', - styleUrls: ['./label-selector.component.less'] + template: require('./label-selector.component.html'), + styles: [require('./label-selector.component.css').toString()] }) export class LabelSelectorComponent implements OnInit, OnChanges { diff --git a/src/app/components/labels/labels.component.ts b/src/app/components/labels/labels.component.ts index 8f6476a83..50cd56fb5 100644 --- a/src/app/components/labels/labels.component.ts +++ b/src/app/components/labels/labels.component.ts @@ -15,8 +15,8 @@ import { LabelModel } from './../../models/label.model'; @Component({ selector: 'f8-label', - templateUrl: './labels.component.html', - styleUrls: ['./labels.component.less'] + template: require('./labels.component.html'), + styles: [require('./labels.component.css').toString()] }) export class LabelsComponent implements OnInit { diff --git a/src/app/components/markdown-control/markdown-control.component.ts b/src/app/components/markdown-control/markdown-control.component.ts index 30f39aef5..834b230ee 100644 --- a/src/app/components/markdown-control/markdown-control.component.ts +++ b/src/app/components/markdown-control/markdown-control.component.ts @@ -22,8 +22,8 @@ import { WorkItemService } from '../../services/work-item.service'; */ @Component({ selector: 'markdown-control', - templateUrl: './markdown-control.component.html', - styleUrls: ['./markdown-control.component.less'] + template: require('./markdown-control.component.html'), + styles: [require('./markdown-control.component.css').toString()] }) export class MarkdownControlComponent implements OnInit, OnChanges { diff --git a/src/app/components/modal/modal.component.ts b/src/app/components/modal/modal.component.ts index 649681cc8..d60c335b9 100644 --- a/src/app/components/modal/modal.component.ts +++ b/src/app/components/modal/modal.component.ts @@ -9,8 +9,8 @@ import { ModalService } from '../../services/modal.service'; @Component({ selector: 'osio-modal', - templateUrl: './modal.component.html', - styleUrls: ['./modal.component.less'] + template: require('./modal.component.html'), + styles: [require('./modal.component.css').toString()] }) export class ModalComponent { diff --git a/src/app/components/planner-board/planner-board.component.ts b/src/app/components/planner-board/planner-board.component.ts index 02793e203..26539476a 100644 --- a/src/app/components/planner-board/planner-board.component.ts +++ b/src/app/components/planner-board/planner-board.component.ts @@ -49,8 +49,8 @@ import { GroupTypesModel } from '../../models/group-types.model'; @Component({ // tslint:disable-next-line:use-host-property-decorator selector: 'alm-board', - templateUrl: './planner-board.component.html', - styleUrls: ['./planner-board.component.less'] + template: require('./planner-board.component.html'), + styles: [require('./planner-board.component.css').toString()] }) export class PlannerBoardComponent implements OnInit, OnDestroy, AfterViewChecked { diff --git a/src/app/components/planner-list/planner-list.component.ts b/src/app/components/planner-list/planner-list.component.ts index 6260469af..633e6863f 100644 --- a/src/app/components/planner-list/planner-list.component.ts +++ b/src/app/components/planner-list/planner-list.component.ts @@ -69,8 +69,8 @@ import { WorkItemDetailAddTypeSelectorComponent } from './../work-item-create/wo 'class': '' }, selector: 'alm-work-item-list', - templateUrl: './planner-list.component.html', - styleUrls: ['./planner-list.component.less'] + template: require('./planner-list.component.html'), + styles: [require('./planner-list.component.css').toString()] }) export class PlannerListComponent implements OnInit, AfterViewChecked, OnDestroy { @ViewChildren('activeFilters', { read: ElementRef }) activeFiltersRef: QueryList; diff --git a/src/app/components/side-panel/side-panel.component.ts b/src/app/components/side-panel/side-panel.component.ts index f4d1f788c..104dcfc12 100644 --- a/src/app/components/side-panel/side-panel.component.ts +++ b/src/app/components/side-panel/side-panel.component.ts @@ -13,8 +13,8 @@ import { IterationService } from '../../services/iteration.service'; @Component({ selector: 'side-panel', - templateUrl: './side-panel.component.html', - styleUrls: ['./side-panel.component.less'] + template: require('./side-panel.component.html'), + styles: [require('./side-panel.component.css').toString()] }) export class SidepanelComponent implements OnInit, OnDestroy { diff --git a/src/app/components/switch/switch.component.ts b/src/app/components/switch/switch.component.ts index 424f46327..ab3519cce 100644 --- a/src/app/components/switch/switch.component.ts +++ b/src/app/components/switch/switch.component.ts @@ -12,8 +12,8 @@ import { User } from 'ngx-login-client'; @Component({ selector: 'switch', - templateUrl: './switch.component.html', - styleUrls: ['./switch.component.less'] + template: require('./switch.component.html'), + styles: [require('./switch.component.css').toString()] }) export class SwitchComponent { @Input() isChecked: Boolean; diff --git a/src/app/components/toolbar-panel/toolbar-panel.component.ts b/src/app/components/toolbar-panel/toolbar-panel.component.ts index 6cfe227c8..a0b2db72d 100644 --- a/src/app/components/toolbar-panel/toolbar-panel.component.ts +++ b/src/app/components/toolbar-panel/toolbar-panel.component.ts @@ -44,8 +44,8 @@ import { WorkItem } from '../../models/work-item'; @Component({ encapsulation: ViewEncapsulation.None, selector: 'toolbar-panel', - templateUrl: './toolbar-panel.component.html', - styleUrls: ['./toolbar-panel.component.less'] + template: require('./toolbar-panel.component.html'), + styles: [require('./toolbar-panel.component.css').toString()] }) export class ToolbarPanelComponent implements OnInit, AfterViewInit, OnDestroy { diff --git a/src/app/components/typeahead-dropdown/typeahead-dropdown.component.ts b/src/app/components/typeahead-dropdown/typeahead-dropdown.component.ts index ae29b3bfa..f7c0523f6 100644 --- a/src/app/components/typeahead-dropdown/typeahead-dropdown.component.ts +++ b/src/app/components/typeahead-dropdown/typeahead-dropdown.component.ts @@ -32,8 +32,8 @@ export class TypeaheadDropdownValue { */ @Component({ selector: 'typeahead-dropdown', - templateUrl: './typeahead-dropdown.component.html', - styleUrls: ['./typeahead-dropdown.component.less'] + template: require('./typeahead-dropdown.component.html'), + styles: [require('./typeahead-dropdown.component.css').toString()] }) export class TypeaheadDropdown implements OnInit, OnChanges, OnDestroy { diff --git a/src/app/components/work-item-cell/work-item-cell.component.ts b/src/app/components/work-item-cell/work-item-cell.component.ts index d9219eb92..cb2ec0d64 100644 --- a/src/app/components/work-item-cell/work-item-cell.component.ts +++ b/src/app/components/work-item-cell/work-item-cell.component.ts @@ -9,8 +9,8 @@ import { @Component({ encapsulation: ViewEncapsulation.None, selector: 'work-item-cell', - templateUrl: './work-item-cell.component.html', - styleUrls: ['./work-item-cell.component.less'] + template: require('./work-item-cell.component.html'), + styles: [require('./work-item-cell.component.css').toString()] }) export class WorkItemCellComponent { diff --git a/src/app/components/work-item-comment/work-item-comment.component.ts b/src/app/components/work-item-comment/work-item-comment.component.ts index 10dc62ed6..74bce3e8d 100644 --- a/src/app/components/work-item-comment/work-item-comment.component.ts +++ b/src/app/components/work-item-comment/work-item-comment.component.ts @@ -17,8 +17,8 @@ import { ModalService } from '../../services/modal.service'; @Component({ selector: 'alm-work-item-comment', - templateUrl: './work-item-comment.component.html', - styleUrls: ['./work-item-comment.component.less'], + template: require('./work-item-comment.component.html'), + styles: [require('./work-item-comment.component.css').toString()] }) export class WorkItemCommentComponent implements OnInit { @Input() loadingComments: boolean = true; diff --git a/src/app/components/work-item-create/work-item-create-selector/work-item-create-selector.component.ts b/src/app/components/work-item-create/work-item-create-selector/work-item-create-selector.component.ts index 4a60abe93..102e03096 100644 --- a/src/app/components/work-item-create/work-item-create-selector/work-item-create-selector.component.ts +++ b/src/app/components/work-item-create/work-item-create-selector/work-item-create-selector.component.ts @@ -28,8 +28,8 @@ import { @Component({ selector: 'create-selector-widget', - templateUrl: './work-item-create-selector.component.html', - styleUrls: ['./work-item-create-selector.component.less'] + template: require('./work-item-create-selector.component.html'), + styles: [require('./work-item-create-selector.component.css').toString()] }) export class WorkItemDetailAddTypeSelectorWidgetComponent implements OnInit, AfterViewChecked{ diff --git a/src/app/components/work-item-create/work-item-create.component.ts b/src/app/components/work-item-create/work-item-create.component.ts index 6f82f1232..76e884175 100644 --- a/src/app/components/work-item-create/work-item-create.component.ts +++ b/src/app/components/work-item-create/work-item-create.component.ts @@ -16,8 +16,8 @@ import { WorkItem } from '../../models/work-item'; @Component({ selector: 'detail-add-type-selector', - templateUrl: './work-item-create.component.html', - styleUrls: ['./work-item-create.component.less'] + template: require('./work-item-create.component.html'), + styles: [require('./work-item-create.component.css').toString()] }) export class WorkItemDetailAddTypeSelectorComponent implements OnInit, OnChanges { diff --git a/src/app/components/work-item-detail/work-item-detail.component.ts b/src/app/components/work-item-detail/work-item-detail.component.ts index 765e6ea62..0a83bf894 100644 --- a/src/app/components/work-item-detail/work-item-detail.component.ts +++ b/src/app/components/work-item-detail/work-item-detail.component.ts @@ -60,8 +60,8 @@ import { @Component({ selector: 'work-item-preview', - templateUrl: './work-item-detail.component.html', - styleUrls: ['./work-item-detail.component.less'], + template: require('./work-item-detail.component.html'), + styles: [require('./work-item-detail.component.css').toString()], animations: [ trigger('slideInOut', [ state('in', style({ diff --git a/src/app/components/work-item-iteration-modal/work-item-iteration-modal.component.ts b/src/app/components/work-item-iteration-modal/work-item-iteration-modal.component.ts index 05aca8676..caffd1ae1 100644 --- a/src/app/components/work-item-iteration-modal/work-item-iteration-modal.component.ts +++ b/src/app/components/work-item-iteration-modal/work-item-iteration-modal.component.ts @@ -22,8 +22,8 @@ import { IterationService } from '../../services/iteration.service'; @Component({ selector: 'fab-planner-associate-iteration-modal', - templateUrl: './work-item-iteration-modal.component.html', - styleUrls: ['./work-item-iteration-modal.component.less'] + template: require('./work-item-iteration-modal.component.html'), + styles: [require('./work-item-iteration-modal.component.css').toString()] }) export class FabPlannerAssociateIterationModalComponent implements OnChanges { diff --git a/src/app/components/work-item-link/work-item-link.component.ts b/src/app/components/work-item-link/work-item-link.component.ts index 97cd436d6..85c59b54f 100644 --- a/src/app/components/work-item-link/work-item-link.component.ts +++ b/src/app/components/work-item-link/work-item-link.component.ts @@ -14,8 +14,8 @@ import { WorkItemService } from '../../services/work-item.service'; @Component({ selector: 'alm-work-item-link', - templateUrl: './work-item-link.component.html', - styleUrls: ['./work-item-link.component.less'], + template: require('./work-item-link.component.html'), + styles: [require('./work-item-link.component.css').toString()] // styles:['.completer-input {width:100%;float:left;};.completer-dropdown-holder {width:100%;float:left;}'] }) export class WorkItemLinkComponent implements OnInit, OnChanges, DoCheck, OnDestroy { diff --git a/src/app/components/work-item-new-detail/work-item-new-detail.component.ts b/src/app/components/work-item-new-detail/work-item-new-detail.component.ts index 4241eb917..69a37819a 100644 --- a/src/app/components/work-item-new-detail/work-item-new-detail.component.ts +++ b/src/app/components/work-item-new-detail/work-item-new-detail.component.ts @@ -53,8 +53,8 @@ import { @Component({ selector: 'work-item-new-detail', - templateUrl: './work-item-new-detail.component.html', - styleUrls: [ './work-item-new-detail.component.less' ] + template: require('./work-item-new-detail.component.html'), + styles: [require('./work-item-new-detail.component.css').toString()] }) export class WorkItemNewDetailComponent implements OnInit, OnDestroy, AfterViewChecked { diff --git a/src/app/components/work-item-quick-add/work-item-quick-add.component.ts b/src/app/components/work-item-quick-add/work-item-quick-add.component.ts index 8d3862404..3614f49a3 100644 --- a/src/app/components/work-item-quick-add/work-item-quick-add.component.ts +++ b/src/app/components/work-item-quick-add/work-item-quick-add.component.ts @@ -31,8 +31,8 @@ import { WorkItemService } from '../../services/work-item.service'; @Component({ selector: 'alm-work-item-quick-add', - templateUrl: './work-item-quick-add.component.html', - styleUrls: ['./work-item-quick-add.component.less'] + template: require('./work-item-quick-add.component.html'), + styles: [require('./work-item-quick-add.component.css').toString()] }) export class WorkItemQuickAddComponent implements OnInit, OnDestroy, AfterViewInit, AfterViewChecked { @ViewChild('quickAddTitle') qaTitle: any; diff --git a/src/app/widgets/inlineinput/inlineinput.component.ts b/src/app/widgets/inlineinput/inlineinput.component.ts index 25f839ed6..e3dd31798 100644 --- a/src/app/widgets/inlineinput/inlineinput.component.ts +++ b/src/app/widgets/inlineinput/inlineinput.component.ts @@ -14,8 +14,8 @@ import { @Component({ encapsulation: ViewEncapsulation.None, selector: 'f8-inlineinput', - templateUrl: './inlineinput.component.html', - styleUrls: ['./inlineinput.component.less'] + template: require('./inlineinput.component.html'), + styles: [require('./inlineinput.component.css').toString()] }) export class InlineInputComponent implements OnInit { diff --git a/src/app/widgets/planner-layout/planner-layout.component.ts b/src/app/widgets/planner-layout/planner-layout.component.ts index aad18b384..ac3581534 100644 --- a/src/app/widgets/planner-layout/planner-layout.component.ts +++ b/src/app/widgets/planner-layout/planner-layout.component.ts @@ -17,8 +17,8 @@ import { @Component({ selector: 'alm-planner-layout', - templateUrl: './planner-layout.component.html', - styleUrls: ['./planner-layout.component.less'], + template: require('./planner-layout.component.html'), + styles: [require('./planner-layout.component.css').toString()], animations: [ trigger('slideInOut', [ diff --git a/src/app/widgets/select-dropdown/select-dropdown.component.ts b/src/app/widgets/select-dropdown/select-dropdown.component.ts index 7e4a6b17a..706bee5d2 100644 --- a/src/app/widgets/select-dropdown/select-dropdown.component.ts +++ b/src/app/widgets/select-dropdown/select-dropdown.component.ts @@ -10,8 +10,8 @@ import { @Component({ selector: 'f8-select-dropdown', - templateUrl: './select-dropdown.component.html', - styleUrls: ['./select-dropdown.component.less'] + template: require('./select-dropdown.component.html'), + styles: [require('./select-dropdown.component.css').toString()] }) export class SelectDropdownComponent implements OnInit { @Input() headerText: string = 'This is default header';