build: bump screenshot tool to Angular 6 (#11150)

tools/screenshot-test/angular-cli.json

@@ -1,47 +0,0 @@
-{
-  "project": {
-    "version": "1.0.0-beta.26",
-    "name": "screenshot-test"
-  },
-  "apps": [
-    {
-      "root": "src",
-      "outDir": "dist",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.json",
-      "prefix": "app",
-      "mobile": false,
-      "styles": [
-        "styles.css"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environment": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    }
-  ],
-  "defaults": {
-    "styleExt": "css",
-    "prefixInterfaces": false,
-    "inline": {
-      "style": false,
-      "template": false
-    },
-    "spec": {
-      "class": false,
-      "component": true,
-      "directive": true,
-      "module": false,
-      "pipe": true,
-      "service": true
-    }
-  }
-}

tools/screenshot-test/angular.json

@@ -0,0 +1,66 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "screenshot-test": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "tsConfig": "src/tsconfig.json",
+            "assets": [
+              "src/favicon.ico"
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
+          },
+          "configurations": {}
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "screenshot-test:build"
+          },
+          "configurations": {}
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "screenshot-test:build"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [],
+            "exclude": []
+          }
+        }
+      }
+    },
+    "screenshot-test-e2e": {
+      "root": "",
+      "sourceRoot": "",
+      "projectType": "application"
+    }
+  },
+  "defaultProject": "screenshot-test",
+  "schematics": {
+    "@schematics/angular:component": {
+      "prefix": "app",
+      "styleext": "css"
+    },
+    "@schematics/angular:directive": {
+      "prefix": "app"
+    }
+  }
+}

tools/screenshot-test/package.json

@@ -9,28 +9,28 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "6.0.0-rc.6",
+    "@angular/animations": "6.0.0",
     "@angular/cdk": "github:angular/cdk-builds#master",
-    "@angular/common": "6.0.0-rc.6",
-    "@angular/compiler": "6.0.0-rc.6",
-    "@angular/compiler-cli": "6.0.0-rc.6",
-    "@angular/core": "6.0.0-rc.6",
-    "@angular/forms": "6.0.0-rc.6",
+    "@angular/common": "6.0.0",
+    "@angular/compiler": "6.0.0",
+    "@angular/core": "6.0.0",
+    "@angular/forms": "6.0.0",
     "@angular/material": "github:angular/material2-builds#master",
-    "@angular/platform-browser": "6.0.0-rc.6",
-    "@angular/platform-browser-dynamic": "6.0.0-rc.6",
-    "@angular/router": "6.0.0-rc.6",
+    "@angular/platform-browser": "6.0.0",
+    "@angular/platform-browser-dynamic": "6.0.0",
+    "@angular/router": "6.0.0",
     "core-js": "^2.4.1",
-    "firebase": "^3.7.6",
+    "firebase": "4.13.1",
     "rxjs": "6.0.0",
     "ts-helpers": "^1.1.1",
     "zone.js": "^0.8.12"
   },
   "devDependencies": {
-    "@angular/cli": "^1.4.9",
-    "@angular/compiler-cli": "6.0.0-rc.6",
+    "@angular/cli": "6.0.0",
+    "@angular/compiler-cli": "6.0.0",
     "@types/node": "^6.0.42",
     "ts-node": "1.2.1",
-    "typescript": "2.7.x"
+    "typescript": "2.7.x",
+    "@angular-devkit/build-angular": "~0.6.0"
   }
 }

tools/screenshot-test/src/app/firebase.service.ts

@@ -27,17 +27,17 @@ export class FirebaseService {
 
 
   /** Get the firebase storage test image folder url */
-  getTestScreenshotImageUrl(filename: string): firebase.Promise<string> {
+  getTestScreenshotImageUrl(filename: string): Promise<string> {
     return this._storageRef().child('test').child(filename).getDownloadURL();
   }
 
   /** Get the firebase storage diff image folder url */
-  getDiffScreenshotImageUrl(filename: string): firebase.Promise<string> {
+  getDiffScreenshotImageUrl(filename: string): Promise<string> {
     return this._storageRef().child('diff').child(filename).getDownloadURL();
   }
 
   /** Get the firebase storage golden image folder url */
-  getGoldScreenshotImageUrl(filename: string): firebase.Promise<string> {
+  getGoldScreenshotImageUrl(filename: string): Promise<string> {
     return firebase.storage().ref('goldens').child(filename).getDownloadURL();
   }
 
@@ -78,7 +78,7 @@ export class FirebaseService {
     });
   }
 
-  signIntoGithub(): firebase.Promise<void> {
+  signIntoGithub(): Promise<void> {
     return firebase.auth().signInWithRedirect(new firebase.auth.GithubAuthProvider());
   }