Skip to content

Commit

Permalink
Merge pull request #1252 from IgniteUI/update-18
Browse files Browse the repository at this point in the history
chore(ng): update to ng 18
  • Loading branch information
Lipata authored May 31, 2024
2 parents 8a036d3 + 74c2d68 commit 08ad6e1
Show file tree
Hide file tree
Showing 25 changed files with 216 additions and 178 deletions.
6 changes: 3 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "igniteui-cli",
"version": "13.2.1",
"version": "13.3.0-beta.3",
"description": "CLI tool for creating Ignite UI projects",
"keywords": [
"CLI",
Expand Down Expand Up @@ -78,8 +78,8 @@
"all": true
},
"dependencies": {
"@igniteui/angular-templates": "~17.2.1321",
"@igniteui/cli-core": "~13.2.1",
"@igniteui/angular-templates": "~18.0.1330-beta.3",
"@igniteui/cli-core": "~13.3.0-beta.3",
"chalk": "^2.3.2",
"fs-extra": "^3.0.1",
"glob": "^7.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@igniteui/cli-core",
"version": "13.2.1",
"version": "13.3.0-beta.3",
"description": "Base types and functionality for Ignite UI CLI",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/types/FileSystem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export interface IFileSystem {
* @param dirPath Root dir to search in
* @param pattern Pattern to match
*/
glob(dirPath: string, pattern: string): string[];
glob(dirPath: string, pattern: string, ignorePattern?: string): string[];
}

export const FS_TOKEN: string = "fs";
Expand Down
2 changes: 1 addition & 1 deletion packages/core/update/Update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export async function updateWorkspace(rootPath: string): Promise<boolean> {
const logicFiles = [];
const styleFiles = [];
const pkgJsonFiles = [];
pkgJsonFiles.push(...fs.glob(rootPath, `package.json`));
pkgJsonFiles.push(...fs.glob(rootPath, `package.json`, "node_modules"));

let workspaceConfig = null;
switch (framework.toLowerCase()) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
"recommendations": ["angular.ng-template"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "ng serve",
"type": "chrome",
"request": "launch",
"preLaunchTask": "npm: start",
"url": "http://localhost:4200/"
},
{
"name": "ng test",
"type": "chrome",
"request": "launch",
"preLaunchTask": "npm: test",
"url": "http://localhost:9876/debug.html"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "start",
"isBackground": true,
"problemMatcher": {
"owner": "typescript",
"pattern": "$tsc",
"background": {
"activeOnStart": true,
"beginsPattern": {
"regexp": "(.*?)"
},
"endsPattern": {
"regexp": "bundle generation complete"
}
}
}
},
{
"type": "npm",
"script": "test",
"isBackground": true,
"problemMatcher": {
"owner": "typescript",
"pattern": "$tsc",
"background": {
"activeOnStart": true,
"beginsPattern": {
"regexp": "(.*?)"
},
"endsPattern": {
"regexp": "bundle generation complete"
}
}
}
}
]
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,41 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~17.2.0",
"@angular/common": "~17.2.0",
"@angular/compiler": "~17.2.0",
"@angular/core": "~17.2.0",
"@angular/forms": "~17.2.0",
"@angular/platform-browser": "~17.2.0",
"@angular/platform-browser-dynamic": "~17.2.0",
"@angular/router": "~17.2.0",
"@angular/animations": "~18.0.0",
"@angular/common": "~18.0.0",
"@angular/compiler": "~18.0.0",
"@angular/core": "~18.0.0",
"@angular/forms": "~18.0.0",
"@angular/platform-browser": "~18.0.0",
"@angular/platform-browser-dynamic": "~18.0.0",
"@angular/router": "~18.0.0",
"hammerjs": "^2.0.8",
"igniteui-angular": "~17.2.0",
"igniteui-angular": "~18.0.0-alpha.3",
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "~2.3.0",
"zone.js": "~0.14.0"
"zone.js": "~0.14.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~17.2.0",
"@angular-eslint/builder": "~17.2.0",
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular-eslint/eslint-plugin-template": "~17.2.0",
"@angular-eslint/schematics": "~17.2.0",
"@angular-eslint/template-parser": "~17.2.0",
"@angular/cli": "~17.2.0",
"@angular/compiler-cli": "~17.2.0",
"@angular-devkit/build-angular": "~18.0.0",
"@angular-eslint/builder": "~18.0.0-alpha.5",
"@angular-eslint/eslint-plugin": "~18.0.0-alpha.5",
"@angular-eslint/eslint-plugin-template": "~18.0.0-alpha.5",
"@angular-eslint/schematics": "~18.0.0-alpha.5",
"@angular-eslint/template-parser": "~18.0.0-alpha.5",
"@angular/cli": "~18.0.0",
"@angular/compiler-cli": "~18.0.0",
"@types/jasmine": "~5.1.1",
"@typescript-eslint/eslint-plugin": "6.9.1",
"@typescript-eslint/parser": "6.9.1",
"eslint": "~8.52.0",
"eslint": "~8.57.0",
"igniteui-cli": "~<%=cliVersion%>",
"jasmine-core": "~5.1.0",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.3.2"
"typescript": "~5.4.5"
}
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
// This file can be replaced during build by using the `fileReplacements` array.
// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`.

export const environment = {
production: false
};

/*
* For easier debugging in development mode, you can import the following file
* to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
*
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {
IgxLabelDirective,
IgxInputDirective,
IgxCheckboxComponent,
GridType
} from '<%=igxPackage%>';
import { GridType } from '<%=igxPackage%>/lib/grids/common/grid.interface';
import { ReactiveFormsModule, FormsModule } from '@angular/forms';
import { SINGERS } from './data';
import { Singer } from './singer';
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
"recommendations": ["angular.ng-template"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "ng serve",
"type": "chrome",
"request": "launch",
"preLaunchTask": "npm: start",
"url": "http://localhost:4200/"
},
{
"name": "ng test",
"type": "chrome",
"request": "launch",
"preLaunchTask": "npm: test",
"url": "http://localhost:9876/debug.html"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "start",
"isBackground": true,
"problemMatcher": {
"owner": "typescript",
"pattern": "$tsc",
"background": {
"activeOnStart": true,
"beginsPattern": {
"regexp": "(.*?)"
},
"endsPattern": {
"regexp": "bundle generation complete"
}
}
}
},
{
"type": "npm",
"script": "test",
"isBackground": true,
"problemMatcher": {
"owner": "typescript",
"pattern": "$tsc",
"background": {
"activeOnStart": true,
"beginsPattern": {
"regexp": "(.*?)"
},
"endsPattern": {
"regexp": "bundle generation complete"
}
}
}
}
]
}
44 changes: 0 additions & 44 deletions packages/igx-templates/igx-ts/projects/_base/files/karma.conf.js

This file was deleted.

Loading

0 comments on commit 08ad6e1

Please sign in to comment.