Skip to content

Commit

Permalink
build(notifications): fix AOT build issue
Browse files Browse the repository at this point in the history
  • Loading branch information
xmlking committed Dec 10, 2018
1 parent c97573a commit 0083ae2
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 36 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import { AppNotification, TargetType, NotificationColor, NotificationIcon } from
import { NotificationService } from '../../services/notification.service';
import { NotificationEditComponent } from '../../components/notification-edit/notification-edit.component';

const entityHtmlTpl = require('../../../../../shared/src/lib/containers/entity/entity.component.html');
const cellHtmlTpl = require('./cell.templates.html');
// const entityHtmlTpl = require('../../../../../shared/src/lib/containers/entity/entity.component.html');
// const cellHtmlTpl = require('./cell.templates.html');

// tslint:disable-next-line
@Component({
selector: 'ngx-admin-notifications',
// FIXME: AOT build not working with require
template: entityHtmlTpl + cellHtmlTpl,
// templateUrl: './notifications.component.html',
// template: entityHtmlTpl + cellHtmlTpl,
templateUrl: './notifications.component.html',
styleUrls: [
'./notifications.component.scss',
'../../../../../shared/src/lib/containers/entity/entity.component.scss',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import { EntitiesComponent, EntityColumnDef } from '@ngx-starter-kit/shared';
import { SubscriptionService } from '../../services/subscription.service';
import { Subscription } from '../../models/subscription.model';

const entityHtmlTpl = require('../../../../../shared/src/lib/containers/entity/entity.component.html');
const cellHtmlTpl = require('./cell.templates.html');
// const entityHtmlTpl = require('../../../../../shared/src/lib/containers/entity/entity.component.html');
// const cellHtmlTpl = require('./cell.templates.html');

// tslint:disable-next-line
@Component({
selector: 'ngx-admin-subscriptions',
// FIXME: AOT build not working with require
template: entityHtmlTpl + cellHtmlTpl,
// templateUrl: './subscriptions.component.html',
// template: entityHtmlTpl + cellHtmlTpl,
templateUrl: './subscriptions.component.html',
styleUrls: [
'./subscriptions.component.scss',
'../../../../../shared/src/lib/containers/entity/entity.component.scss',
Expand Down
36 changes: 18 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.api.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"name": "api",
"version": "0.0.0",
"dependencies": {
"@nestjs/common": "^5.4.0",
"@nestjs/core": "^5.4.0",
"@nestjs/common": "^5.5.0",
"@nestjs/core": "^5.5.0",
"@nestjs/passport": "^5.1.0",
"@nestjs/swagger": "^2.5.1",
"@nestjs/typeorm": "^5.2.2",
"@nestjs/websockets": "^5.4.0",
"@nestjs/websockets": "^5.5.0",
"@xmlking/jwks-rsa": "^1.4.3",
"class-transformer": "^0.2.0",
"class-validator": "^0.9.1",
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@
"@fortawesome/fontawesome-svg-core": "^1.2.0",
"@fortawesome/free-brands-svg-icons": "^5.6.0",
"@fortawesome/free-solid-svg-icons": "^5.6.0",
"@nestjs/common": "^5.4.0",
"@nestjs/core": "^5.4.0",
"@nestjs/common": "^5.5.0",
"@nestjs/core": "^5.5.0",
"@nestjs/elasticsearch": "^0.1.2",
"@nestjs/microservices": "^5.4.0",
"@nestjs/microservices": "^5.5.0",
"@nestjs/passport": "^5.1.0",
"@nestjs/swagger": "^2.5.1",
"@nestjs/typeorm": "^5.2.2",
"@nestjs/websockets": "^5.4.0",
"@nestjs/websockets": "^5.5.0",
"@ngx-formly/core": "^5.0.0-beta.19",
"@ngx-formly/material": "^5.0.0-beta.19",
"@ngx-lite/in-viewport": "^0.1.3",
Expand Down Expand Up @@ -197,7 +197,7 @@
"@commitlint/cli": "^7.2.1",
"@commitlint/config-conventional": "^7.1.2",
"@compodoc/compodoc": "^1.1.7",
"@nestjs/testing": "^5.4.0",
"@nestjs/testing": "^5.5.0",
"@ngx-formly/schematics": "5.0.0-beta.5",
"@ngxs/schematics": "0.0.1-alpha.0",
"@nrwl/builders": "^7.1.1",
Expand Down
7 changes: 5 additions & 2 deletions stories/awesome.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Awesome
=======
Awesome Links
==============

A curated list of awesome Angular resources

* How do I use this template projects?
Expand Down Expand Up @@ -195,6 +196,8 @@ semantic-release is a fully automated library/system for versioning, changelog g
* How to setup NestJS Project?

> Refer [An Introduction to NestJS](https://www.joshmorony.com/an-introduction-to-nestjs-for-ionic-developers/)
<br/>
> Refer [Vendure](https://github.com/vendure-ecommerce/vendure) an eCommerce framework build with GraphQL and NestJS
* Shoud I use mergeMap or concatMap or switchMap or forkJoin for my usecase?

Expand Down

0 comments on commit 0083ae2

Please sign in to comment.