Skip to content

Commit fe552ef

Browse files
tuplletuplle
authored
Merge pull request #235 from netgrif/NAE-1940
[NAE- 1940] Update to new Angular
2 parents dab205f + 8e3b9e9 commit fe552ef

File tree

309 files changed

+1221
-1307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

309 files changed

+1221
-1307
lines changed

‎.github/workflows/master-build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
name: Build
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
with:
1414
fetch-depth: 0
15-
- name: Use Node.js 16
16-
uses: actions/setup-node@v3
15+
- name: Use Node.js 20
16+
uses: actions/setup-node@v4
1717
with:
18-
node-version: 16
18+
node-version: 20
1919
- run: npm i --legacy-peer-deps
2020
- name: Build & test components-core
2121
run: |
@@ -36,7 +36,7 @@ jobs:
3636
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3737
- name: Build examples
3838
run: npm run example:build
39-
- uses: EndBug/add-and-commit@v8
39+
- uses: EndBug/add-and-commit@v9
4040
with:
4141
add: docs
4242
pathspec_error_handling: exitImmediately

‎.github/workflows/pr-build.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
node-version: [ 14, 16, 18 ]
11+
node-version: [ 18, 20 ]
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0
16-
- uses: actions/setup-node@v3
16+
- uses: actions/setup-node@v4
1717
name: Full Test on Node.js version ${{ matrix.node-version }}
1818
with:
1919
node-version: ${{ matrix.node-version }}
20-
- run: npm i
20+
- run: npm i --legacy-peer-deps
2121
- name: Build & test components-core
2222
run: |
2323
npm run ncc:build
2424
npm run ncc:full-test
25-
npm i ./dist/netgrif-components-core --save-optional
25+
npm i ./dist/netgrif-components-core --save-optional --legacy-peer-deps
2626
- name: Build & test components
2727
run: |
2828
npm run nc:build
2929
npm run nc:full-test
30-
npm i ./dist/netgrif-components --save-optional
30+
npm i ./dist/netgrif-components --save-optional --legacy-peer-deps
3131
- name: Build examples
3232
run: npm run example:build
3333
test:
3434
name: Test with SonarCloud
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838
with:
3939
fetch-depth: 0
40-
- uses: actions/setup-node@v3
40+
- uses: actions/setup-node@v4
4141
name: Full Test
4242
with:
43-
node-version: 16
43+
node-version: 20
4444
- run: npm i --legacy-peer-deps
4545
- name: Build & test components-core
4646
run: |

‎.github/workflows/release-build.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
10-
- uses: actions/setup-node@v3
9+
- uses: actions/checkout@v4
10+
- uses: actions/setup-node@v4
1111
with:
12-
node-version: 16
12+
node-version: 20
1313
- run: |
1414
npm i --legacy-peer-deps
1515
npm run ncc:build
@@ -24,10 +24,10 @@ jobs:
2424
needs: build
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v3
28-
- uses: actions/setup-node@v3
27+
- uses: actions/checkout@v4
28+
- uses: actions/setup-node@v4
2929
with:
30-
node-version: 16
30+
node-version: 20
3131
registry-url: https://registry.npmjs.org/
3232
- run: npm i --legacy-peer-deps
3333
- name: Publish components-core
@@ -54,10 +54,10 @@ jobs:
5454
contents: read
5555
packages: write
5656
steps:
57-
- uses: actions/checkout@v3
58-
- uses: actions/setup-node@v3
57+
- uses: actions/checkout@v4
58+
- uses: actions/setup-node@v4
5959
with:
60-
node-version: 16
60+
node-version: 20
6161
registry-url: https://npm.pkg.github.com
6262
- run: npm i --legacy-peer-deps
6363
- name: Publish components-core

