Skip to content

Commit

Permalink
chore(packages): Updating the versions for Angular 19 (#1340)
Browse files Browse the repository at this point in the history 
* chore(schematics, cli): Updating to 19.0.0

* chore(*): Updating the templates.

* chore(*): yarn.lock for typescript and builder change to application

* chore(PackageManager): allow legacy peer deps for DV components

* refactor(igx-templates): bump igniteui-angular to latest beta for all templates

* chore(templates): Bumping igniteui-angular and angular-eslint packages.

---------

Co-authored-by: jackofdiamond5 <[email protected]>
  • Loading branch information
@valadzhov @jackofdiamond5
valadzhov and jackofdiamond5 authored Nov 22, 2024
1 parent 945ae0d commit ceb1a59
Show file tree
Hide file tree
Showing 16 changed files with 131 additions and 218 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"source-map-support": "^0.5.21",
"ts-node": "^10.9.2",
"tslint": "^5.11.0",
"typescript": "~5.5.4",
"typescript": "~5.6.2",
"typescript-json-schema": "^0.65.1",
"parse-url": "^8.1.0",
"braces": "^3.0.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@
"yargs": "^17.7.2"
},
"devDependencies": {
"@angular-devkit/core": "^18.2.4",
"@angular-devkit/schematics": "^18.2.4",
"@schematics/angular": "~14.0.0",
"@angular-devkit/core": "^19.0.0",
"@angular-devkit/schematics": "^19.0.0",
"@schematics/angular": "~19.0.0",
"@types/jasmine": "^5.1.4",
"@types/node": "^22.5.5",
"browser-sync": "^3.0.3",
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -15,7 +15,7 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/$(dash-name)",
"index": "src/index.html",
Expand Down
26 changes: 13 additions & 13 deletions packages/cli/templates/angular/ig-ts/projects/empty/files/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,26 @@
},
"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": "~19.0.0",
"@angular/common": "~19.0.0",
"@angular/compiler": "~19.0.0",
"@angular/core": "~19.0.0",
"@angular/forms": "~19.0.0",
"@angular/platform-browser": "~19.0.0",
"@angular/platform-browser-dynamic": "~19.0.0",
"@angular/router": "~19.0.0",
"jquery": ">=1.9.1",
"jquery-ui": ">=1.10.5",
"igniteui-angular-wrappers": "~17.0.0",
"ignite-ui": "~22.2",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.14.0"
"zone.js": "~0.15.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~17.2.0",
"@angular/cli": "~17.2.0",
"@angular/compiler-cli": "~17.2.0",
"@angular-devkit/build-angular": "~19.0.0",
"@angular/cli": "~19.0.0",
"@angular/compiler-cli": "~19.0.0",
"@types/jasmine": "~5.1.0",
"@types/node": "^18.16.0",
"igniteui-cli": "^$(cliVersion)",
Expand All @@ -39,6 +39,6 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.5.4"
"typescript": "~5.6.2"
}
}
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"typescript": "~5.5.4"
},
"devDependencies": {
"@angular-devkit/schematics": "^18.2.4",
"@angular-devkit/schematics": "^19.0.0",
"@inquirer/type": "^1.5.3"
}
}
6 changes: 4 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,8 @@ export class PackageManager {
case "npm":
/* passes through */
default:
command = `${managerCommand} install --quiet`;
// TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available
command = `${managerCommand} install --quiet --legacy-peer-deps`;
break;
}
await this.flushQueue(false);
Expand Down Expand Up @@ -165,7 +166,8 @@ export class PackageManager {
}

