@netlify/edge-bundler 2.2.0 → 2.3.0

package/dist/node/serving.test.js

@@ -0,0 +1,31 @@
+import { join } from 'path';
+import getPort from 'get-port';
+import fetch from 'node-fetch';
+import { test, expect } from 'vitest';
+import { fixturesDir } from '../test/util.js';
+import { serve } from './index.js';
+test('bundler serving functionality', async () => {
+    const port = await getPort();
+    const server = await serve({
+        port,
+    });
+    const { success } = await server([
+        {
+            name: 'echo_env',
+            path: join(fixturesDir, 'serve_test', 'echo_env.ts'),
+        },
+    ], {
+        very_secret_secret: 'i love netlify',
+    });
+    expect(success).toBe(true);
+    const response = await fetch(`http://0.0.0.0:${port}/foo`, {
+        headers: {
+            'x-deno-functions': 'echo_env',
+            'x-deno-pass': 'passthrough',
+            'X-NF-Request-ID': 'foo',
+        },
+    });
+    expect(response.status).toBe(200);
+    const body = (await response.json());
+    expect(body.very_secret_secret).toBe('i love netlify');
+});

package/dist/node/stage_2.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/node/stage_2.test.js

@@ -0,0 +1,48 @@
+import { promises as fs } from 'fs';
+import { join } from 'path';
+import process from 'process';
+import { pathToFileURL } from 'url';
+import del from 'del';
+import { execa } from 'execa';
+import tmp from 'tmp-promise';
+import { test, expect } from 'vitest';
+import { getLocalEntryPoint } from './formats/javascript.js';
+test('`getLocalEntryPoint` returns a valid stage 2 file for local development', async () => {
+    const { path: tmpDir } = await tmp.dir();
+    // This is a fake bootstrap that we'll create just for the purpose of logging
+    // the functions and the metadata that are sent to the `boot` function.
+    const printer = `
+    export const boot = async (functions, metadata) => {
+      const responses = {}
+
+      for (const name in functions) {
+        responses[name] = await functions[name]()
+      }
+
+      console.log(JSON.stringify({ responses, metadata }))
+    }
+  `;
+    const printerPath = join(tmpDir, 'printer.mjs');
+    await fs.writeFile(printerPath, printer);
+    process.env.NETLIFY_EDGE_BOOTSTRAP = pathToFileURL(printerPath).toString();
+    const functions = [
+        { name: 'func1', path: join(tmpDir, 'func1.mjs'), response: 'Hello from function 1' },
+        { name: 'func2', path: join(tmpDir, 'func2.mjs'), response: 'Hello from function 2' },
+    ];
+    for (const func of functions) {
+        const contents = `export default () => ${JSON.stringify(func.response)}`;
+        await fs.writeFile(func.path, contents);
+    }
+    const stage2 = getLocalEntryPoint(functions.map(({ name, path }) => ({ name, path })), {});
+    const stage2Path = join(tmpDir, 'stage2.mjs');
+    await fs.writeFile(stage2Path, stage2);
+    const { stdout, stderr } = await execa('deno', ['run', '--allow-all', stage2Path]);
+    expect(stderr).toBe('');
+    const { metadata, responses } = JSON.parse(stdout);
+    for (const func of functions) {
+        expect(responses[func.name]).toBe(func.response);
+        expect(metadata.functions[func.name].url).toBe(pathToFileURL(func.path).toString());
+    }
+    await del(tmpDir, { force: true });
+    delete process.env.NETLIFY_EDGE_BOOTSTRAP;
+});

package/dist/node/types.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/node/types.test.js

@@ -0,0 +1,61 @@
+import { promises as fs } from 'fs';
+import { join } from 'path';
+import nock from 'nock';
+import { stub } from 'sinon';
+import tmp from 'tmp-promise';
+import { test, expect } from 'vitest';
+import { testLogger } from '../test/util.js';
+import { DenoBridge } from './bridge.js';
+import { ensureLatestTypes } from './types.js';
+test('`ensureLatestTypes` updates the Deno CLI cache if the local version of types is outdated', async () => {
+    const mockURL = 'https://edge.netlify';
+    const mockVersion = '123456789';
+    const latestVersionMock = nock(mockURL).get('/version.txt').reply(200, mockVersion);
+    const tmpDir = await tmp.dir();
+    const deno = new DenoBridge({
+        cacheDirectory: tmpDir.path,
+        logger: testLogger,
+    });
+    const mock = stub(deno, 'run').resolves();
+    await ensureLatestTypes(deno, testLogger, mockURL);
+    const versionFile = await fs.readFile(join(tmpDir.path, 'types-version.txt'), 'utf8');
+    expect(latestVersionMock.isDone()).toBe(true);
+    expect(mock.callCount).toBe(1);
+    expect(mock.firstCall.firstArg).toEqual(['cache', '-r', mockURL]);
+    expect(versionFile).toBe(mockVersion);
+    mock.restore();
+    await fs.rmdir(tmpDir.path, { recursive: true });
+});
+test('`ensureLatestTypes` does not update the Deno CLI cache if the local version of types is up-to-date', async () => {
+    const mockURL = 'https://edge.netlify';
+    const mockVersion = '987654321';
+    const tmpDir = await tmp.dir();
+    const versionFilePath = join(tmpDir.path, 'types-version.txt');
+    await fs.writeFile(versionFilePath, mockVersion);
+    const latestVersionMock = nock(mockURL).get('/version.txt').reply(200, mockVersion);
+    const deno = new DenoBridge({
+        cacheDirectory: tmpDir.path,
+        logger: testLogger,
+    });
+    const mock = stub(deno, 'run').resolves();
+    await ensureLatestTypes(deno, testLogger, mockURL);
+    expect(latestVersionMock.isDone()).toBe(true);
+    expect(mock.callCount).toBe(0);
+    mock.restore();
+    await fs.rmdir(tmpDir.path, { recursive: true });
+});
+test('`ensureLatestTypes` does not throw if the types URL is not available', async () => {
+    const mockURL = 'https://edge.netlify';
+    const latestVersionMock = nock(mockURL).get('/version.txt').reply(500);
+    const tmpDir = await tmp.dir();
+    const deno = new DenoBridge({
+        cacheDirectory: tmpDir.path,
+        logger: testLogger,
+    });
+    const mock = stub(deno, 'run').resolves();
+    await ensureLatestTypes(deno, testLogger, mockURL);
+    expect(latestVersionMock.isDone()).toBe(true);
+    expect(mock.callCount).toBe(0);
+    mock.restore();
+    await fs.rmdir(tmpDir.path, { recursive: true });
+});

