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
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const versionMap = {
18: 'node18',
20: 'node20',
22: 'node22',
24: 'node24',
} as const

type VersionValues = (typeof versionMap)[keyof typeof versionMap]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export interface NodeVersionSupport {
}

// Must match the default version used in Bitballoon.
export const DEFAULT_NODE_VERSION = 22
export const DEFAULT_NODE_VERSION = 24

export const getNodeVersion = (configVersion?: string) => parseVersion(configVersion) ?? DEFAULT_NODE_VERSION

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@ describe('getNodeRuntime', () => {

describe('getNodeRuntimeForV2', () => {
test.each([
['nodejs12.x', 'nodejs22.x'],
['nodejs14.x', 'nodejs22.x'],
['nodejs16.x', 'nodejs22.x'],
['nodejs12.x', 'nodejs24.x'],
['nodejs14.x', 'nodejs24.x'],
['nodejs16.x', 'nodejs24.x'],
['nodejs18.x', 'nodejs18.x'],
['nodejs20.x', 'nodejs20.x'],
['nodejs22.x', 'nodejs22.x'],
['nodejs24.x', 'nodejs24.x'],
['14.x', 'nodejs22.x'],
['v16.x', 'nodejs22.x'],
['14.x', 'nodejs24.x'],
['v16.x', 'nodejs24.x'],
['18.0.0', 'nodejs18.x'],
['20.0.0', 'nodejs20.x'],
['v14.2.0', 'nodejs22.x'],
['14.1', 'nodejs22.x'],
[':shrug:', 'nodejs22.x'],
['v14.2.0', 'nodejs24.x'],
['14.1', 'nodejs24.x'],
[':shrug:', 'nodejs24.x'],
['99.0.0', undefined],
])('handles `%s`', (input, expected) => {
expect(getNodeRuntimeForV2(input)).toBe(expected)
Expand Down
8 changes: 4 additions & 4 deletions packages/zip-it-and-ship-it/tests/v2api.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ describe('V2 functions API', () => {
expect(statusCode).toBe(200)
})

test('Returns Node.js 18 if older version is set', async () => {
test('Returns Node.js 24 if older version is set', async () => {
const { files } = await zipFixture('v2-api-mjs', {
fixtureDir: FIXTURES_ESM_DIR,
opts: {
Expand All @@ -338,10 +338,10 @@ describe('V2 functions API', () => {
},
})

expect(files[0].runtimeVersion).toBe('nodejs22.x')
expect(files[0].runtimeVersion).toBe('nodejs24.x')
})

test('Returns Node.js 18 if invalid version is set', async () => {
test('Returns Node.js 24 if invalid version is set', async () => {
const { files } = await zipFixture('v2-api-mjs', {
fixtureDir: FIXTURES_ESM_DIR,
opts: {
Expand All @@ -353,7 +353,7 @@ describe('V2 functions API', () => {
},
})

expect(files[0].runtimeVersion).toBe('nodejs22.x')
expect(files[0].runtimeVersion).toBe('nodejs24.x')
})

test('Returns no Node.js version if version is newer than 18 but not a valid runtime', async () => {
Expand Down
Loading