@vercel/build-utils 2.12.3-canary.23 → 2.12.3-canary.27

package/dist/convert-runtime-to-plugin.d.ts

@@ -1,5 +1,5 @@
 import { Lambda } from './lambda';
-import type { BuilderFunctions, BuildOptions } from './types';
+import type { BuildOptions } from './types';
 /**
  * Convert legacy Runtime to a Plugin.
  * @param buildRuntime - a legacy build() function from a Runtime
@@ -7,23 +7,14 @@ import type { BuilderFunctions, BuildOptions } from './types';
  */
 export declare function convertRuntimeToPlugin(buildRuntime: (options: BuildOptions) => Promise<{
     output: Lambda;
-}>, ext: string): ({ vercelConfig, workPath, }: {
-    vercelConfig: {
-        functions?: BuilderFunctions;
-        regions?: string[];
-    };
+}>, ext: string): ({ workPath }: {
     workPath: string;
 }) => Promise<void>;
 /**
  * If `.output/functions-manifest.json` exists, append to the pages
- * property. Otherwise write a new file. This will also read `vercel.json`
- * and apply relevant `functions` property config.
+ * property. Otherwise write a new file.
  */
-export declare function updateFunctionsManifest({ vercelConfig, workPath, pages, }: {
-    vercelConfig: {
-        functions?: BuilderFunctions;
-        regions?: string[];
-    };
+export declare function updateFunctionsManifest({ workPath, pages, }: {
     workPath: string;
     pages: {
         [key: string]: any;

package/dist/convert-runtime-to-plugin.js

@@ -9,7 +9,6 @@ const path_1 = require("path");
 const glob_1 = __importDefault(require("./fs/glob"));
 const normalize_path_1 = require("./fs/normalize-path");
 const lambda_1 = require("./lambda");
-const minimatch_1 = __importDefault(require("minimatch"));
 /**
  * Convert legacy Runtime to a Plugin.
  * @param buildRuntime - a legacy build() function from a Runtime
@@ -17,26 +16,24 @@ const minimatch_1 = __importDefault(require("minimatch"));
  */
 function convertRuntimeToPlugin(buildRuntime, ext) {
     // This `build()` signature should match `plugin.build()` signature in `vercel build`.
-    return async function build({ vercelConfig, workPath, }) {
+    return async function build({ workPath }) {
         const opts = { cwd: workPath };
         const files = await glob_1.default('**', opts);
         delete files['vercel.json']; // Builders/Runtimes didn't have vercel.json
         const entrypoints = await glob_1.default(`api/**/*${ext}`, opts);
         const pages = {};
-        const { functions = {} } = vercelConfig;
         const traceDir = path_1.join(workPath, '.output', 'runtime-traced-files');
         await fs_extra_1.default.ensureDir(traceDir);
         for (const entrypoint of Object.keys(entrypoints)) {
-            const key = Object.keys(functions).find(src => src === entrypoint || minimatch_1.default(entrypoint, src)) || '';
-            const config = functions[key] || {};
             const { output } = await buildRuntime({
                 files,
                 entrypoint,
                 workPath,
                 config: {
                     zeroConfig: true,
-                    includeFiles: config.includeFiles,
-                    excludeFiles: config.excludeFiles,
+                },
+                meta: {
+                    avoidTopLevelInstall: true,
                 },
             });
             pages[entrypoint] = {
@@ -46,7 +43,6 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
                 maxDuration: output.maxDuration,
                 environment: output.environment,
                 allowQuery: output.allowQuery,
-                //regions: output.regions,
             };
             // @ts-ignore This symbol is a private API
             const lambdaFiles = output[lambda_1.FILES_SYMBOL];
@@ -79,7 +75,7 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
             await fs_extra_1.default.ensureDir(path_1.dirname(nft));
             await fs_extra_1.default.writeFile(nft, json);
         }
-        await updateFunctionsManifest({ vercelConfig, workPath, pages });
+        await updateFunctionsManifest({ workPath, pages });
     };
 }
 exports.convertRuntimeToPlugin = convertRuntimeToPlugin;
@@ -107,10 +103,9 @@ async function readJson(filePath) {
 }
 /**
  * If `.output/functions-manifest.json` exists, append to the pages
- * property. Otherwise write a new file. This will also read `vercel.json`
- * and apply relevant `functions` property config.
+ * property. Otherwise write a new file.
  */
-async function updateFunctionsManifest({ vercelConfig, workPath, pages, }) {
+async function updateFunctionsManifest({ workPath, pages, }) {
     const functionsManifestPath = path_1.join(workPath, '.output', 'functions-manifest.json');
     const functionsManifest = await readJson(functionsManifestPath);
     if (!functionsManifest.version)
@@ -118,16 +113,7 @@ async function updateFunctionsManifest({ vercelConfig, workPath, pages, }) {
     if (!functionsManifest.pages)
         functionsManifest.pages = {};
     for (const [pageKey, pageConfig] of Object.entries(pages)) {
-        const fnConfig = await lambda_1.getLambdaOptionsFromFunction({
-            sourceFile: pageKey,
-            config: vercelConfig,
-        });
-        functionsManifest.pages[pageKey] = {
-            ...pageConfig,
-            memory: fnConfig.memory || pageConfig.memory,
-            maxDuration: fnConfig.maxDuration || pageConfig.maxDuration,
-            regions: vercelConfig.regions || pageConfig.regions,
-        };
+        functionsManifest.pages[pageKey] = { ...pageConfig };
     }
     await fs_extra_1.default.writeFile(functionsManifestPath, JSON.stringify(functionsManifest));
 }

package/dist/index.js

@@ -26274,7 +26274,7 @@ exports.frameworks = [
         name: 'Remix',
         slug: 'remix',
         demo: 'https://remix.examples.vercel.com',
-        logo: 'https://raw.githubusercontent.com/vercel/vercel/main/packages/frameworks/logos/remix.svg',
+        logo: 'https://raw.githubusercontent.com/vercel/vercel/main/packages/frameworks/logos/remix-no-shadow.svg',
         tagline: 'Build Better Websites',
         description: 'A new Remix app — the result of running `npx create-remix`.',
         website: 'https://remix.run',
@@ -26329,8 +26329,8 @@ exports.frameworks = [
         ],
         defaultHeaders: [
             {
-                source: '^/build/(.*)$',
-                regex: '^/build/(.*)$',
+                source: '/build/(.*)',
+                regex: '/build/(.*)',
                 headers: [
                     { key: 'cache-control', value: 'public, max-age=31536000, immutable' },
                 ],
@@ -32286,7 +32286,6 @@ const path_1 = __webpack_require__(5622);
 const glob_1 = __importDefault(__webpack_require__(4240));
 const normalize_path_1 = __webpack_require__(6261);
 const lambda_1 = __webpack_require__(6721);
-const minimatch_1 = __importDefault(__webpack_require__(9566));
 /**
  * Convert legacy Runtime to a Plugin.
  * @param buildRuntime - a legacy build() function from a Runtime
@@ -32294,26 +32293,24 @@ const minimatch_1 = __importDefault(__webpack_require__(9566));
  */
 function convertRuntimeToPlugin(buildRuntime, ext) {
     // This `build()` signature should match `plugin.build()` signature in `vercel build`.
-    return async function build({ vercelConfig, workPath, }) {
+    return async function build({ workPath }) {
         const opts = { cwd: workPath };
         const files = await glob_1.default('**', opts);
         delete files['vercel.json']; // Builders/Runtimes didn't have vercel.json
         const entrypoints = await glob_1.default(`api/**/*${ext}`, opts);
         const pages = {};
-        const { functions = {} } = vercelConfig;
         const traceDir = path_1.join(workPath, '.output', 'runtime-traced-files');
         await fs_extra_1.default.ensureDir(traceDir);
         for (const entrypoint of Object.keys(entrypoints)) {
-            const key = Object.keys(functions).find(src => src === entrypoint || minimatch_1.default(entrypoint, src)) || '';
-            const config = functions[key] || {};
             const { output } = await buildRuntime({
                 files,
                 entrypoint,
                 workPath,
                 config: {
                     zeroConfig: true,
-                    includeFiles: config.includeFiles,
-                    excludeFiles: config.excludeFiles,
+                },
+                meta: {
+                    avoidTopLevelInstall: true,
                 },
             });
             pages[entrypoint] = {
@@ -32323,7 +32320,6 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
                 maxDuration: output.maxDuration,
                 environment: output.environment,
                 allowQuery: output.allowQuery,
-                //regions: output.regions,
             };
             // @ts-ignore This symbol is a private API
             const lambdaFiles = output[lambda_1.FILES_SYMBOL];
@@ -32356,7 +32352,7 @@ function convertRuntimeToPlugin(buildRuntime, ext) {
             await fs_extra_1.default.ensureDir(path_1.dirname(nft));
             await fs_extra_1.default.writeFile(nft, json);
         }
-        await updateFunctionsManifest({ vercelConfig, workPath, pages });
+        await updateFunctionsManifest({ workPath, pages });
     };
 }
 exports.convertRuntimeToPlugin = convertRuntimeToPlugin;
@@ -32384,10 +32380,9 @@ async function readJson(filePath) {
 }
 /**
  * If `.output/functions-manifest.json` exists, append to the pages
- * property. Otherwise write a new file. This will also read `vercel.json`
- * and apply relevant `functions` property config.
+ * property. Otherwise write a new file.
  */
-async function updateFunctionsManifest({ vercelConfig, workPath, pages, }) {
+async function updateFunctionsManifest({ workPath, pages, }) {
     const functionsManifestPath = path_1.join(workPath, '.output', 'functions-manifest.json');
     const functionsManifest = await readJson(functionsManifestPath);
     if (!functionsManifest.version)
@@ -32395,16 +32390,7 @@ async function updateFunctionsManifest({ vercelConfig, workPath, pages, }) {
     if (!functionsManifest.pages)
         functionsManifest.pages = {};
     for (const [pageKey, pageConfig] of Object.entries(pages)) {
-        const fnConfig = await lambda_1.getLambdaOptionsFromFunction({
-            sourceFile: pageKey,
-            config: vercelConfig,
-        });
-        functionsManifest.pages[pageKey] = {
-            ...pageConfig,
-            memory: fnConfig.memory || pageConfig.memory,
-            maxDuration: fnConfig.maxDuration || pageConfig.maxDuration,
-            regions: vercelConfig.regions || pageConfig.regions,
-        };
+        functionsManifest.pages[pageKey] = { ...pageConfig };
     }
     await fs_extra_1.default.writeFile(functionsManifestPath, JSON.stringify(functionsManifest));
 }

package/dist/types.d.ts

@@ -51,6 +51,7 @@ export interface Meta {
     filesRemoved?: string[];
     env?: Env;
     buildEnv?: Env;
+    avoidTopLevelInstall?: boolean;
 }
 export interface AnalyzeOptions {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.23",
+  "version": "2.12.3-canary.27",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -30,7 +30,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.5.1-canary.13",
+    "@vercel/frameworks": "0.5.1-canary.16",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
@@ -49,5 +49,5 @@
     "typescript": "4.3.4",
     "yazl": "2.4.3"
   },
-  "gitHead": "7bd338618c80681a09cd8d4c482f1038f8676f7f"
+  "gitHead": "5499fa9a042ef4f44cd4a48f2a168bf5c6d164f5"
 }