diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f8e541..2ad7b55 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,8 @@ jobs: - name: Setup NodeJs uses: actions/setup-node@v4 + with: + node-version-file: '.nvmrc' - name: Setup JDK uses: actions/setup-java@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c8f6fe8..21156b0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,6 +14,8 @@ jobs: - name: Setup NodeJs uses: actions/setup-node@v4 + with: + node-version-file: '.nvmrc' - name: Setup JDK uses: actions/setup-java@v4 diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..2edeafb --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +20 \ No newline at end of file diff --git a/README.md b/README.md index 005a056..5827fea 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ A modern, web-based RSS reader application built with Scala, Scala.js, and Lamin - [Java 17+](https://www.oracle.com/java/technologies/downloads/) - [sbt](https://www.scala-sbt.org/) -- [Node.js](https://nodejs.org/) and [npm](https://www.npmjs.com/) +- [Node.js 20](https://nodejs.org/) and [npm](https://www.npmjs.com/) (version specified in `.nvmrc`) - [Docker](https://www.docker.com/) and [Docker Compose](https://docs.docker.com/compose/) ### Running with Docker (Recommended) diff --git a/build.sbt b/build.sbt index 621af6d..269d0bc 100644 --- a/build.sbt +++ b/build.sbt @@ -78,7 +78,6 @@ lazy val server = project dockerRepository := sys.env.get("REGISTRY"), dockerExposedPorts := Seq(8080), watchSources ++= (client / Compile / watchSources).value, - Compile / compile := (Compile / compile).dependsOn(client / Compile / fastLinkJS).value, javaOptions += "-Dotel.java.global-autoconfigure.enabled=true", libraryDependencies ++= Seq( "org.typelevel" %% "cats-effect" % "3.6.3", diff --git a/client/.nvmrc b/client/.nvmrc new file mode 100644 index 0000000..2edeafb --- /dev/null +++ b/client/.nvmrc @@ -0,0 +1 @@ +20 \ No newline at end of file diff --git a/client/package-lock.json b/client/package-lock.json index b85b077..dbe6806 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1027,7 +1027,6 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, diff --git a/server/src/main/scala/ru/trett/rss/server/Server.scala b/server/src/main/scala/ru/trett/rss/server/Server.scala index 9c82349..5a27537 100644 --- a/server/src/main/scala/ru/trett/rss/server/Server.scala +++ b/server/src/main/scala/ru/trett/rss/server/Server.scala @@ -113,19 +113,17 @@ object Server extends IOApp: appRoutes <- corsPolicy( jarRoutes <+> - routes( - sessionManager, - channelService, - userService, - feedService, - appConfig.oauth, - authFilter, - client, - summarizeService, - new LogoutController[IO]( - sessionManager + routes( + sessionManager, + channelService, + userService, + feedService, + appConfig.oauth, + authFilter, + client, + summarizeService, + new LogoutController[IO](sessionManager) ) - ) ) exitCode <- UpdateTask( channelService,