@vercel/node 2.3.3 → 2.4.1

package/dist/index.d.ts

@@ -1,9 +1,33 @@
-import { shouldServe } from '@vercel/build-utils';
-import type { BuildV3, PrepareCache, StartDevServer } from '@vercel/build-utils';
-export { shouldServe };
-export type { NowRequest, NowResponse, VercelRequest, VercelResponse, } from './types';
-export * from './types';
-export declare const version = 3;
-export declare const build: BuildV3;
-export declare const prepareCache: PrepareCache;
-export declare const startDevServer: StartDevServer;
+/// <reference types="node" />
+import { ServerResponse, IncomingMessage } from 'http';
+export declare type VercelRequestCookies = {
+    [key: string]: string;
+};
+export declare type VercelRequestQuery = {
+    [key: string]: string | string[];
+};
+export declare type VercelRequestBody = any;
+export declare type VercelRequest = IncomingMessage & {
+    query: VercelRequestQuery;
+    cookies: VercelRequestCookies;
+    body: VercelRequestBody;
+};
+export declare type VercelResponse = ServerResponse & {
+    send: (body: any) => VercelResponse;
+    json: (jsonBody: any) => VercelResponse;
+    status: (statusCode: number) => VercelResponse;
+    redirect: (statusOrUrl: string | number, url?: string) => VercelResponse;
+};
+export declare type VercelApiHandler = (req: VercelRequest, res: VercelResponse) => void;
+/** @deprecated Use VercelRequestCookies instead. */
+export declare type NowRequestCookies = VercelRequestCookies;
+/** @deprecated Use VercelRequestQuery instead. */
+export declare type NowRequestQuery = VercelRequestQuery;
+/** @deprecated Use VercelRequestBody instead. */
+export declare type NowRequestBody = any;
+/** @deprecated Use VercelRequest instead. */
+export declare type NowRequest = VercelRequest;
+/** @deprecated Use VercelResponse instead. */
+export declare type NowResponse = VercelResponse;
+/** @deprecated Use VercelApiHandler instead. */
+export declare type NowApiHandler = VercelApiHandler;

package/dist/index.js

@@ -304511,6 +304511,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.startDevServer = exports.prepareCache = exports.build = exports.version = exports.shouldServe = void 0;
+const url_1 = __importDefault(__webpack_require__(78835));
 const child_process_1 = __webpack_require__(63129);
 const fs_1 = __webpack_require__(35747);
 const path_1 = __webpack_require__(85622);
