test: cleanup semver checks surrounding node v16

Author: mrstork

packages/build/tests/blobs_upload/tests.js

@@ -210,35 +210,32 @@ test.serial('Blobs upload step cancels deploy if blob metadata is malformed', as
  t.is(severityCode, 4)
 })
 
-// the monorepo works with pnpm which is not available on node 14 tests
-if (semver.gte(nodeVersion, '16.9.0')) {
- test.serial('monorepo > blobs upload, uploads files to deploy store', async (t) => {
- const fixture = await new Fixture('./fixtures/monorepo').withCopyRoot({ git: false })
- const { success } = await fixture
- .withFlags({ deployId: 'abc123', siteId: 'test', token: TOKEN, offline: true, packagePath: 'apps/app-1' })
- .runBuildProgrammatic()
+test.serial('monorepo > blobs upload, uploads files to deploy store', async (t) => {
+ const fixture = await new Fixture('./fixtures/monorepo').withCopyRoot({ git: false })
+ const { success } = await fixture
+ .withFlags({ deployId: 'abc123', siteId: 'test', token: TOKEN, offline: true, packagePath: 'apps/app-1' })
+ .runBuildProgrammatic()
 
-  t.true(success)
-  t.is(t.context.blobRequests.set.length, 6)
+ t.true(success)
+ t.is(t.context.blobRequests.set.length, 6)
 
-  const storeOpts = { deployID: 'abc123', siteID: 'test', token: TOKEN }
-  if (semver.lt(nodeVersion, '18.0.0')) {
-  const nodeFetch = await import('node-fetch')
-  storeOpts.fetch = nodeFetch.default
-  }
+ const storeOpts = { deployID: 'abc123', siteID: 'test', token: TOKEN }
+ if (semver.lt(nodeVersion, '18.0.0')) {
+ const nodeFetch = await import('node-fetch')
+ storeOpts.fetch = nodeFetch.default
+ }
 
-  const store = getDeployStore(storeOpts)
+ const store = getDeployStore(storeOpts)
 
-  const blob1 = await store.getWithMetadata('something.txt')
-  t.is(blob1.data, 'some value')
-  t.deepEqual(blob1.metadata, {})
+ const blob1 = await store.getWithMetadata('something.txt')
+ t.is(blob1.data, 'some value')
+ t.deepEqual(blob1.metadata, {})
 
-  const blob2 = await store.getWithMetadata('with-metadata.txt')
-  t.is(blob2.data, 'another value')
-  t.deepEqual(blob2.metadata, { meta: 'data', number: 1234 })
+ const blob2 = await store.getWithMetadata('with-metadata.txt')
+ t.is(blob2.data, 'another value')
+ t.deepEqual(blob2.metadata, { meta: 'data', number: 1234 })
 
- const blob3 = await store.getWithMetadata('nested/file.txt')
- t.is(blob3.data, 'file value')
- t.deepEqual(blob3.metadata, { some: 'metadata' })
- })
-}
+ const blob3 = await store.getWithMetadata('nested/file.txt')
+ t.is(blob3.data, 'file value')
+ t.deepEqual(blob3.metadata, { some: 'metadata' })
+})

packages/build/tests/edge_functions/tests.js

@@ -1,12 +1,11 @@
 import { promises as fs } from 'fs'
 import { join } from 'path'
-import { platform, version as nodeVersion } from 'process'
+import { platform } from 'process'
 import { fileURLToPath } from 'url'
 
 import { Fixture, normalizeOutput } from '@netlify/testing'
 import test from 'ava'
 import { pathExists } from 'path-exists'
-import semver from 'semver'
 import tmp from 'tmp-promise'
 
 import { importJsonFile } from '../../lib/utils/json.js'
@@ -215,10 +214,31 @@ test.serial('cleans up the edge functions dist directory before bundling', async
  t.false(await pathExists(oldBundlePath))
 })
 
