Skip to content

Commit 9620588

Browse files
authoredApr 26, 2024
fix: disable regional blobs until feature is ready for release (#433)
* fix: disable regional blobs until feature is ready for release * test: Update tests to not include the experimental region flag
1 parent d73a912 commit 9620588

File tree

3 files changed

+2
-21
lines changed

3 files changed

+2
-21
lines changed
 

‎src/build/plugin-context.test.ts

-15
Original file line numberDiff line numberDiff line change
@@ -195,18 +195,3 @@ test('nx monorepo with package path and different distDir', () => {
195195
expect(ctx.relPublishDir).toBe('dist/apps/my-app/.next')
196196
expect(ctx.publishDir).toBe(join(cwd, 'dist/apps/my-app/.next'))
197197
})
198-
199-
test('should use deploy configuration blobs directory when @netlify/build version supports regional blob awareness', () => {
200-
const { cwd } = mockFileSystem({
201-
'.next/required-server-files.json': JSON.stringify({
202-
config: { distDir: '.next' },
203-
relativeAppDir: '',
204-
} as RequiredServerFilesManifest),
205-
})
206-
207-
const ctx = new PluginContext({
208-
constants: { NETLIFY_BUILD_VERSION: '29.39.1' },
209-
} as NetlifyPluginOptions)
210-
211-
expect(ctx.blobDir).toBe(join(cwd, '.netlify/deploy/v1/blobs/deploy'))
212-
})

‎src/build/plugin-context.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import type {
1313
import type { PrerenderManifest, RoutesManifest } from 'next/dist/build/index.js'
1414
import type { MiddlewareManifest } from 'next/dist/build/webpack/plugins/middleware-plugin.js'
1515
import type { NextConfigComplete } from 'next/dist/server/config-shared.js'
16-
import { satisfies } from 'semver'
1716

1817
const MODULE_DIR = fileURLToPath(new URL('.', import.meta.url))
1918
const PLUGIN_DIR = join(MODULE_DIR, '../..')
@@ -152,9 +151,8 @@ export class PluginContext {
152151
}
153152

154153
get useRegionalBlobs(): boolean {
155-
// Region-aware blobs are only available as of CLI v17.22.1 (i.e. Build v29.39.1)
156-
const REQUIRED_BUILD_VERSION = '>=29.39.1'
157-
return satisfies(this.buildVersion, REQUIRED_BUILD_VERSION, { includePrerelease: true })
154+
// Disabling regional blobs until feature is ready for production (see FRA-436)
155+
return false
158156
}
159157

160158
/**

‎tests/utils/helpers.ts

-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ export const startMockBlobStore = async (ctx: FixtureTestContext) => {
7676
deployID: ctx.deployID,
7777
siteID: ctx.siteID,
7878
token: BLOB_TOKEN,
79-
experimentalRegion: 'context',
8079
})
8180
}
8281

@@ -91,7 +90,6 @@ export const getBlobEntries = async (ctx: FixtureTestContext) => {
9190
deployID: ctx.deployID,
9291
siteID: ctx.siteID,
9392
token: BLOB_TOKEN,
94-
experimentalRegion: 'context',
9593
})
9694

9795
const { blobs } = await ctx.blobStore.list()

0 commit comments

Comments
 (0)