feat: update to cli7 and nx7

apps/angular-console/src/polyfills.ts

@@ -42,7 +42,7 @@
 
 /** Evergreen browsers require these. **/
 // Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
-import 'core-js/es7/reflect';
+
 
 /**
  * Web Animations `@angular/platform-browser/animations`

libs/feature-generate/src/lib/schematic/schematic.component.ts

@@ -112,7 +112,8 @@ export class SchematicComponent implements OnInit {
 
         return this.serializer.normalizeSchematic(schematic);
       }),
-      tap((schematic: Schematic) => {
+      tap((schematic: Schematic|null) => {
+        if (! schematic) return;
         const uiFlags = (this.elementRef
           .nativeElement as HTMLElement).querySelector('.ui-flags-container');
 

libs/utils/src/lib/generated/graphql.ts

@@ -30,7 +30,7 @@ export namespace Editors {
 
   export type Query = {
     __typename?: 'Query';
-    editors?: (Editors | null)[] | null;
+    editors: Editors[];
   };
 
   export type Editors = {

package.json

@@ -59,33 +59,33 @@
     ]
   },
   "dependencies": {
-    "@nrwl/nx": "6.3.1",
+    "@nrwl/nx": "7.0.0",
     "@types/strip-json-comments": "^0.0.30",
     "karma-spec-reporter": "^0.0.32",
     "karma-verbose-reporter": "^0.0.6"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "0.8.5",
-    "@angular-devkit/build-ng-packagr": "0.8.5",
+    "@angular-devkit/build-angular": "~0.10.0",
+    "@angular-devkit/build-ng-packagr": "~0.10.0",
     "@angular-devkit/core": "0.8.5",
     "@angular-devkit/schematics": "0.8.5",
-    "@angular/animations": "6.1.9",
+    "@angular/animations": "7.0.2",
     "@angular/cdk": "6.4.7",
-    "@angular/cli": "6.2.4",
-    "@angular/common": "6.1.9",
-    "@angular/compiler": "6.1.9",
-    "@angular/compiler-cli": "^6.1.9",
-    "@angular/core": "6.1.9",
+    "@angular/cli": "7.0.4",
+    "@angular/common": "7.0.2",
+    "@angular/compiler": "7.0.2",
+    "@angular/compiler-cli": "^7.0.2",
+    "@angular/core": "7.0.2",
     "@angular/flex-layout": "6.0.0-beta.18",
-    "@angular/forms": "6.1.9",
-    "@angular/language-service": "^6.1.9",
+    "@angular/forms": "7.0.2",
+    "@angular/language-service": "^7.0.2",
     "@angular/material": "6.4.7",
-    "@angular/platform-browser": "6.1.9",
-    "@angular/platform-browser-dynamic": "6.1.9",
-    "@angular/router": "6.1.9",
+    "@angular/platform-browser": "7.0.2",
+    "@angular/platform-browser-dynamic": "7.0.2",
+    "@angular/router": "7.0.2",
     "@nrwl/angular-console-enterprise-electron": "0.0.12",
     "@nrwl/angular-console-enterprise-frontend": "0.0.12",
-    "@nrwl/schematics": "6.3.1",
+    "@nrwl/schematics": "7.0.0",
     "@types/express": "4.16.0",
     "@types/graphql": "0.13.0",
     "@types/jasmine": "2.8.9",
@@ -138,7 +138,7 @@
     "prettier": "1.13.7",
     "protractor": "5.3.0",
     "resolve": "1.8.1",
-    "rxjs": "6.2.2",
+    "rxjs": "6.3.3",
     "rxjs-compat": "6.2.2",
     "shelljs": "0.8.2",
     "strip-json-comments": "2.0.1",
@@ -147,11 +147,12 @@
     "tsickle": "0.33.0",
     "tslib": "1.9.3",
     "tslint": "5.11.0",
-    "typescript": "2.9.2",
+    "typescript": "3.1.6",
     "universal-analytics": "0.4.17",
     "uuid": "3.3.2",
     "xterm": "3.4.1",
-    "zone.js": "0.8.26"
+    "zone.js": "0.8.26",
+    "@types/jquery": "3.3.6"
   },
   "jest": {
     "moduleFileExtensions": [
@@ -175,4 +176,4 @@
       "**/*.+(spec|test).(ts|js)"
     ]
   }
-}
+}

server/package.json