-// Targeting Node 16.7.0+ because these fixtures rely on `fs.cp()`.
-if (semver.gte(nodeVersion, '16.7.0')) {
- test.serial('builds edge functions generated with the Frameworks API', async (t) => {
- const output = await new Fixture('./fixtures/functions_user_framework')
+test.serial('builds edge functions generated with the Frameworks API', async (t) => {
+ const output = await new Fixture('./fixtures/functions_user_framework')
+ .withFlags({
+ debug: false,
+ mode: 'buildbot',
+ })
+ .runWithBuild()
+
+ t.snapshot(normalizeOutput(output))
+
+ const { routes } = await assertManifest(t, 'functions_user_framework')
+
+ t.is(routes.length, 1)
+ t.deepEqual(routes[0], {
+ function: 'function-2',
+ pattern: '^/framework(?:/(.*))/?$',
+ excluded_patterns: ['^/framework/skip_(.*)/?$'],
+ path: '/framework/*',
+ })
+})
+
+test.serial(
+ 'builds both edge functions generated with the Frameworks API and the ones in the internal directory',
+ async (t) => {
+ const output = await new Fixture('./fixtures/functions_user_internal_framework')
  .withFlags({
  debug: false,
  mode: 'buildbot',
@@ -227,69 +247,45 @@ if (semver.gte(nodeVersion, '16.7.0')) {
 
  t.snapshot(normalizeOutput(output))
 
- const { routes } = await assertManifest(t, 'functions_user_framework')
-
- t.is(routes.length, 1)
- t.deepEqual(routes[0], {
- function: 'function-2',
- pattern: '^/framework(?:/(.*))/?$',
- excluded_patterns: ['^/framework/skip_(.*)/?$'],
- path: '/framework/*',
- })
- })
-
- test.serial(
- 'builds both edge functions generated with the Frameworks API and the ones in the internal directory',
- async (t) => {
- const output = await new Fixture('./fixtures/functions_user_internal_framework')
- .withFlags({
- debug: false,
- mode: 'buildbot',
- })
- .runWithBuild()
-
- t.snapshot(normalizeOutput(output))
-
- const { routes } = await assertManifest(t, 'functions_user_internal_framework')
-
- t.deepEqual(routes, [
- {
- function: 'frameworks-internal-conflict',
- pattern: '^/frameworks-internal-conflict/frameworks/?$',
- excluded_patterns: [],
- path: '/frameworks-internal-conflict/frameworks',
- },
- {
- function: 'function-3',
- pattern: '^/internal(?:/(.*))/?$',
- excluded_patterns: ['^/internal/skip_(.*)/?$'],
- path: '/internal/*',
- },
- {
- function: 'frameworks-user-conflict',
- pattern: '^/frameworks-user-conflict/frameworks/?$',
- excluded_patterns: [],
- path: '/frameworks-user-conflict/frameworks',
- },
- {
- function: 'function-2',
- pattern: '^/framework(?:/(.*))/?$',
- excluded_patterns: ['^/framework/skip_(.*)/?$'],
- path: '/framework/*',
- },
- {
- function: 'frameworks-user-conflict',
- pattern: '^/frameworks-user-conflict/user/?$',
- excluded_patterns: [],
- path: '/frameworks-user-conflict/user',
- },
- {
- function: 'function-1',
- pattern: '^/user/?$',
- excluded_patterns: [],
- path: '/user',
- },
- ])
- },
- )
-}
+ const { routes } = await assertManifest(t, 'functions_user_internal_framework')
+
+ t.deepEqual(routes, [
+ {
+ function: 'frameworks-internal-conflict',
+ pattern: '^/frameworks-internal-conflict/frameworks/?$',
+ excluded_patterns: [],
+ path: '/frameworks-internal-conflict/frameworks',
+ },
+ {
+ function: 'function-3',
+ pattern: '^/internal(?:/(.*))/?$',
+ excluded_patterns: ['^/internal/skip_(.*)/?$'],
+ path: '/internal/*',
+ },
+ {
+ function: 'frameworks-user-conflict',
+ pattern: '^/frameworks-user-conflict/frameworks/?$',
+ excluded_patterns: [],
+ path: '/frameworks-user-conflict/frameworks',
+ },
+ {
+ function: 'function-2',
+ pattern: '^/framework(?:/(.*))/?$',
+ excluded_patterns: ['^/framework/skip_(.*)/?$'],
+ path: '/framework/*',
+ },
+ {
+ function: 'frameworks-user-conflict',
+ pattern: '^/frameworks-user-conflict/user/?$',
+ excluded_patterns: [],
+ path: '/frameworks-user-conflict/user',
+ },
+ {
+ function: 'function-1',
+ pattern: '^/user/?$',
+ excluded_patterns: [],
+ path: '/user',
+ },
+ ])
+ },
+)

packages/build/tests/frameworks_api/tests.js

@@ -1,10 +1,9 @@
 import { promises as fs } from 'fs'
 import { dirname, resolve } from 'path'
-import { platform, version as nodeVersion } from 'process'
+import { platform } from 'process'
 
 import { Fixture } from '@netlify/testing'
 import test from 'ava'
-import semver from 'semver'
 import tmp from 'tmp-promise'
 
 test('Does not mutate read-only properties', async (t) => {
@@ -95,23 +94,20 @@ test('Loads configuration data that has been generated by the build command usin
  }
 })
 
-// pnpm is not available in Node 14.
-if (semver.gte(nodeVersion, '16.9.0')) {
- test('In a monorepo setup, loads package-specific configuration data', async (t) => {
- const fixture = await new Fixture('./fixtures/monorepo').withCopyRoot({ git: false })
- const { success, netlifyConfig } = await fixture
- .withFlags({
- cwd: fixture.repositoryRoot,
- packagePath: 'apps/app-1',
- })
- .runWithBuildAndIntrospect()
-
- t.true(success)
- t.deepEqual(netlifyConfig.images, {
- remote_images: ['domain1.netlify', 'domain2.netlify'],
+test('In a monorepo setup, loads package-specific configuration data', async (t) => {
+ const fixture = await new Fixture('./fixtures/monorepo').withCopyRoot({ git: false })
+ const { success, netlifyConfig } = await fixture
+ .withFlags({
+ cwd: fixture.repositoryRoot,
+ packagePath: 'apps/app-1',
  })
+ .runWithBuildAndIntrospect()
+
+ t.true(success)
+ t.deepEqual(netlifyConfig.images, {
+ remote_images: ['domain1.netlify', 'domain2.netlify'],
  })
-}
+})
 
 test('Configuration data is exposed to build plugins in the `onBuild` event', async (t) => {
  const { netlifyConfig, success } = await new Fixture('./fixtures/with_build_plugin').runWithBuildAndIntrospect()