Skip to content

Commit 59ecff2

Browse files
authored
Merge pull request #77 from Service-Soft/update-to-angular-20
updated to angular v20
2 parents 6cc2de6 + d9683ee commit 59ecff2

File tree

18 files changed

+13820
-14188
lines changed

18 files changed

+13820
-14188
lines changed

angular.json

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@
2121
"options": {
2222
"project": "projects/ngx-material-navigation/ng-package.json"
2323
}
24-
},
25-
"test": {
26-
"builder": "@angular-devkit/build-angular:karma",
27-
"options": {
28-
"karmaConfig": "projects/ngx-material-navigation/karma.conf.js",
29-
"main": "projects/ngx-material-navigation/src/test.ts",
30-
"tsConfig": "projects/ngx-material-navigation/tsconfig.spec.json"
31-
}
3224
}
3325
},
3426
"prefix": "lib",
@@ -102,22 +94,6 @@
10294
}
10395
},
10496
"defaultConfiguration": "development"
105-
},
106-
"test": {
107-
"builder": "@angular-devkit/build-angular:karma",
108-
"options": {
109-
"assets": [
110-
"projects/ngx-material-navigation-showcase/src/favicon.ico",
111-
"projects/ngx-material-navigation-showcase/src/assets"
112-
],
113-
"inlineStyleLanguage": "scss",
114-
"karmaConfig": "projects/ngx-material-navigation-showcase/karma.conf.js",
115-
"main": "projects/ngx-material-navigation-showcase/src/test.ts",
116-
"polyfills": "projects/ngx-material-navigation-showcase/src/polyfills.ts",
117-
"scripts": [],
118-
"styles": ["projects/ngx-material-navigation-showcase/src/styles.scss"],
119-
"tsConfig": "projects/ngx-material-navigation-showcase/tsconfig.spec.json"
120-
}
12197
}
12298
},
12399
"prefix": "app",

cspell.words.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
packagr

eslint.config.js renamed to eslint.config.mjs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
const config = require('eslint-config-service-soft');
1+
import { configs } from 'eslint-config-service-soft';
22