@@ -9,9 +9,9 @@
   "main": "src/index.js",
   "license": "MIT",
   "dependencies": {
-    "@angular/cli": "6.2.4",
+    "@angular/cli": "7.0.4",
     "@nrwl/angular-console-enterprise-electron": "0.0.12",
-    "@nrwl/schematics": "6.4.0",
+    "@nrwl/schematics": "7.0.0",
     "@types/tmp": "0.0.33",
     "apollo-server-express": "2.1.0",
     "dotenv": "6.0.0",

server/src/graphql-types.ts

@@ -32,7 +32,7 @@ export interface Database {
   settings: Settings;
   schematicCollections?: (SchematicCollectionForNgNew | null)[] | null;
   workspace: Workspace;
-  editors?: (EditorSupport | null)[] | null;
+  editors: EditorSupport[];
   availableExtensions?: (Extension | null)[] | null;
   installNodeJsStatus?: InstallNodeJsStatus | null;
   isNodejsInstalled?: IsNodeInstalledResult | null;
@@ -341,7 +341,7 @@ export namespace DatabaseResolvers {
       Context
     >;
     workspace?: WorkspaceResolver<Workspace, any, Context>;
-    editors?: EditorsResolver<(EditorSupport | null)[] | null, any, Context>;
+    editors?: EditorsResolver<EditorSupport[], any, Context>;
     availableExtensions?: AvailableExtensionsResolver<
       (Extension | null)[] | null,
       any,
@@ -385,7 +385,7 @@ export namespace DatabaseResolvers {
   }
 
   export type EditorsResolver<
-    R = (EditorSupport | null)[] | null,
+    R = EditorSupport[],
     Parent = any,
     Context = any
   > = Resolver<R, Parent, Context>;

server/src/schema/type-defs.ts

@@ -67,7 +67,7 @@ export const typeDefs = gql`
     settings: Settings!
     schematicCollections: [SchematicCollectionForNgNew]
     workspace(path: String!): Workspace!
-    editors: [EditorSupport]
+    editors: [EditorSupport!]!
     availableExtensions(name: String): [Extension]
     installNodeJsStatus: InstallNodeJsStatus
     isNodejsInstalled: IsNodeInstalledResult

tools/scripts/set-up-e2e-fixtures.js

@@ -14,12 +14,16 @@ shell.mkdir(path.join(tmp, 'proj-extensions'));
 shell.rm('-rf', path.join(tmp, 'proj-no-node-modules'));
 shell.mkdir(path.join(tmp, 'proj-no-node-modules'));
 
+shell.rm('-rf', path.join(tmp, 'ng'));
+shell.mkdir(path.join(tmp, 'ng'));
+cp.execSync('yarn add @angular/[email protected]', {cwd: path.join(tmp, 'ng')});
+
 cp.execSync('ng config -g cli.packageManager yarn');
-cp.execSync(`${process.cwd()}/node_modules/.bin/ng new proj --collection=@schematics/angular --directory=proj --skip-git`, { cwd: tmp, stdio: [0, 1, 2] });
+cp.execSync(`${path.join(tmp, 'ng')}/node_modules/.bin/ng new proj --collection=@schematics/angular --directory=proj --skip-git --no-interactive`, { cwd: tmp, stdio: [0, 1, 2] });
 shell.mv(path.join(tmp, 'proj'), './tmp/proj');
 
-cp.execSync(`${process.cwd()}/node_modules/.bin/ng new proj-extensions --collection=@schematics/angular --directory=proj-extensions --skip-git`, { cwd: tmp, stdio: [0, 1, 2] });
+cp.execSync(`${path.join(tmp, 'ng')}/node_modules/.bin/ng new proj-extensions --collection=@schematics/angular --directory=proj-extensions --skip-git --no-interactive`, { cwd: tmp, stdio: [0, 1, 2] });
 shell.mv(path.join(tmp, 'proj-extensions'), './tmp/proj-extensions');
 
-cp.execSync(`${process.cwd()}/node_modules/.bin/ng new proj-no-node-modules --collection=@schematics/angular --directory=proj-no-node-modules --skip-install --skip-git`, { cwd: tmp, stdio: [0, 1, 2] });
+cp.execSync(`${path.join(tmp, 'ng')}/node_modules/.bin/ng new proj-no-node-modules --collection=@schematics/angular --directory=proj-no-node-modules --skip-install --skip-git --no-interactive`, { cwd: tmp, stdio: [0, 1, 2] });
 shell.mv(path.join(tmp, 'proj-no-node-modules'), './tmp/proj-no-node-modules');