Skip to content

Commit cff42b2

Browse files
authored
Merge pull request #438 from IgniteUI/vnext
Updating master from vnext
2 parents 70ddb87 + 2bfbfaa commit cff42b2

1,509 files changed

Lines changed: 7878 additions & 6665 deletions

File tree

Some content is hidden

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

.github/workflows/build.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: Build
2+
3+
# This workflow is meant to run on changes pushed to the vnext branch only.
4+
# If it runs on PRs, it will create PRs to the destination repos' vnext branches - we don't want that.
5+
on:
6+
push:
7+
branches:
8+
- vnext
9+
- master
10+
workflow_dispatch:
11+
inputs:
12+
isVerbose:
13+
description: 'Get verbose output from steps - where configurable'
14+
required: false
15+
type: boolean
16+
default: false
17+
18+
jobs:
19+
build:
20+
runs-on: ubuntu-latest
21+
permissions:
22+
contents: read
23+
24+
steps:
25+
- name: Checkout repository
26+
uses: actions/checkout@v4
27+
with:
28+
clean: true
29+
persist-credentials: true
30+
path: igniteui-angular-examples
31+
32+
- name: Setup Node.js
33+
uses: actions/setup-node@v4
34+
with:
35+
node-version: '20.19.0'
36+
37+
- name: Install npm dependencies
38+
run: npm install
39+
working-directory: ./igniteui-angular-examples/browser
40+
41+
- name: Apply very special configuration
42+
shell: bash
43+
run: |
44+
echo "Current directory: $(pwd)"
45+
sed -i 's/build --configuration production/build --configuration production --base-href=\/angular-demos-dv\//g' package.json
46+
working-directory: ./igniteui-angular-examples/browser
47+
48+
- name: Build project
49+
run: |
50+
if [ "${{ github.event.inputs.isVerbose }}" == "true" ]; then
51+
npm run build --verbose
52+
else
53+
npm run build
54+
fi
55+
working-directory: ./igniteui-angular-examples/browser
56+
57+
- name: Copy web.config to dist
58+
run: |
59+
cp web.config dist/browser/
60+
working-directory: ./igniteui-angular-examples/browser
61+
62+
- name: Upload build artifacts
63+
uses: actions/upload-artifact@v4
64+
with:
65+
name: dist
66+
path: ./igniteui-angular-examples/browser/dist/browser
67+
retention-days: 1

browser/.browserslistrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
last 2 Chrome versions
99
last 2 Firefox versions
1010
last 2 Edge versions
11-
Safari >= 16
11+
Safari >= 17

browser/build-output.txt

1.27 KB
Binary file not shown.