public static async queuePackage(packageName: string, verbose = false) {
const command = this.getInstallCommand(this.getManager(), packageName).replace("--save", "--no-save");
// TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available
const command = this.getInstallCommand(this.getManager(), packageName).replace("--save", "--no-save").concat(" --legacy-peer-deps");
const [packName, version] = packageName.split(/@(?=[^\/]+$)/);
const packageJSON = this.getPackageJSON();
if (!packageJSON.dependencies) {
Expand Down
2 changes: 1 addition & 1 deletion packages/igx-templates/constants.ts
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const IGNITEUI_ANGULAR_PACKAGE = "igniteui-angular@~17.1.0-beta.0";
export const IGNITEUI_ANGULAR_PACKAGE = "igniteui-angular@~19.0.0-beta.0";
2 changes: 1 addition & 1 deletion packages/igx-templates/igx-ts-legacy/projects/_base/files/angular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/<%=dashName%>",
"index": "src/index.html",
Expand Down
36 changes: 18 additions & 18 deletions packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,30 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~18.2.0",
"@angular/common": "~18.2.0",
"@angular/compiler": "~18.2.0",
"@angular/core": "~18.2.0",
"@angular/forms": "~18.2.0",
"@angular/platform-browser": "~18.2.0",
"@angular/platform-browser-dynamic": "~18.2.0",
"@angular/router": "~18.2.0",
"@angular/animations": "~19.0.0",
"@angular/common": "~19.0.0",
"@angular/compiler": "~19.0.0",
"@angular/core": "~19.0.0",
"@angular/forms": "~19.0.0",
"@angular/platform-browser": "~19.0.0",
"@angular/platform-browser-dynamic": "~19.0.0",
"@angular/router": "~19.0.0",
"hammerjs": "^2.0.8",
"igniteui-angular": "~18.2.0",
"igniteui-angular": "~19.0.0-rc.0",
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "~2.3.0",
"zone.js": "~0.14.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~18.2.0",
"@angular-eslint/builder": "~18.2.0",
"@angular-eslint/eslint-plugin": "~18.2.0",
"@angular-eslint/eslint-plugin-template": "~18.2.0",
"@angular-eslint/schematics": "~18.2.0",
"@angular-eslint/template-parser": "~18.2.0",
"@angular/cli": "~18.2.0",
"@angular/compiler-cli": "~18.2.0",
"@angular-devkit/build-angular": "~19.0.0",
"@angular-eslint/builder": "~19.0.0-alpha.1",
"@angular-eslint/eslint-plugin": "~19.0.0-alpha.1",
"@angular-eslint/eslint-plugin-template": "~19.0.0-alpha.1",
"@angular-eslint/schematics": "~19.0.0-alpha.1",
"@angular-eslint/template-parser": "~19.0.0-alpha.1",
"@angular/cli": "~19.0.0",
"@angular/compiler-cli": "~19.0.0",
"@types/jasmine": "~5.1.1",
"@typescript-eslint/eslint-plugin": "6.9.1",
"@typescript-eslint/parser": "6.9.1",
Expand All @@ -46,6 +46,6 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.5.4"
"typescript": "~5.6.2"
}
}
40 changes: 20 additions & 20 deletions packages/igx-templates/igx-ts-legacy/projects/side-nav-auth/files/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,32 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~18.2.0",
"@angular/common": "~18.2.0",
"@angular/compiler": "~18.2.0",
"@angular/core": "~18.2.0",
"@angular/forms": "~18.2.0",
"@angular/platform-browser": "~18.2.0",
"@angular/platform-browser-dynamic": "~18.2.0",
"@angular/router": "~18.2.0",
"@angular/animations": "~19.0.0",
"@angular/common": "~19.0.0",
"@angular/compiler": "~19.0.0",
"@angular/core": "~19.0.0",
"@angular/forms": "~19.0.0",
"@angular/platform-browser": "~19.0.0",
"@angular/platform-browser-dynamic": "~19.0.0",
"@angular/router": "~19.0.0",
"angular-auth-oidc-client": "~15.0.4",
"hammerjs": "~2.0.8",
"igniteui-angular": "~18.2.0",
"igniteui-angular": "~19.0.0-rc.0",
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "~2.3.0",
"zone.js": "~0.14.0"
"zone.js": "~0.15.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~18.2.0",
"@angular-eslint/builder": "~18.2.0",
"@angular-eslint/eslint-plugin": "~18.2.0",
"@angular-eslint/eslint-plugin-template": "~18.2.0",
"@angular-eslint/schematics": "~18.2.0",
"@angular-eslint/template-parser": "~18.2.0",
"@angular/cli": "~18.2.0",
"@angular/compiler-cli": "~18.2.0",
"@angular/language-service": "~18.2.0",
"@angular-devkit/build-angular": "~19.0.0",
"@angular-eslint/builder": "~19.0.0-alpha.1",
"@angular-eslint/eslint-plugin": "~19.0.0-alpha.1",
"@angular-eslint/eslint-plugin-template": "~19.0.0-alpha.1",
"@angular-eslint/schematics": "~19.0.0-alpha.1",
"@angular-eslint/template-parser": "~19.0.0-alpha.1",
"@angular/cli": "~19.0.0",
"@angular/compiler-cli": "~19.0.0",
"@angular/language-service": "~19.0.0",
"@types/facebook-js-sdk": "~3.3.6",
"@types/hammerjs": "~2.0.41",
"@types/jasmine": "~5.1.1",
Expand All @@ -51,6 +51,6 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.5.4"
"typescript": "~5.6.2"
}
}
40 changes: 20 additions & 20 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 @@ -11,30 +11,30 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~18.2.0",
"@angular/common": "~18.2.0",
"@angular/compiler": "~18.2.0",
"@angular/core": "~18.2.0",
"@angular/forms": "~18.2.0",
"@angular/platform-browser": "~18.2.0",
"@angular/platform-browser-dynamic": "~18.2.0",
"@angular/router": "~18.2.0",
"hammerjs": "~2.0.8",
"igniteui-angular": "~18.2.0",
"@angular/animations": "~19.0.0",
"@angular/common": "~19.0.0",
"@angular/compiler": "~19.0.0",
"@angular/core": "~19.0.0",
"@angular/forms": "~19.0.0",
"@angular/platform-browser": "~19.0.0",
"@angular/platform-browser-dynamic": "~19.0.0",
"@angular/router": "~19.0.0",
"hammerjs": "~2.0.8",
"igniteui-angular": "~19.0.0-rc.0",
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "~2.3.0",
"zone.js": "~0.14.3"
"zone.js": "~0.15.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~18.2.0",
"@angular-eslint/builder": "~18.2.0",
"@angular-eslint/eslint-plugin": "~18.2.0",
"@angular-eslint/eslint-plugin-template": "~18.2.0",
"@angular-eslint/schematics": "~18.2.0",
"@angular-eslint/template-parser": "~18.2.0",
"@angular/cli": "~18.2.0",
"@angular/compiler-cli": "~18.2.0",
"@angular-devkit/build-angular": "~19.0.0",
"@angular-eslint/builder": "~19.0.0-alpha.1",
"@angular-eslint/eslint-plugin": "~19.0.0-alpha.1",
"@angular-eslint/eslint-plugin-template": "~19.0.0-alpha.1",
"@angular-eslint/schematics": "~19.0.0-alpha.1",
"@angular-eslint/template-parser": "~19.0.0-alpha.1",
"@angular/cli": "~19.0.0",
"@angular/compiler-cli": "~19.0.0",
"@types/jasmine": "~5.1.1",
"@typescript-eslint/eslint-plugin": "~7.11.0",
"@typescript-eslint/parser": "~7.11.0",
Expand All @@ -46,6 +46,6 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.5.4"
"typescript": "~5.6.2"
}
}
18 changes: 9 additions & 9 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 @@ -28,15 +28,15 @@
"zone.js": "~0.14.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~18.2.0",
"@angular-eslint/builder": "~18.2.0",
"@angular-eslint/eslint-plugin": "~18.2.0",
"@angular-eslint/eslint-plugin-template": "~18.2.0",
"@angular-eslint/schematics": "~18.2.0",
"@angular-eslint/template-parser": "~18.2.0",
"@angular/cli": "~18.2.0",
"@angular/compiler-cli": "~18.2.0",
"@angular/language-service": "~18.2.0",
"@angular-devkit/build-angular": "~19.0.0",
"@angular-eslint/builder": "~19.0.0-alpha.1",
"@angular-eslint/eslint-plugin": "~19.0.0-alpha.1",
"@angular-eslint/eslint-plugin-template": "~19.0.0-alpha.1",
"@angular-eslint/schematics": "~19.0.0-alpha.1",
"@angular-eslint/template-parser": "~19.0.0-alpha.1",
"@angular/cli": "~19.0.0",
"@angular/compiler-cli": "~19.0.0",
"@angular/language-service": "~19.0.0",
"@types/facebook-js-sdk": "~3.3.6",
"@types/hammerjs": "~2.0.41",
"@types/jasmine": "~5.1.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/ng-schematics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
"license": "MIT",
"schematics": "./src/collection.json",
"dependencies": {
"@angular-devkit/core": "^18.2.4",
"@angular-devkit/schematics": "^18.2.4",
"@angular-devkit/core": "^19.0.0",
"@angular-devkit/schematics": "^19.0.0",
"@igniteui/angular-templates": "~18.2.1424-beta.0",
"@igniteui/cli-core": "~14.2.4-beta.0",
"@schematics/angular": "~14.0.0",
"@schematics/angular": "~19.0.0",
"rxjs": "^7.8.1"
},
"devDependencies": {
"@types/jasmine": "^5.1.4",
"@types/node": "^22.5.5",
"jasmine": "^5.3.0",
"typescript": "~5.5.4"
"typescript": "~5.6.2"
},
"ng-update": {
"migrations": "./src/migrations/migration-collection.json"
Expand Down
11 changes: 7 additions & 4 deletions spec/unit/packageManager-spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,8 @@ describe("Unit - Package Manager", () => {
expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`);
expect(Util.log).toHaveBeenCalledWith(`Error installing npm packages.`);
expect(Util.log).toHaveBeenCalledWith(`Example`);
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`,
// TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet --legacy-peer-deps`,
{ stdio: ["inherit"], killSignal: "SIGINT" });
mockProjectConfig.packagesInstalled = true;
expect(ProjectConfig.setConfig).toHaveBeenCalledWith(mockProjectConfig);
Expand All @@ -312,7 +313,8 @@ describe("Unit - Package Manager", () => {
expect(Util.log).toHaveBeenCalledTimes(2);
expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`);
expect(Util.log).toHaveBeenCalledWith(`Packages installed successfully`);
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`,
// TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet --legacy-peer-deps`,
{ stdio: ["inherit"], killSignal: "SIGINT" });
mockProjectConfig.packagesInstalled = true;
expect(ProjectConfig.setConfig).toHaveBeenCalledWith(mockProjectConfig);
Expand All @@ -331,7 +333,8 @@ describe("Unit - Package Manager", () => {
await PackageManager.installPackages(true);
expect(Util.log).toHaveBeenCalledTimes(1);
expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`);
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`,
// TODO: remove --legacy-peer-deps flag igniteui-cli#1338 once new DV package is available
expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet --legacy-peer-deps`,
{ stdio: ["inherit"], killSignal: "SIGINT" });
expect(process.exit).toHaveBeenCalled();
expect(ProjectConfig.setConfig).toHaveBeenCalledTimes(0);
Expand Down Expand Up @@ -417,7 +420,7 @@ describe("Unit - Package Manager", () => {
expect(Util.log).toHaveBeenCalledTimes(0);
expect(child_process.exec).toHaveBeenCalledTimes(1);
expect(child_process.exec).toHaveBeenCalledWith(
`npm install test-pack --quiet --no-save`, {}, jasmine.any(Function));
`npm install test-pack --quiet --no-save --legacy-peer-deps`, {}, jasmine.any(Function));
});

it("queuePackage should ignore existing package installs", async () => {
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"./packages/cli"
]
},
"esModuleInterop": true
"esModuleInterop": true,
"skipLibCheck": true,
},
"exclude": [
"output",
Expand Down
Loading

0 comments on commit ceb1a59

Please sign in to comment.