@vercel/static-build 0.25.0 → 0.25.2-canary.0

package/dist/utils/build-output-v3.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBuildOutput = exports.readConfig = exports.getBuildOutputDirectory = void 0;
+exports.readConfig = exports.getBuildOutputDirectory = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const BUILD_OUTPUT_DIR = '.vercel/output';
 /**
- * Returns the path to the Build Output API v3 directory when the
+ * Returns the path to the Build Output v3 directory when the
  * `config.json` file was created by the framework / build script,
  * or `undefined` if the framework did not create the v3 output.
  */
@@ -36,20 +36,3 @@ async function readConfig(path) {
     return undefined;
 }
 exports.readConfig = readConfig;
-function createBuildOutput(meta, buildCommand, buildOutputPath, framework) {
-    if (!meta.cliVersion) {
-        let buildCommandName;
-        if (buildCommand)
-            buildCommandName = `"${buildCommand}"`;
-        else if (framework)
-            buildCommandName = framework.name;
-        else
-            buildCommandName = 'the "build" script';
-        throw new Error(`Detected Build Output v3 from ${buildCommandName}, but this Deployment is not using \`vercel build\`.\nPlease set the \`ENABLE_VC_BUILD=1\` environment variable.`);
-    }
-    return {
-        buildOutputVersion: 3,
-        buildOutputPath,
-    };
-}
-exports.createBuildOutput = createBuildOutput;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "0.25.0",
+  "version": "0.25.2-canary.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -14,8 +14,9 @@
   },
   "scripts": {
     "build": "node build",
-    "test-unit": "jest --env node --verbose --bail test/build.test.ts test/prepare-cache.test.ts",
-    "test-integration-once": "jest --env node --verbose --runInBand --bail test/integration.test.js",
+    "test": "jest --env node --verbose --bail --runInBand",
+    "test-unit": "yarn test test/build.test.ts test/prepare-cache.test.ts",
+    "test-integration-once": "yarn test test/integration-*.test.js",
     "prepublishOnly": "node build"
   },
   "jest": {
@@ -31,21 +32,21 @@
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",
     "@types/cross-spawn": "6.0.0",
-    "@types/fs-extra": "9.0.13",
     "@types/jest": "27.4.1",
     "@types/ms": "0.7.31",
     "@types/node-fetch": "2.5.4",
     "@types/promise-timeout": "1.3.0",
-    "@vercel/build-utils": "3.0.1",
-    "@vercel/frameworks": "0.9.0",
+    "@vercel/build-utils": "3.0.2-canary.0",
+    "@vercel/frameworks": "0.9.1-canary.0",
     "@vercel/ncc": "0.24.0",
-    "@vercel/routing-utils": "1.13.2",
+    "@vercel/routing-utils": "1.13.3-canary.0",
     "fs-extra": "10.0.0",
     "get-port": "5.0.0",
     "is-port-reachable": "2.0.1",
     "ms": "2.1.2",
     "node-fetch": "2.6.1",
-    "rc9": "1.2.0"
+    "rc9": "1.2.0",
+    "typescript": "4.3.4"
   },
-  "gitHead": "5e66d4b2ccd80a7e6a21d53cf4be3b11f2861513"
+  "gitHead": "f26858b735ad5d54e01afa67133b9f9456fbe72f"
 }

package/dist/utils/build-output-v2.js

