diff --git a/packages/edge-bundler/node/bridge.test.ts b/packages/edge-bundler/node/bridge.test.ts index 4315231a14..8e51893be1 100644 --- a/packages/edge-bundler/node/bridge.test.ts +++ b/packages/edge-bundler/node/bridge.test.ts @@ -9,14 +9,14 @@ import semver from 'semver' import tmp, { DirectoryResult } from 'tmp-promise' import { test, expect } from 'vitest' -import { DenoBridge, LEGACY_DENO_VERSION_RANGE } from './bridge.js' +import { DenoBridge, DENO_VERSION_RANGE } from './bridge.js' import { getPlatformTarget } from './platform.js' const require = createRequire(import.meta.url) const archiver = require('archiver') const getMockDenoBridge = function (tmpDir: DirectoryResult, mockBinaryOutput: string) { - const latestVersion = semver.minVersion(LEGACY_DENO_VERSION_RANGE)?.version ?? '' + const latestVersion = semver.minVersion(DENO_VERSION_RANGE)?.version ?? '' const data = new PassThrough() const archive = archiver('zip', { zlib: { level: 9 } }) @@ -139,7 +139,7 @@ test('Does inherit environment variables if `extendEnv` is not set', async () => test('Provides actionable error message when downloaded binary cannot be executed', async () => { const tmpDir = await tmp.dir() - const latestVersion = semver.minVersion(LEGACY_DENO_VERSION_RANGE)?.version ?? '' + const latestVersion = semver.minVersion(DENO_VERSION_RANGE)?.version ?? '' const data = new PassThrough() const archive = archiver('zip', { zlib: { level: 9 } }) diff --git a/packages/edge-bundler/node/bridge.ts b/packages/edge-bundler/node/bridge.ts index 3dcea43ee5..8c3f313e18 100644 --- a/packages/edge-bundler/node/bridge.ts +++ b/packages/edge-bundler/node/bridge.ts @@ -19,7 +19,7 @@ export const LEGACY_DENO_VERSION_RANGE = '1.39.0 - 2.2.4' // When updating DENO_VERSION_RANGE, ensure that the deno version // on the netlify/buildbot build image satisfies this range! // https://github.com/netlify/buildbot/blob/f9c03c9dcb091d6570e9d0778381560d469e78ad/build-image/noble/Dockerfile#L410 -const DENO_VERSION_RANGE = '^2.4.2' +export const DENO_VERSION_RANGE = '^2.4.2' export type OnBeforeDownloadHook = () => void | Promise export type OnAfterDownloadHook = (error?: Error) => void | Promise @@ -69,13 +69,7 @@ export class DenoBridge { this.onAfterDownload = options.onAfterDownload this.onBeforeDownload = options.onBeforeDownload this.useGlobal = options.useGlobal ?? true - - const useNextDeno = - options.featureFlags?.edge_bundler_dry_run_generate_tarball || - options.featureFlags?.edge_bundler_generate_tarball || - options.featureFlags?.edge_bundler_deno_v2 - - this.versionRange = options.versionRange ?? (useNextDeno ? DENO_VERSION_RANGE : LEGACY_DENO_VERSION_RANGE) + this.versionRange = options.versionRange ?? DENO_VERSION_RANGE } private async downloadBinary() { diff --git a/packages/edge-bundler/node/bundler.test.ts b/packages/edge-bundler/node/bundler.test.ts index d502e23361..3df83ac861 100644 --- a/packages/edge-bundler/node/bundler.test.ts +++ b/packages/edge-bundler/node/bundler.test.ts @@ -634,9 +634,6 @@ test('Is backwards compatible with Deno 1.x', async () => { await bundle([sourceDirectory], distPath, [], { basePath, - featureFlags: { - edge_bundler_deno_v2: true, - }, systemLogger, vendorDirectory: vendorDirectory.path, }) diff --git a/packages/edge-bundler/node/feature_flags.ts b/packages/edge-bundler/node/feature_flags.ts index 0ac0ee16e0..a5cd183c9a 100644 --- a/packages/edge-bundler/node/feature_flags.ts +++ b/packages/edge-bundler/node/feature_flags.ts @@ -1,7 +1,6 @@ const defaultFlags = { edge_bundler_generate_tarball: false, edge_bundler_dry_run_generate_tarball: false, - edge_bundler_deno_v2: true, } type FeatureFlag = keyof typeof defaultFlags diff --git a/packages/edge-bundler/node/main.test.ts b/packages/edge-bundler/node/main.test.ts index 78cff9e762..b530bc6b1f 100644 --- a/packages/edge-bundler/node/main.test.ts +++ b/packages/edge-bundler/node/main.test.ts @@ -9,14 +9,14 @@ import semver from 'semver' import tmp from 'tmp-promise' import { test, expect, vi } from 'vitest' -import { DenoBridge, LEGACY_DENO_VERSION_RANGE } from './bridge.js' +import { DenoBridge, DENO_VERSION_RANGE } from './bridge.js' import { getPlatformTarget } from './platform.js' const require = createRequire(import.meta.url) const archiver = require('archiver') test('Downloads the Deno CLI on demand and caches it for subsequent calls', async () => { - const latestVersion = semver.minVersion(LEGACY_DENO_VERSION_RANGE)?.version ?? '' + const latestVersion = semver.minVersion(DENO_VERSION_RANGE)?.version ?? '' const mockBinaryOutput = `#!/usr/bin/env sh\n\necho "deno ${latestVersion}"` const data = new PassThrough() const archive = archiver('zip', { zlib: { level: 9 } })