Skip to content

Commit ef498b2

Browse files
committed
Merge branch 'main' of github.com:ionic-team/ionic-framework into FW-6596
2 parents da06a67 + 7b9f306 commit ef498b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+234
-723
lines changed

docs/angular/testing.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Ionic Framework supports multiple versions of Angular. As a result, we need to v
44

55
## Syncing Local Changes
66

7-
The Angular test app supports syncing your locally built changes for validation.
7+
The Angular test app supports syncing your locally built changes for validation. This allows you to test local changes like `core` without having to publish a new version of the package.
88

99
1. Build the `core` directory.
1010
2. Navigate to `packages/angular` and run `npm run sync`.
@@ -16,6 +16,12 @@ The Angular test app supports syncing your locally built changes for validation.
1616

1717
From here you can either build the application or start a local dev server. When re-syncing changes, you will need to [wipe or disable the application cache](#application-cache).
1818

19+
> [!NOTE]
20+
> Syncing is required to verify that the minimal supported Angular version is still compatible with the latest Ionic Framework changes.
21+
> For example, Ionic Framework 8 supports Angular 16, but the latest version of Ionic Framework may not be compatible with Angular 16. Syncing allows you to verify that the latest changes are still compatible with the minimal supported version.
22+
>
23+
> Support for the minimal version and maximum version can be found on the [Support page](https://ionicframework.com/docs/reference/support#ionic-angular) of the Ionic Framework documentation.
24+
1925
## Application Cache
2026

2127
Angular CLI creates a cache of several files on disk by default in the `.angular` directory. This decreases the time taken to build the test application. However, the cache makes it difficult to quickly sync and check local changes of Ionic. As a result, the `.angular` cache is disabled by default in the test app projects.

packages/angular/test/apps/ng19/angular.json renamed to packages/angular/test/apps/ng16/angular.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,22 @@
7878
"serve": {
7979
"builder": "@angular-devkit/build-angular:dev-server",
8080
"options": {
81-
"buildTarget": "test-app:build"
81+
"browserTarget": "test-app:build"
8282
},
8383
"configurations": {
8484
"production": {
85-
"buildTarget": "test-app:build:production"
85+
"browserTarget": "test-app:build:production"
8686
},
8787
"development": {
88-
"buildTarget": "test-app:build:development"
88+
"browserTarget": "test-app:build:development"
8989
}
9090
},
9191
"defaultConfiguration": "development"
9292
},
9393
"extract-i18n": {
9494
"builder": "@angular-devkit/build-angular:extract-i18n",
9595
"options": {
96-
"buildTarget": "test-app:build"
96+
"browserTarget": "test-app:build"
9797
}
9898
},
9999
"lint": {
@@ -124,7 +124,7 @@
124124
}
125125
},
126126
"serve-ssr": {
127-
"builder": "@angular-devkit/build-angular:ssr-dev-server",
127+
"builder": "@nguniversal/builders:ssr-dev-server",
128128
"options": {
129129
"browserTarget": "test-app:build",
130130
"serverTarget": "test-app:server"
@@ -137,7 +137,7 @@
137137
}
138138
},
139139
"prerender": {
140-
"builder": "@angular-devkit/build-angular:prerender",
140+
"builder": "@nguniversal/builders:prerender",
141141
"options": {
142142
"browserTarget": "test-app:build:production",
143143
"serverTarget": "test-app:server:production",
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"angularCompilerOptions": {
3+
"fullTemplateTypeCheck": true,
4+
"strictMetadataEmit" : true
5+
},
6+
"extends": "../tsconfig.json",
7+
"include": [
8+
"src/**spec.ts",
9+
"../cypress/support/index.d.ts"
10+
],
11+
"compilerOptions": {
12+
"outDir": "../out-tsc/app",
13+
"module": "commonjs",
14+
"target": "es5",
15+
"types": [
16+
"cypress",
17+
"node"
18+
]
19+
}
20+
}

packages/angular/test/apps/ng16/src/app/app-routing.module.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

packages/angular/test/apps/ng16/src/app/lazy/version-test/version-test-routing.module.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.

packages/angular/test/apps/ng19/src/main.server.ts renamed to packages/angular/test/apps/ng16/src/main.server.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@ import { enableProdMode } from '@angular/core';
22

33
import { environment } from './environments/environment';
44

5-
import { AppServerModule } from './app/app.server.module';
6-
75
if (environment.production) {
86
enableProdMode();
97
}
108

119
export { AppServerModule } from './app/app.server.module';
12-
export { renderModule } from '@angular/platform-server';
13-
14-
// Add a default export
15-
export default AppServerModule;
10+
export { renderModule, renderModuleFactory } from '@angular/platform-server';
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"extends": "./tsconfig.json",
3+
"compilerOptions": {
4+
"outDir": "./out-tsc/app"
5+
},
6+
"files": [
7+
"src/main.ts",
8+
"src/polyfills.ts",
9+
"src/zone-flags.ts"
10+
],
11+
"include": ["src/**/*.d.ts"]
12+
}

packages/angular/test/apps/ng20/tsconfig.server.json renamed to packages/angular/test/apps/ng16/tsconfig.server.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
{
2-
"extends": "./tsconfig.json",
2+
"extends": "./tsconfig.app.json",
33
"compilerOptions": {
44
"outDir": "./out-tsc/app-server",
5-
"target": "ES2016",
6-
"module": "commonjs",
7-
"types": ["node"]
5+
"target": "es2016",
6+
"types": [
7+
"node"
8+
]
89
},
910
"files": [
1011
"src/main.server.ts",
11-
"src/server.ts"
12-
],
13-
"include": [
14-
"src/**/*.d.ts"
12+
"server.ts"
1513
],
1614
"angularCompilerOptions": {
1715
"entryModule": "./src/app/app.server.module#AppServerModule"

packages/angular/test/apps/ng19/tsconfig.spec.json renamed to packages/angular/test/apps/ng16/tsconfig.spec.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "./out-tsc/spec",
5-
"module": "commonjs",
6-
"types": ["jasmine", "node"]
5+
"types": [
6+
"node"
7+
]
78
},
89
"files": [
910
"src/test.ts",
11+
"src/zone-flags.ts",
1012
"src/polyfills.ts"
1113
],
1214
"include": [

packages/angular/test/apps/ng17/e2e/src/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)