@@ -1,123 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBuildOutput = exports.readBuildOutputDirectory = exports.getBuildOutputDirectory = void 0;
-const path_1 = __importDefault(require("path"));
-const fs_extra_1 = require("fs-extra");
-const build_utils_1 = require("@vercel/build-utils");
-const _shared_1 = require("./_shared");
-const BUILD_OUTPUT_DIR = '.output';
-const BRIDGE_MIDDLEWARE_V2_TO_V3 = `
-
-
-// appended to convert v2 middleware to v3 middleware
-export default async (request) => {
-  const { response } = await _ENTRIES['middleware_pages/_middleware'].default({ request });
-  return response;
-}
-`;
-/**
- * Returns the path to the Build Output API v2 directory when the
- * `config.json` file was created by the framework / build script,
- * or `undefined` if the framework did not create the v3 output.
- */
-async function getBuildOutputDirectory(workingDir) {
-    const outputDir = path_1.default.join(workingDir, BUILD_OUTPUT_DIR);
-    const outputPathExists = await fs_extra_1.pathExists(outputDir);
-    if (outputPathExists) {
-        return outputDir;
-    }
-    return undefined;
-}
-exports.getBuildOutputDirectory = getBuildOutputDirectory;
-/**
- * Reads the BUILD_OUTPUT_DIR directory and returns and object
- * that should be merged with the build outputs.
- */
-async function readBuildOutputDirectory({ workPath, }) {
-    // Functions are not supported, but are used to support Middleware
-    const functions = {};
-    // Routes are not supported, but are used to support Middleware
-    const routes = [];
-    const middleware = await getMiddleware(workPath);
-    if (middleware) {
-        routes.push(middleware.route);
-        functions['middleware'] = new build_utils_1.EdgeFunction({
-            deploymentTarget: 'v8-worker',
-            entrypoint: '_middleware.js',
-            files: {
-                '_middleware.js': middleware.file,
-            },
-            name: 'middleware',
-        });
-    }
-    const staticFiles = await readStaticFiles({ workPath });
-    const outputs = {
-        staticFiles: _shared_1.isObjectEmpty(staticFiles) ? null : staticFiles,
-        functions: _shared_1.isObjectEmpty(functions) ? null : functions,
-        routes: routes.length ? routes : null,
-    };
-    if (outputs.functions) {
-        build_utils_1.debug(`Detected Serverless Functions in "${BUILD_OUTPUT_DIR}"`);
-    }
-    if (outputs.staticFiles) {
-        build_utils_1.debug(`Detected Static Assets in "${BUILD_OUTPUT_DIR}"`);
-    }
-    if (outputs.routes) {
-        build_utils_1.debug(`Detected Routes Configuration in "${BUILD_OUTPUT_DIR}"`);
-    }
-    return outputs;
-}
-exports.readBuildOutputDirectory = readBuildOutputDirectory;
-async function getMiddleware(workPath) {
-    const manifestPath = path_1.default.join(workPath, BUILD_OUTPUT_DIR, 'functions-manifest.json');
-    try {
-        const manifest = await fs_extra_1.readJson(manifestPath);
-        if (manifest.pages['_middleware.js'].runtime !== 'web') {
-            return;
-        }
-    }
-    catch (error) {
-        if (error.code !== 'ENOENT')
-            throw error;
-        return;
-    }
-    const middlewareRelativePath = path_1.default.join(BUILD_OUTPUT_DIR, 'server/pages/_middleware.js');
-    const middlewareAbsoluatePath = path_1.default.join(workPath, middlewareRelativePath);
-    await fs_extra_1.appendFile(middlewareAbsoluatePath, BRIDGE_MIDDLEWARE_V2_TO_V3);
-    const route = {
-        src: '/(.*)',
-        middlewarePath: 'middleware',
-        continue: true,
-    };
-    return {
-        route,
-        file: new build_utils_1.FileFsRef({
-            fsPath: middlewareRelativePath,
-        }),
-    };
-}
-async function readStaticFiles({ workPath, }) {
-    const staticFilePath = path_1.default.join(workPath, BUILD_OUTPUT_DIR, 'static');
-    const staticFiles = await build_utils_1.glob('**', {
-        cwd: staticFilePath,
-    });
-    return staticFiles;
-}
-async function createBuildOutput(workPath) {
-    let output = {};
-    const routes = [];
-    const extraOutputs = await readBuildOutputDirectory({
-        workPath,
-    });
-    if (extraOutputs.routes) {
-        routes.push(...extraOutputs.routes);
-    }
-    if (extraOutputs.staticFiles) {
-        output = Object.assign({}, extraOutputs.staticFiles, extraOutputs.functions);
-    }
-    return { routes, output };
-}
-exports.createBuildOutput = createBuildOutput;