@@ -304747,9 +304748,7 @@ const build = async ({ files, entrypoint, workPath, repoRootPath, config = {}, m
     let routes;
     let output;
     const handler = renameTStoJS(path_1.relative(baseDir, entrypointPath));
-    const outputName = config.zeroConfig
-        ? handler.substring(0, handler.length - 3)
-        : handler;
+    const outputPath = utils_1.entrypointToOutputPath(entrypoint, config.zeroConfig);
     const isMiddleware = config.middleware === true;
     // Will output an `EdgeFunction` for when `config.middleware = true`
     // (i.e. for root-level "middleware" file) or if source code contains:
@@ -304774,9 +304773,7 @@ const build = async ({ files, entrypoint, workPath, repoRootPath, config = {}, m
         routes = [
             {
                 src,
-                middlewarePath: config.zeroConfig
-                    ? outputName
-                    : path_1.relative(baseDir, entrypointPath),
+                middlewarePath: outputPath,
                 continue: true,
                 override: true,
             },
@@ -304787,7 +304784,7 @@ const build = async ({ files, entrypoint, workPath, repoRootPath, config = {}, m
             entrypoint: handler,
             files: preparedFiles,
             // TODO: remove - these two properties should not be required
-            name: outputName,
+            name: outputPath,
             deploymentTarget: 'v8-worker',
         });
     }
@@ -304820,7 +304817,9 @@ const startDevServer = async (opts) => {
         const staticConfig = static_config_1.getConfig(project, entrypointPath);
         // Middleware is a catch-all for all paths unless a `matcher` property is defined
         const matchers = new RegExp(utils_1.getRegExpFromMatchers(staticConfig?.matcher));
-        if (!matchers.test(meta.requestUrl)) {
+        const parsed = url_1.default.parse(meta.requestUrl, true);
+        if (typeof parsed.pathname !== 'string' ||
+            !matchers.test(parsed.pathname)) {
             // If the "matchers" doesn't say to handle this
             // path then skip middleware invocation
             return null;
@@ -305308,7 +305307,8 @@ function filterDiagnostics(diagnostics, ignore) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getRegExpFromMatchers = void 0;
+exports.entrypointToOutputPath = exports.getRegExpFromMatchers = void 0;
+const path_1 = __webpack_require__(85622);
 const path_to_regexp_1 = __webpack_require__(91786);
 function getRegExpFromMatchers(matcherOrMatchers) {
     if (!matcherOrMatchers) {
@@ -305330,6 +305330,23 @@ function getRegExpFromMatcher(matcher) {
     const re = path_to_regexp_1.pathToRegexp(matcher);
     return re.source;
 }
+/**
+ * If `zeroConfig`:
+ *   "api/foo.js" -> "api/foo.js"
+ *   "api/foo.ts" -> "api/foo.ts"
+ *
+ * If *NOT* `zeroConfig`:
+ *   "api/foo.js" -> "api/foo"
+ *   "api/foo.ts" -> "api/foo"
+ */
+function entrypointToOutputPath(entrypoint, zeroConfig) {
+    if (zeroConfig) {
+        const ext = path_1.extname(entrypoint);
+        return entrypoint.slice(0, entrypoint.length - ext.length);
+    }
+    return entrypoint;
+}
+exports.entrypointToOutputPath = entrypointToOutputPath;
 
 
 /***/ }),

package/dist/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRegExpFromMatchers = void 0;
+exports.entrypointToOutputPath = exports.getRegExpFromMatchers = void 0;
+const path_1 = require("path");
 const path_to_regexp_1 = require("path-to-regexp");
 function getRegExpFromMatchers(matcherOrMatchers) {
     if (!matcherOrMatchers) {
@@ -22,3 +23,20 @@ function getRegExpFromMatcher(matcher) {
     const re = path_to_regexp_1.pathToRegexp(matcher);
     return re.source;
 }
+/**
+ * If `zeroConfig`:
+ *   "api/foo.js" -> "api/foo.js"
+ *   "api/foo.ts" -> "api/foo.ts"
+ *
+ * If *NOT* `zeroConfig`:
+ *   "api/foo.js" -> "api/foo"
+ *   "api/foo.ts" -> "api/foo"
+ */
+function entrypointToOutputPath(entrypoint, zeroConfig) {
+    if (zeroConfig) {
+        const ext = path_1.extname(entrypoint);
+        return entrypoint.slice(0, entrypoint.length - ext.length);
+    }
+    return entrypoint;
+}
+exports.entrypointToOutputPath = entrypointToOutputPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "2.3.3",
+  "version": "2.4.1",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -13,7 +13,7 @@
     "build": "node build",
     "test-integration-once": "yarn test test/integration.test.js",
     "test": "jest --env node --verbose --bail --runInBand",
-    "test-unit": "yarn test test/prepare-cache.test.ts",
+    "test-unit": "yarn test test/prepare-cache.test.ts test/utils.test.ts",
     "prepublishOnly": "node build"
   },
   "files": [
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@types/node": "*",
-    "@vercel/build-utils": "4.2.1",
+    "@vercel/build-utils": "5.0.1",
     "@vercel/node-bridge": "3.0.0",
     "@vercel/static-config": "2.0.1",
     "edge-runtime": "1.0.1",
@@ -61,5 +61,5 @@
     "source-map-support": "0.5.12",
     "test-listen": "1.1.0"
   },
-  "gitHead": "547e88228e180e883e5f07ab815a16960767bbf5"
+  "gitHead": "0a2af4fb94d71a7a23ffc72fb68748be1177f345"
 }

package/dist/babel.d.ts

@@ -1,4 +0,0 @@
-export declare function compile(filename: string, source: string): {
-    code: string;
-    map: any;
-};

package/dist/dev-server.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="node" />
-import { IncomingMessage, ServerResponse } from 'http';
-import { Readable } from 'stream';
-export declare function rawBody(readable: Readable): Promise<Buffer>;
-export declare function onDevRequest(req: IncomingMessage, res: ServerResponse): Promise<void>;
-export declare function fixConfigDev(config: {
-    compilerOptions: any;
-}): void;

package/dist/types.d.ts

@@ -1,33 +0,0 @@
-/// <reference types="node" />
-import { ServerResponse, IncomingMessage } from 'http';
-export declare type VercelRequestCookies = {
-    [key: string]: string;
-};
-export declare type VercelRequestQuery = {
-    [key: string]: string | string[];
-};
-export declare type VercelRequestBody = any;
-export declare type VercelRequest = IncomingMessage & {
-    query: VercelRequestQuery;
-    cookies: VercelRequestCookies;
-    body: VercelRequestBody;
-};
-export declare type VercelResponse = ServerResponse & {
-    send: (body: any) => VercelResponse;
-    json: (jsonBody: any) => VercelResponse;
-    status: (statusCode: number) => VercelResponse;
-    redirect: (statusOrUrl: string | number, url?: string) => VercelResponse;
-};
-export declare type VercelApiHandler = (req: VercelRequest, res: VercelResponse) => void;
-/** @deprecated Use VercelRequestCookies instead. */
-export declare type NowRequestCookies = VercelRequestCookies;
-/** @deprecated Use VercelRequestQuery instead. */
-export declare type NowRequestQuery = VercelRequestQuery;
-/** @deprecated Use VercelRequestBody instead. */
-export declare type NowRequestBody = any;
-/** @deprecated Use VercelRequest instead. */
-export declare type NowRequest = VercelRequest;
-/** @deprecated Use VercelResponse instead. */
-export declare type NowResponse = VercelResponse;
-/** @deprecated Use VercelApiHandler instead. */
-export declare type NowApiHandler = VercelApiHandler;

package/dist/typescript.d.ts

@@ -1,43 +0,0 @@
-import _ts from 'typescript';
-/**
- * Registration options.
- */
-interface Options {
-    basePath?: string;
-    pretty?: boolean | null;
-    logError?: boolean | null;
-    files?: boolean | null;
-    compiler?: string;
-    ignore?: string[];
-    project?: string;
-    compilerOptions?: _ts.CompilerOptions;
-    ignoreDiagnostics?: Array<number | string>;
-    readFile?: (path: string) => string | undefined;
-    fileExists?: (path: string) => boolean;
-    transformers?: _ts.CustomTransformers;
-    nodeVersionMajor?: number;
-}
-/**
- * Return type for registering `ts-node`.
- */
-export declare type Register = (code: string, fileName: string, skipTypeCheck?: boolean) => SourceOutput;
-/**
- * Register TypeScript compiler.
- */
-export declare function register(opts?: Options): Register;
-/**
- * Do post-processing on config options to support `ts-node`.
- */
-export declare function fixConfig(config: {
-    compilerOptions: any;
-}, nodeVersionMajor?: number): {
-    compilerOptions: any;
-};
-/**
- * Internal source output.
- */
-declare type SourceOutput = {
-    code: string;
-    map: string;
-};
-export {};

package/dist/utils.d.ts

@@ -1 +0,0 @@
-export declare function getRegExpFromMatchers(matcherOrMatchers: unknown): string;