Add support for Angular 17

packages/playwright-ct-angular/cli.js

@@ -14,4 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-module.exports = require('@playwright/experimental-ct-core/cli');
+
+const { program } = require('@playwright/experimental-ct-core/lib/program');
+
+program.parse(process.argv);

packages/playwright-ct-angular/index.d.ts

@@ -15,39 +15,31 @@
  */
 
 import type {
-  TestType,
+  Locator,
   PlaywrightTestArgs,
-  PlaywrightTestConfig as BasePlaywrightTestConfig,
   PlaywrightTestOptions,
   PlaywrightWorkerArgs,
   PlaywrightWorkerOptions,
-  Locator,
+  TestType,
 } from '@playwright/test';
 import type { JsonObject } from '@playwright/experimental-ct-core/types/component';
-import type { InlineConfig } from 'vite';
-import type { Type } from '@angular/core';
-
-export type PlaywrightTestConfig<T = {}, W = {}> = Omit<BasePlaywrightTestConfig<T, W>, 'use'> & {
-  use?: BasePlaywrightTestConfig<T, W>['use'] & {
-    ctPort?: number;
-    ctTemplateDir?: string;
-    ctCacheDir?: string;
-    ctViteConfig?: InlineConfig | (() => Promise<InlineConfig>);
-  };
-};
+import type { Provider, Type } from '@angular/core';
 
-type ComponentSlot = string | string[];
-type ComponentSlots = Record<string, ComponentSlot> & { default?: ComponentSlot };
+export type { PlaywrightTestConfig } from '@playwright/experimental-ct-core';
 
 type ComponentEvents = Record<string, Function>;
 
 export interface MountOptions<HooksConfig extends JsonObject, Component> {
-  props?: Partial<Component>, // TODO: filter props
-  slots?: ComponentSlots;
+  props?: Partial<Component> | Record<string, unknown>, // TODO: filter props and handle signals
+  providers?: Provider[],
   on?: ComponentEvents;
   hooksConfig?: HooksConfig;
 }
 
+export interface MountTemplateOptions<HooksConfig extends JsonObject, Component> extends MountOptions<HooksConfig, Component> {
+  imports?: Type<unknown>[];
+}
+
 interface MountResult<Component> extends Locator {
   unmount(): Promise<void>;
   update(options: {
@@ -57,6 +49,10 @@ interface MountResult<Component> extends Locator {
 }
 
 export interface ComponentFixtures {
+  mount<HooksConfig extends JsonObject, Component = unknown>(
+    template: string,
+    options?: MountTemplateOptions<HooksConfig, Component>
+  ): Promise<MountResult<Component>>;
   mount<HooksConfig extends JsonObject, Component = unknown>(
     component: Type<Component>,
     options?: MountOptions<HooksConfig, Component>

packages/playwright-ct-angular/index.js

@@ -17,22 +17,16 @@
 const { test, expect, devices, defineConfig: originalDefineConfig } = require('@playwright/experimental-ct-core');
 const path = require('path');
 
-process.env['NODE_ENV'] = 'test';
-
-function plugin() {
-  // Only fetch upon request to avoid resolution in workers.
-  const { createPlugin } = require('@playwright/experimental-ct-core/lib/vitePlugin');
-  return createPlugin(
-      path.join(__dirname, 'registerSource.mjs'),
-      () => import('@analogjs/vite-plugin-angular').then(plugin => {
-        // TODO: remove the typeof plugin.default check
-        if (typeof plugin.default === 'function')
-          return plugin.default({ jit: false });
-        return plugin.default.default({ jit: false });
-      })
-  );
-}
-
-const defineConfig = config => originalDefineConfig({ ...config, _plugins: [plugin] });
+const defineConfig = (config, ...configs) => {
+  return originalDefineConfig({
+    ...config,
+    '@playwright/test': {
+      packageJSON: require.resolve('./package.json'),
+    },
+    '@playwright/experimental-ct-core': {
+      registerSourceFile: path.join(__dirname, 'registerSource.mjs')
+    },
+  }, ...configs);
+};
 
 module.exports = { test, expect, devices, defineConfig };

packages/playwright-ct-angular/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@playwright/experimental-ct-angular",
-  "version": "1.42.0-next",
+  "version": "1.43.0-next",
   "description": "Playwright Component Testing for Angular",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/sand4rt/playwright-ct-angular.git"
+    "url": "git+https://github.com/microsoft/playwright.git"
   },
   "homepage": "https://playwright.dev",
   "engines": {
@@ -29,35 +29,24 @@
     }
   },
   "dependencies": {
-    "@analogjs/vite-plugin-angular": "0.2.28",
-    "@angular-devkit/build-angular": "^16.1.0",
-    "@playwright/experimental-ct-core": "1.42.0-next",
-    "vite": "^4.4.9"
+    "@playwright/experimental-ct-core": "1.43.0-next"
   },
   "devDependencies": {
-    "@angular/animations": "^16.1.7",
-    "@angular/common": "^16.1.7",
-    "@angular/compiler": "^16.1.7",
-    "@angular/compiler-cli": "^16.1.7",
-    "@angular/core": "^16.1.7",
-    "@angular/platform-browser": "^16.1.7",
-    "@angular/platform-browser-dynamic": "^16.1.7",
-    "@angular/router": "^16.1.7",
-    "@playwright/test": "1.38.1",
+    "@angular/compiler": "^17.0.0",
+    "@angular/core": "^17.0.0",
+    "@angular/platform-browser-dynamic": "^17.0.0",
     "rxjs": "~7.8.1",
-    "tslib": "^2.5.0",
-    "typescript": "^5.0.4",
-    "zone.js": "~0.13.1"
+    "typescript": "~5.2.0",
+    "vite": "~5.0.12",
+    "zone.js": "~0.14.0"
   },
   "peerDependencies": {
-    "@playwright/test": ">=1.38.1",
-    "typescript": ">=4.9.3",
-    "@angular/common": ">=15.1.0 || >=16.0.0",
-    "@angular/platform-browser": ">=15.1.0 || >=16.0.0",
-    "@angular/router": ">=15.1.0 || >=16.0.0",
-    "@angular/core": ">=15.1.0 || >=16.0.0"
+    "@angular/compiler": "^17.0.0",
+    "@angular/core": "^17.0.0",
+    "@angular/platform-browser-dynamic": "^17.0.0",
+    "typescript": ">=5.2.0"
   },
   "bin": {
-    "playwright": "./cli.js"
+    "playwright": "cli.js"
   }
 }