@netlify/edge-bundler 11.4.0 → 12.0.1

package/deno/lib/stage2.test.ts

@@ -0,0 +1,58 @@
+import { assertEquals, assertStringIncludes } from 'https://deno.land/std@0.177.0/testing/asserts.ts'
+
+import { join } from 'https://deno.land/std@0.177.0/path/mod.ts'
+import { pathToFileURL } from 'https://deno.land/std@0.177.0/node/url.ts'
+
+import { getStage2Entry } from './stage2.ts'
+import { virtualRoot } from './consts.ts'
+
+Deno.test('`getStage2Entry` returns a valid stage 2 file', async () => {
+  const directory = await Deno.makeTempDir()
+  const functions = [
+    {
+      name: 'func1',
+      path: join(directory, 'func1.ts'),
+      response: 'Hello from function 1',
+    },
+    {
+      name: 'func2',
+      path: join(directory, 'func2.ts'),
+      response: 'Hello from function 2',
+    },
+  ]
+
+  for (const func of functions) {
+    const contents = `export default async () => new Response(${JSON.stringify(func.response)})`
+
+    await Deno.writeTextFile(func.path, contents)
+  }
+
+  const baseURL = pathToFileURL(directory)
+  const stage2 = getStage2Entry(
+    directory,
+    functions.map(({ name, path }) => ({ name, path })),
+  )
+
+  // Ensuring that the stage 2 paths have the virtual root before we strip it.
+  assertStringIncludes(stage2, virtualRoot)
+
+  // Replacing the virtual root with the URL of the temporary directory so that
+  // we can actually import the module.
+  const normalizedStage2 = stage2.replaceAll(virtualRoot, `${baseURL.href}/`)
+
+  const stage2Path = join(directory, 'stage2.ts')
+  const stage2URL = pathToFileURL(stage2Path)
+
+  await Deno.writeTextFile(stage2Path, normalizedStage2)
+
+  const mod = await import(stage2URL.href)
+
+  await Deno.remove(directory, { recursive: true })
+
+  for (const func of functions) {
+    const result = await mod.functions[func.name]()
+
+    assertEquals(await result.text(), func.response)
+    assertEquals(mod.metadata.functions[func.name].url, pathToFileURL(func.path).toString())
+  }
+})

package/dist/node/bridge.js

@@ -157,7 +157,6 @@ class DenoBridge {
         const options = { env, extendEnv };
         const ps = DenoBridge.runWithBinary(binaryPath, args, { options, pipeOutput, stderr, stdout });
         if (ref !== undefined) {
-            // eslint-disable-next-line no-param-reassign
             ref.ps = ps;
         }
     }

package/dist/node/bundle_error.js

