Skip to content

Commit

Permalink
migrate to Angular 17
Browse files Browse the repository at this point in the history
  • Loading branch information
adlerre committed Feb 19, 2024
1 parent 5a0fa02 commit 56cfef9
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 53 deletions.
6 changes: 3 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,18 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "srdash-ui:build"
"buildTarget": "srdash-ui:build"
},
"configurations": {
"production": {
"browserTarget": "srdash-ui:build:production"
"buildTarget": "srdash-ui:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "srdash-ui:build"
"buildTarget": "srdash-ui:build"
}
}
}
Expand Down
53 changes: 27 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,46 +21,47 @@
"not IE 11"
],
"dependencies": {
"@angular/animations": "15.0.3",
"@angular/common": "15.0.3",
"@angular/compiler": "15.0.3",
"@angular/core": "15.0.3",
"@angular/forms": "15.0.3",
"@angular/localize": "15.0.3",
"@angular/platform-browser": "15.0.3",
"@angular/platform-browser-dynamic": "15.0.3",
"@angular/router": "15.0.3",
"@angular/animations": "17.2.1",
"@angular/common": "17.2.1",
"@angular/compiler": "17.2.1",
"@angular/core": "17.2.1",
"@angular/forms": "17.2.1",
"@angular/localize": "17.2.1",
"@angular/platform-browser": "17.2.1",
"@angular/platform-browser-dynamic": "17.2.1",
"@angular/router": "17.2.1",
"@fontsource/dseg14": "^4.5.3",
"@fortawesome/fontawesome-free": "^6.2.1",
"@ngx-translate/core": "^14.0.0",
"@ngx-translate/http-loader": "^7.0.0",
"@uirouter/angular": "10.0.0",
"@uirouter/core": "6.0.8",
"@fortawesome/fontawesome-free": "^6.5.1",
"@ngx-translate/core": "^15.0.0",
"@ngx-translate/http-loader": "^8.0.0",
"@uirouter/angular": "13.0.0",
"@uirouter/core": "6.1.0",
"@uirouter/rx": "1.0.0",
"messageformat": "^2.3.0",
"ngx-translate-messageformat-compiler": "^6.2.0",
"rxjs": "^6.6.7",
"ngx-translate-messageformat-compiler": "^7.0.0",
"rxjs": "^7.8.1",
"tslib": "^2.3.0",
"web-animations-js": "^2.3.2",
"zone.js": "~0.12.0"
"zone.js": "~0.14.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^15.0.3",
"@angular/cli": "15.0.3",
"@angular/compiler-cli": "15.0.3",
"@angular/language-service": "15.0.3",
"@types/node": "^18.11.13",
"@angular-devkit/build-angular": "^17.2.0",
"@angular/cli": "17.2.0",
"@angular/compiler-cli": "17.2.1",
"@angular/language-service": "17.2.1",
"@types/node": "^20.11.19",
"codelyzer": "^6.0.2",
"domhandler": "^5.0.3",
"imagemin": "^8.0.1",
"imagemin-giflossy": "^5.1.10",
"imagemin-gifsicle": "^7.0.0",
"imagemin-mozjpeg": "^10.0.0",
"imagemin-pngquant": "^9.0.2",
"imagemin-svgo": "^10.0.1",
"p-limit": "^4.0.0",
"ts-node": "^10.9.1",
"p-limit": "^5.0.0",
"ts-node": "^10.9.2",
"tslint": "~6.1.3",
"typescript": "4.8.4",
"webpack-bundle-analyzer": "^4.7.0"
"typescript": "5.3.3",
"webpack-bundle-analyzer": "^4.10.1"
}
}
39 changes: 19 additions & 20 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
<properties>
<eclipselink.version>3.0.3</eclipselink.version>
<encoding>UTF-8</encoding>
<grizzly.version>4.0.0</grizzly.version>
<grizzly.version>4.0.2</grizzly.version>
<java.version>11</java.version>
<jersey.version>3.1.0</jersey.version>
<log4j.version>2.19.0</log4j.version>
<jersey.version>3.1.5</jersey.version>
<log4j.version>2.20.0</log4j.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
<node.version>v18.10.0</node.version>
<npm.version>8.19.2</npm.version>
<node.version>v18.16.0</node.version>
<npm.version>9.2.0</npm.version>
</properties>
<dependencies>
<dependency>
Expand All @@ -53,6 +53,11 @@
<artifactId>grizzly-http</artifactId>
<version>${grizzly.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-framework</artifactId>
<version>${grizzly.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-websockets</artifactId>
Expand Down Expand Up @@ -134,7 +139,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
<version>33.0.0-jre</version>
</dependency>

<dependency>
Expand All @@ -146,7 +151,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>2.15.1</version>
</dependency>

<dependency>
Expand All @@ -158,7 +163,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.1</version>
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand All @@ -168,15 +173,9 @@
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>3.0.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>3.0.2</version>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>4.0.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -210,13 +209,13 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<version>3.3.0</version>
<dependencies>
<!-- new version to support Java 11 -->
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-analyzer</artifactId>
<version>1.11.3</version>
<version>1.13.2</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
Expand Down Expand Up @@ -254,7 +253,7 @@
</bundledSignatures>
</configuration>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
Expand Down
8 changes: 4 additions & 4 deletions src/ui/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "esnext",
"module": "ESNext",
"moduleResolution": "node",
"experimentalDecorators": true,
"importHelpers": true,
"target": "es2015",
"target": "ES2022",
"typeRoots": [
"../../node_modules/@types"
],
"lib": [
"es2017",
"ES2020",
"dom"
]
}
}
}

0 comments on commit 56cfef9

Please sign in to comment.