‎angular.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,17 @@
113113
"build": {
114114
"builder": "@angular-devkit/build-angular:browser",
115115
"options": {
116+
"allowedCommonJsDependencies": [
117+
"moment",
118+
"buffer",
119+
"easymde",
120+
"semver",
121+
"rfdc"
122+
],
116123
"outputPath": "dist/nae-example-app",
117124
"index": "projects/nae-example-app/src/index.html",
118125
"main": "projects/nae-example-app/src/main.ts",
119-
"polyfills": "projects/nae-example-app/src/polyfills.ts",
126+
"polyfills": ["zone.js"],
120127
"tsConfig": "projects/nae-example-app/tsconfig.app.json",
121128
"assets": [
122129
"projects/nae-example-app/src/favicon.ico",
@@ -168,25 +175,25 @@
168175
"serve": {
169176
"builder": "@angular-devkit/build-angular:dev-server",
170177
"options": {
171-
"browserTarget": "nae-example-app:build"
178+
"buildTarget": "nae-example-app:build"
172179
},
173180
"configurations": {
174181
"production": {
175-
"browserTarget": "nae-example-app:build:production"
182+
"buildTarget": "nae-example-app:build:production"
176183
}
177184
}
178185
},
179186
"extract-i18n": {
180187
"builder": "@angular-devkit/build-angular:extract-i18n",
181188
"options": {
182-
"browserTarget": "nae-example-app:build"
189+
"buildTarget": "nae-example-app:build"
183190
}
184191
},
185192
"test": {
186193
"builder": "@angular-devkit/build-angular:karma",
187194
"options": {
188195
"main": "projects/nae-example-app/src/test.ts",
189-
"polyfills": "projects/nae-example-app/src/polyfills.ts",
196+
"polyfills": ["zone.js"],
190197
"tsConfig": "projects/nae-example-app/tsconfig.spec.json",
191198
"karmaConfig": "projects/nae-example-app/karma.conf.js",
192199
"assets": [
@@ -227,7 +234,6 @@
227234
}
228235
}
229236
},
230-
"defaultProject": "nae-example-app",
231237
"cli": {
232238
"analytics": false,
233239
"defaultCollection": "@angular-eslint/schematics"

‎package.json‎

Lines changed: 56 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@netgrif/components-project",
3-
"version": "6.4.0-rc.2",
3+
"version": "6.5.0-beta.1",
44
"description": "Netgrif Application Engine Frontend project. Project includes angular libraries as base for NAE applications.",
55
"homepage": "https://components.netgrif.com",
66
"license": "SEE LICENSE IN LICENSE",
@@ -33,7 +33,8 @@
3333
"test": "ng test",
3434
"lint": "ng lint",
3535
"e2e": "ng e2e",
36-
"ncc:build": "ng build netgrif-components-core --configuration production && npm run ncc:build-schematics",
36+
"ncc:clean": "node projects/netgrif-components-core/src/scripts/delete-local-build-link.js",
37+
"ncc:build": "npm run ncc:clean && ng build netgrif-components-core --configuration production && npm run ncc:build-schematics",
3738
"ncc:local-build": "npm run ncc:build && npm i ./dist/netgrif-components-core --save-optional --legacy-peer-deps",
3839
"ncc:build-schematics": "node projects/netgrif-components-core/src/scripts/build-schematics.js",
3940
"ncc:lint": "ng lint netgrif-components-core",
@@ -64,32 +65,32 @@
6465
"project:sonar": "node scripts/sonar-scanner-analysis.js",
6566
"components:start": "npm run nc:local-build && ng serve",
6667
"example:start": "ng serve",
67-
"example:build": "ng build --configuration production"
68+
"example:build": "ng build nae-example-app --configuration production"
6869
},
6970
"dependencies": {
70-
"@angular-material-components/datetime-picker": "~7.0.1",
71-
"@angular-material-components/moment-adapter": "~7.0.0",
72-
"@angular/animations": "~13.3.1",
73-
"@angular/cdk": "~13.3.1",
74-
"@angular/common": "~13.3.1",
75-
"@angular/compiler": "~13.3.1",
76-
"@angular/core": "~13.3.1",
77-
"@angular/flex-layout": "~13.0.0-beta.38",
78-
"@angular/forms": "~13.3.1",
79-
"@angular/material": "~13.3.1",
80-
"@angular/material-moment-adapter": "~13.3.1",
81-
"@angular/platform-browser": "~13.3.1",
82-
"@angular/platform-browser-dynamic": "~13.3.1",
83-
"@angular/router": "~13.3.1",
84-
"@covalent/markdown": "~4.1.0",
85-
"@ngx-translate/core": "~13.0.0",
86-
"@ngx-translate/http-loader": "~6.0.0",
87-
"@schematics/angular": "~13.3.0",
71+
"@angular-material-components/datetime-picker": "~16.0.1",
72+
"@angular-material-components/moment-adapter": "~16.0.1",
73+
"@angular/animations": "~17.3.11",
74+
"@angular/cdk": "~17.3.10",
75+
"@angular/common": "~17.3.11",
76+
"@angular/compiler": "~17.3.11",
77+
"@angular/core": "~17.3.11",
78+
"@angular/forms": "~17.3.11",
79+
"@angular/material": "~17.3.10",
80+
"@angular/material-moment-adapter": "~17.3.10",
81+
"@angular/platform-browser": "~17.3.11",
82+
"@angular/platform-browser-dynamic": "~17.3.11",
83+
"@angular/router": "~17.3.11",
84+
"@covalent/markdown": "~8.0.0",
85+
"@ngbracket/ngx-layout": "^17.0.1",
86+
"@ngx-translate/core": "~15.0.0",
87+
"@ngx-translate/http-loader": "~8.0.0",
88+
"@schematics/angular": "~17.3.8",
8889
"@swimlane/ngx-charts": "~20.1.0",
8990
"@types/mousetrap": "~1.6.9",
90-
"angular-resizable-element": "~3.3.0",
91-
"angular-resize-event": "~3.1.1",
92-
"angular2-hotkeys": "~2.4.0",
91+
"angular-resizable-element": "~7.0.0",
92+
"angular-resize-event": "~3.2.0",
93+
"angular2-hotkeys": "~16.0.0",
9394
"easymde": "~2.16.1",
9495
"hammerjs": "~2.0.8",
9596
"json-schema-to-typescript": "~8.1.0",
@@ -101,56 +102,56 @@
101102
"ngx-quill": "~16.2.0",
102103
"palette-creator": "~0.5.4",
103104
"quill": "~1.3.7",
104-
"rxjs": "~6.6.7",
105+
"rxjs": "~7.8.1",
105106
"showdown": "^2.0.3",
106107
"tslib": "^2.0.0",
107-
"zone.js": "~0.11.4"
108+
"zone.js": "~0.14.0"
108109
},
109110
"devDependencies": {
110-
"@angular-devkit/build-angular": "~13.3.1",
111-
"@angular-devkit/schematics-cli": "~13.3.10",
112-
"@angular-eslint/builder": "~13.1.0",
113-
"@angular-eslint/eslint-plugin": "~13.1.0",
114-
"@angular-eslint/eslint-plugin-template": "~13.1.0",
115-
"@angular-eslint/schematics": "~13.1.0",
116-
"@angular-eslint/template-parser": "~13.1.0",
117-
"@angular/cli": "~13.3.1",
118-
"@angular/compiler-cli": "~13.3.1",
119-
"@angular/language-service": "~13.3.1",
120-
"@compodoc/compodoc": "1.1.13",
121-
"@types/jasmine": "~3.6.0",
122-
"@types/jasminewd2": "~2.0.3",
111+
"@angular-devkit/build-angular": "~17.3.8",
112+
"@angular-devkit/schematics-cli": "~17.3.8",
113+
"@angular-eslint/builder": "~17.1.0",
114+
"@angular-eslint/eslint-plugin": "~17.1.0",
115+
"@angular-eslint/eslint-plugin-template": "~17.1.0",
116+
"@angular-eslint/schematics": "~17.1.0",
117+
"@angular-eslint/template-parser": "~17.1.0",
118+
"@angular/cli": "~17.3.8",
119+
"@angular/compiler-cli": "~17.3.11",
120+
"@angular/language-service": "~17.3.11",
121+
"@compodoc/compodoc": "1.1.23",
122+
"@types/jasmine": "~3.10.0",
123+
"@types/jasminewd2": "~2.0.10",
123124
"@types/moment": "~2.13.0",
124125
"@types/node": "~12.12.29",
125-
"@typescript-eslint/eslint-plugin": "~5.17.0",
126-
"@typescript-eslint/parser": "~5.17.0",
126+
"@typescript-eslint/eslint-plugin": "~6.21.0",
127+
"@typescript-eslint/parser": "~6.21.0",
127128
"commander": "~4.1.1",
128129
"cspell": "~5.18.4",
129130
"eslint": "~8.12.0",
130-
"jasmine-core": "~3.10.1",
131-
"jasmine-spec-reporter": "~5.0.0",
132-
"json-server": "~0.15.1",
133-
"karma": "~6.3.17",
134-
"karma-chrome-launcher": "~3.1.0",
135-
"karma-coverage-istanbul-reporter": "~2.1.0",
136-
"karma-firefox-launcher": "~1.3.0",
137-
"karma-jasmine": "~4.0.0",
138-
"karma-jasmine-html-reporter": "~1.7.0",
131+
"jasmine-core": "~5.1.0",
132+
"jasmine-spec-reporter": "~7.0.0",
133+
"json-server": "~0.17.4",
134+
"karma": "~6.4.2",
135+
"karma-chrome-launcher": "~3.2.0",
136+
"karma-coverage-istanbul-reporter": "~3.0.0",
137+
"karma-firefox-launcher": "~2.1.0",
138+
"karma-jasmine": "~5.1.0",
139+
"karma-jasmine-html-reporter": "~2.1.0",
139140
"karma-junit-reporter": "~2.0.1",
140141
"karma-mocha-reporter": "~2.2.5",
141142
"karma-nyan-reporter": "~0.2.5",
142143
"karma-sonarqube-unit-reporter": "^0.0.23",
144+
"karma-webpack": "^5.0.1",
143145
"ncp": "~2.0.0",
144-
"ng-packagr": "~13.3.0",
145-
"protractor": "~7.0.0",
146-
"puppeteer": "~2.1.1",
146+
"ng-packagr": "~17.3.0",
147+
"puppeteer": "~22.0.0",
147148
"requirejs": "^2.3.6",
148149
"schematics-utilities": "~2.0.1",
149150
"sonarqube-scanner": "~2.5.0",
150151
"ts-node": "~10.2.1",
151152
"typedoc": "~0.22.11",
152-
"typescript": "~4.6.3",
153-
"typescript-json-schema": "~0.42.0",
153+
"typescript": "~5.2.0",
154+
"typescript-json-schema": "~0.60.0",
154155
"unique-names-generator": "~4.2.0"
155156
},
156157
"optionalDependencies": {

‎projects/nae-example-app/browserslist‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
# You can see what browsers were selected by your queries by running:
66
# npx browserslist
77

8-
> 0.5%
9-
last 2 versions
8+
last 2 Chrome versions
9+
last 1 Firefox version
10+
last 2 Edge major versions
11+
last 2 Safari major versions
12+
last 2 iOS major versions
13+
last 2 Android major versions
1014
Firefox ESR
11-
not dead
12-
not IE 9-11 # For IE 9-11 support, remove 'not'.

‎projects/nae-example-app/src/app/app-routing.module.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {RouterModule, Routes} from '@angular/router';
44
const routes: Routes = [];
55

66
@NgModule({
7-
imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
7+
imports: [RouterModule.forRoot(routes)],
88
exports: [RouterModule]
99
})
1010
export class AppRoutingModule {

‎projects/nae-example-app/src/app/app.module.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
FrontActionModule, NAE_ASYNC_RENDERING_CONFIGURATION
2323
} from '@netgrif/components-core';
2424
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
25-
import {FlexLayoutModule, FlexModule} from '@angular/flex-layout';
25+
import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout';
2626
import {DocumentationComponent} from './doc/documentation/documentation.component';
2727
import {NaeExampleAppConfigurationService} from './nae-example-app-configuration.service';
2828
import {AuthenticationComponent} from './doc/authentication/authentication.component';

‎projects/nae-example-app/src/app/doc/active-group/active-group.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ export class ActiveGroupComponent implements OnDestroy {
1515

1616
activeGroups: Array<string>;
1717

18-
fcGroup: FormControl;
19-
fcGroups: FormControl;
18+
fcGroup: FormControl<string>;
19+
fcGroups: FormControl<string[]>;
2020

2121
private _subGroups: Subscription;
2222
private _subGroupFc: Subscription;

‎projects/nae-example-app/src/app/doc/documentation/documentation.component.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ code {
22
background-color: rgba(0, 0, 0, .06);
33
padding: 5px;
44
font-size: 90%;
5-
font-family: 'Roboto', sans-serif;
5+
font-family: Roboto, sans-serif;
66
font-weight: 400;
77
margin-bottom: 20px;
88
width: max-content;

0 commit comments

Comments
 (0)