Skip to content

Commit

Permalink
feat(igx): update to 16 (#1120)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lipata
Lipata authored May 15, 2023
1 parent d84c431 commit e6efa40
Show file tree
Hide file tree
Showing 23 changed files with 102 additions and 113 deletions.
2 changes: 1 addition & 1 deletion packages/cli/lib/commands/upgrade.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ command = {
if (success && !argv.skipInstall) {
Util.log("Installing npm packages.");
try {
Util.execSync("npm install --quiet");
Util.execSync("npm install --force --quiet");
Util.log("npm packages installed.");
} catch (error) {
Util.error(`Error installing npm packages.`);
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "igniteui-cli",
"version": "11.1.2-alpha.3",
"version": "12.0.0-beta.0",
"description": "CLI tool for creating Ignite UI projects",
"keywords": [
"CLI",
Expand Down Expand Up @@ -78,8 +78,8 @@
"all": true
},
"dependencies": {
"@igniteui/angular-templates": "~15.1.1112-alpha.3",
"@igniteui/cli-core": "~11.1.2-alpha.3",
"@igniteui/angular-templates": "~16.0.1200-beta.0",
"@igniteui/cli-core": "~12.0.0-beta.0",
"chalk": "^2.3.2",
"fs-extra": "^3.0.1",
"glob": "^7.1.2",
Expand Down
3 changes: 1 addition & 2 deletions packages/cli/templates/angular/ig-ts/projects/empty/files/angular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,5 @@
}
}
}
},
"defaultProject": "$(dash-name)"
}
}
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@igniteui/cli-core",
"version": "11.1.2-alpha.3",
"version": "12.0.0-beta.0",
"description": "Base types and functionality for Ignite UI CLI",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/packages/PackageManager.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class PackageManager {
case "npm":
/* passes through */
default:
command = `${managerCommand} install --quiet`;
command = `${managerCommand} install --force --quiet`;
break;
}
await this.flushQueue(false);
Expand Down Expand Up @@ -277,7 +277,7 @@ export class PackageManager {
case "npm":
/* passes through */
default:
return `${managerCommand} install ${packageName} --quiet --save`;
return `${managerCommand} install ${packageName} --force --quiet --save`;
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...tes/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

$crm-grid-palette: palette(
$primary: #09f,
$secondary: #ffbf00,
$secondary: #4db8ff,
$surface: #333
);
@include theme($crm-grid-palette);
Expand Down Expand Up @@ -370,7 +370,7 @@
@keyframes spin-fade {
0% {
opacity: 0;
tranform: rotate(0);
tranfsorm: rotate(0);
}

100% {
Expand Down
2 changes: 1 addition & 1 deletion ...lates/igx-ts/grid/grid-batch-editing/files/src/app/__path__/__filePrefix__.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[batchEditing]="true" [rowEditable]="true">
<igx-column width="135px">
<ng-template igxCell let-cell="cell" let-val>
<button igxButton (click)="deleteRow(cell.id.rowID)" [disabled]="cell.row.deleted">Delete</button>
<button igxButton (click)="deleteRow(cell.id?.rowID)" [disabled]="cell.row.deleted">Delete</button>
</ng-template>
</igx-column>
<igx-column width="60px" field="ProductID" header="Product ID"></igx-column>
Expand Down
2 changes: 1 addition & 1 deletion ...grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<igx-column field="GrammyAwards" header="Grammy Awards" [editable]="true" dataType="number"></igx-column>
<igx-column width="150px" [editable]="false">
<ng-template igxCell let-cell="cell" let-val>
<button igxButton (click)="removeRow(cell.id.rowIndex)"
<button igxButton (click)="removeRow(cell.id ? cell.id.rowIndex : -1)"
[disabled]="cell.row.deleted">Delete</button>
</ng-template>
</igx-column>
Expand Down
2 changes: 1 addition & 1 deletion ...l-grid/hierarchical-grid-batch-editing/files/src/app/__path__/__filePrefix__.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export class <%=ClassName%>Component {
public commit(): void {
this.hierarchicalGrid.transactions.commit(this.localdata);
this.layout1.gridAPI.getChildGrids().forEach((grid) => {
grid.transactions.commit(grid.data);
grid.transactions.commit(grid.data as any[]);
});
this.dialogChanges.close();
}
Expand Down
1 change: 1 addition & 0 deletions ...mplates/igx-ts/pivot-grid/default/files/src/app/__path__/__filePrefix__.component.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { FormsModule } from '@angular/forms';
import { IgxPivotGridModule } from '<%=igxPackage%>';
import { <%=ClassName%>Component } from './<%=filePrefix%>.component';

describe('<%=ClassName%>Component', () => {
Expand Down
1 change: 0 additions & 1 deletion packages/igx-templates/igx-ts/projects/_base/files/angular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@
}
}
},
"defaultProject": "<%=dashName%>",
"cli": {
"schematicCollections": ["@angular-eslint/schematics"]
}
Expand Down
57 changes: 29 additions & 28 deletions packages/igx-templates/igx-ts/projects/_base/files/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,48 +5,49 @@
"ng": "ng",
"start": "ng serve -o",
"build": "ng build --configuration production",
"watch": "ng build --watch --configuration development",
"test": "ng test",
"lint": "ng lint"
},
"private": true,
"dependencies": {
"@angular/animations": "~15.2.0",
"@angular/common": "~15.2.0",
"@angular/compiler": "~15.2.0",
"@angular/core": "~15.2.0",
"@angular/forms": "~15.2.0",
"@angular/platform-browser": "~15.2.0",
"@angular/platform-browser-dynamic": "~15.2.0",
"@angular/router": "~15.2.0",
"@angular/animations": "~16.0.0",
"@angular/common": "~16.0.0",
"@angular/compiler": "~16.0.0",
"@angular/core": "~16.0.0",
"@angular/forms": "~16.0.0",
"@angular/platform-browser": "~16.0.0",
"@angular/platform-browser-dynamic": "~16.0.0",
"@angular/router": "~16.0.0",
"hammerjs": "^2.0.8",
"igniteui-angular": "~15.1.0",
"minireset.css": "~0.0.4",
"rxjs": "~7.5.0",
"igniteui-angular": "~16.0.0-beta.2",
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.12.0"
"zone.js": "~0.13.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~15.2.0",
"@angular-eslint/builder": "^15.2.0",
"@angular-eslint/eslint-plugin": "^15.2.0",
"@angular-eslint/eslint-plugin-template": "^15.2.0",
"@angular-eslint/schematics": "^15.2.0",
"@angular-eslint/template-parser": "^15.2.0",
"@angular/cli": "~15.2.0",
"@angular/compiler-cli": "~15.2.0",
"@angular-devkit/build-angular": "~16.0.0",
"@angular-eslint/builder": "^16.0.0",
"@angular-eslint/eslint-plugin": "^16.0.0",
"@angular-eslint/eslint-plugin-template": "^16.0.0",
"@angular-eslint/schematics": "^16.0.0",
"@angular-eslint/template-parser": "^16.0.0",
"@angular/cli": "~16.0.0",
"@angular/compiler-cli": "~16.0.0",
"@types/jasmine": "~4.3.0",
"@types/node": "^18.14.0",
"@typescript-eslint/eslint-plugin": "5.3.0",
"@typescript-eslint/parser": "5.3.0",
"eslint": "^8.1.0",
"@types/node": "^18.16.0",
"@typescript-eslint/eslint-plugin": "5.59.2",
"@typescript-eslint/parser": "5.59.2",
"eslint": "^8.39.0",
"igniteui-cli": "~<%=cliVersion%>",
"jasmine-core": "~4.5.0",
"jasmine-core": "~4.6.0",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.1.0",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.0.0",
"ts-node": "~9.1.1",
"typescript": "~4.9.5"
"ts-node": "~10.9.1",
"typescript": "~5.0.4"
}
}
4 changes: 0 additions & 4 deletions packages/igx-templates/igx-ts/projects/_base/files/tsconfig.app.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"lib": [
"es2019",
"dom"
],
"outDir": "./out-tsc/app",
"types": []
},
Expand Down
8 changes: 3 additions & 5 deletions packages/igx-templates/igx-ts/projects/_base/files/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,17 @@
"outDir": "./dist/out-tsc",
"forceConsistentCasingInFileNames": true,
"strict": false,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
"target": "ES2020",
"module": "ES2020",
"target": "ES2022",
"module": "ES2022",
"useDefineForClassFields": false,
"lib": [
"ES2020",
"ES2022",
"dom"
]
},
Expand Down
2 changes: 1 addition & 1 deletion packages/igx-templates/igx-ts/projects/_base/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class BaseIgxProject implements ProjectTemplate {
@use "igniteui-angular/theming" as *;
$primary: #09f !default;
$secondary: #ffbf00 !default;
$secondary: #4db8ff !default;
$surface: #fff !default;
$app-palette: palette($primary, $secondary, $surface);
Expand Down
66 changes: 33 additions & 33 deletions packages/igx-templates/igx-ts/projects/side-nav-auth/files/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,48 +10,48 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~15.2.0",
"@angular/common": "~15.2.0",
"@angular/compiler": "~15.2.0",
"@angular/core": "~15.2.0",
"@angular/forms": "~15.2.0",
"@angular/platform-browser": "~15.2.0",
"@angular/platform-browser-dynamic": "~15.2.0",
"@angular/router": "~15.2.0",
"angular-auth-oidc-client": "^9.0.3",
"@angular/animations": "~16.0.0",
"@angular/common": "~16.0.0",
"@angular/compiler": "~16.0.0",
"@angular/core": "~16.0.0",
"@angular/forms": "~16.0.0",
"@angular/platform-browser": "~16.0.0",
"@angular/platform-browser-dynamic": "~16.0.0",
"@angular/router": "~16.0.0",
"angular-auth-oidc-client": "^15.0.4",
"hammerjs": "^2.0.8",
"igniteui-angular": "~15.1.0",
"minireset.css": "~0.0.4",
"rxjs": "~7.5.0",
"tslib": "^2.4.0",
"zone.js": "~0.12.0"
"igniteui-angular": "~16.0.0-beta.2",
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.13.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~15.2.0",
"@angular-eslint/builder": "^15.2.0",
"@angular-eslint/eslint-plugin": "^15.2.0",
"@angular-eslint/eslint-plugin-template": "^15.2.0",
"@angular-eslint/schematics": "^15.2.0",
"@angular-eslint/template-parser": "^15.2.0",
"@angular/cli": "~15.2.0",
"@angular/compiler-cli": "~15.2.0",
"@angular/language-service": "~15.2.0",
"@types/facebook-js-sdk": "^2.8.6",
"@types/hammerjs": "^2.0.35",
"@angular-devkit/build-angular": "~16.0.0",
"@angular-eslint/builder": "^16.0.0",
"@angular-eslint/eslint-plugin": "^16.0.0",
"@angular-eslint/eslint-plugin-template": "^16.0.0",
"@angular-eslint/schematics": "^16.0.0",
"@angular-eslint/template-parser": "^16.0.0",
"@angular/cli": "~16.0.0",
"@angular/compiler-cli": "~16.0.0",
"@angular/language-service": "~16.0.0",
"@types/facebook-js-sdk": "^3.3.6",
"@types/hammerjs": "^2.0.41",
"@types/jasmine": "~4.3.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^18.14.0",
"@typescript-eslint/eslint-plugin": "5.3.0",
"@typescript-eslint/parser": "5.3.0",
"eslint": "^8.1.0",
"@types/node": "^18.16.0",
"@typescript-eslint/eslint-plugin": "5.59.2",
"@typescript-eslint/parser": "5.59.2",
"eslint": "^8.39.0",
"igniteui-cli": "~<%=cliVersion%>",
"jasmine-core": "~4.5.0",
"jasmine-core": "~4.6.0",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.1.0",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.0.0",
"ts-node": "~9.1.1",
"typescript": "~4.9.5"
"ts-node": "~10.9.1",
"typescript": "~5.0.4"
}
}
1 change: 0 additions & 1 deletion packages/igx-templates/igx-ts/tree/default/files/src/app/__path__/services/data.service.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/naming-convention */
import { Injectable } from '@angular/core';
import { Observable, ReplaySubject } from 'rxjs';
import { NodeData, REMOTE_DATA, SelectableNodeData } from '../local-data';
Expand Down
4 changes: 2 additions & 2 deletions packages/igx-templates/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@igniteui/angular-templates",
"version": "15.1.1112-alpha.3",
"version": "16.0.1200-beta.0",
"description": "Templates for Ignite UI for Angular projects and components",
"repository": {
"type": "git",
Expand All @@ -12,7 +12,7 @@
"author": "Infragistics",
"license": "MIT",
"dependencies": {
"@igniteui/cli-core": "~11.1.2-alpha.3",
"@igniteui/cli-core": "~12.0.0-beta.0",
"typescript": "~4.7.2"
}
}
6 changes: 3 additions & 3 deletions packages/ng-schematics/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@igniteui/angular-schematics",
"version": "15.1.1112-alpha.3",
"version": "16.0.1200-beta.0",
"description": "Ignite UI for Angular Schematics for ng new and ng generate",
"repository": {
"type": "git",
Expand All @@ -20,8 +20,8 @@
"dependencies": {
"@angular-devkit/core": "~14.0.0",
"@angular-devkit/schematics": "~14.0.0",
"@igniteui/angular-templates": "~15.1.1112-alpha.3",
"@igniteui/cli-core": "~11.1.2-alpha.3",
"@igniteui/angular-templates": "~16.0.1200-beta.0",
"@igniteui/cli-core": "~12.0.0-beta.0",
"@schematics/angular": "~14.0.0",
"rxjs": "^6.6.3"
},
Expand Down
Loading

0 comments on commit e6efa40

Please sign in to comment.