diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index fc9583fc50..48c647e80d 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -54,14 +54,12 @@ jobs: os: [ubuntu-24.04, macos-14, windows-2025] node-version: ['22'] # Must include the minimum deno version from the `DENO_VERSION_RANGE` constant in `node/bridge.ts`. - # We're adding v2.4.2 here because it's needed for the upcoming nimble release, so we can test - # those workflows ahead of time before we can update the base version across the board. - deno-version: ['v1.39.0', 'v2.2.4', 'v2.4.2'] + deno-version: ['v2.4.2'] include: - os: ubuntu-24.04 # Earliest supported version node-version: '18.14.0' - deno-version: 'v2.2.4' + deno-version: 'v2.4.2' fail-fast: false steps: # Sets an output parameter if this is a release PR @@ -159,7 +157,7 @@ jobs: - name: Setup Deno uses: denoland/setup-deno@v1 with: - deno-version: v2.2.4 + deno-version: v2.4.2 if: ${{ !steps.release-check.outputs.IS_RELEASE }} - name: Node.js ${{ matrix.node-version }} uses: actions/setup-node@v6 diff --git a/packages/build/tests/edge_functions/snapshots/tests.js.md b/packages/build/tests/edge_functions/snapshots/tests.js.md index a57e5e46ea..dd91154bf1 100644 --- a/packages/build/tests/edge_functions/snapshots/tests.js.md +++ b/packages/build/tests/edge_functions/snapshots/tests.js.md @@ -1279,7 +1279,7 @@ Generated by [AVA](https://avajs.dev). ────────────────────────────────────────────────────────────────␊ ␊ Error message␊ - Error: Command failed with exit code 1: "/external/path" bundle --import-map BASE64_STRING --quiet --code-splitting --allow-import --outdir /external/path packages/build/tests/edge_functions/fixtures/functions_invalid/netlify/edge-functions/functions-1.ts␊ + Error: Command failed with exit code 1: deno bundle --import-map BASE64_STRING --quiet --code-splitting --allow-import --outdir /external/path packages/build/tests/edge_functions/fixtures/functions_invalid/netlify/edge-functions/functions-1.ts␊ STACK TRACE␊ ␊ export async () => ␊ @@ -1292,9 +1292,9 @@ Generated by [AVA](https://avajs.dev). ␊ Error properties␊ {␊ - shortMessage: 'Command failed with exit code 1: "/external/path" bundle --import-map BASE64_STRING --quiet --code-splitting --allow-import --outdir /external/path packages/build/tests/edge_functions/fixtures/functions_invalid/netlify/edge-functions/functions-1.ts',␊ - command: '"/external/path" bundle --import-map BASE64_STRING --quiet --code-splitting --allow-import --outdir /external/path packages/build/tests/edge_functions/fixtures/functions_invalid/netlify/edge-functions/functions-1.ts',␊ - escapedCommand: '"/external/path" bundle --import-map "BASE64_STRING" --quiet --code-splitting --allow-import --outdir "/external/path" "packages/build/tests/edge_functions/fixtures/functions_invalid/netlify/edge-functions/functions-1.ts"',␊ + shortMessage: 'Command failed with exit code 1: deno bundle --import-map BASE64_STRING --quiet --code-splitting --allow-import --outdir /external/path packages/build/tests/edge_functions/fixtures/functions_invalid/netlify/edge-functions/functions-1.ts',␊ + command: 'deno bundle --import-map BASE64_STRING --quiet --code-splitting --allow-import --outdir /external/path packages/build/tests/edge_functions/fixtures/functions_invalid/netlify/edge-functions/functions-1.ts',␊ + escapedCommand: 'deno bundle --import-map "BASE64_STRING" --quiet --code-splitting --allow-import --outdir "/external/path" "packages/build/tests/edge_functions/fixtures/functions_invalid/netlify/edge-functions/functions-1.ts"',␊ exitCode: 1,␊ signal: undefined,␊ signalDescription: undefined,␊ diff --git a/packages/build/tests/edge_functions/snapshots/tests.js.snap b/packages/build/tests/edge_functions/snapshots/tests.js.snap index a725462cd1..0b79626884 100644 Binary files a/packages/build/tests/edge_functions/snapshots/tests.js.snap and b/packages/build/tests/edge_functions/snapshots/tests.js.snap differ diff --git a/packages/build/tests/edge_functions/tests.js b/packages/build/tests/edge_functions/tests.js index ec84916dc8..8736f11632 100644 --- a/packages/build/tests/edge_functions/tests.js +++ b/packages/build/tests/edge_functions/tests.js @@ -174,7 +174,7 @@ for (const variant of FLAG_VARIANTS) { t.snapshot(normalizeOutput(output)) }) - test(variant.id + ' - bundles Edge Functions via runCoreSteps function', async (t) => { + test.serial(variant.id + ' - bundles Edge Functions via runCoreSteps function', async (t) => { const output = await new Fixture('./fixtures/functions_user') .withFlags({ ...variant.flags, buildSteps: ['edge_functions_bundling'], useRunCoreSteps: true }) .runWithBuild() diff --git a/packages/edge-bundler/node/feature_flags.ts b/packages/edge-bundler/node/feature_flags.ts index 3a35c11dac..0ac0ee16e0 100644 --- a/packages/edge-bundler/node/feature_flags.ts +++ b/packages/edge-bundler/node/feature_flags.ts @@ -1,7 +1,7 @@ const defaultFlags = { edge_bundler_generate_tarball: false, edge_bundler_dry_run_generate_tarball: false, - edge_bundler_deno_v2: false, + edge_bundler_deno_v2: true, } type FeatureFlag = keyof typeof defaultFlags