Skip to content
Open
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: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- uses: actions/setup-node@v6
with:
node-version: 18
node-version: 24
cache: 'npm'
registry-url: 'https://npm.pkg.github.com'
scope: '@clearlydefined'
Expand Down
2 changes: 1 addition & 1 deletion DevDockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation and others. Licensed under the MIT license.
# SPDX-License-Identifier: MIT

FROM docker.io/library/node:18
FROM docker.io/library/node:24-bullseye
Copy link
Contributor

Choose a reason for hiding this comment

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

I know that this was extracted from #1340, and we want to avoid conflicts with that PR as much as is possible, but we likely want to bump this to bookworm or trixie in the near future. Bullseye support is comimg to an end soon: https://endoflife.date/debian

ENV APPDIR=/opt/service

## get SSH server running
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation and others. Licensed under the MIT license.
# SPDX-License-Identifier: MIT

FROM docker.io/library/node:18
FROM docker.io/library/node:24-bullseye
ENV APPDIR=/opt/service

## get SSH server running
Expand Down
23 changes: 18 additions & 5 deletions package-lock.json

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

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"name": "service",
"version": "2.3.0",
"description": "Service side of clearlydefined.io.",
"engines": {
"node": "24"
},
"scripts": {
"test": "npm run mocha && npm run lint",
"mocha": "nyc mocha --exit \"test/**/*.js\"",
Expand Down Expand Up @@ -75,7 +78,7 @@
"winston-azure-application-insights": "^1.5.0"
},
"devDependencies": {
"@tsconfig/node18": "18.2.4",
"@tsconfig/node24": "24.0.2",
"@tsconfig/strictest": "2.0.5",
"@types/chai": "4.3.3",
"@types/deep-equal-in-any-order": "1.0.4",
Expand Down
7 changes: 5 additions & 2 deletions test/providers/store/mongoDefinitionPagination.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,11 @@ const shouldPaginateSearchCorrectly = function () {
})

after('cleanup database', async function () {
await mongoStore.collection.drop()
await mongoStore.close()
if (mongoStore) {
await mongoStore.collection.drop()
Copy link
Author

Choose a reason for hiding this comment

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

I found during some local testing that the before() function didn't always complete before after() which would mean the variable mongoStore was still undefined and this line would throw.

await mongoStore.close()
}

await mongoServer.stop()
})

Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["@tsconfig/strictest/tsconfig.json", "@tsconfig/node18/tsconfig.json"],
"extends": ["@tsconfig/strictest/tsconfig.json", "@tsconfig/node24/tsconfig.json"],
"compilerOptions": {
"allowJs": true,
"checkJs": true,
Expand Down