Angular 7 update

.editorconfig

@@ -1,4 +1,4 @@
-# Editor configuration, see http://editorconfig.org
+# Editor configuration, see https://editorconfig.org
 root = true
 
 [*]

.gitignore

@@ -2,13 +2,16 @@
 
 # compiled output
 /dist
-/dist-server
 /tmp
 /out-tsc
 
 # dependencies
 /node_modules
 
+# profiling files
+chrome-profiler-events.json
+speed-measure-plugin.json
+
 # IDEs and editors
 /.idea
 .project
@@ -31,13 +34,10 @@
 /coverage
 /libpeerconnection.log
 npm-debug.log
+yarn-error.log
 testem.log
 /typings
 
-# e2e
-/e2e/*.js
-/e2e/*.map
-
 # System Files
 .DS_Store
 Thumbs.db

angular.json

@@ -0,0 +1,135 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "angular-cypress-unit": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {},
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/angular-cypress-unit",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.app.json",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "angular-cypress-unit:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "angular-cypress-unit:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "angular-cypress-unit:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "karmaConfig": "src/karma.conf.js",
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": [],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "angular-cypress-unit-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "prefix": "",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "angular-cypress-unit:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "angular-cypress-unit:serve:production"
+            }
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "angular-cypress-unit"
+}

cypress/integration/spec-private-api.ts

@@ -0,0 +1,37 @@
+import { ɵrenderComponent as renderComponent, ɵcompileComponent as compileComponent} from '@angular/core';
+import '@angular/compiler';
+import 'zone.js';
+import { AppComponent } from '../../src/app/app.component';
+
+/* eslint-env mocha */
+/* global cy */
+describe('AppComponent', () => {
+  beforeEach(() => {
+    const html = `
+      <head>
+        <meta charset="UTF-8">
+      </head>
+      <body>
+        <app-root></app-root>
+      </body>
+    `;
+    const document = (cy as any).state('document');
+    document.write(html);
+    document.close();
+
+    // Quick hack to get the component definition, which in our case is the first annotation.
+    compileComponent(AppComponent, (<any>AppComponent).__annotations__[0]);
+    renderComponent(AppComponent, {
+      host: document.body
+    });
+  });
+
+  it('works', () => {
+    cy.contains('Welcome to angular-cypress-unit!').should('be.visible');
+  });
+
+  it('works again', () => {
+    cy.contains('Welcome to angular-cypress-unit!').should('be.visible');
+  });
+
+});

cypress/integration/spec.ts

@@ -1,5 +1,7 @@
 /// <reference types="cypress" />
 
+// Required for JIT in NG-7
+import 'core-js/es7/reflect';
 import { ApplicationRef, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
@@ -52,10 +54,10 @@ describe('AppComponent', () => {
   });
 
   it('works', () => {
-    cy.contains('Welcome to app').should('be.visible');
+    cy.contains('Welcome to angular-cypress-unit').should('be.visible');
   });
 
   it('works again', () => {
-    cy.contains('Welcome to app').should('be.visible');
+    cy.contains('Welcome to angular-cypress-unit').should('be.visible');
   });
 });

cypress/plugins/cy-ts-preprocessor.js

@@ -11,13 +11,13 @@ const webpackOptions = {
         loaders: ['ts-loader', 'angular2-template-loader'],
         exclude: [/node_modules/],
       },
-      { 
-        test: /\.(html|css)$/, 
+      {
+        test: /\.(html|css)$/,
         loader: 'raw-loader',
         exclude: /\.async\.(html|css)$/
       },
       {
-        test: /\.async\.(html|css)$/, 
+        test: /\.async\.(html|css)$/,
         loaders: ['file?name=[name].[hash].[ext]', 'extract']
       }
     ]

cypress/tsconfig.json

@@ -4,6 +4,7 @@
     "../node_modules/cypress"
   ],
   "compilerOptions": {
+    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "skipLibCheck": true
   }

protractor.conf.js → e2e/protractor.conf.js

@@ -6,7 +6,7 @@ const { SpecReporter } = require('jasmine-spec-reporter');
 exports.config = {
   allScriptsTimeout: 11000,
   specs: [
-    './e2e/**/*.e2e-spec.ts'
+    './src/**/*.e2e-spec.ts'
   ],
   capabilities: {
     'browserName': 'chrome'
@@ -21,8 +21,8 @@ exports.config = {
   },
   onPrepare() {
     require('ts-node').register({
-      project: 'e2e/tsconfig.e2e.json'
+      project: require('path').join(__dirname, './tsconfig.e2e.json')
     });
     jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
   }
-};
+};

e2e/app.e2e-spec.ts → e2e/src/app.e2e-spec.ts

@@ -1,6 +1,6 @@
 import { AppPage } from './app.po';
 
-describe('ng-mount App', () => {
+describe('workspace-project App', () => {
   let page: AppPage;
 
   beforeEach(() => {
@@ -9,6 +9,6 @@ describe('ng-mount App', () => {
 
   it('should display welcome message', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to app!');
+    expect(page.getTitleText()).toEqual('Welcome to angular-cypress-unit!');
   });
 });

e2e/app.po.ts → e2e/src/app.po.ts

@@ -5,7 +5,7 @@ export class AppPage {
     return browser.get('/');
   }
 
-  getParagraphText() {
+  getTitleText() {
     return element(by.css('app-root h1')).getText();
   }
 }

e2e/tsconfig.e2e.json

@@ -1,8 +1,7 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../out-tsc/e2e",
-    "baseUrl": "./",
+    "outDir": "../out-tsc/app",
     "module": "commonjs",
     "target": "es5",
     "types": [
@@ -11,4 +10,4 @@
       "node"
     ]
   }
-}
+}