3-
module.exports = [
4-
...config,
3+
// eslint-disable-next-line jsdoc/require-description
4+
/** @type {import('eslint').Linter.Config} */
5+
export default [
6+
...configs,
57
{
68
files: ['**/ngx-material-navigation/**/*.ts'],
79
rules: {

package-lock.json

Lines changed: 13735 additions & 13944 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,46 +16,38 @@
1616
"copyToDist:readme": "ncp ./README.md ./dist/ngx-material-navigation/README.md",
1717
"copyToDist:contributing": "ncp ./CONTRIBUTING.md ./dist/ngx-material-navigation/CONTRIBUTING.md",
1818
"copyToDist:license": "ncp ./LICENSE.md ./dist/ngx-material-navigation/LICENSE.md",
19-
"test": "ng test",
2019
"lint": "eslint projects --max-warnings 0",
2120
"lint:fix": "eslint projects --fix"
2221
},
2322
"private": true,
2423
"dependencies": {
25-
"@angular/animations": "~18.2.12",
26-
"@angular/cdk": "^18.2.12",
27-
"@angular/common": "~18.2.12",
28-
"@angular/compiler": "~18.2.12",
29-
"@angular/core": "~18.2.12",
30-
"@angular/forms": "~18.2.12",
31-
"@angular/material": "^18.2.12",
32-
"@angular/platform-browser": "~18.2.12",
33-
"@angular/platform-browser-dynamic": "~18.2.12",
34-
"@angular/router": "~18.2.12",
35-
"rxjs": "~7.8.1",
36-
"tslib": "^2.6.3",
37-
"zone.js": "~0.14.8"
24+
"@angular/animations": "~20.2.1",
25+
"@angular/cdk": "^20.2.0",
26+
"@angular/common": "~20.2.1",
27+
"@angular/compiler": "~20.2.1",
28+
"@angular/core": "~20.2.1",
29+
"@angular/forms": "~20.2.1",
30+
"@angular/material": "^20.2.0",
31+
"@angular/platform-browser": "~20.2.1",
32+
"@angular/platform-browser-dynamic": "~20.2.1",
33+
"@angular/router": "~20.2.1",
34+
"rxjs": "~7.8.2",
35+
"tslib": "^2.8.1",
36+
"zone.js": "~0.15.1"
3837
},
3938
"devDependencies": {
40-
"@angular-devkit/build-angular": "~18.2.12",
41-
"@angular/cli": "~18.2.12",
42-
"@angular/compiler-cli": "~18.2.12",
43-
"@fortawesome/angular-fontawesome": "^0.15.0",
44-
"@fortawesome/free-solid-svg-icons": "^6.6.0",
45-
"@types/jasmine": "~5.1.4",
46-
"@types/node": "^20.14.11",
47-
"concurrently": "^8.2.2",
48-
"eslint-config-service-soft": "^1.5.7",
49-
"jasmine-core": "~5.1.2",
50-
"karma": "~6.4.3",
51-
"karma-chrome-launcher": "~3.2.0",
52-
"karma-coverage": "~2.2.1",
53-
"karma-jasmine": "~5.1.0",
54-
"karma-jasmine-html-reporter": "~2.1.0",
39+
"@angular-devkit/build-angular": "~20.2.0",
40+
"@angular/cli": "~20.2.0",
41+
"@angular/compiler-cli": "~20.2.1",
42+
"@fortawesome/angular-fontawesome": "^3.0.0",
43+
"@fortawesome/free-solid-svg-icons": "^7.0.0",
44+
"@types/node": "^24.3.0",
45+
"concurrently": "^9.2.0",
46+
"eslint-config-service-soft": "^2.0.8",
5547
"ncp": "^2.0.0",
56-
"ng-packagr": "^18.2.1",
48+
"ng-packagr": "^20.2.0",
5749
"npm-run-all": "^4.1.5",
58-
"typescript": "~5.5.3",
59-
"wait-on": "^7.2.0"
50+
"typescript": "~5.9.2",
51+
"wait-on": "^8.0.4"
6052
}
6153
}

projects/ngx-material-navigation-showcase/karma.conf.js

Lines changed: 0 additions & 44 deletions
This file was deleted.

projects/ngx-material-navigation-showcase/src/app/app.component.spec.ts

Lines changed: 0 additions & 19 deletions
This file was deleted.

projects/ngx-material-navigation-showcase/src/main.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { enableProdMode } from '@angular/core';
22
import { bootstrapApplication } from '@angular/platform-browser';
3-
import { provideAnimations } from '@angular/platform-browser/animations';
43
import { InMemoryScrollingOptions, RouterConfigOptions, provideRouter, withInMemoryScrolling, withRouterConfig } from '@angular/router';
54
import { faHome } from '@fortawesome/free-solid-svg-icons';
65
import { NGX_BURGER_MENU_ARIA_LABEL, NGX_BURGER_MENU_ICON } from 'ngx-material-navigation';
@@ -27,7 +26,6 @@ bootstrapApplication(
2726
{
2827
providers: [
2928
provideRouter(routes, withInMemoryScrolling(scrollConfig), withRouterConfig(routerOptions)),
30-
provideAnimations(),
3129
{
3230
provide: NGX_BURGER_MENU_ICON,
3331
useValue: faHome

projects/ngx-material-navigation-showcase/src/test.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.

projects/ngx-material-navigation-showcase/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"compilerOptions": {
44
"outDir": "../../out-tsc/spec",
5-
"types": ["jasmine"]
5+
"types": []
66
},
77
"extends": "../../tsconfig.json",
88
"files": ["src/test.ts"],

0 commit comments

Comments
 (0)