fix(webpack-dev-server): handle polyfills array for upcoming angular 15 change

Author: Coly010

npm/webpack-dev-server/src/helpers/angularHandler.ts

@@ -124,9 +124,11 @@ export async function generateTsConfig (devServerConfig: AngularWebpackDevServer
   }
 
   if (buildOptions.polyfills) {
-    const polyfills = getProjectFilePath(buildOptions.polyfills)
+    const polyfills = Array.isArray(buildOptions.polyfills)
+      ? buildOptions.polyfills.filter((p: string) => devServerConfig.options?.projectConfig.sourceRoot && p.startsWith(devServerConfig.options?.projectConfig.sourceRoot))
+      : [buildOptions.polyfills]
 
-    includePaths.push(polyfills)
+    includePaths.push(...polyfills.map((p: string) => getProjectFilePath(p)))
   }
 
   const cypressTypes = getProjectFilePath('node_modules', 'cypress', 'types', 'index.d.ts')

npm/webpack-dev-server/test/handlers/angularHandler.spec.ts

@@ -77,6 +77,33 @@ describe('angularHandler', function () {
     expectLoadsAngularBuildOptions(buildOptions)
   })
 
+  it('sources the config from angular-15', async () => {
+    const projectRoot = await scaffoldMigrationProject('angular-15')
+
+    process.chdir(projectRoot)
+
+    const devServerConfig = {
+      cypressConfig: {
+        projectRoot,
+        specPattern: 'src/**/*.cy.ts',
+      } as Cypress.PluginConfigOptions,
+      framework: 'angular',
+    } as AngularWebpackDevServerConfig
+
+    const { frameworkConfig: webpackConfig, sourceWebpackModulesResult } = await angularHandler(devServerConfig)
+
+    expect(webpackConfig).to.exist
+    expect((webpackConfig?.entry as any).main).to.be.undefined
+    expect(sourceWebpackModulesResult.framework?.importPath).to.include(path.join('@angular-devkit', 'build-angular'))
+
+    const { buildOptions } = await expectNormalizeProjectConfig(projectRoot)
+
+    await expectLoadsAngularJson(projectRoot)
+    await expectLoadsAngularCLiModules(projectRoot)
+    await expectGeneratesTsConfig(devServerConfig, buildOptions)
+    expectLoadsAngularBuildOptions(buildOptions)
+  })
+
   it('allows custom project config', async () => {
     const customProjectConfig = {
       root: '',

system-tests/project-fixtures/angular-15/angular.json

@@ -0,0 +1,96 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "cli": {
+    "analytics": false
+  },
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "angular": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        },
+        "@schematics/angular:application": {
+          "strict": true
+        }
+      },
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/angular",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.app.json",
+            "inlineStyleLanguage": "scss",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "500kb",
+                  "maximumError": "1mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
+                }
+              ],
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "outputHashing": "all"
+            },
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "configurations": {
+            "production": {
+              "browserTarget": "angular:build:production"
+            },
+            "development": {
+              "browserTarget": "angular:build:development"
+            }
+          },
+          "defaultConfiguration": "development"
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "angular:build"
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "angular"
+}

system-tests/project-fixtures/angular-15/cypress.config.ts

@@ -0,0 +1,26 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  component: {
+    devServer: {
+      framework: 'angular',
+      bundler: 'webpack',
+      webpackConfig: {
+        resolve: {
+          alias: {
+            '@angular/common': require.resolve('@angular/common'),
+            '@angular/core/testing': require.resolve('@angular/core/testing'),
+            '@angular/core': require.resolve('@angular/core'),
+            '@angular/platform-browser/testing': require.resolve('@angular/platform-browser/testing'),
+            '@angular/platform-browser': require.resolve('@angular/platform-browser'),
+            '@angular/platform-browser-dynamic/testing': require.resolve('@angular/platform-browser-dynamic/testing'),
+            '@angular/platform-browser-dynamic': require.resolve('@angular/platform-browser-dynamic'),
+            'zone.js/testing': require.resolve('zone.js/dist/zone-testing'),
+            'zone.js': require.resolve('zone.js'),
+          }
+        }
+      }
+    },
+    specPattern: 'src/**/*.cy.ts'
+  },
+})

system-tests/project-fixtures/angular-15/cypress/support/component-index.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <title>Components App</title>
+  </head>
+  <body>
+    <div data-cy-root></div>
+  </body>
+</html>

system-tests/project-fixtures/angular-15/cypress/support/component.ts

@@ -0,0 +1,12 @@
+import { mount } from 'cypress/angular'
+
+declare global {
+  namespace Cypress {
+    interface Chainable {
+      mount: typeof mount
+    }
+  }
+}
+
+
+Cypress.Commands.add('mount', mount);

system-tests/project-fixtures/angular-15/src/app/app.component.cy.ts

@@ -0,0 +1,6 @@
+import { AppComponent } from './app.component'
+
+it('should', () => {
+  cy.mount(AppComponent)
+  cy.get('h1').contains('Hello World')
+})

system-tests/project-fixtures/angular-15/src/app/app.component.html

@@ -0,0 +1 @@
+<h1>Hello World your app is running!</h1>

system-tests/project-fixtures/angular-15/src/app/app.component.scss

@@ -0,0 +1,3 @@
+h1 {
+  color: red
+}

system-tests/project-fixtures/angular-15/src/app/app.component.ts

