Skip to content

Commit

Permalink
Merge pull request #266 from adorsys/feature/DATASAFE-238_UpdateToAng…
Browse files Browse the repository at this point in the history
…ular17

Feature/datasafe 238 update to angular17
  • Loading branch information
max402 committed Apr 18, 2024
2 parents 6a752b8 + 659f9c4 commit 791233c
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 26 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ hs_err_pid*
# node.js / frontend
node_modules/
dist/
cache/

12 changes: 7 additions & 5 deletions frontend/datasafe-ui/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,21 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "my-app:build"
"buildTarget": "my-app:build"
},
"configurations": {
"production": {
"browserTarget": "my-app:build:production"
"buildTarget": "my-app:build:production"
},
"dev": {
"browserTarget": "my-app:build:dev"
"buildTarget": "my-app:build:dev"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "my-app:build"
"buildTarget": "my-app:build"
}
},
"test": {
Expand Down Expand Up @@ -118,5 +118,7 @@
}
}
},
"defaultProject": "datasafe-ui"
"cli": {
"analytics": false
}
}
1 change: 1 addition & 0 deletions frontend/datasafe-ui/main.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 18 additions & 19 deletions frontend/datasafe-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,27 @@
"e2e": "npm run build:prod && ../datasafe-ui/node_modules/.bin/mocha --timeout 300000 --require ts-node/register e2e/**/*.spec.ts"
},
"devDependencies": {
"@angular-devkit/build-angular": "15.2.9",
"@angular/animations": "15.2.9",
"@angular/cdk": "15.2.9",
"@angular/cli": "15.2.9",
"@angular/common": "15.2.9",
"@angular/compiler": "15.2.9",
"@angular/compiler-cli": "15.2.9",
"@angular/core": "15.2.9",

"@angular/forms": "15.2.9",
"@angular/material": "15.2.9",
"@angular/material-moment-adapter": "15.2.9",
"@angular/platform-browser": "15.2.9",
"@angular/platform-browser-dynamic": "15.2.9",
"@angular/router": "15.2.9",
"@angular-devkit/build-angular": "17.1.3",
"@angular/animations": "17.1.3",
"@angular/cdk": "17.1.2",
"@angular/cli": "17.1.3",
"@angular/common": "17.1.3",
"@angular/compiler": "17.1.3",
"@angular/compiler-cli": "17.1.3",
"@angular/core": "17.1.3",
"@angular/forms": "17.1.3",
"@angular/material": "17.1.2",
"@angular/material-moment-adapter": "17.1.2",
"@angular/platform-browser": "17.1.3",
"@angular/platform-browser-dynamic": "17.1.3",
"@angular/router": "17.1.3",
"@types/jasmine": "4.3.6",
"@types/jasminewd2": "2.0.11",
"@types/mocha": "10.0.2",
"@types/node": "20.8.0",
"codelyzer": "6.0.2",
"core-js": "3.33.0",
"electron": "^26.2.4",
"electron": "^26.6.9",
"electron-builder": "24.7.0",
"electron-reload": "1.5.0",
"hammerjs": "2.0.8",
Expand All @@ -71,11 +70,11 @@
"spectron": "19.0.0",
"ts-node": "10.9.1",
"tslint": "5.17.0",
"typescript": "4.9.4",
"wait-on": "7.0.1",
"typescript": "5.2.2",
"wait-on": "^7.2.0",
"web-animations-js": "2.3.2",
"webdriver-manager": "13.0.2",
"zone.js": "0.13.0"
"zone.js": "^0.14.3"
},
"engines": {
"node": ">=18.10.0"
Expand Down
2 changes: 1 addition & 1 deletion frontend/datasafe-ui/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const appRoutes: Routes = [
ReactiveFormsModule,
RouterModule.forRoot(appRoutes)
],
entryComponents: [AppComponent, AddFolderDialog, ConfigureApiDialog],

declarations: [AppComponent, UserComponent, LoginComponent, RegisterComponent, FiletreeComponent, AddFolderDialog, ConfigureApiDialog],
bootstrap: [AppComponent],
providers: []
Expand Down
2 changes: 1 addition & 1 deletion frontend/datasafe-ui/src/app/polyfills.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'core-js/features/reflect';
import 'zone.js/dist/zone';
import 'zone.js';
import 'hammerjs';
import 'web-animations-js';

0 comments on commit 791233c

Please sign in to comment.