Misc grooming and updates

MAINTAINERS.md

@@ -38,10 +38,7 @@ Then follow these steps:
 7. Run `npm run changelog`. This will create a commit with the new updated `CHANGELOG.md`, but it will not be pushed so
    you can check it up before pushing.
 
-8. Rebase `ci/*` branches onto `master` (could be automated). This should also be done regularly outside release cycle,
-   after merging new PR for example.
-
-9. Done! :tropical_drink: Now you can tell the world a new version is out! :speaker:
+8. Done! :tropical_drink: Now you can tell the world a new version is out! :speaker:
 
 ## Dedicated CI branches
 

cli/index.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const path = require('path');
 const fs = require('fs');
 const child = require('child_process');

generators/addon/index.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const chalk = require('chalk');
 const Insight = require('insight');
 const camelCase = require('lodash.camelcase');

generators/addon/templates/generators/app/_index.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const Generator = require('@ngx-rocket/core');
 <% if (props.advanced) { -%>
 const chalk = require('chalk');

generators/app/index.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const fs = require('fs');
 const path = require('path');
 const chalk = require('chalk');
@@ -43,9 +41,10 @@ class NgxGenerator extends Generator {
       this.props.location = this.options['location-strategy'];
     }
 
-    if (this.options.strict) {
-      this.props.strict = true;
-    }
+    this.props.strict = this.options.strict;
+    this.props.skipInstall = this.options['skip-install'];
+    this.props.skipQuickstart = this.options['skip-quickstart'];
+    this.props.initGit = this.options.git;
 
     // Updating
     let fromVersion = null;
@@ -115,11 +114,11 @@ class NgxGenerator extends Generator {
   }
 
   install() {
-    if (this.options.git) {
+    if (this.props.initGit) {
       this.spawnCommandSync('git', ['init', '--quiet']);
     }
 
-    if (!this.options['skip-install']) {
+    if (!this.props.skipInstall) {
       this.log(`\nRunning ${chalk.yellow(`${this.packageManager} install`)}, please wait...`);
 
       const install = this.packageManager === 'yarn' ? this.yarnInstall.bind(this) : this.npmInstall.bind(this);
@@ -146,7 +145,7 @@ class NgxGenerator extends Generator {
       return;
     }
 
-    if (this.options['skip-quickstart']) {
+    if (this.props.skipQuickstart) {
       return;
     }
 

generators/app/options.js

@@ -1,5 +1,3 @@
-'use strict';
-
 module.exports = [
   {
     name: 'skip-welcome',

generators/app/prompts.js

@@ -1,5 +1,3 @@
-'use strict';
-
 module.exports = [
   {
     type: 'input',

generators/app/templates/_package.json

@@ -113,7 +113,7 @@
 <% } -%>
     "core-js": "^2.6.3",
     "rxjs": "^6.4.0",
-    "zone.js": "^0.9.0"
+    "zone.js": "~0.8.26"
   },
   "devDependencies": {
 <% if (props.target.includes('cordova')) { -%>

generators/app/templates/proxy.conf.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const HttpsProxyAgent = require('https-proxy-agent');
 
 /*

generators/app/templates/src/app/shell/__material-simple.shell.component.ts

@@ -18,9 +18,10 @@ export class ShellComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     // Automatically close side menu on screens > sm breakpoint
-    this.media.media$
+    this.media
+      .asObservable()
       .pipe(
-        filter((change: MediaChange) => (change.mqAlias !== 'xs' && change.mqAlias !== 'sm')),
+        filter((changes: MediaChange[]) => changes.some(change => change.mqAlias !== 'xs' && change.mqAlias !== 'sm')),
         untilDestroyed(this)
       )
       .subscribe(() => this.sidenav.close());

package.json

@@ -63,7 +63,7 @@
     "lodash.get": "^4.4.2",
     "lodash.upperfirst": "^4.3.1",
     "minimist": "^1.2.0",
-    "semver": "^6.0.0",
+    "semver": "^6.1.0",
     "update-notifier": "^3.0.0",
     "yeoman-environment": "^2.3.4"
   },