@@ -0,0 +1,10 @@
+import { Component } from '@angular/core'
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+})
+export class AppComponent {
+  title = 'angular';
+}

system-tests/project-fixtures/angular-15/src/app/app.module.ts

@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core'
+import { BrowserModule } from '@angular/platform-browser'
+
+import { AppComponent } from './app.component'
+
+@NgModule({
+  declarations: [
+    AppComponent,
+  ],
+  imports: [
+    BrowserModule,
+  ],
+  providers: [],
+  bootstrap: [AppComponent],
+})
+export class AppModule { }

system-tests/project-fixtures/angular-15/src/app/components/button-output.component.ts

@@ -0,0 +1,9 @@
+import { Component, EventEmitter, Output } from "@angular/core";
+
+@Component({
+  selector: 'app-button-output',
+  template: `<button (click)="clicked.emit(true)">Click Me</button>`
+})
+export class ButtonOutputComponent {
+  @Output() clicked: EventEmitter<boolean> = new EventEmitter()
+}

system-tests/project-fixtures/angular-15/src/app/components/child.component.ts

@@ -0,0 +1,9 @@
+import { Component, Input } from "@angular/core";
+
+@Component({
+  selector: "child-component",
+  template: "<h1>{{msg}}</h1>",
+})
+export class ChildComponent {
+  @Input() msg!: string;
+}

system-tests/project-fixtures/angular-15/src/app/components/counter.component.ts

@@ -0,0 +1,18 @@
+import { Component } from "@angular/core";
+import { CounterService } from "./counter.service";
+
+@Component({
+  selector: "counter-component",
+  template: `<button (click)="increment()">
+    Increment: {{ count$ | async }}
+  </button>`,
+})
+export class CounterComponent {
+  count$ = this.counterService.count$;
+
+  constructor(private counterService: CounterService) {}
+
+  increment() {
+    this.counterService.increment();
+  }
+}

system-tests/project-fixtures/angular-15/src/app/components/counter.service.ts

@@ -0,0 +1,12 @@
+import { Injectable } from "@angular/core";
+import { BehaviorSubject } from "rxjs";
+
+@Injectable()
+export class CounterService {
+  private count = new BehaviorSubject<number>(0);
+  public count$ = this.count.asObservable();
+
+  public increment() {
+    this.count.next(this.count.value + 1);
+  }
+}

system-tests/project-fixtures/angular-15/src/app/components/errors.ts

@@ -0,0 +1,22 @@
+import { Component, Input } from "@angular/core";
+
+@Component({
+  selector: "errors-component",
+  template: `<div>
+  <button id="sync-error" (click)="syncError()">Sync Error</button>
+  <button id="async-error" (click)="asyncError()">Sync Error</button>
+  </div>`,
+})
+export class ErrorsComponent {
+  @Input() throwError!: boolean;
+
+  syncError() {
+    throw new Error('sync error')
+  }
+
+  asyncError() {
+    setTimeout(() => {
+      throw new Error('async error')
+    }, 50)
+  }
+}

system-tests/project-fixtures/angular-15/src/app/components/parent-child.module.ts

@@ -0,0 +1,7 @@
+import { NgModule } from '@angular/core'
+import { ParentComponent } from './parent.component'
+import { ChildComponent } from './child.component'
+
+@NgModule({
+  declarations: [ParentComponent, ChildComponent],
+}) export class ParentChildModule {}

system-tests/project-fixtures/angular-15/src/app/components/parent.component.ts

@@ -0,0 +1,9 @@
+import { Component } from "@angular/core";
+
+@Component({
+  selector: "parent-component",
+  template: '<child-component [msg]="msg"></child-component>',
+})
+export class ParentComponent {
+  msg = "Hello World from ParentComponent";
+}

system-tests/project-fixtures/angular-15/src/app/components/projection.component.ts

@@ -0,0 +1,7 @@
+import { Component } from '@angular/core'
+
+@Component({
+  selector: 'app-projection',
+  template: `<h3><ng-content></ng-content></h3>`
+})
+export class ProjectionComponent {}

system-tests/project-fixtures/angular-15/src/app/components/with-directives.component.ts

@@ -0,0 +1,14 @@
+import { Component } from "@angular/core";
+
+@Component({
+  selector: "with-directives-component",
+  template: ` <button (click)="show = !show">Toggle Message</button>
+    <ul *ngIf="show">
+      <li *ngFor="let item of items">{{ item }}</li>
+    </ul>`,
+})
+export class WithDirectivesComponent {
+  show = true;
+
+  items = ["breakfast", "lunch", "dinner"];
+}

system-tests/project-fixtures/angular-15/src/app/errors.cy.ts

@@ -0,0 +1,23 @@
+import { ErrorsComponent } from './components/errors'
+
+describe('Errors', () => {
+
+  it('error on mount', () => {
+    cy.mount(ErrorsComponent, { componentProperties: { throwError: true } })
+  })
+
+  it('sync error', () => {
+    cy.mount(ErrorsComponent)
+    cy.get('#sync-error').click()
+  })
+
+  it('async error', () => {
+    cy.mount(ErrorsComponent)
+    cy.get('#async-error').click()
+  })
+
+  it('command failure', { defaultCommandTimeout: 50 }, () => {
+    cy.mount(ErrorsComponent)
+    cy.get('element-that-does-not-exist')
+  })
+})