package/dist/test/util.d.ts

@@ -0,0 +1,3 @@
+declare const testLogger: import("../node/logger.js").Logger;
+declare const fixturesDir: string;
+export { fixturesDir, testLogger };

package/dist/test/util.js

@@ -0,0 +1,9 @@
+import { resolve } from 'path';
+import { fileURLToPath } from 'url';
+import { getLogger } from '../node/logger.js';
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+const testLogger = getLogger(() => { });
+const url = new URL(import.meta.url);
+const dirname = fileURLToPath(url);
+const fixturesDir = resolve(dirname, '..', 'fixtures');
+export { fixturesDir, testLogger };

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
   "exports": "./dist/node/index.js",
   "files": [
     "deno/**",
+    "!deno/**/*.test.ts",
     "dist/**/*.js",
     "dist/**/*.d.ts",
     "shared/**"
@@ -17,38 +18,26 @@
     "prepublishOnly": "npm ci && npm test",
     "prepack": "npm run build",
     "test": "run-s build format test:dev",
-    "format": "run-s build format:check-fix:*",
-    "format:ci": "run-s build format:check:*",
+    "format": "run-s format:check-fix:*",
+    "format:ci": "run-s format:check:*",
     "format:check-fix:lint": "run-e format:check:lint format:fix:lint",
     "format:check:lint": "cross-env-shell eslint $npm_package_config_eslint",
     "format:fix:lint": "cross-env-shell eslint --fix $npm_package_config_eslint",
     "format:check-fix:prettier": "run-e format:check:prettier format:fix:prettier",
     "format:check:prettier": "cross-env-shell prettier --check $npm_package_config_prettier",
     "format:fix:prettier": "cross-env-shell prettier --write $npm_package_config_prettier",
-    "test:dev": "run-s build test:dev:*",
-    "test:ci": "run-s build test:ci:*",
-    "test:dev:ava": "ava",
-    "test:dev:deno": "deno test --allow-all test/deno",
-    "test:ci:ava": "nyc -r lcovonly -r text -r json ava",
-    "test:ci:deno": "deno test --allow-all test/deno"
+    "test:dev": "run-s test:dev:*",
+    "test:ci": "run-s test:ci:*",
+    "test:dev:vitest": "vitest run",
+    "test:dev:deno": "deno test --allow-all deno",
+    "test:ci:vitest": "vitest run",
+    "test:ci:deno": "deno test --allow-all deno",
+    "test:integration": "node --experimental-modules test/integration/test.js"
   },
   "config": {
     "eslint": "--ignore-path .gitignore --cache --format=codeframe --max-warnings=0 \"{node,scripts,.github}/**/*.{js,ts,md,html}\" \"*.{js,ts,md,html}\"",
     "prettier": "--ignore-path .gitignore --loglevel=warn \"{node,scripts,.github}/**/*.{js,ts,md,yml,json,html}\" \"*.{js,ts,yml,json,html}\" \".*.{js,ts,yml,json,html}\" \"!**/package-lock.json\" \"!package-lock.json\""
   },
-  "ava": {
-    "files": [
-      "test/node/**/*.ts",
-      "!test/node/fixtures/**"
-    ],
-    "extensions": {
-      "ts": "module"
-    },
-    "nodeArguments": [
-      "--loader=ts-node/esm",
-      "--no-warnings"
-    ]
-  },
   "keywords": [],
   "license": "MIT",
   "repository": "netlify/edge-bundler",
@@ -60,7 +49,6 @@
     "test": "test/node"
   },
   "devDependencies": {
-    "@ava/typescript": "^3.0.1",
     "@commitlint/cli": "^16.0.0",
     "@commitlint/config-conventional": "^16.0.0",
     "@netlify/eslint-config-node": "^4.1.7",
@@ -69,14 +57,15 @@
     "@types/semver": "^7.3.9",
     "@types/sinon": "^10.0.8",
     "@types/uuid": "^8.3.4",
+    "@vitest/coverage-c8": "^0.23.4",
     "archiver": "^5.3.1",
-    "ava": "^4.0.1",
     "husky": "^8.0.0",
     "nock": "^13.2.4",
-    "nyc": "^15.0.0",
     "sinon": "^14.0.0",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.5.4"
+    "tar": "^6.1.11",
+    "typescript": "^4.5.4",
+    "vite": "^3.1.3",
+    "vitest": "^0.23.4"
   },
   "engines": {
     "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
@@ -87,8 +76,8 @@
     "del": "^6.0.0",
     "env-paths": "^3.0.0",
     "execa": "^6.0.0",
-    "get-port": "^6.1.2",
     "find-up": "^6.3.0",
+    "get-port": "^6.1.2",
     "glob-to-regexp": "^0.4.1",
     "node-fetch": "^3.1.1",
     "node-stream-zip": "^1.15.0",