browser/package.json

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -24,36 +24,35 @@
2424
"@lit/reactive-element": "desired-version"
2525
},
2626
"dependencies": {
27-
"@angular/animations": "20.0.1",
28-
"@angular/common": "20.0.1",
29-
"@angular/compiler": "20.0.1",
30-
"@angular/core": "20.0.1",
31-
"@angular/forms": "20.0.1",
32-
"@angular/platform-browser": "20.0.1",
33-
"@angular/platform-browser-dynamic": "20.0.1",
34-
"@angular/router": "20.0.1",
27+
"@angular/animations": "21.1.1",
28+
"@angular/common": "21.1.1",
29+
"@angular/compiler": "21.1.1",
30+
"@angular/core": "21.1.1",
31+
"@angular/forms": "21.1.1",
32+
"@angular/platform-browser": "21.1.1",
33+
"@angular/platform-browser-dynamic": "21.1.1",
34+
"@angular/router": "21.1.1",
3535
"@ionic/angular": "5.6.3",
3636
"@types/file-saver": "2.0.5",
37-
"@types/hammerjs": "2.0.40",
38-
"ajv": "8.6.2",
39-
"angular-in-memory-web-api": "0.20.0",
37+
"@types/hammerjs": "2.0.46",
38+
"ajv": "8.17.1",
39+
"angular-in-memory-web-api": "0.21.0",
4040
"classlist.js": "1.1.20150312",
4141
"core-js": "3.21.0",
4242
"file-saver": "2.0.5",
4343
"hammerjs": "2.0.8",
44-
"igniteui-angular": "20.1.0-rc.2",
45-
"igniteui-angular-charts": "20.2.1",
46-
"igniteui-angular-core": "20.2.1",
47-
"igniteui-angular-dashboards": "20.2.1",
48-
"igniteui-angular-data-grids": "20.2.1",
49-
"igniteui-angular-excel": "20.2.1",
50-
"igniteui-angular-gauges": "20.2.1",
51-
"igniteui-angular-inputs": "20.2.1",
52-
"igniteui-angular-layouts": "20.2.1",
53-
"igniteui-angular-maps": "20.2.1",
54-
"igniteui-angular-spreadsheet": "20.2.1",
55-
"igniteui-angular-spreadsheet-chart-adapter": "20.2.1",
56-
"igniteui-theming": "20.0.0",
44+
"igniteui-angular": "21.0.8",
45+
"igniteui-angular-charts": "21.0.0",
46+
"igniteui-angular-core": "21.0.0",
47+
"igniteui-angular-dashboards": "21.0.0",
48+
"igniteui-angular-data-grids": "21.0.0",
49+
"igniteui-angular-excel": "21.0.0",
50+
"igniteui-angular-gauges": "21.0.0",
51+
"igniteui-angular-inputs": "21.0.0",
52+
"igniteui-angular-layouts": "21.0.0",
53+
"igniteui-angular-maps": "21.0.0",
54+
"igniteui-angular-spreadsheet": "21.0.0",
55+
"igniteui-angular-spreadsheet-chart-adapter": "21.0.0",
5756
"igniteui-webcomponents": "6.3.1",
5857
"immediate": "3.2.3",
5958
"intl": "1.2.5",
@@ -67,10 +66,10 @@
6766
"zone.js": "~0.15.0"
6867
},
6968
"devDependencies": {
70-
"@angular-devkit/build-angular": "20.0.1",
71-
"@angular/cli": "20.0.1",
72-
"@angular/compiler-cli": "20.0.1",
73-
"@angular/language-service": "20.0.1",
69+
"@angular-devkit/build-angular": "21.1.1",
70+
"@angular/cli": "21.1.1",
71+
"@angular/compiler-cli": "21.1.1",
72+
"@angular/language-service": "21.1.1",
7473
"@types/jasmine": "3.10.2",
7574
"@types/jasminewd2": "2.0.9",
7675
"@types/node": "18.17.0",
@@ -85,16 +84,16 @@
8584
"gulp-flatten": "0.4.0",
8685
"jasmine-core": "5.1.1",
8786
"jasmine-spec-reporter": "~4.2.1",
88-
"karma": "6.3.7",
87+
"karma": "6.4.4",
8988
"karma-chrome-launcher": "~3.1.0",
9089
"karma-cli": "~2.0.0",
9190
"karma-coverage-istanbul-reporter": "2.1.1",
9291
"karma-jasmine": "~3.3.0",
9392
"karma-jasmine-html-reporter": "1.6.0",
94-
"protractor": "~7.0.0",
93+
"sass": "1.69.5",
9594
"sass.js": "0.11.1",
9695
"ts-node": "10.9.1",
9796
"tslint": "~6.1.3",
98-
"typescript": "5.8.3"
97+
"typescript": "5.9.3"
9998
}
10099
}

