fix(package): added static attr to the contenct childs

angular-material-extensions · Jul 31, 2019 · 480f738 · 480f738
1 parent ba9a318
commit 480f738
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,8 +38,8 @@
   "devDependencies": {
     "@angular-devkit/schematics": "^8.1.3",
     "@angular/animations": "^8.1.3",
-    "@angular/compiler": "^8.1.3",
-    "@angular/compiler-cli": "^8.1.3",
+    "@angular/compiler": "8.0.3",
+    "@angular/compiler-cli": "8.0.3",
     "@angular/forms": "^8.1.3",
     "@angular/platform-browser": "^8.1.3",
     "@angular/platform-browser-dynamic": "^8.1.3",

diff --git a/src/module/component/mat-jumbotron/content/mat-jumbotron-content.component.ts b/src/module/component/mat-jumbotron/content/mat-jumbotron-content.component.ts
@@ -8,8 +8,7 @@ import {Component, OnInit, TemplateRef, ViewChild} from '@angular/core';
 export class MatJumbotronContentComponent implements OnInit {
 
   /** Template for page outlook content. */
-  @ViewChild(TemplateRef)
-  content: TemplateRef<any>;
+  @ViewChild(TemplateRef, {static: false}) content: TemplateRef<any>;
 
   constructor() {
   }

diff --git a/src/module/component/mat-jumbotron/mat-jumbotron.component.ts b/src/module/component/mat-jumbotron/mat-jumbotron.component.ts
@@ -9,8 +9,7 @@ import {MatJumbotronContentComponent} from './content/mat-jumbotron-content.comp
 })
 export class MatJumbotronComponent {
 
-  @ContentChild(MatJumbotronContentComponent)
-  jumbotronContent: MatJumbotronContentComponent;
+  @ContentChild(MatJumbotronContentComponent, {static: false}) jumbotronContent: MatJumbotronContentComponent;
 
   @Input()
   imgURL: string;

diff --git a/src/module/mat-jumbotron.module.ts b/src/module/mat-jumbotron.module.ts
@@ -1,5 +1,5 @@
 import {CommonModule} from '@angular/common';
-import {NgModule, ModuleWithProviders} from '@angular/core';
+import {NgModule} from '@angular/core';
 
 import {MatCardModule} from '@angular/material';
 import {FlexLayoutModule} from '@angular/flex-layout';

diff --git a/src/schematics/src/ng-add/index.ts b/src/schematics/src/ng-add/index.ts
@@ -33,8 +33,8 @@ export function addPackageJsonDependencies(): Rule {
         version: loadPackageVersionGracefully(context) || 'latest',
         name: '@angular-material-extensions/jumbotron'
       },
-      {type: NodeDependencyType.Default, version: ngCoreVersionTag || '7.2.11', name: '@angular/animations'},
-      {type: NodeDependencyType.Default, version: ngCoreVersionTag || '7.2.11', name: '@angular/forms'},
+      {type: NodeDependencyType.Default, version: ngCoreVersionTag || '8.1.2', name: '@angular/animations'},
+      {type: NodeDependencyType.Default, version: ngCoreVersionTag || '8.1.2', name: '@angular/forms'},
     ];
 
     dependencies.forEach(dependency => {
@@ -78,6 +78,7 @@ export function getPackageVersionFromPackageJson(tree: Tree, name: string): stri
     return null;
   }
 
+  // tslint:disable-next-line:no-non-null-assertion
   const packageJson = JSON.parse(tree.read('package.json')!.toString('utf8'));
 
   if (packageJson.dependencies && packageJson.dependencies[name]) {