Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions browser/.browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
# You can see what browsers were selected by your queries by running:
# npx browserslist

> 0.5%
last 2 versions
Firefox ESR
not > 0.5%
not last 2 versions
not dead
IE 9-11 # For IE 9-11 support, remove 'not'.
not IE 9-11
Safari >=15
15 changes: 9 additions & 6 deletions browser/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
Expand All @@ -16,7 +17,10 @@
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"polyfills": [
"zone.js",
"hammerjs"
],
"assets": [
"src/assets",
"src/assets/favicon.ico"
Expand Down Expand Up @@ -45,7 +49,6 @@
}
],
"optimization": true,
"aot": true,
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
Expand Down Expand Up @@ -74,21 +77,21 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "my-app:build"
"buildTarget": "my-app:build"
},
"configurations": {
"production": {
"browserTarget": "my-app:build:production"
"buildTarget": "my-app:build:production"
},
"es5": {
"browserTarget": "my-app:build:es5"
"buildTarget": "my-app:build:es5"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "my-app:build"
"buildTarget": "my-app:build"
}
},
"test": {
Expand Down
54 changes: 27 additions & 27 deletions browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "gulp updateBrowser --max_old_space_size=12192 && gulp overwrite-package-json && node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng build --configuration production --progress=true",
"start": "gulp updateBrowser --max_old_space_size=12192 && node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng serve --configuration es5 -o",
"startProd": "gulp updateBrowser --max_old_space_size=12192 && node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng serve --configuration production --configuration es5 -o --progress=true",
"start:es6": "node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng serve -o",
"start:es5": "node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng serve -o",
"startHost": "node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng serve --configuration es5 -o",
"sass-js-compile-check": "gulp sass-js-compile-check",
"test": "ng test",
Expand All @@ -21,14 +21,14 @@
"url": "git://github.com/IgniteUI/@infragistics/igniteui-angular-examples/repository.git"
},
"dependencies": {
"@angular/animations": "16.0.1",
"@angular/common": "16.0.1",
"@angular/compiler": "16.0.1",
"@angular/core": "16.0.1",
"@angular/forms": "16.0.1",
"@angular/platform-browser": "16.0.1",
"@angular/platform-browser-dynamic": "16.0.1",
"@angular/router": "16.0.1",
"@angular/animations": "17.0.0",
"@angular/common": "17.0.0",
"@angular/compiler": "17.0.0",
"@angular/core": "17.0.0",
"@angular/forms": "17.0.0",
"@angular/platform-browser": "17.0.0",
"@angular/platform-browser-dynamic": "17.0.0",
"@angular/router": "17.0.0",
"@ionic/angular": "5.6.3",
"@types/file-saver": "2.0.5",
"@types/hammerjs": "2.0.39",
Expand All @@ -38,17 +38,17 @@
"core-js": "2.6.2",
"file-saver": "2.0.5",
"hammerjs": "2.0.8",
"igniteui-angular": "16.0.7",
"igniteui-angular-charts": "16.1.2-beta.0",
"igniteui-angular-core": "16.1.2-beta.0",
"igniteui-angular-excel": "16.1.2-beta.0",
"igniteui-angular-gauges": "16.1.2-beta.0",
"igniteui-angular-inputs": "16.1.2-beta.0",
"igniteui-angular-layouts": "16.1.2-beta.0",
"igniteui-angular-maps": "16.1.2-beta.0",
"igniteui-angular-spreadsheet": "16.1.2-beta.0",
"igniteui-angular-spreadsheet-chart-adapter": "16.1.2-beta.0",
"igniteui-theming": "1.4.14",
"igniteui-angular": "17.0.0-beta.0",
"igniteui-angular-charts": "17.0.0-beta.0",
"igniteui-angular-core": "17.0.0-beta.0",
"igniteui-angular-excel": "17.0.0-beta.0",
"igniteui-angular-gauges": "17.0.0-beta.0",
"igniteui-angular-inputs": "17.0.0-beta.0",
"igniteui-angular-layouts": "17.0.0-beta.0",
"igniteui-angular-maps": "17.0.0-beta.0",
"igniteui-angular-spreadsheet": "17.0.0-beta.0",
"igniteui-angular-spreadsheet-chart-adapter": "17.0.0-beta.0",
"igniteui-theming": "^3.3.1",
"igniteui-webcomponents": "4.5.0-beta.1",
"immediate": "3.2.3",
"intl": "1.2.5",
Expand All @@ -59,13 +59,13 @@
"tslib": "2.3.1",
"uzip": "0.20200128.0",
"web-animations-js": "2.3.2",
"zone.js": "~0.13.0"
"zone.js": "~0.14.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "16.0.1",
"@angular/cli": "16.0.1",
"@angular/compiler-cli": "16.0.1",
"@angular/language-service": "16.0.1",
"@angular-devkit/build-angular": "17.0.0",
"@angular/cli": "17.0.0",
"@angular/compiler-cli": "17.0.0",
"@angular/language-service": "17.0.0",
"@types/jasmine": "3.10.2",
"@types/jasminewd2": "2.0.9",
"@types/node": "14.14.28",
Expand All @@ -90,6 +90,6 @@
"sass.js": "0.11.1",
"ts-node": "9.1.1",
"tslint": "~6.1.3",
"typescript": "5.0.4"
"typescript": "5.2.2"
}
}
}
19 changes: 10 additions & 9 deletions browser/scripts/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ exports.generateStats = function generateStats(cb) {
combinedSamples.push(samplePath);
break;
}
combinedSamples.sort();
stats.generate(cb, combinedSamples);
}

