@vercel/build-utils 2.12.3-canary.28 → 2.12.3-canary.29

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

@@ -10,6 +10,20 @@ const glob_1 = __importDefault(require("./fs/glob"));
 const normalize_path_1 = require("./fs/normalize-path");
 const lambda_1 = require("./lambda");
 const _1 = require(".");
+// `.output` was already created by the Build Command, so we have
+// to ensure its contents don't get bundled into the Lambda. Similarily,
+// we don't want to bundle anything from `.vercel` either. Lastly,
+// Builders/Runtimes didn't have `vercel.json` or `now.json`.
+const ignoredPaths = ['.output', '.vercel', 'vercel.json', 'now.json'];
+const shouldIgnorePath = (file, ignoreFilter, ignoreFile) => {
+    const isNative = ignoredPaths.some(item => {
+        return file.startsWith(item);
+    });
+    if (!ignoreFile) {
+        return isNative;
+    }
+    return isNative || ignoreFilter(file);
+};
 /**
  * Convert legacy Runtime to a Plugin.
  * @param buildRuntime - a legacy build() function from a Runtime
@@ -21,22 +35,15 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
     return async function build({ workPath }) {
         const opts = { cwd: workPath };
         const files = await glob_1.default('**', opts);
-        // `.output` was already created by the Build Command, so we have
-        // to ensure its contents don't get bundled into the Lambda. Similarily,
-        // we don't want to bundle anything from `.vercel` either. Lastly,
-        // Builders/Runtimes didn't have `vercel.json` or `now.json`.
-        const ignoredPaths = ['.output', '.vercel', 'vercel.json', 'now.json'];
         // We also don't want to provide any files to Runtimes that were ignored
         // through `.vercelignore` or `.nowignore`, because the Build Step does the same.
         const ignoreFilter = await _1.getIgnoreFilter(workPath);
         // We're not passing this as an `ignore` filter to the `glob` function above,
         // so that we can re-use exactly the same `getIgnoreFilter` method that the
-        // Build Step uses (literally the same code).
+        // Build Step uses (literally the same code). Note that this exclusion only applies
+        // when deploying. Locally, another exclusion further below is needed.
         for (const file in files) {
-            const isNative = ignoredPaths.some(item => {
-                return file.startsWith(item);
-            });
-            if (isNative || ignoreFilter(file)) {
+            if (shouldIgnorePath(file, ignoreFilter, true)) {
                 delete files[file];
             }
         }
@@ -73,6 +80,15 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
             };
             // @ts-ignore This symbol is a private API
             const lambdaFiles = output[lambda_1.FILES_SYMBOL];
+            // When deploying, the `files` that are passed to the Legacy Runtimes already
+            // have certain files that are ignored stripped, but locally, that list of
+            // files isn't used by the Legacy Runtimes, so we need to apply the filters
+            // to the outputs that they are returning instead.
+            for (const file in lambdaFiles) {
+                if (shouldIgnorePath(file, ignoreFilter, false)) {
+                    delete files[file];
+                }
+            }
             const entry = path_1.join(workPath, '.output', 'server', 'pages', entrypoint);
             await fs_extra_1.default.ensureDir(path_1.dirname(entry));
             await linkOrCopy(files[entrypoint].fsPath, entry);

package/dist/index.js

@@ -32757,6 +32757,20 @@ const glob_1 = __importDefault(__webpack_require__(4240));
 const normalize_path_1 = __webpack_require__(6261);
 const lambda_1 = __webpack_require__(6721);
 const _1 = __webpack_require__(2855);
+// `.output` was already created by the Build Command, so we have
+// to ensure its contents don't get bundled into the Lambda. Similarily,
+// we don't want to bundle anything from `.vercel` either. Lastly,
+// Builders/Runtimes didn't have `vercel.json` or `now.json`.
+const ignoredPaths = ['.output', '.vercel', 'vercel.json', 'now.json'];
+const shouldIgnorePath = (file, ignoreFilter, ignoreFile) => {
+    const isNative = ignoredPaths.some(item => {
+        return file.startsWith(item);
+    });
+    if (!ignoreFile) {
+        return isNative;
+    }
+    return isNative || ignoreFilter(file);
+};
 /**
  * Convert legacy Runtime to a Plugin.
  * @param buildRuntime - a legacy build() function from a Runtime
@@ -32768,22 +32782,15 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
     return async function build({ workPath }) {
         const opts = { cwd: workPath };
         const files = await glob_1.default('**', opts);
-        // `.output` was already created by the Build Command, so we have
-        // to ensure its contents don't get bundled into the Lambda. Similarily,
-        // we don't want to bundle anything from `.vercel` either. Lastly,
-        // Builders/Runtimes didn't have `vercel.json` or `now.json`.
-        const ignoredPaths = ['.output', '.vercel', 'vercel.json', 'now.json'];
         // We also don't want to provide any files to Runtimes that were ignored
         // through `.vercelignore` or `.nowignore`, because the Build Step does the same.
         const ignoreFilter = await _1.getIgnoreFilter(workPath);
         // We're not passing this as an `ignore` filter to the `glob` function above,
         // so that we can re-use exactly the same `getIgnoreFilter` method that the
-        // Build Step uses (literally the same code).
+        // Build Step uses (literally the same code). Note that this exclusion only applies
+        // when deploying. Locally, another exclusion further below is needed.
         for (const file in files) {
-            const isNative = ignoredPaths.some(item => {
-                return file.startsWith(item);
-            });
-            if (isNative || ignoreFilter(file)) {
+            if (shouldIgnorePath(file, ignoreFilter, true)) {
                 delete files[file];
             }
         }
@@ -32820,6 +32827,15 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
             };
             // @ts-ignore This symbol is a private API
             const lambdaFiles = output[lambda_1.FILES_SYMBOL];
+            // When deploying, the `files` that are passed to the Legacy Runtimes already
+            // have certain files that are ignored stripped, but locally, that list of
+            // files isn't used by the Legacy Runtimes, so we need to apply the filters
+            // to the outputs that they are returning instead.
+            for (const file in lambdaFiles) {
+                if (shouldIgnorePath(file, ignoreFilter, false)) {
+                    delete files[file];
+                }
+            }
             const entry = path_1.join(workPath, '.output', 'server', 'pages', entrypoint);
             await fs_extra_1.default.ensureDir(path_1.dirname(entry));
             await linkOrCopy(files[entrypoint].fsPath, entry);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.28",
+  "version": "2.12.3-canary.29",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -49,5 +49,5 @@
     "typescript": "4.3.4",
     "yazl": "2.4.3"
   },
-  "gitHead": "792ab38760eca4543a7ac02dd05eda280b5328a1"
+  "gitHead": "9b3aa41f2e8d40b560969305af8cf26dcd6da8c9"
 }