chore: cleanup (#325)

* chore: cleanup

* chore: increase timeout to 30s

.eslintrc.cjs

@@ -15,6 +15,7 @@ module.exports = {
     'max-statements': 'off',
     'node/no-missing-import': 'off',
     'no-shadow': 'off',
+    'no-use-before-define': 'off',
     'unicorn/prefer-json-parse-buffer': 'off',
   },
   overrides: [

node/bridge.test.ts

@@ -1,5 +1,5 @@
 import { Buffer } from 'buffer'
-import fs from 'fs'
+import { rm } from 'fs/promises'
 import { createRequire } from 'module'
 import { platform, env } from 'process'
 import { PassThrough } from 'stream'
@@ -68,7 +68,7 @@ test('Does not inherit environment variables if `extendEnv` is false', async ()
 
   expect(output).toBe('LULU=LALA')
 
-  await fs.promises.rmdir(tmpDir.path, { recursive: true })
+  await rm(tmpDir.path, { force: true, recursive: true })
 })
 
 test('Does inherit environment variables if `extendEnv` is true', async () => {
@@ -101,7 +101,7 @@ test('Does inherit environment variables if `extendEnv` is true', async () => {
 
   expect(environmentVariables).toEqual(['LULU=LALA', 'TADA=TUDU'])
 
-  await fs.promises.rmdir(tmpDir.path, { recursive: true })
+  await rm(tmpDir.path, { force: true, recursive: true })
 })
 
 test('Does inherit environment variables if `extendEnv` is not set', async () => {
@@ -134,5 +134,5 @@ test('Does inherit environment variables if `extendEnv` is not set', async () =>
 
   expect(environmentVariables).toEqual(['LULU=LALA', 'TADA=TUDU'])
 
-  await fs.promises.rmdir(tmpDir.path, { recursive: true })
+  await rm(tmpDir.path, { force: true, recursive: true })
 })

node/deploy_config.ts

@@ -6,14 +6,12 @@ import type { Layer } from './layer.js'
 import type { Logger } from './logger.js'
 import { isFileNotFoundError } from './utils/error.js'
 
-/* eslint-disable camelcase */
 interface DeployConfigFile {
   functions?: Declaration[]
   import_map?: string
   layers?: Layer[]
   version: number
 }
-/* eslint-enable camelcase */
 
 export interface DeployConfig {
   declarations: Declaration[]

node/downloader.test.ts

@@ -1,4 +1,4 @@
-import { promises as fs } from 'fs'
+import { rm } from 'fs/promises'
 import { platform } from 'process'
 import { PassThrough } from 'stream'
 
@@ -32,7 +32,7 @@ beforeEach(async (ctx: TestContext) => {
 })
 
 afterEach(async (ctx: TestContext) => {
-  await fs.rmdir(ctx.tmpDir, { recursive: true })
+  await rm(ctx.tmpDir, { force: true, recursive: true })
 })
 
 test('tries downloading binary up to 4 times', async (ctx: TestContext) => {

node/main.test.ts

@@ -1,5 +1,5 @@
 import { Buffer } from 'buffer'
-import fs from 'fs'
+import { rm } from 'fs/promises'
 import { createRequire } from 'module'
 import { platform } from 'process'
 import { PassThrough } from 'stream'
@@ -51,5 +51,5 @@ test('Downloads the Deno CLI on demand and caches it for subsequent calls', asyn
   expect(beforeDownload).toHaveBeenCalledTimes(1)
   expect(afterDownload).toHaveBeenCalledTimes(1)
 
-  await fs.promises.rmdir(tmpDir.path, { recursive: true })
+  await rm(tmpDir.path, { force: true, recursive: true })
 })

node/manifest.ts

@@ -12,7 +12,6 @@ import { Layer } from './layer.js'
 import { getPackageVersion } from './package_json.js'
 import { nonNullable } from './utils/non_nullable.js'
 
-/* eslint-disable camelcase */
 interface Route {
   function: string
   name?: string
@@ -32,8 +31,6 @@ interface Manifest {
   function_config: Record<string, EdgeFunctionConfig>
 }
 
-/* eslint-enable camelcase */
-
 interface GenerateManifestOptions {
   bundles?: Bundle[]
   declarations?: Declaration[]

node/types.test.ts

@@ -1,4 +1,4 @@
-import { promises as fs } from 'fs'
+import { readFile, rm, writeFile } from 'fs/promises'
 import { join } from 'path'
 
 import nock from 'nock'
@@ -26,7 +26,7 @@ test('`ensureLatestTypes` updates the Deno CLI cache if the local version of typ
 
   await ensureLatestTypes(deno, testLogger, mockURL)
 
-  const versionFile = await fs.readFile(join(tmpDir.path, 'types-version.txt'), 'utf8')
+  const versionFile = await readFile(join(tmpDir.path, 'types-version.txt'), 'utf8')
 
   expect(latestVersionMock.isDone()).toBe(true)
   expect(mock).toHaveBeenCalledTimes(1)
@@ -35,7 +35,7 @@ test('`ensureLatestTypes` updates the Deno CLI cache if the local version of typ
 
   mock.mockRestore()
 
-  await fs.rmdir(tmpDir.path, { recursive: true })
+  await rm(tmpDir.path, { force: true, recursive: true })
 })
 
 test('`ensureLatestTypes` does not update the Deno CLI cache if the local version of types is up-to-date', async () => {
@@ -45,7 +45,7 @@ test('`ensureLatestTypes` does not update the Deno CLI cache if the local versio
   const tmpDir = await tmp.dir()
   const versionFilePath = join(tmpDir.path, 'types-version.txt')
 
-  await fs.writeFile(versionFilePath, mockVersion)
+  await writeFile(versionFilePath, mockVersion)
 
   const latestVersionMock = nock(mockURL).get('/version.txt').reply(200, mockVersion)
   const deno = new DenoBridge({
@@ -63,7 +63,7 @@ test('`ensureLatestTypes` does not update the Deno CLI cache if the local versio
 
   mock.mockRestore()
 
-  await fs.rmdir(tmpDir.path, { recursive: true })
+  await rm(tmpDir.path, { force: true, recursive: true })
 })
 
 test('`ensureLatestTypes` does not throw if the types URL is not available', async () => {
@@ -86,5 +86,5 @@ test('`ensureLatestTypes` does not throw if the types URL is not available', asy
 
   mock.mockRestore()
 
-  await fs.rmdir(tmpDir.path, { recursive: true })
+  await rm(tmpDir.path, { force: true, recursive: true })
 })

node/validation/manifest/index.test.ts

@@ -1,7 +1,12 @@
+import chalk from 'chalk'
 import { test, expect, describe } from 'vitest'
 
 import { validateManifest, ManifestValidationError } from './index.js'
 
+// We need to disable all color outputs for the tests as they are different on different platforms, CI, etc.
+// This only works if this is the same instance of chalk that better-ajv-errors uses
+chalk.level = 0
+
 // Factory so we have a new object per test
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const getBaseManifest = (): Record<string, any> => ({

node/validation/manifest/index.ts

@@ -1,6 +1,6 @@
 import Ajv from 'ajv'
-import ajvErrors from 'ajv-errors'
 import type { ValidateFunction } from 'ajv/dist/core.js'
+import ajvErrors from 'ajv-errors'
 import betterAjvErrors from 'better-ajv-errors'
 
 import type { Manifest } from '../../manifest.js'