Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions client/.nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
1 change: 0 additions & 1 deletion client/package-lock.json
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot can we add .nvmrc file to prevent the changing this line on each PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added .nvmrc files to pin Node.js version to 20 in both root and client directories. Also updated GitHub workflows to use the .nvmrc file and updated README to reflect the Node.js version requirement. This will prevent package-lock.json changes across different environments. See commit 70df0e8.

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

22 changes: 10 additions & 12 deletions server/src/main/scala/ru/trett/rss/server/Server.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down