browser/scripts/browser.js

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,30 +1214,29 @@ function updateIG(cb) {
12141214
// { version: "14.1.0", name: "igniteui-angular-charts" }, // NPM
12151215
let packageUpgrades = [
12161216
// these IG packages are often updated:
1217-
{ version: "20.2.1", name: "igniteui-angular-core" },
1218-
{ version: "20.2.1", name: "igniteui-angular-charts" },
1219-
{ version: "20.2.1", name: "igniteui-angular-excel" },
1220-
{ version: "20.2.1", name: "igniteui-angular-gauges" },
1221-
{ version: "20.2.1", name: "igniteui-angular-data-grids" },
1222-
{ version: "20.2.1", name: "igniteui-angular-inputs" },
1223-
{ version: "20.2.1", name: "igniteui-angular-layouts" },
1224-
{ version: "20.2.1", name: "igniteui-angular-maps" },
1225-
{ version: "20.2.1", name: "igniteui-angular-spreadsheet-chart-adapter" },
1226-
{ version: "20.2.1", name: "igniteui-angular-spreadsheet" },
1227-
{ version: "20.2.1", name: "igniteui-angular-datasources" },
1228-
{ version: "20.2.1", name: "igniteui-angular-dashboards" },
1217+
{ version: "21.0.0", name: "igniteui-angular-core" },
1218+
{ version: "21.0.0", name: "igniteui-angular-charts" },
1219+
{ version: "21.0.0", name: "igniteui-angular-excel" },
1220+
{ version: "21.0.0", name: "igniteui-angular-gauges" },
1221+
{ version: "21.0.0", name: "igniteui-angular-data-grids" },
1222+
{ version: "21.0.0", name: "igniteui-angular-inputs" },
1223+
{ version: "21.0.0", name: "igniteui-angular-layouts" },
1224+
{ version: "21.0.0", name: "igniteui-angular-maps" },
1225+
{ version: "21.0.0", name: "igniteui-angular-spreadsheet-chart-adapter" },
1226+
{ version: "21.0.0", name: "igniteui-angular-spreadsheet" },
1227+
{ version: "21.0.0", name: "igniteui-angular-datasources" },
1228+
{ version: "21.0.0", name: "igniteui-angular-dashboards" },
12291229
// these IG packages are sometimes updated:
12301230
{ version: "6.3.1" , name: "igniteui-webcomponents" },
1231-
{ version: "20.0.0", name: "igniteui-theming" },
1232-
{ version: "20.1.0-rc.2", name: "igniteui-angular" },
1233-
{ version: "20.0.1", name: "@angular/animations" },
1234-
{ version: "20.0.1", name: "@angular/common" },
1235-
{ version: "20.0.1", name: "@angular/compiler" },
1236-
{ version: "20.0.1", name: "@angular/core" },
1237-
{ version: "20.0.1", name: "@angular/forms" },
1238-
{ version: "20.0.1", name: "@angular/platform-browser" },
1239-
{ version: "20.0.1", name: "@angular/platform-browser-dynamic" },
1240-
{ version: "2.0.40", name: "@types/hammerjs" },
1231+
{ version: "21.0.8", name: "igniteui-angular" },
1232+
{ version: "21.1.1", name: "@angular/animations" },
1233+
{ version: "21.1.1", name: "@angular/common" },
1234+
{ version: "21.1.1", name: "@angular/compiler" },
1235+
{ version: "21.1.1", name: "@angular/core" },
1236+
{ version: "21.1.1", name: "@angular/forms" },
1237+
{ version: "21.1.1", name: "@angular/platform-browser" },
1238+
{ version: "21.1.1", name: "@angular/platform-browser-dynamic" },
1239+
{ version: "2.0.46", name: "@types/hammerjs" },
12411240
{ version: "1.1.20150312", name: "classlist-js" },
12421241
{ version: "3.21.0" , name: "core-js" },
12431242
{ version: "2.0.8" , name: "hammerjs" },
@@ -1248,18 +1247,18 @@ function updateIG(cb) {
12481247
{ version: "2.3.2" , name: "web-animations-js", },
12491248
{ version: "~0.15.0", name: "zone.js" },
12501249
// dev packages:
1251-
{ version: "20.0.1" , name: "@angular/cli" },
1252-
{ version: "20.0.1" , name: "@angular/compiler-cli" },
1253-
{ version: "20.0.1" , name: "@angular/language-service" },
1254-
{ version: "20.0.1" , name: "@angular-devkit/build-angular" },
1250+
{ version: "21.1.1" , name: "@angular/cli" },
1251+
{ version: "21.1.1" , name: "@angular/compiler-cli" },
1252+
{ version: "21.1.1" , name: "@angular/language-service" },
1253+
{ version: "21.1.1" , name: "@angular-devkit/build-angular" },
12551254
{ version: "18.17.0", name: "@types/node" },
12561255
{ version: "6.0.2" , name: "codelyzer" },
12571256
{ version: "5.1.1" , name: "jasmine-core" },
12581257
{ version: "~4.2.1" , name: "jasmine-spec-reporter" },
12591258
{ version: "0.11.1" , name: "sass.js" },
12601259
{ version: "~6.1.3" , name: "tslint" },
12611260
{ version: "10.9.1" , name: "ts-node" },
1262-
{ version: "5.8.3" , name: "typescript" },
1261+
{ version: "5.9.3" , name: "typescript" },
12631262
];
12641263

12651264
// NOTE you can comment out strings in this array to run these function only on a subset of samples

browser/src/app/app.component.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,23 @@ import { Component, HostListener, Inject, OnInit, DOCUMENT } from "@angular/core
99
export class AppComponent implements OnInit {
1010
public title = "Samples";
1111
private theme = "default-theme";
12-
private styleElem: HTMLStyleElement;
12+
private styleElem: HTMLStyleElement | null = null;
1313
private typefacesLoaded = ["Titillium Web", "Roboto"];
1414
private typefaceUrl = "https://fonts.googleapis.com/css?family=";
1515

16-
constructor(@Inject(DOCUMENT) private document: Document) { }
16+
constructor(@Inject(DOCUMENT) private document: Document) {}
1717

1818
public ngOnInit() {
1919
// console.log("SB app ngOnInit");
2020
this.createThemeStyle();
2121
}
2222

2323
@HostListener("window:message", ["$event"])
24-
private onMessage(e: MessageEvent) {
24+
protected onMessage(e: MessageEvent) {
2525
if (e.origin === e.data.origin && typeof e.data.themeStyle === "string") {
26-
this.styleElem.textContent = e.data.themeStyle;
26+
if (this.styleElem) {
27+
this.styleElem.textContent = e.data.themeStyle;
28+
}
2729
const typeface = window.getComputedStyle(this.document.body).fontFamily.replace(/\"/g, "");
2830
if (!(typeface.match(/,/g) || []).length &&
2931
!this.typefacesLoaded.includes(typeface)) {

browser/src/app/app.module.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { provideHttpClient, withInterceptorsFromDi } from "@angular/common/http";
2-
import { NgModule } from "@angular/core";
2+
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
33
import { FormsModule } from "@angular/forms";
44
import { BrowserModule } from "@angular/platform-browser";
55
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
6+
import { RouterModule } from "@angular/router";
67
import {
78
IgxButtonModule, IgxIconModule, IgxInputGroupModule,
89
IgxLayoutModule, IgxNavbarModule, IgxNavigationDrawerModule, IgxRippleModule
@@ -14,14 +15,17 @@ import { DocsLayoutComponent } from "./index/docs-layout.component";
1415
import { IndexComponent } from "./index/index.component";
1516
import { FallbackComponent } from './fallback/fallback.component';
1617

17-
@NgModule({ bootstrap: [AppComponent],
18+
@NgModule({
19+
bootstrap: [AppComponent],
1820
declarations: [
1921
AppComponent,
2022
HomeComponent,
2123
DocsLayoutComponent,
2224
IndexComponent,
2325
FallbackComponent
24-
], imports: [AppRoutingModule,
26+
],
27+
imports: [AppRoutingModule,
28+
RouterModule,
2529
IgxRippleModule,
2630
IgxNavbarModule,
2731
IgxNavigationDrawerModule,
@@ -31,5 +35,8 @@ import { FallbackComponent } from './fallback/fallback.component';
3135
BrowserModule,
3236
BrowserAnimationsModule,
3337
IgxButtonModule,
34-
FormsModule], providers: [provideHttpClient(withInterceptorsFromDi())] })
38+
FormsModule],
39+
providers: [provideHttpClient(withInterceptorsFromDi())],
40+
schemas: [CUSTOM_ELEMENTS_SCHEMA]
41+
})
3542
export class AppModule { }

browser/src/app/index/docs-layout.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, HostListener, Inject, OnInit, DOCUMENT } from "@angular/core";
1+
import { Component } from "@angular/core";
22

33
@Component({
44
selector: "app-docs-layout",

browser/src/browser-info.json

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
[
2-
{"ver":"20.1.0-rc.2","name":"igniteui-angular"},
3-
{"ver":"20.2.1","name":"igniteui-angular-charts"},
4-
{"ver":"20.2.1","name":"igniteui-angular-core"},
5-
{"ver":"20.2.1","name":"igniteui-angular-dashboards"},
6-
{"ver":"20.2.1","name":"igniteui-angular-data-grids"},
7-
{"ver":"20.2.1","name":"igniteui-angular-excel"},
8-
{"ver":"20.2.1","name":"igniteui-angular-gauges"},
9-
{"ver":"20.2.1","name":"igniteui-angular-inputs"},
10-
{"ver":"20.2.1","name":"igniteui-angular-layouts"},
11-
{"ver":"20.2.1","name":"igniteui-angular-maps"},
12-
{"ver":"20.2.1","name":"igniteui-angular-spreadsheet"},
13-
{"ver":"20.2.1","name":"igniteui-angular-spreadsheet-chart-adapter"},
14-
{"ver":"20.0.0","name":"igniteui-theming"},
2+
{"ver":"21.0.8","name":"igniteui-angular"},
3+
{"ver":"21.0.0","name":"igniteui-angular-charts"},
4+
{"ver":"21.0.0","name":"igniteui-angular-core"},
5+
{"ver":"21.0.0","name":"igniteui-angular-dashboards"},
6+
{"ver":"21.0.0","name":"igniteui-angular-data-grids"},
7+
{"ver":"21.0.0","name":"igniteui-angular-excel"},
8+
{"ver":"21.0.0","name":"igniteui-angular-gauges"},
9+
{"ver":"21.0.0","name":"igniteui-angular-inputs"},
10+
{"ver":"21.0.0","name":"igniteui-angular-layouts"},
11+
{"ver":"21.0.0","name":"igniteui-angular-maps"},
12+
{"ver":"21.0.0","name":"igniteui-angular-spreadsheet"},
13+
{"ver":"21.0.0","name":"igniteui-angular-spreadsheet-chart-adapter"},
1514
{"ver":"6.3.1","name":"igniteui-webcomponents"}
1615
]

browser/src/tsconfig.app.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
"baseUrl": "./",
88
"types": []
99
},
10+
"angularCompilerOptions": {
11+
"strictTemplates": false
12+
},
1013
"files": [
1114
"main.ts",
1215
"polyfills.ts"

0 commit comments

Comments
 (0)