@@ -21,7 +21,6 @@ class BundleError extends Error {
 const wrapBundleError = (input, options) => {
     if (input instanceof Error) {
         if (input.message.includes("The module's source code could not be parsed")) {
-            // eslint-disable-next-line no-param-reassign
             input.message = input.stderr;
         }
         return new BundleError(input, options);

package/dist/node/declaration.js

@@ -37,6 +37,7 @@ const getDeclarationsFromInput = (inputDeclarations, functionConfigs, functionsV
         }
         else {
             // With an in-source config without a path, add the config to the declaration.
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const { path, excludedPath, ...rest } = config;
             declarations.push({ ...declaration, ...rest });
         }

package/dist/node/downloader.test.js

@@ -26,7 +26,6 @@ const streamError = () => {
 };
 beforeEach(async (ctx) => {
     const tmpDir = await tmp.dir();
-    // eslint-disable-next-line no-param-reassign
     ctx.tmpDir = tmpDir.path;
 });
 afterEach(async (ctx) => {

package/dist/node/finder.js

@@ -23,7 +23,6 @@ const findFunctionInDirectory = async (directory) => {
     for (const candidatePath of candidatePaths) {
         try {
             const stats = await fs.stat(candidatePath);
-            // eslint-disable-next-line max-depth
             if (stats.isFile()) {
                 functionPath = candidatePath;
                 break;

package/dist/node/manifest.js

@@ -65,6 +65,7 @@ const generateManifest = ({ bundles = [], declarations = [], functions, userFunc
             traffic_rules: getTrafficRulesConfig(rateLimit),
         };
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     for (const [name, { excludedPath, path, onError, rateLimit, ...rest }] of Object.entries(internalFunctionConfig)) {
         // If the config block is for a function that is not defined, discard it.
         if (manifestFunctionConfig[name] === undefined) {

package/dist/node/manifest.test.js

@@ -1,5 +1,6 @@
-import { env } from 'process';
 import { test, expect } from 'vitest';
+// @ts-expect-error current tsconfig.json doesn't allow this, but I don't want to change it
+import { version } from '../package.json' assert { type: 'json' };
 import { getRouteMatcher } from '../test/util.js';
 import { BundleFormat } from './bundle.js';
 import { BundleError } from './bundle_error.js';
@@ -26,7 +27,7 @@ test('Generates a manifest with different bundles', () => {
     const expectedRoutes = [{ function: 'func-1', pattern: '^/f1/?$', excluded_patterns: [], path: '/f1' }];
     expect(manifest.bundles).toEqual(expectedBundles);
     expect(manifest.routes).toEqual(expectedRoutes);
-    expect(manifest.bundler_version).toBe(env.npm_package_version);
+    expect(manifest.bundler_version).toBe(version);
 });
 test('Generates a manifest with display names', () => {
     const functions = [{ name: 'func-1', path: '/path/to/func-1.ts' }];
@@ -47,7 +48,7 @@ test('Generates a manifest with display names', () => {
         'func-1': { name: 'Display Name' },
     });
     expect(manifest.routes).toEqual(expectedRoutes);
-    expect(manifest.bundler_version).toBe(env.npm_package_version);
+    expect(manifest.bundler_version).toBe(version);
 });
 test('Generates a manifest with a generator field', () => {
     const functions = [{ name: 'func-1', path: '/path/to/func-1.ts' }];
@@ -101,7 +102,7 @@ test('Generates a manifest with excluded paths and patterns', () => {
     ];
     expect(manifest.routes).toEqual(expectedRoutes);
     expect(manifest.function_config).toEqual({});
-    expect(manifest.bundler_version).toBe(env.npm_package_version);
+    expect(manifest.bundler_version).toBe(version);
     const matcher = getRouteMatcher(manifest);
     expect((_a = matcher('/f1/hello')) === null || _a === void 0 ? void 0 : _a.function).toBe('func-1');
     expect((_b = matcher('/grandparent/parent/child/grandchild.html')) === null || _b === void 0 ? void 0 : _b.function).toBeUndefined();
@@ -123,7 +124,7 @@ test('TOML-defined paths can be combined with ISC-defined excluded paths', () =>
     expect(manifest.function_config).toEqual({
         'func-1': { excluded_patterns: ['^/f1/exclude/?$'] },
     });
-    expect(manifest.bundler_version).toBe(env.npm_package_version);
+    expect(manifest.bundler_version).toBe(version);
 });
 test('Filters out internal in-source configurations in user created functions', () => {
     const functions = [
@@ -312,7 +313,7 @@ test('Generates a manifest without bundles', () => {
     const expectedRoutes = [{ function: 'func-1', pattern: '^/f1/?$', excluded_patterns: [], path: '/f1' }];
     expect(manifest.bundles).toEqual([]);
     expect(manifest.routes).toEqual(expectedRoutes);
-    expect(manifest.bundler_version).toBe(env.npm_package_version);
+    expect(manifest.bundler_version).toBe(version);
 });
 test('Generates a manifest with pre and post-cache routes', () => {
     const bundle1 = {
@@ -350,7 +351,7 @@ test('Generates a manifest with pre and post-cache routes', () => {
     expect(manifest.bundles).toEqual(expectedBundles);
     expect(manifest.routes).toEqual(expectedPreCacheRoutes);
     expect(manifest.post_cache_routes).toEqual(expectedPostCacheRoutes);
-    expect(manifest.bundler_version).toBe(env.npm_package_version);
+    expect(manifest.bundler_version).toBe(version);
 });
 test('Generates a manifest with layers', () => {
     const functions = [

package/dist/node/npm_dependencies.js

@@ -105,7 +105,6 @@ const getNPMSpecifiers = async ({ basePath, functions, importMap, environment, r
             }
             return fs.readFile(filePath, 'utf8');
         },
-        // eslint-disable-next-line require-await
         resolve: async (specifier, ...args) => {
             // Start by checking whether the specifier matches any import map defined
             // by the user.

package/dist/node/server/util.js

@@ -14,7 +14,6 @@ const isServerReady = async (port, successRef, ps) => {
     }
     try {
         await fetch(`http://127.0.0.1:${port}`);
-        // eslint-disable-next-line no-param-reassign
         successRef.success = true;
     }
     catch {

package/dist/node/types.js

@@ -4,6 +4,7 @@ import fetch from 'node-fetch';
 const TYPES_URL = 'https://edge.netlify.com';
 const ensureLatestTypes = async (deno, logger, customTypesURL) => {
     const typesURL = customTypesURL !== null && customTypesURL !== void 0 ? customTypesURL : TYPES_URL;
+    // eslint-disable-next-line prefer-const
     let [localVersion, remoteVersion] = [await getLocalVersion(deno), ''];
     try {
         remoteVersion = await getRemoteVersion(typesURL);

package/dist/node/utils/error.js

@@ -1,4 +1,2 @@
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const isNodeError = (error) => error instanceof Error;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const isFileNotFoundError = (error) => isNodeError(error) && error.code === 'ENOENT';

package/dist/node/validation/manifest/index.js

@@ -31,5 +31,4 @@ export const validateManifest = (manifestData, _featureFlags = {}) => {
         throw new ManifestValidationError(errorOutput);
     }
 };
-// eslint-disable-next-line unicorn/prefer-export-from
 export { ManifestValidationError };

package/dist/node/validation/manifest/index.test.js

@@ -5,7 +5,6 @@ import { validateManifest, ManifestValidationError } from './index.js';
 // 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 = () => ({
     bundles: [
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "11.4.0",
+  "version": "12.0.1",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -15,20 +15,10 @@
   "scripts": {
     "build": "tsc",
     "build:dev": "tsc -w",
-    "prepare": "husky install node_modules/@netlify/eslint-config-node/.husky/",
-    "prepublishOnly": "npm ci && npm test",
     "prepack": "npm run build",
-    "test": "run-s build format test:dev",
-    "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": "run-s build test:dev",
     "test:dev": "run-s test:dev:*",
-    "test:ci": "run-s test:ci:*",
+    "test:ci": "run-s test:integration test:ci:*",
     "test:dev:vitest": "vitest run",
     "test:dev:vitest:watch": "vitest watch",
     "test:dev:deno": "deno test --allow-all deno",
@@ -37,24 +27,21 @@
     "test:integration": "node --experimental-modules test/integration/test.js",
     "vendor": "deno vendor --force --output deno/vendor https://deno.land/x/eszip@v0.55.2/mod.ts https://deno.land/x/retry@v2.0.0/mod.ts https://deno.land/x/std@0.177.0/path/mod.ts"
   },
-  "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\" \"!node/vendor/**\""
-  },
   "keywords": [],
   "license": "MIT",
-  "repository": "https://github.com/netlify/edge-bundler",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/netlify/build.git",
+    "directory": "packages/edge-bundler"
+  },
   "bugs": {
-    "url": "https://github.com/netlify/edge-bundler/issues"
+    "url": "https://github.com/netlify/build/issues"
   },
   "author": "Netlify Inc.",
   "directories": {
     "test": "test/node"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.0.0",
-    "@commitlint/config-conventional": "^17.0.0",
-    "@netlify/eslint-config-node": "^7.0.1",
     "@types/glob-to-regexp": "^0.4.1",
     "@types/node": "^14.18.32",
     "@types/semver": "^7.3.9",
@@ -64,7 +51,6 @@
     "chalk": "^4.1.2",
     "cpy": "^9.0.1",
     "cross-env": "^7.0.3",
-    "husky": "^8.0.0",
     "nock": "^13.2.4",
     "tar": "^6.1.11",
     "typescript": "^5.0.0",
@@ -75,13 +61,13 @@
   },
   "dependencies": {
     "@import-maps/resolve": "^1.0.1",
-    "@vercel/nft": "^0.26.0",
+    "@vercel/nft": "^0.27.0",
     "ajv": "^8.11.2",
     "ajv-errors": "^3.0.0",
     "better-ajv-errors": "^1.2.0",
     "common-path-prefix": "^3.0.0",
     "env-paths": "^3.0.0",
-    "esbuild": "0.20.2",
+    "esbuild": "0.21.2",
     "execa": "^6.0.0",
     "find-up": "^6.3.0",
     "get-package-name": "^2.2.0",
@@ -97,5 +83,6 @@
     "tmp-promise": "^3.0.3",
     "urlpattern-polyfill": "8.0.2",
     "uuid": "^9.0.0"
-  }
+  },
+  "gitHead": "95038d0359de8abef07cb3caadd8cea0c3fb539e"
 }