Expand Down Expand Up @@ -971,12 +972,12 @@ function updateReadme(cb) {
readmeNewFile = readmeNewFile.replace("{SampleDisplayName}", sample.SampleDisplayName);
readmeNewFile = readmeNewFile.replace("{SampleFolderPath}", sample.SourcePath);
readmeNewFile = readmeNewFile.replace("{SampleRoute}", sampleRoute);
let readmeOldFile = "";

let readmeOldFile = "";
if (fs.existsSync(readmePath)) {
readmeOldFile = fs.readFileSync(readmePath).toString();
readmeOldFile = fs.readFileSync(readmePath).toString();
}

if (readmeNewFile !== readmeOldFile) {
console.log('UPDATED: ' + readmePath)
changeFilesCount++;
Expand Down Expand Up @@ -1032,7 +1033,7 @@ function sortByKeys(dependencies)
{
let keys = Object.keys(dependencies);
keys.sort();

var sorted = {};
for (const key of keys) {
sorted[key] = dependencies[key];
Expand All @@ -1046,7 +1047,7 @@ function updateIG(cb) {
// del.sync("./samples/**/node_modules/**", {force:true});
// del.sync("./samples/**/node_modules", {force:true});

// NOTE: change this array with new version of packages
// NOTE: change this array with new version of packages
// and optionally use "@infragistics/" proget prefix, e.g.
// { name: "@infragistics/igniteui-angular-charts", version: "23.2.18" }, // PROGET
// { name: "igniteui-angular-charts", version: "14.1.0" }, // NPM
Expand All @@ -1062,7 +1063,7 @@ function updateIG(cb) {
{ name: "igniteui-angular-spreadsheet-chart-adapter", version: "16.1.2-beta.0" },
{ name: "igniteui-angular-spreadsheet" , version: "16.1.2-beta.0" },
{ name: "igniteui-angular-datasources" , version: "16.1.2-beta.0" },

// these IG packages are sometimes updated:
{ name: "igniteui-webcomponents", version: "4.5.0-beta.1" },
{ name: "igniteui-theming", version: "1.4.14" },
Expand Down Expand Up @@ -1137,13 +1138,13 @@ function updateIG(cb) {
}
}

let newContent = fileLines.join('\n');
let newContent = fileLines.join('\n');
let jsonPackages = JSON.parse(newContent);
// sort package dependencies by their names
let sortPackages = sortByKeys(jsonPackages.dependencies);
if (JSON.stringify(sortPackages) !== JSON.stringify(jsonPackages.dependencies)) {
jsonPackages.dependencies = sortPackages;
jsonPackages.devDependencies = sortByKeys(jsonPackages.devDependencies);
jsonPackages.devDependencies = sortByKeys(jsonPackages.devDependencies);
newContent = JSON.stringify(jsonPackages, null, ' ') + '\n';
fileChanged = true;
}
Expand Down
2 changes: 0 additions & 2 deletions browser/scripts/stats.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ const gulp = require("gulp");
const chmod = require("gulp-chmod");
const flatten = require("gulp-flatten");
const fs = require("fs");
const path = require("path");

const path = require("path");
const es = require("event-stream");
const del = require("del");
Expand Down
2 changes: 1 addition & 1 deletion browser/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export const samplesRoutes: Routes = [
// note these section is auto-generated - do not change it:
// Auto-Insert-Modules-Start
{ path: "charts", data: ["SamplesForCharts"], loadChildren: () => import("../samples/charts/samples-modules").then(m => m.SamplesForCharts) },
{ path: "gauges", data: ["SamplesForGauges"], loadChildren: () => import("../samples/gauges/samples-modules").then(m => m.SamplesForGauges) },
{ path: "excel", data: ["SamplesForExcel"], loadChildren: () => import("../samples/excel/samples-modules").then(m => m.SamplesForExcel) },
{ path: "gauges", data: ["SamplesForGauges"], loadChildren: () => import("../samples/gauges/samples-modules").then(m => m.SamplesForGauges) },
{ path: "maps", data: ["SamplesForMaps"], loadChildren: () => import("../samples/maps/samples-modules").then(m => m.SamplesForMaps) }


Expand Down
4 changes: 2 additions & 2 deletions browser/src/app/index/index.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import BrowserInfo from "../../browser-info.json";
// note these section is auto-generated - do not change it:
// Auto-Insert-Imports-RoutingData-Start
import { RoutingDataForCharts } from "../../samples/charts/routing-data";
import { RoutingDataForGauges } from "../../samples/gauges/routing-data";
import { RoutingDataForExcel } from "../../samples/excel/routing-data";
import { RoutingDataForGauges } from "../../samples/gauges/routing-data";
import { RoutingDataForMaps } from "../../samples/maps/routing-data";


Expand Down Expand Up @@ -48,8 +48,8 @@ export class IndexComponent implements OnInit, AfterViewInit {
private modulesRoutes = [
// Auto-Insert-SamplesRoutingArray-Start
{ path: "charts", routesData: RoutingDataForCharts },
{ path: "gauges", routesData: RoutingDataForGauges },
{ path: "excel", routesData: RoutingDataForExcel },
{ path: "gauges", routesData: RoutingDataForGauges },
{ path: "maps", routesData: RoutingDataForMaps }


Expand Down
Loading