diff --git a/README.md b/README.md index a07ca67..2ecb32f 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ Read more @ http://bit.ly/2AStvhK ## Used Summary -* [Play Framework: 2.8.0](https://www.playframework.com/documentation/2.8.x/Home) -* [Angular: 8.x.x](https://angular.io/) -* [Angular CLI: 8.3.9](https://cli.angular.io/) +* [Play Framework: 2.8.13](https://www.playframework.com/documentation/2.8.x/Home) +* [Angular: 13.3.2](https://angular.io/) +* [Angular CLI: 13.3.2](https://cli.angular.io/) ## How to use it? @@ -20,7 +20,7 @@ Read more @ http://bit.ly/2AStvhK * [Node.js](https://nodejs.org/) (version 10 or higher) * [JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html) (recommend version 1.8 or higher) -* [scala](https://www.scala-lang.org/download/) +* [scala: 2.13](https://www.scala-lang.org/download/) ### Let's get started, diff --git a/build.sbt b/build.sbt index ec13083..f9c665d 100644 --- a/build.sbt +++ b/build.sbt @@ -8,8 +8,8 @@ lazy val root = (project in file(".")).enablePlugins(PlayScala).settings( resolvers += Resolver.sonatypeRepo("snapshots") -scalaVersion := "2.12.8" +scalaVersion := "2.13.8" libraryDependencies += guice -libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "4.0.2" % Test +libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test libraryDependencies += "com.h2database" % "h2" % "1.4.199" diff --git a/project/plugins.sbt b/project/plugins.sbt index 1442c5a..6fe689d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.13") diff --git a/ui/.gitignore b/ui/.gitignore index 85158b7..682a3c7 100644 --- a/ui/.gitignore +++ b/ui/.gitignore @@ -29,6 +29,7 @@ speed-measure-plugin.json !.vscode/extensions.json # misc +/.angular/cache /.sass-cache /connect.lock /coverage diff --git a/ui/angular.json b/ui/angular.json index 9d796b3..7051e78 100644 --- a/ui/angular.json +++ b/ui/angular.json @@ -25,7 +25,13 @@ "styles": [ "src/styles.css" ], - "scripts": [] + "scripts": [], + "vendorChunk": true, + "extractLicenses": false, + "buildOptimizer": false, + "sourceMap": true, + "optimization": false, + "namedChunks": true }, "configurations": { "production": { @@ -38,9 +44,7 @@ "optimization": true, "outputHashing": "all", "sourceMap": false, - "extractCss": true, "namedChunks": false, - "aot": true, "extractLicenses": true, "vendorChunk": false, "buildOptimizer": true, @@ -49,10 +53,15 @@ "type": "initial", "maximumWarning": "2mb", "maximumError": "5mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "6kb" } ] } - } + }, + "defaultConfiguration": "" }, "serve": { "builder": "@angular-devkit/build-angular:dev-server", @@ -87,18 +96,6 @@ "src/assets" ] } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" - ], - "exclude": [ - "**/node_modules/**" - ] - } } } }, @@ -118,15 +115,6 @@ "devServerTarget": "scala-play-angular-seed:serve:production" } } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": "e2e/tsconfig.e2e.json", - "exclude": [ - "**/node_modules/**" - ] - } } } } diff --git a/ui/e2e/tsconfig.e2e.json b/ui/e2e/tsconfig.e2e.json index a6dd622..d696d43 100644 --- a/ui/e2e/tsconfig.e2e.json +++ b/ui/e2e/tsconfig.e2e.json @@ -3,11 +3,11 @@ "compilerOptions": { "outDir": "../out-tsc/app", "module": "commonjs", - "target": "es5", + "target": "es2018", "types": [ "jasmine", "jasminewd2", "node" ] } -} \ No newline at end of file +} diff --git a/ui/package.json b/ui/package.json index cda5823..fc262ca 100644 --- a/ui/package.json +++ b/ui/package.json @@ -12,42 +12,42 @@ "test:coverage": "ng test --watch=true --code-coverage=true", "test:coverage:ci": "ng test --watch=false --code-coverage=true --browsers ChromeHeadless", "build:dev": "ng build --progress --output-path ../public", - "build:prod": "ng build --progress --prod --output-path ../public" + "build:prod": "ng build --progress --configuration production --output-path ../public" }, "private": true, "dependencies": { - "@angular/animations": "~8.2.10", - "@angular/common": "~8.2.10", - "@angular/compiler": "~8.2.10", - "@angular/core": "~8.2.10", - "@angular/forms": "~8.2.10", - "@angular/platform-browser": "~8.2.10", - "@angular/platform-browser-dynamic": "~8.2.10", - "@angular/router": "~8.2.10", + "@angular/animations": "~13.3.2", + "@angular/common": "~13.3.2", + "@angular/compiler": "~13.3.2", + "@angular/core": "~13.3.2", + "@angular/forms": "~13.3.2", + "@angular/platform-browser": "~13.3.2", + "@angular/platform-browser-dynamic": "~13.3.2", + "@angular/router": "~13.3.2", "core-js": "^3.1.4", "rxjs": "~6.5.3", - "tslib": "^1.10.0", - "zone.js": "~0.9.1" + "tslib": "^2.0.0", + "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.803.9", - "@angular/cli": "~8.3.9", - "@angular/compiler-cli": "~8.2.10", - "@angular/language-service": "~8.2.10", - "@types/jasmine": "~3.3.13", + "@angular-devkit/build-angular": "~13.3.2", + "@angular/cli": "~13.3.2", + "@angular/compiler-cli": "~13.3.2", + "@angular/language-service": "~13.3.2", + "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.6", - "@types/node": "^12.6.8", - "codelyzer": "~5.1.0", - "jasmine-core": "~3.4.0", - "jasmine-spec-reporter": "~4.2.1", - "karma": "^4.2.0", - "karma-chrome-launcher": "^3.0.0", - "karma-coverage-istanbul-reporter": "~2.0.5", - "karma-jasmine": "~2.0.1", - "karma-jasmine-html-reporter": "^1.4.2", - "protractor": "~5.4.2", + "@types/node": "^12.11.1", + "codelyzer": "^6.0.0", + "jasmine-core": "~3.6.0", + "jasmine-spec-reporter": "~5.0.0", + "karma": "~6.3.17", + "karma-chrome-launcher": "~3.1.0", + "karma-coverage-istanbul-reporter": "~3.0.2", + "karma-jasmine": "~4.0.0", + "karma-jasmine-html-reporter": "^1.5.0", + "protractor": "~7.0.0", "ts-node": "~8.3.0", - "tslint": "~5.18.0", - "typescript": "~3.5.3" + "tslint": "~6.1.0", + "typescript": "~4.6.3" } -} +} \ No newline at end of file diff --git a/ui/src/browserslist b/ui/src/.browserslistrc similarity index 100% rename from ui/src/browserslist rename to ui/src/.browserslistrc diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html index 52e56c7..ade57d9 100644 --- a/ui/src/app/app.component.html +++ b/ui/src/app/app.component.html @@ -5,7 +5,7 @@