mirror of
https://github.com/LukeHagar/vercel.git
synced 2025-12-11 12:57:46 +00:00
Compare commits
60 Commits
sowju/exam
...
@vercel/bu
| Author | SHA1 | Date | |
|---|---|---|---|
|
621b53bc49 | ||
|
|
728b620355 | ||
|
|
7d16395038 | ||
|
|
59e1259688 | ||
|
|
169242157e | ||
|
|
db10ffd679 | ||
|
|
c0d0744c4e | ||
|
|
9da67423a5 | ||
|
|
51fe09d5e9 | ||
|
|
695bfbdd60 | ||
|
|
547e88228e | ||
|
|
9bfb5dd535 | ||
|
|
81ea84fae8 | ||
|
|
fa8bf07be4 | ||
|
|
cc9dce73ad | ||
|
|
bba7cbd411 | ||
|
|
9a3739bebd | ||
|
|
8c62de16ce | ||
|
|
e9333988d7 | ||
|
|
fb001ce7eb | ||
|
|
b399fe7037 | ||
|
|
88385b3c84 | ||
|
|
eed39913e1 | ||
|
|
03e9047bc9 | ||
|
|
0e35205bf1 | ||
|
|
e42fe34c4a | ||
|
|
3ece7ac969 | ||
|
|
4f832acf90 | ||
|
|
918726e01d | ||
|
|
dc2ddf867b | ||
|
|
ee1211416f | ||
|
|
570fd24e29 | ||
|
|
40681ad0f4 | ||
|
|
f20703b15d | ||
|
|
68eb197112 | ||
|
|
b8b87b96da | ||
|
|
967c24f1bb | ||
|
|
609f781234 | ||
|
|
998f6bf6e6 | ||
|
|
7511c2ef85 | ||
|
|
71425fac1f | ||
|
|
6973cd5989 | ||
|
|
24785ff50a | ||
|
|
aa3ad4478c | ||
|
|
f0d73049ca | ||
|
|
6cef07354a | ||
|
|
50af9f5b75 | ||
|
|
af76b134d8 | ||
|
|
c7640005fd | ||
|
|
3deed977ba | ||
|
|
b38c360e36 | ||
|
|
1595e48414 | ||
|
|
e6b0ee3e3c | ||
|
|
a247e31688 | ||
|
|
dc02e763a4 | ||
|
|
8567fc0de6 | ||
|
|
4f8f3d373f | ||
|
|
debb85b690 | ||
|
|
bfef989ada | ||
|
|
4e0b6c5eaf |
4
.prettierignore
Normal file
4
.prettierignore
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
# https://prettier.io/docs/en/ignore.html
|
||||||
|
|
||||||
|
# ignore this file with an intentional syntax error
|
||||||
|
packages/cli/test/dev/fixtures/edge-function-error/api/edge-error-syntax.js
|
||||||
@@ -24,7 +24,6 @@ export function sendToVercelAnalytics(metric) {
|
|||||||
speed: getConnectionSpeed(),
|
speed: getConnectionSpeed(),
|
||||||
};
|
};
|
||||||
|
|
||||||
console.log({ body });
|
|
||||||
const blob = new Blob([new URLSearchParams(body).toString()], {
|
const blob = new Blob([new URLSearchParams(body).toString()], {
|
||||||
// This content type is necessary for `sendBeacon`
|
// This content type is necessary for `sendBeacon`
|
||||||
type: 'application/x-www-form-urlencoded',
|
type: 'application/x-www-form-urlencoded',
|
||||||
|
|||||||
3
examples/remix/.eslintrc.js
Normal file
3
examples/remix/.eslintrc.js
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
module.exports = {
|
||||||
|
extends: ["@remix-run/eslint-config", "@remix-run/eslint-config/node"],
|
||||||
|
};
|
||||||
8
examples/remix/.gitignore
vendored
8
examples/remix/.gitignore
vendored
@@ -1,7 +1,11 @@
|
|||||||
node_modules
|
node_modules
|
||||||
|
|
||||||
.cache
|
.cache
|
||||||
|
.env
|
||||||
.vercel
|
.vercel
|
||||||
|
.output
|
||||||
|
|
||||||
public/build
|
/build/
|
||||||
api/_build
|
/public/build
|
||||||
|
/api/index.js
|
||||||
|
/api/index.js.map
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
const { createRequestHandler } = require("@remix-run/vercel");
|
|
||||||
|
|
||||||
module.exports = createRequestHandler({
|
|
||||||
build: require("./_build")
|
|
||||||
});
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
|
import { RemixBrowser } from "@remix-run/react";
|
||||||
import { hydrate } from "react-dom";
|
import { hydrate } from "react-dom";
|
||||||
import { RemixBrowser } from "remix";
|
|
||||||
|
|
||||||
hydrate(<RemixBrowser />, document);
|
hydrate(<RemixBrowser />, document);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
import type { EntryContext } from "@remix-run/node";
|
||||||
|
import { RemixServer } from "@remix-run/react";
|
||||||
import { renderToString } from "react-dom/server";
|
import { renderToString } from "react-dom/server";
|
||||||
import { RemixServer } from "remix";
|
|
||||||
import type { EntryContext } from "remix";
|
|
||||||
|
|
||||||
export default function handleRequest(
|
export default function handleRequest(
|
||||||
request: Request,
|
request: Request,
|
||||||
@@ -16,6 +16,6 @@ export default function handleRequest(
|
|||||||
|
|
||||||
return new Response("<!DOCTYPE html>" + markup, {
|
return new Response("<!DOCTYPE html>" + markup, {
|
||||||
status: responseStatusCode,
|
status: responseStatusCode,
|
||||||
headers: responseHeaders
|
headers: responseHeaders,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import type { LinksFunction, MetaFunction } from "@remix-run/node";
|
||||||
import {
|
import {
|
||||||
Link,
|
Link,
|
||||||
Links,
|
Links,
|
||||||
@@ -6,14 +7,13 @@ import {
|
|||||||
Outlet,
|
Outlet,
|
||||||
Scripts,
|
Scripts,
|
||||||
ScrollRestoration,
|
ScrollRestoration,
|
||||||
useCatch
|
useCatch,
|
||||||
} from "remix";
|
} from "@remix-run/react";
|
||||||
import type { LinksFunction } from "remix";
|
|
||||||
|
|
||||||
import globalStylesUrl from "~/styles/global.css";
|
|
||||||
import darkStylesUrl from "~/styles/dark.css";
|
import darkStylesUrl from "~/styles/dark.css";
|
||||||
|
import globalStylesUrl from "~/styles/global.css";
|
||||||
|
|
||||||
// https://remix.run/api/app#links
|
// https://remix.run/api/conventions#links
|
||||||
export let links: LinksFunction = () => {
|
export let links: LinksFunction = () => {
|
||||||
return [
|
return [
|
||||||
{ rel: "stylesheet", href: globalStylesUrl },
|
{ rel: "stylesheet", href: globalStylesUrl },
|
||||||
@@ -25,6 +25,12 @@ export let links: LinksFunction = () => {
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// https://remix.run/api/conventions#meta
|
||||||
|
export let meta: MetaFunction = () => ({
|
||||||
|
charset: "utf-8",
|
||||||
|
viewport: "width=device-width,initial-scale=1",
|
||||||
|
});
|
||||||
|
|
||||||
// https://remix.run/api/conventions#default-export
|
// https://remix.run/api/conventions#default-export
|
||||||
// https://remix.run/api/conventions#route-filenames
|
// https://remix.run/api/conventions#route-filenames
|
||||||
export default function App() {
|
export default function App() {
|
||||||
@@ -37,7 +43,7 @@ export default function App() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// https://remix.run/docs/en/v1/api/conventions#errorboundary
|
// https://remix.run/api/conventions#errorboundary
|
||||||
export function ErrorBoundary({ error }: { error: Error }) {
|
export function ErrorBoundary({ error }: { error: Error }) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
return (
|
return (
|
||||||
@@ -57,7 +63,7 @@ export function ErrorBoundary({ error }: { error: Error }) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// https://remix.run/docs/en/v1/api/conventions#catchboundary
|
// https://remix.run/api/conventions#catchboundary
|
||||||
export function CatchBoundary() {
|
export function CatchBoundary() {
|
||||||
let caught = useCatch();
|
let caught = useCatch();
|
||||||
|
|
||||||
@@ -103,8 +109,6 @@ function Document({
|
|||||||
return (
|
return (
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charSet="utf-8" />
|
|
||||||
<meta name="viewport" content="width=device-width,initial-scale=1" />
|
|
||||||
{title ? <title>{title}</title> : null}
|
{title ? <title>{title}</title> : null}
|
||||||
<Meta />
|
<Meta />
|
||||||
<Links />
|
<Links />
|
||||||
@@ -113,7 +117,7 @@ function Document({
|
|||||||
{children}
|
{children}
|
||||||
<ScrollRestoration />
|
<ScrollRestoration />
|
||||||
<Scripts />
|
<Scripts />
|
||||||
{process.env.NODE_ENV === "development" && <LiveReload />}
|
<LiveReload />
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Outlet } from "remix";
|
import type { MetaFunction, LinksFunction } from "@remix-run/node";
|
||||||
import type { MetaFunction, LinksFunction } from "remix";
|
import { Outlet } from "@remix-run/react";
|
||||||
|
|
||||||
import stylesUrl from "~/styles/demos/about.css";
|
import stylesUrl from "~/styles/demos/about.css";
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Link } from "remix";
|
import { Link } from "@remix-run/react";
|
||||||
|
|
||||||
export default function AboutIndex() {
|
export default function AboutIndex() {
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Link } from "remix";
|
import { Link } from "@remix-run/react";
|
||||||
|
|
||||||
export default function AboutIndex() {
|
export default function AboutIndex() {
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
|
import type { ActionFunction } from "@remix-run/node";
|
||||||
|
import { json, redirect } from "@remix-run/node";
|
||||||
|
import { Form, useActionData } from "@remix-run/react";
|
||||||
import { useEffect, useRef } from "react";
|
import { useEffect, useRef } from "react";
|
||||||
import type { ActionFunction } from "remix";
|
|
||||||
import { Form, json, useActionData, redirect } from "remix";
|
|
||||||
|
|
||||||
export function meta() {
|
export function meta() {
|
||||||
return { title: "Actions Demo" };
|
return { title: "Actions Demo" };
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { useCatch, Link, json, useLoaderData, Outlet } from "remix";
|
import type { MetaFunction } from "@remix-run/node";
|
||||||
|
import { json } from "@remix-run/node";
|
||||||
|
import { Link, Outlet, useCatch, useLoaderData } from "@remix-run/react";
|
||||||
|
|
||||||
export function meta() {
|
export let meta: MetaFunction = () => ({ title: "Boundaries Demo" });
|
||||||
return { title: "Boundaries Demo" };
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function Boundaries() {
|
export default function Boundaries() {
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { useCatch, Link, json, useLoaderData } from "remix";
|
import type { LoaderFunction, MetaFunction } from "@remix-run/node";
|
||||||
import type { LoaderFunction, MetaFunction } from "remix";
|
import { json } from "@remix-run/node";
|
||||||
|
import { Link, useCatch, useLoaderData } from "@remix-run/react";
|
||||||
|
|
||||||
// The `$` in route filenames becomes a pattern that's parsed from the URL and
|
// The `$` in route filenames becomes a pattern that's parsed from the URL and
|
||||||
// passed to your loaders so you can look up data.
|
// passed to your loaders so you can look up data.
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { useCatch, Link, json, useLoaderData, Outlet } from "remix";
|
import type { LoaderFunction } from "@remix-run/node";
|
||||||
import type { LoaderFunction } from "remix";
|
import { json } from "@remix-run/node";
|
||||||
|
import { Link, Outlet, useCatch, useLoaderData } from "@remix-run/react";
|
||||||
|
|
||||||
export default function Boundaries() {
|
export default function Boundaries() {
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import type { MetaFunction, LoaderFunction } from "remix";
|
import type { MetaFunction, LoaderFunction } from "@remix-run/node";
|
||||||
import { useLoaderData, json, Link } from "remix";
|
import { json } from "@remix-run/node";
|
||||||
|
import { Link, useLoaderData } from "@remix-run/react";
|
||||||
|
|
||||||
type IndexData = {
|
type IndexData = {
|
||||||
resources: Array<{ name: string; url: string }>;
|
resources: Array<{ name: string; url: string }>;
|
||||||
|
|||||||
8345
examples/remix/package-lock.json
generated
8345
examples/remix/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,26 +1,28 @@
|
|||||||
{
|
{
|
||||||
"private": true,
|
"private": true,
|
||||||
"name": "remix-app-template",
|
"sideEffects": false,
|
||||||
"description": "",
|
|
||||||
"license": "",
|
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "remix build",
|
"build": "remix build",
|
||||||
"dev": "remix dev",
|
"dev": "remix dev"
|
||||||
"postinstall": "remix setup node"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@remix-run/react": "^1.0.6",
|
"@remix-run/node": "^1.5.1",
|
||||||
|
"@remix-run/react": "^1.5.1",
|
||||||
|
"@remix-run/vercel": "^1.5.1",
|
||||||
|
"@vercel/node": "^2.0.0",
|
||||||
"react": "^17.0.2",
|
"react": "^17.0.2",
|
||||||
"react-dom": "^17.0.2",
|
"react-dom": "^17.0.2"
|
||||||
"remix": "^1.0.6",
|
|
||||||
"@remix-run/serve": "^1.0.6",
|
|
||||||
"@remix-run/vercel": "^1.0.6"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@remix-run/dev": "^1.0.6",
|
"@remix-run/dev": "^1.5.1",
|
||||||
"@types/react": "^17.0.24",
|
"@remix-run/eslint-config": "^1.5.1",
|
||||||
"@types/react-dom": "^17.0.9",
|
"@remix-run/serve": "^1.5.1",
|
||||||
"typescript": "^4.1.2"
|
"@types/react": "^17.0.45",
|
||||||
|
"@types/react-dom": "^17.0.17",
|
||||||
|
"eslint": "^8.15.0",
|
||||||
|
"typescript": "^4.6.4"
|
||||||
},
|
},
|
||||||
"sideEffects": false
|
"engines": {
|
||||||
|
"node": ">=14"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,15 @@
|
|||||||
/**
|
/**
|
||||||
* @type {import('@remix-run/dev/config').AppConfig}
|
* @type {import('@remix-run/dev').AppConfig}
|
||||||
*/
|
*/
|
||||||
module.exports = {
|
module.exports = {
|
||||||
appDirectory: "app",
|
serverBuildTarget: "vercel",
|
||||||
browserBuildDirectory: "public/build",
|
// When running locally in development mode, we use the built in remix
|
||||||
publicPath: "/build/",
|
// server. This does not understand the vercel lambda module format,
|
||||||
serverBuildDirectory: "api/_build"
|
// so we default back to the standard build output.
|
||||||
|
server: process.env.NODE_ENV === "development" ? undefined : "./server.js",
|
||||||
|
ignoredRouteFiles: ["**/.*"],
|
||||||
|
// appDirectory: "app",
|
||||||
|
// assetsBuildDirectory: "public/build",
|
||||||
|
// serverBuildPath: "api/index.js",
|
||||||
|
// publicPath: "/build/",
|
||||||
};
|
};
|
||||||
|
|||||||
4
examples/remix/server.js
Normal file
4
examples/remix/server.js
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
import * as build from "@remix-run/dev/server-build";
|
||||||
|
import { createRequestHandler } from "@remix-run/vercel";
|
||||||
|
|
||||||
|
export default createRequestHandler({ build, mode: process.env.NODE_ENV });
|
||||||
@@ -19,7 +19,6 @@
|
|||||||
"prettier-plugin-svelte": "^2.5.0",
|
"prettier-plugin-svelte": "^2.5.0",
|
||||||
"svelte": "^3.46.0",
|
"svelte": "^3.46.0",
|
||||||
"svelte-check": "^2.2.6",
|
"svelte-check": "^2.2.6",
|
||||||
"svelte-preprocess": "^4.10.6",
|
|
||||||
"typescript": "~4.6.2"
|
"typescript": "~4.6.2"
|
||||||
},
|
},
|
||||||
"type": "module",
|
"type": "module",
|
||||||
|
|||||||
1633
examples/sveltekit/pnpm-lock.yaml
generated
1633
examples/sveltekit/pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -7,14 +7,12 @@
|
|||||||
|
|
||||||
let analyticsId = import.meta.env.VERCEL_ANALYTICS_ID;
|
let analyticsId = import.meta.env.VERCEL_ANALYTICS_ID;
|
||||||
|
|
||||||
if (browser && analyticsId) {
|
$: if (browser && analyticsId) {
|
||||||
page.subscribe(({ url, params }) =>
|
webVitals({
|
||||||
webVitals({
|
path: $page.url.pathname,
|
||||||
path: url.pathname,
|
params: $page.params,
|
||||||
params,
|
analyticsId
|
||||||
analyticsId
|
})
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -1,19 +1,18 @@
|
|||||||
import adapter from '@sveltejs/adapter-auto';
|
import adapter from '@sveltejs/adapter-auto';
|
||||||
import preprocess from 'svelte-preprocess';
|
|
||||||
|
|
||||||
/** @type {import('@sveltejs/kit').Config} */
|
/** @type {import('@sveltejs/kit').Config} */
|
||||||
const config = {
|
const config = {
|
||||||
preprocess: preprocess({
|
|
||||||
replace: [
|
|
||||||
['import.meta.env.VERCEL_ANALYTICS_ID', JSON.stringify(process.env.VERCEL_ANALYTICS_ID)]
|
|
||||||
]
|
|
||||||
}),
|
|
||||||
kit: {
|
kit: {
|
||||||
adapter: adapter(),
|
adapter: adapter(),
|
||||||
|
|
||||||
// Override http methods in the Todo forms
|
// Override http methods in the Todo forms
|
||||||
methodOverride: {
|
methodOverride: {
|
||||||
allowed: ['PATCH', 'DELETE']
|
allowed: ['PATCH', 'DELETE']
|
||||||
|
},
|
||||||
|
vite: {
|
||||||
|
define: {
|
||||||
|
'import.meta.env.VERCEL_ANALYTICS_ID': JSON.stringify(process.env.VERCEL_ANALYTICS_ID)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
"prettier": "2.6.2",
|
"prettier": "2.6.2",
|
||||||
"ts-eager": "2.0.2",
|
"ts-eager": "2.0.2",
|
||||||
"ts-jest": "28.0.5",
|
"ts-jest": "28.0.5",
|
||||||
"turbo": "1.2.14"
|
"turbo": "1.3.1"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"lerna": "lerna",
|
"lerna": "lerna",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@vercel/build-utils",
|
"name": "@vercel/build-utils",
|
||||||
"version": "4.1.1-canary.1",
|
"version": "5.0.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.js",
|
"types": "./dist/index.d.js",
|
||||||
@@ -31,7 +31,6 @@
|
|||||||
"@types/node-fetch": "^2.1.6",
|
"@types/node-fetch": "^2.1.6",
|
||||||
"@types/semver": "6.0.0",
|
"@types/semver": "6.0.0",
|
||||||
"@types/yazl": "2.4.2",
|
"@types/yazl": "2.4.2",
|
||||||
"@vercel/frameworks": "1.0.2-canary.0",
|
|
||||||
"@vercel/ncc": "0.24.0",
|
"@vercel/ncc": "0.24.0",
|
||||||
"aggregate-error": "3.0.1",
|
"aggregate-error": "3.0.1",
|
||||||
"async-retry": "1.2.3",
|
"async-retry": "1.2.3",
|
||||||
|
|||||||
@@ -61,6 +61,13 @@ export interface SpawnOptionsExtended extends SpawnOptions {
|
|||||||
* Pretty formatted command that is being spawned for logging purposes.
|
* Pretty formatted command that is being spawned for logging purposes.
|
||||||
*/
|
*/
|
||||||
prettyCommand?: string;
|
prettyCommand?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns instead of throwing an error when the process exits with a
|
||||||
|
* non-0 exit code. When relevant, the returned object will include
|
||||||
|
* the error code, stdout and stderr.
|
||||||
|
*/
|
||||||
|
ignoreNon0Exit?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function spawnAsync(
|
export function spawnAsync(
|
||||||
@@ -79,7 +86,7 @@ export function spawnAsync(
|
|||||||
|
|
||||||
child.on('error', reject);
|
child.on('error', reject);
|
||||||
child.on('close', (code, signal) => {
|
child.on('close', (code, signal) => {
|
||||||
if (code === 0) {
|
if (code === 0 || opts.ignoreNon0Exit) {
|
||||||
return resolve();
|
return resolve();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -123,24 +130,24 @@ export function execAsync(
|
|||||||
|
|
||||||
child.on('error', reject);
|
child.on('error', reject);
|
||||||
child.on('close', (code, signal) => {
|
child.on('close', (code, signal) => {
|
||||||
if (code !== 0) {
|
if (code === 0 || opts.ignoreNon0Exit) {
|
||||||
const cmd = opts.prettyCommand
|
return resolve({
|
||||||
? `Command "${opts.prettyCommand}"`
|
code,
|
||||||
: 'Command';
|
stdout: Buffer.concat(stdoutList).toString(),
|
||||||
|
stderr: Buffer.concat(stderrList).toString(),
|
||||||
return reject(
|
});
|
||||||
new NowBuildError({
|
|
||||||
code: `BUILD_UTILS_EXEC_${code || signal}`,
|
|
||||||
message: `${cmd} exited with ${code || signal}`,
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return resolve({
|
const cmd = opts.prettyCommand
|
||||||
code,
|
? `Command "${opts.prettyCommand}"`
|
||||||
stdout: Buffer.concat(stdoutList).toString(),
|
: 'Command';
|
||||||
stderr: Buffer.concat(stderrList).toString(),
|
|
||||||
});
|
return reject(
|
||||||
|
new NowBuildError({
|
||||||
|
code: `BUILD_UTILS_EXEC_${code || signal}`,
|
||||||
|
message: `${cmd} exited with ${code || signal}`,
|
||||||
|
})
|
||||||
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -166,9 +173,30 @@ export async function execCommand(command: string, options: SpawnOptions = {}) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getNodeBinPath({ cwd }: { cwd: string }) {
|
export async function getNodeBinPath({
|
||||||
const { stdout } = await execAsync('npm', ['bin'], { cwd });
|
cwd,
|
||||||
return stdout.trim();
|
}: {
|
||||||
|
cwd: string;
|
||||||
|
}): Promise<string> {
|
||||||
|
const { code, stdout, stderr } = await execAsync('npm', ['bin'], {
|
||||||
|
cwd,
|
||||||
|
prettyCommand: 'npm bin',
|
||||||
|
|
||||||
|
// in some rare cases, we saw `npm bin` exit with a non-0 code, but still
|
||||||
|
// output the right bin path, so we ignore the exit code
|
||||||
|
ignoreNon0Exit: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
const nodeBinPath = stdout.trim();
|
||||||
|
|
||||||
|
if (path.isAbsolute(nodeBinPath)) {
|
||||||
|
return nodeBinPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new NowBuildError({
|
||||||
|
code: `BUILD_UTILS_GET_NODE_BIN_PATH`,
|
||||||
|
message: `Running \`npm bin\` failed to return a valid bin path (code=${code}, stdout=${stdout}, stderr=${stderr})`,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function chmodPlusX(fsPath: string) {
|
async function chmodPlusX(fsPath: string) {
|
||||||
@@ -205,10 +233,23 @@ export function getSpawnOptions(
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (!meta.isDev) {
|
if (!meta.isDev) {
|
||||||
// Ensure that the selected Node version is at the beginning of the `$PATH`
|
let found = false;
|
||||||
opts.env.PATH = `/node${nodeVersion.major}/bin${path.delimiter}${
|
const oldPath = opts.env.PATH || process.env.PATH || '';
|
||||||
opts.env.PATH || process.env.PATH
|
|
||||||
}`;
|
const pathSegments = oldPath.split(path.delimiter).map(segment => {
|
||||||
|
if (/^\/node[0-9]+\/bin/.test(segment)) {
|
||||||
|
found = true;
|
||||||
|
return `/node${nodeVersion.major}/bin`;
|
||||||
|
}
|
||||||
|
return segment;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
// If we didn't find & replace, prepend at beginning of PATH
|
||||||
|
pathSegments.unshift(`/node${nodeVersion.major}/bin`);
|
||||||
|
}
|
||||||
|
|
||||||
|
opts.env.PATH = pathSegments.filter(Boolean).join(path.delimiter);
|
||||||
}
|
}
|
||||||
|
|
||||||
return opts;
|
return opts;
|
||||||
@@ -446,20 +487,31 @@ export function getEnvForPackageManager({
|
|||||||
env: { [x: string]: string | undefined };
|
env: { [x: string]: string | undefined };
|
||||||
}) {
|
}) {
|
||||||
const newEnv: { [x: string]: string | undefined } = { ...env };
|
const newEnv: { [x: string]: string | undefined } = { ...env };
|
||||||
|
const oldPath = env.PATH + '';
|
||||||
|
const npm7 = '/node16/bin-npm7';
|
||||||
|
const pnpm7 = '/pnpm7/node_modules/.bin';
|
||||||
|
const corepackEnabled = env.ENABLE_EXPERIMENTAL_COREPACK === '1';
|
||||||
if (cliType === 'npm') {
|
if (cliType === 'npm') {
|
||||||
if (
|
if (
|
||||||
typeof lockfileVersion === 'number' &&
|
typeof lockfileVersion === 'number' &&
|
||||||
lockfileVersion >= 2 &&
|
lockfileVersion >= 2 &&
|
||||||
(nodeVersion?.major || 0) < 16
|
(nodeVersion?.major || 0) < 16 &&
|
||||||
|
!oldPath.includes(npm7) &&
|
||||||
|
!corepackEnabled
|
||||||
) {
|
) {
|
||||||
// Ensure that npm 7 is at the beginning of the `$PATH`
|
// Ensure that npm 7 is at the beginning of the `$PATH`
|
||||||
newEnv.PATH = `/node16/bin-npm7${path.delimiter}${env.PATH}`;
|
newEnv.PATH = `${npm7}${path.delimiter}${oldPath}`;
|
||||||
console.log('Detected `package-lock.json` generated by npm 7...');
|
console.log('Detected `package-lock.json` generated by npm 7+...');
|
||||||
}
|
}
|
||||||
} else if (cliType === 'pnpm') {
|
} else if (cliType === 'pnpm') {
|
||||||
if (typeof lockfileVersion === 'number' && lockfileVersion === 5.4) {
|
if (
|
||||||
|
typeof lockfileVersion === 'number' &&
|
||||||
|
lockfileVersion === 5.4 &&
|
||||||
|
!oldPath.includes(pnpm7) &&
|
||||||
|
!corepackEnabled
|
||||||
|
) {
|
||||||
// Ensure that pnpm 7 is at the beginning of the `$PATH`
|
// Ensure that pnpm 7 is at the beginning of the `$PATH`
|
||||||
newEnv.PATH = `/pnpm7/node_modules/.bin${path.delimiter}${env.PATH}`;
|
newEnv.PATH = `${pnpm7}${path.delimiter}${oldPath}`;
|
||||||
console.log('Detected `pnpm-lock.yaml` generated by pnpm 7...');
|
console.log('Detected `pnpm-lock.yaml` generated by pnpm 7...');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -80,16 +80,6 @@ export {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export { EdgeFunction } from './edge-function';
|
export { EdgeFunction } from './edge-function';
|
||||||
export {
|
|
||||||
detectBuilders,
|
|
||||||
detectOutputDirectory,
|
|
||||||
detectApiDirectory,
|
|
||||||
detectApiExtensions,
|
|
||||||
} from './detect-builders';
|
|
||||||
export { detectFileSystemAPI } from './detect-file-system-api';
|
|
||||||
export { detectFramework } from './detect-framework';
|
|
||||||
export { getProjectPaths } from './get-project-paths';
|
|
||||||
export { DetectorFilesystem } from './detectors/filesystem';
|
|
||||||
export { readConfigFile } from './fs/read-config-file';
|
export { readConfigFile } from './fs/read-config-file';
|
||||||
export { normalizePath } from './fs/normalize-path';
|
export { normalizePath } from './fs/normalize-path';
|
||||||
|
|
||||||
@@ -97,35 +87,3 @@ export * from './should-serve';
|
|||||||
export * from './schemas';
|
export * from './schemas';
|
||||||
export * from './types';
|
export * from './types';
|
||||||
export * from './errors';
|
export * from './errors';
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper function to support both `@vercel` and legacy `@now` official Runtimes.
|
|
||||||
*/
|
|
||||||
export const isOfficialRuntime = (desired: string, name?: string): boolean => {
|
|
||||||
if (typeof name !== 'string') {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return (
|
|
||||||
name === `@vercel/${desired}` ||
|
|
||||||
name === `@now/${desired}` ||
|
|
||||||
name.startsWith(`@vercel/${desired}@`) ||
|
|
||||||
name.startsWith(`@now/${desired}@`)
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const isStaticRuntime = (name?: string): boolean => {
|
|
||||||
return isOfficialRuntime('static', name);
|
|
||||||
};
|
|
||||||
|
|
||||||
export { workspaceManagers } from './workspaces/workspace-managers';
|
|
||||||
export {
|
|
||||||
getWorkspaces,
|
|
||||||
GetWorkspaceOptions,
|
|
||||||
Workspace,
|
|
||||||
WorkspaceType,
|
|
||||||
} from './workspaces/get-workspaces';
|
|
||||||
export {
|
|
||||||
getWorkspacePackagePaths,
|
|
||||||
GetWorkspacePackagePathsOptions,
|
|
||||||
} from './workspaces/get-workspace-package-paths';
|
|
||||||
export { monorepoManagers } from './monorepos/monorepo-managers';
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
# users.rb
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
"functions": {
|
|
||||||
"api/users.rb": {
|
|
||||||
"memory": 3008
|
|
||||||
},
|
|
||||||
"api/doesnt-exist.rb": {
|
|
||||||
"memory": 768
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
# [id].py
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
# index
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
# project/[aid]/[bid]/index.py
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
# get
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
# post
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
This file should also be included
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
# date
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
# math
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"functions": {
|
|
||||||
"api/users/post.py": {
|
|
||||||
"memory": 3008
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
148
packages/build-utils/test/integration.test.ts
vendored
148
packages/build-utils/test/integration.test.ts
vendored
@@ -5,7 +5,6 @@ import {
|
|||||||
testDeployment,
|
testDeployment,
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
} from '../../../test/lib/deployment/test-deployment';
|
} from '../../../test/lib/deployment/test-deployment';
|
||||||
import { glob, detectBuilders } from '../src';
|
|
||||||
|
|
||||||
jest.setTimeout(4 * 60 * 1000);
|
jest.setTimeout(4 * 60 * 1000);
|
||||||
|
|
||||||
@@ -32,11 +31,6 @@ const skipFixtures: string[] = [
|
|||||||
'08-zero-config-middleman',
|
'08-zero-config-middleman',
|
||||||
'21-npm-workspaces',
|
'21-npm-workspaces',
|
||||||
'23-pnpm-workspaces',
|
'23-pnpm-workspaces',
|
||||||
'27-yarn-workspaces',
|
|
||||||
'28-turborepo-with-yarn-workspaces',
|
|
||||||
'29-nested-workspaces',
|
|
||||||
'30-double-nested-workspaces',
|
|
||||||
'31-turborepo-in-package-json',
|
|
||||||
];
|
];
|
||||||
|
|
||||||
// eslint-disable-next-line no-restricted-syntax
|
// eslint-disable-next-line no-restricted-syntax
|
||||||
@@ -83,145 +77,3 @@ for (const builder of buildersToTestWith) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
it('Test `detectBuilders` and `detectRoutes`', async () => {
|
|
||||||
const fixture = path.join(__dirname, 'fixtures', '01-zero-config-api');
|
|
||||||
const pkg = await fs.readJSON(path.join(fixture, 'package.json'));
|
|
||||||
const fileList = await glob('**', fixture);
|
|
||||||
const files = Object.keys(fileList);
|
|
||||||
|
|
||||||
const probes = [
|
|
||||||
{
|
|
||||||
path: '/api/my-endpoint',
|
|
||||||
mustContain: 'my-endpoint',
|
|
||||||
status: 200,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api/other-endpoint',
|
|
||||||
mustContain: 'other-endpoint',
|
|
||||||
status: 200,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api/team/zeit',
|
|
||||||
mustContain: 'team/zeit',
|
|
||||||
status: 200,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api/user/myself',
|
|
||||||
mustContain: 'user/myself',
|
|
||||||
status: 200,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api/not-okay/',
|
|
||||||
status: 404,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api',
|
|
||||||
status: 404,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api/',
|
|
||||||
status: 404,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/',
|
|
||||||
mustContain: 'hello from index.txt',
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
const { builders, defaultRoutes } = await detectBuilders(files, pkg);
|
|
||||||
|
|
||||||
const nowConfig = { builds: builders, routes: defaultRoutes, probes };
|
|
||||||
|
|
||||||
await fs.writeFile(
|
|
||||||
path.join(fixture, 'now.json'),
|
|
||||||
JSON.stringify(nowConfig, null, 2)
|
|
||||||
);
|
|
||||||
|
|
||||||
const deployment = await testDeployment(
|
|
||||||
{ builderUrl, buildUtilsUrl },
|
|
||||||
fixture
|
|
||||||
);
|
|
||||||
expect(deployment).toBeDefined();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Test `detectBuilders` with `index` files', async () => {
|
|
||||||
const fixture = path.join(__dirname, 'fixtures', '02-zero-config-api');
|
|
||||||
const pkg = await fs.readJSON(path.join(fixture, 'package.json'));
|
|
||||||
const fileList = await glob('**', fixture);
|
|
||||||
const files = Object.keys(fileList);
|
|
||||||
|
|
||||||
const probes = [
|
|
||||||
{
|
|
||||||
path: '/api/not-okay',
|
|
||||||
status: 404,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api',
|
|
||||||
mustContain: 'hello from api/index.js',
|
|
||||||
status: 200,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api/',
|
|
||||||
mustContain: 'hello from api/index.js',
|
|
||||||
status: 200,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api/index',
|
|
||||||
mustContain: 'hello from api/index.js',
|
|
||||||
status: 200,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api/index.js',
|
|
||||||
mustContain: 'hello from api/index.js',
|
|
||||||
status: 200,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api/date.js',
|
|
||||||
mustContain: 'hello from api/date.js',
|
|
||||||
status: 200,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
// Someone might expect this to be `date.js`,
|
|
||||||
// but I doubt that there is any case were both
|
|
||||||
// `date/index.js` and `date.js` exists,
|
|
||||||
// so it is not special cased
|
|
||||||
path: '/api/date',
|
|
||||||
mustContain: 'hello from api/date/index.js',
|
|
||||||
status: 200,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api/date/',
|
|
||||||
mustContain: 'hello from api/date/index.js',
|
|
||||||
status: 200,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api/date/index',
|
|
||||||
mustContain: 'hello from api/date/index.js',
|
|
||||||
status: 200,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/api/date/index.js',
|
|
||||||
mustContain: 'hello from api/date/index.js',
|
|
||||||
status: 200,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/',
|
|
||||||
mustContain: 'hello from index.txt',
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
const { builders, defaultRoutes } = await detectBuilders(files, pkg);
|
|
||||||
|
|
||||||
const nowConfig = { builds: builders, routes: defaultRoutes, probes };
|
|
||||||
await fs.writeFile(
|
|
||||||
path.join(fixture, 'now.json'),
|
|
||||||
JSON.stringify(nowConfig, null, 2)
|
|
||||||
);
|
|
||||||
|
|
||||||
const deployment = await testDeployment(
|
|
||||||
{ builderUrl, buildUtilsUrl },
|
|
||||||
fixture
|
|
||||||
);
|
|
||||||
expect(deployment).toBeDefined();
|
|
||||||
});
|
|
||||||
|
|||||||
29
packages/build-utils/test/unit.exec-async.test.ts
vendored
Normal file
29
packages/build-utils/test/unit.exec-async.test.ts
vendored
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
import { execAsync, NowBuildError } from '../src';
|
||||||
|
|
||||||
|
it('should execute a command', async () => {
|
||||||
|
const { code, stdout, stderr } = await execAsync('echo', ['hello']);
|
||||||
|
|
||||||
|
expect(code).toBe(0);
|
||||||
|
expect(stdout).toContain('hello');
|
||||||
|
expect(stderr).toBe('');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should throw if the command exits with non-0 code', async () => {
|
||||||
|
await expect(execAsync('find', ['unknown-file'])).rejects.toBeInstanceOf(
|
||||||
|
NowBuildError
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return if the command exits with non-0 code and ignoreNon0Exit=true', async () => {
|
||||||
|
const { code, stdout, stderr } = await execAsync('find', ['unknown-file'], {
|
||||||
|
ignoreNon0Exit: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(code).toBe(process.platform === 'win32' ? 2 : 1);
|
||||||
|
expect(stdout).toBe('');
|
||||||
|
expect(stderr).toContain(
|
||||||
|
process.platform === 'win32'
|
||||||
|
? 'Parameter format not correct'
|
||||||
|
: 'No such file or directory'
|
||||||
|
);
|
||||||
|
});
|
||||||
@@ -38,6 +38,38 @@ describe('Test `getEnvForPackageManager()`', () => {
|
|||||||
PATH: `/node16/bin-npm7${delimiter}foo`,
|
PATH: `/node16/bin-npm7${delimiter}foo`,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'should not set npm path if corepack enabled',
|
||||||
|
args: {
|
||||||
|
cliType: 'npm',
|
||||||
|
nodeVersion: { major: 14, range: '14.x', runtime: 'nodejs14.x' },
|
||||||
|
lockfileVersion: 2,
|
||||||
|
env: {
|
||||||
|
FOO: 'bar',
|
||||||
|
ENABLE_EXPERIMENTAL_COREPACK: '1',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
want: {
|
||||||
|
FOO: 'bar',
|
||||||
|
ENABLE_EXPERIMENTAL_COREPACK: '1',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'should not prepend npm path again if already detected',
|
||||||
|
args: {
|
||||||
|
cliType: 'npm',
|
||||||
|
nodeVersion: { major: 14, range: '14.x', runtime: 'nodejs14.x' },
|
||||||
|
lockfileVersion: 2,
|
||||||
|
env: {
|
||||||
|
FOO: 'bar',
|
||||||
|
PATH: `/node16/bin-npm7${delimiter}foo`,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
want: {
|
||||||
|
FOO: 'bar',
|
||||||
|
PATH: `/node16/bin-npm7${delimiter}foo`,
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: 'should not set path if node is 16 and npm 7+ is detected',
|
name: 'should not set path if node is 16 and npm 7+ is detected',
|
||||||
args: {
|
args: {
|
||||||
@@ -101,6 +133,38 @@ describe('Test `getEnvForPackageManager()`', () => {
|
|||||||
PATH: `/pnpm7/node_modules/.bin${delimiter}foo`,
|
PATH: `/pnpm7/node_modules/.bin${delimiter}foo`,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'should not set pnpm path if corepack is enabled',
|
||||||
|
args: {
|
||||||
|
cliType: 'pnpm',
|
||||||
|
nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
|
||||||
|
lockfileVersion: 5.4,
|
||||||
|
env: {
|
||||||
|
FOO: 'bar',
|
||||||
|
ENABLE_EXPERIMENTAL_COREPACK: '1',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
want: {
|
||||||
|
FOO: 'bar',
|
||||||
|
ENABLE_EXPERIMENTAL_COREPACK: '1',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'should not prepend pnpm path again if already detected',
|
||||||
|
args: {
|
||||||
|
cliType: 'pnpm',
|
||||||
|
nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
|
||||||
|
lockfileVersion: 5.4,
|
||||||
|
env: {
|
||||||
|
FOO: 'bar',
|
||||||
|
PATH: `/pnpm7/node_modules/.bin${delimiter}foo`,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
want: {
|
||||||
|
FOO: 'bar',
|
||||||
|
PATH: `/pnpm7/node_modules/.bin${delimiter}foo`,
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: 'should not set path if pnpm 6 is detected',
|
name: 'should not set path if pnpm 6 is detected',
|
||||||
args: {
|
args: {
|
||||||
|
|||||||
111
packages/build-utils/test/unit.get-spawn-options.test.ts
vendored
Normal file
111
packages/build-utils/test/unit.get-spawn-options.test.ts
vendored
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
import { delimiter } from 'path';
|
||||||
|
import { getSpawnOptions } from '../src';
|
||||||
|
|
||||||
|
describe('Test `getSpawnOptions()`', () => {
|
||||||
|
const origProcessEnvPath = process.env.PATH;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
process.env.PATH = undefined;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
process.env.PATH = origProcessEnvPath;
|
||||||
|
});
|
||||||
|
|
||||||
|
const cases: Array<{
|
||||||
|
name: string;
|
||||||
|
args: Parameters<typeof getSpawnOptions>;
|
||||||
|
envPath: string | undefined;
|
||||||
|
want: string | undefined;
|
||||||
|
}> = [
|
||||||
|
{
|
||||||
|
name: 'should do nothing when isDev and node14',
|
||||||
|
args: [
|
||||||
|
{ isDev: true },
|
||||||
|
{ major: 14, range: '14.x', runtime: 'nodejs14.x' },
|
||||||
|
],
|
||||||
|
envPath: '/foo',
|
||||||
|
want: '/foo',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'should do nothing when isDev and node16',
|
||||||
|
args: [
|
||||||
|
{ isDev: true },
|
||||||
|
{ major: 16, range: '16.x', runtime: 'nodejs16.x' },
|
||||||
|
],
|
||||||
|
envPath: '/foo',
|
||||||
|
want: '/foo',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'should replace 14 with 16 when only path',
|
||||||
|
args: [
|
||||||
|
{ isDev: false },
|
||||||
|
{ major: 16, range: '16.x', runtime: 'nodejs16.x' },
|
||||||
|
],
|
||||||
|
envPath: '/node14/bin',
|
||||||
|
want: '/node16/bin',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'should replace 14 with 16 at beginning',
|
||||||
|
args: [
|
||||||
|
{ isDev: false },
|
||||||
|
{ major: 16, range: '16.x', runtime: 'nodejs16.x' },
|
||||||
|
],
|
||||||
|
envPath: `/node14/bin${delimiter}/foo`,
|
||||||
|
want: `/node16/bin${delimiter}/foo`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'should replace 14 with 16 at end',
|
||||||
|
args: [
|
||||||
|
{ isDev: false },
|
||||||
|
{ major: 16, range: '16.x', runtime: 'nodejs16.x' },
|
||||||
|
],
|
||||||
|
envPath: `/foo${delimiter}/node14/bin`,
|
||||||
|
want: `/foo${delimiter}/node16/bin`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'should replace 14 with 16 in middle',
|
||||||
|
args: [
|
||||||
|
{ isDev: false },
|
||||||
|
{ major: 16, range: '16.x', runtime: 'nodejs16.x' },
|
||||||
|
],
|
||||||
|
envPath: `/foo${delimiter}/node14/bin${delimiter}/bar`,
|
||||||
|
want: `/foo${delimiter}/node16/bin${delimiter}/bar`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'should prepend 16 at beginning when nothing to replace',
|
||||||
|
args: [
|
||||||
|
{ isDev: false },
|
||||||
|
{ major: 16, range: '16.x', runtime: 'nodejs16.x' },
|
||||||
|
],
|
||||||
|
envPath: `/foo`,
|
||||||
|
want: `/node16/bin${delimiter}/foo`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'should prepend 16 at beginning no path input',
|
||||||
|
args: [
|
||||||
|
{ isDev: false },
|
||||||
|
{ major: 16, range: '16.x', runtime: 'nodejs16.x' },
|
||||||
|
],
|
||||||
|
envPath: '',
|
||||||
|
want: `/node16/bin`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'should replace 12 with 14 when only path',
|
||||||
|
args: [
|
||||||
|
{ isDev: false },
|
||||||
|
{ major: 14, range: '14.x', runtime: 'nodejs14.x' },
|
||||||
|
],
|
||||||
|
envPath: '/node12/bin',
|
||||||
|
want: '/node14/bin',
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
for (const { name, args, envPath, want } of cases) {
|
||||||
|
it(name, () => {
|
||||||
|
process.env.PATH = envPath;
|
||||||
|
const opts = getSpawnOptions(...args);
|
||||||
|
expect(opts.env?.PATH).toBe(want);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
21
packages/build-utils/test/unit.spawn-async.test.ts
vendored
Normal file
21
packages/build-utils/test/unit.spawn-async.test.ts
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
import { spawnAsync, NowBuildError } from '../src';
|
||||||
|
|
||||||
|
it('should execute a command', async () => {
|
||||||
|
// should resolve (it doesn't return anything, so it resolves with "undefined")
|
||||||
|
await expect(spawnAsync('echo', ['hello'])).resolves.toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should throw if the command exits with non-0 code', async () => {
|
||||||
|
await expect(spawnAsync('find', ['unknown-file'])).rejects.toBeInstanceOf(
|
||||||
|
NowBuildError
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return if the command exits with non-0 code and ignoreNon0Exit=true', async () => {
|
||||||
|
// should resolve (it doesn't return anything, so it resolves with "undefined")
|
||||||
|
await expect(
|
||||||
|
spawnAsync('find', ['unknown-file'], {
|
||||||
|
ignoreNon0Exit: true,
|
||||||
|
})
|
||||||
|
).resolves.toBeUndefined();
|
||||||
|
});
|
||||||
2
packages/build-utils/test/unit.test.ts
vendored
2
packages/build-utils/test/unit.test.ts
vendored
@@ -18,6 +18,8 @@ import {
|
|||||||
Meta,
|
Meta,
|
||||||
} from '../src';
|
} from '../src';
|
||||||
|
|
||||||
|
jest.setTimeout(7 * 1000);
|
||||||
|
|
||||||
async function expectBuilderError(promise: Promise<any>, pattern: string) {
|
async function expectBuilderError(promise: Promise<any>, pattern: string) {
|
||||||
let result;
|
let result;
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "vercel",
|
"name": "vercel",
|
||||||
"version": "25.1.1-canary.3",
|
"version": "26.0.0",
|
||||||
"preferGlobal": true,
|
"preferGlobal": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"description": "The command-line interface for Vercel",
|
"description": "The command-line interface for Vercel",
|
||||||
@@ -42,15 +42,15 @@
|
|||||||
"node": ">= 14"
|
"node": ">= 14"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vercel/build-utils": "4.1.1-canary.1",
|
"@vercel/build-utils": "5.0.0",
|
||||||
"@vercel/go": "2.0.2-canary.1",
|
"@vercel/go": "2.0.4",
|
||||||
"@vercel/next": "3.0.3-canary.0",
|
"@vercel/next": "3.1.3",
|
||||||
"@vercel/node": "2.2.0",
|
"@vercel/node": "2.4.0",
|
||||||
"@vercel/python": "3.0.2-canary.1",
|
"@vercel/python": "3.0.4",
|
||||||
"@vercel/redwood": "1.0.2-canary.1",
|
"@vercel/redwood": "1.0.5",
|
||||||
"@vercel/remix": "1.0.2-canary.1",
|
"@vercel/remix": "1.0.5",
|
||||||
"@vercel/ruby": "1.3.10-canary.1",
|
"@vercel/ruby": "1.3.12",
|
||||||
"@vercel/static-build": "1.0.2-canary.1",
|
"@vercel/static-build": "1.0.4",
|
||||||
"update-notifier": "5.1.0"
|
"update-notifier": "5.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -95,8 +95,9 @@
|
|||||||
"@types/which": "1.3.2",
|
"@types/which": "1.3.2",
|
||||||
"@types/write-json-file": "2.2.1",
|
"@types/write-json-file": "2.2.1",
|
||||||
"@types/yauzl-promise": "2.1.0",
|
"@types/yauzl-promise": "2.1.0",
|
||||||
"@vercel/client": "12.0.2-canary.1",
|
"@vercel/client": "12.0.4",
|
||||||
"@vercel/frameworks": "1.0.2-canary.0",
|
"@vercel/frameworks": "1.0.2",
|
||||||
|
"@vercel/fs-detectors": "1.0.0",
|
||||||
"@vercel/ncc": "0.24.0",
|
"@vercel/ncc": "0.24.0",
|
||||||
"@zeit/fun": "0.11.2",
|
"@zeit/fun": "0.11.2",
|
||||||
"@zeit/source-map-support": "0.6.2",
|
"@zeit/source-map-support": "0.6.2",
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import confirm from '../../util/input/confirm';
|
|||||||
import findAliasByAliasOrId from '../../util/alias/find-alias-by-alias-or-id';
|
import findAliasByAliasOrId from '../../util/alias/find-alias-by-alias-or-id';
|
||||||
|
|
||||||
import { Alias } from '../../types';
|
import { Alias } from '../../types';
|
||||||
import { Output } from '../../util/output';
|
|
||||||
import { isValidName } from '../../util/is-valid-name';
|
import { isValidName } from '../../util/is-valid-name';
|
||||||
import { getCommandName } from '../../util/pkg-name';
|
import { getCommandName } from '../../util/pkg-name';
|
||||||
|
|
||||||
@@ -71,7 +70,7 @@ export default async function rm(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const removeStamp = stamp();
|
const removeStamp = stamp();
|
||||||
if (!opts['--yes'] && !(await confirmAliasRemove(output, alias))) {
|
if (!opts['--yes'] && !(await confirmAliasRemove(client, alias))) {
|
||||||
output.log('Aborted');
|
output.log('Aborted');
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -85,7 +84,7 @@ export default async function rm(
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function confirmAliasRemove(output: Output, alias: Alias) {
|
async function confirmAliasRemove(client: Client, alias: Alias) {
|
||||||
const srcUrl = alias.deployment
|
const srcUrl = alias.deployment
|
||||||
? chalk.underline(alias.deployment.url)
|
? chalk.underline(alias.deployment.url)
|
||||||
: null;
|
: null;
|
||||||
@@ -104,7 +103,7 @@ async function confirmAliasRemove(output: Output, alias: Alias) {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
output.log(`The following alias will be removed permanently`);
|
client.output.log(`The following alias will be removed permanently`);
|
||||||
output.print(` ${tbl}\n`);
|
client.output.print(` ${tbl}\n`);
|
||||||
return confirm(chalk.red('Are you sure?'), false);
|
return confirm(client, chalk.red('Are you sure?'), false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ export default async function ({ creditCards, clear = false, contextName }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
console.log(''); // New line
|
console.log(''); // New line
|
||||||
const stopSpinner = wait('Saving card');
|
const stopSpinner = wait(process.stderr, 'Saving card');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const res = await creditCards.add({
|
const res = await creditCards.add({
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ export default async client => {
|
|||||||
)} ${chalk.gray(`[${elapsed}]`)}`;
|
)} ${chalk.gray(`[${elapsed}]`)}`;
|
||||||
const choices = buildInquirerChoices(cards);
|
const choices = buildInquirerChoices(cards);
|
||||||
|
|
||||||
cardId = await listInput({
|
cardId = await listInput(client, {
|
||||||
message,
|
message,
|
||||||
choices,
|
choices,
|
||||||
separator: true,
|
separator: true,
|
||||||
@@ -187,6 +187,7 @@ export default async client => {
|
|||||||
if (cardId) {
|
if (cardId) {
|
||||||
const label = `Are you sure that you to set this card as the default?`;
|
const label = `Are you sure that you to set this card as the default?`;
|
||||||
const confirmation = await promptBool(label, {
|
const confirmation = await promptBool(label, {
|
||||||
|
...client,
|
||||||
trailing: '\n',
|
trailing: '\n',
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -250,7 +251,7 @@ export default async client => {
|
|||||||
)} under ${chalk.bold(contextName)} ${chalk.gray(`[${elapsed}]`)}`;
|
)} under ${chalk.bold(contextName)} ${chalk.gray(`[${elapsed}]`)}`;
|
||||||
const choices = buildInquirerChoices(cards);
|
const choices = buildInquirerChoices(cards);
|
||||||
|
|
||||||
cardId = await listInput({
|
cardId = await listInput(client, {
|
||||||
message,
|
message,
|
||||||
choices,
|
choices,
|
||||||
separator: true,
|
separator: true,
|
||||||
@@ -262,7 +263,7 @@ export default async client => {
|
|||||||
// typed `vercel billing rm <some-id>`) is valid
|
// typed `vercel billing rm <some-id>`) is valid
|
||||||
if (cardId) {
|
if (cardId) {
|
||||||
const label = `Are you sure that you want to remove this card?`;
|
const label = `Are you sure that you want to remove this card?`;
|
||||||
const confirmation = await promptBool(label);
|
const confirmation = await promptBool(label, client);
|
||||||
if (!confirmation) {
|
if (!confirmation) {
|
||||||
console.log('Aborted');
|
console.log('Aborted');
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ import logo from '../../util/output/logo';
|
|||||||
import getArgs from '../../util/get-args';
|
import getArgs from '../../util/get-args';
|
||||||
import Client from '../../util/client';
|
import Client from '../../util/client';
|
||||||
import { getPkgName } from '../../util/pkg-name';
|
import { getPkgName } from '../../util/pkg-name';
|
||||||
import { Output } from '../../util/output';
|
|
||||||
import { Deployment, PaginationOptions } from '../../types';
|
import { Deployment, PaginationOptions } from '../../types';
|
||||||
|
import { normalizeURL } from '../../util/bisect/normalize-url';
|
||||||
|
|
||||||
interface DeploymentV6
|
interface DeploymentV6
|
||||||
extends Pick<
|
extends Pick<
|
||||||
@@ -85,10 +85,10 @@ export default async function main(client: Client): Promise<number> {
|
|||||||
|
|
||||||
let bad =
|
let bad =
|
||||||
argv['--bad'] ||
|
argv['--bad'] ||
|
||||||
(await prompt(output, `Specify a URL where the bug occurs:`));
|
(await prompt(client, `Specify a URL where the bug occurs:`));
|
||||||
let good =
|
let good =
|
||||||
argv['--good'] ||
|
argv['--good'] ||
|
||||||
(await prompt(output, `Specify a URL where the bug does not occur:`));
|
(await prompt(client, `Specify a URL where the bug does not occur:`));
|
||||||
let subpath = argv['--path'] || '';
|
let subpath = argv['--path'] || '';
|
||||||
let run = argv['--run'] || '';
|
let run = argv['--run'] || '';
|
||||||
const openEnabled = argv['--open'] || false;
|
const openEnabled = argv['--open'] || false;
|
||||||
@@ -97,9 +97,7 @@ export default async function main(client: Client): Promise<number> {
|
|||||||
run = resolve(run);
|
run = resolve(run);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!bad.startsWith('https://')) {
|
bad = normalizeURL(bad);
|
||||||
bad = `https://${bad}`;
|
|
||||||
}
|
|
||||||
let parsed = parse(bad);
|
let parsed = parse(bad);
|
||||||
if (!parsed.hostname) {
|
if (!parsed.hostname) {
|
||||||
output.error('Invalid input: no hostname provided');
|
output.error('Invalid input: no hostname provided');
|
||||||
@@ -120,9 +118,7 @@ export default async function main(client: Client): Promise<number> {
|
|||||||
|
|
||||||
const badDeploymentPromise = getDeployment(client, bad).catch(err => err);
|
const badDeploymentPromise = getDeployment(client, bad).catch(err => err);
|
||||||
|
|
||||||
if (!good.startsWith('https://')) {
|
good = normalizeURL(good);
|
||||||
good = `https://${good}`;
|
|
||||||
}
|
|
||||||
parsed = parse(good);
|
parsed = parse(good);
|
||||||
if (!parsed.hostname) {
|
if (!parsed.hostname) {
|
||||||
output.error('Invalid input: no hostname provided');
|
output.error('Invalid input: no hostname provided');
|
||||||
@@ -146,7 +142,7 @@ export default async function main(client: Client): Promise<number> {
|
|||||||
|
|
||||||
if (!subpath) {
|
if (!subpath) {
|
||||||
subpath = await prompt(
|
subpath = await prompt(
|
||||||
output,
|
client,
|
||||||
`Specify the URL subpath where the bug occurs:`
|
`Specify the URL subpath where the bug occurs:`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -394,10 +390,10 @@ function getCommit(deployment: DeploymentV6) {
|
|||||||
return { sha, message };
|
return { sha, message };
|
||||||
}
|
}
|
||||||
|
|
||||||
async function prompt(output: Output, message: string): Promise<string> {
|
async function prompt(client: Client, message: string): Promise<string> {
|
||||||
// eslint-disable-next-line no-constant-condition
|
// eslint-disable-next-line no-constant-condition
|
||||||
while (true) {
|
while (true) {
|
||||||
const { val } = await inquirer.prompt({
|
const { val } = await client.prompt({
|
||||||
type: 'input',
|
type: 'input',
|
||||||
name: 'val',
|
name: 'val',
|
||||||
message,
|
message,
|
||||||
@@ -405,7 +401,7 @@ async function prompt(output: Output, message: string): Promise<string> {
|
|||||||
if (val) {
|
if (val) {
|
||||||
return val;
|
return val;
|
||||||
} else {
|
} else {
|
||||||
output.error('A value must be specified');
|
client.output.error('A value must be specified');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
import fs from 'fs-extra';
|
import fs from 'fs-extra';
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import dotenv from 'dotenv';
|
import dotenv from 'dotenv';
|
||||||
import { join, normalize, relative } from 'path';
|
import { join, normalize, relative, resolve } from 'path';
|
||||||
import {
|
import {
|
||||||
detectBuilders,
|
|
||||||
normalizePath,
|
normalizePath,
|
||||||
Files,
|
Files,
|
||||||
FileFsRef,
|
FileFsRef,
|
||||||
@@ -17,6 +16,7 @@ import {
|
|||||||
BuildResultV3,
|
BuildResultV3,
|
||||||
NowBuildError,
|
NowBuildError,
|
||||||
} from '@vercel/build-utils';
|
} from '@vercel/build-utils';
|
||||||
|
import { detectBuilders } from '@vercel/fs-detectors';
|
||||||
import minimatch from 'minimatch';
|
import minimatch from 'minimatch';
|
||||||
import {
|
import {
|
||||||
appendRoutesToPhase,
|
appendRoutesToPhase,
|
||||||
@@ -65,6 +65,7 @@ const help = () => {
|
|||||||
'DIR'
|
'DIR'
|
||||||
)} Path to the global ${'`.vercel`'} directory
|
)} Path to the global ${'`.vercel`'} directory
|
||||||
--cwd [path] The current working directory
|
--cwd [path] The current working directory
|
||||||
|
--output [path] Directory where built assets should be written to
|
||||||
--prod Build a production deployment
|
--prod Build a production deployment
|
||||||
-d, --debug Debug mode [off]
|
-d, --debug Debug mode [off]
|
||||||
-y, --yes Skip the confirmation prompt
|
-y, --yes Skip the confirmation prompt
|
||||||
@@ -101,6 +102,7 @@ export default async function main(client: Client): Promise<number> {
|
|||||||
// Parse CLI args
|
// Parse CLI args
|
||||||
const argv = getArgs(client.argv.slice(2), {
|
const argv = getArgs(client.argv.slice(2), {
|
||||||
'--cwd': String,
|
'--cwd': String,
|
||||||
|
'--output': String,
|
||||||
'--prod': Boolean,
|
'--prod': Boolean,
|
||||||
'--yes': Boolean,
|
'--yes': Boolean,
|
||||||
});
|
});
|
||||||
@@ -138,6 +140,7 @@ export default async function main(client: Client): Promise<number> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
confirmed = await confirm(
|
confirmed = await confirm(
|
||||||
|
client,
|
||||||
`No Project Settings found locally. Run ${cli.getCommandName(
|
`No Project Settings found locally. Run ${cli.getCommandName(
|
||||||
'pull'
|
'pull'
|
||||||
)} for retrieving them?`,
|
)} for retrieving them?`,
|
||||||
@@ -280,7 +283,9 @@ export default async function main(client: Client): Promise<number> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Delete output directory from potential previous build
|
// Delete output directory from potential previous build
|
||||||
const outputDir = join(cwd, OUTPUT_DIR);
|
const outputDir = argv['--output']
|
||||||
|
? resolve(argv['--output'])
|
||||||
|
: join(cwd, OUTPUT_DIR);
|
||||||
await fs.remove(outputDir);
|
await fs.remove(outputDir);
|
||||||
|
|
||||||
const buildStamp = stamp();
|
const buildStamp = stamp();
|
||||||
@@ -297,6 +302,7 @@ export default async function main(client: Client): Promise<number> {
|
|||||||
{
|
{
|
||||||
'//': 'This file was generated by the `vercel build` command. It is not part of the Build Output API.',
|
'//': 'This file was generated by the `vercel build` command. It is not part of the Build Output API.',
|
||||||
target,
|
target,
|
||||||
|
argv: process.argv,
|
||||||
builds: builds.map(build => {
|
builds: builds.map(build => {
|
||||||
const builderWithPkg = buildersWithPkgs.get(build.use);
|
const builderWithPkg = buildersWithPkgs.get(build.use);
|
||||||
if (!builderWithPkg) {
|
if (!builderWithPkg) {
|
||||||
@@ -305,6 +311,7 @@ export default async function main(client: Client): Promise<number> {
|
|||||||
const { builder, pkg: builderPkg } = builderWithPkg;
|
const { builder, pkg: builderPkg } = builderWithPkg;
|
||||||
return {
|
return {
|
||||||
require: builderPkg.name,
|
require: builderPkg.name,
|
||||||
|
requirePath: builderWithPkg.path,
|
||||||
apiVersion: builder.version,
|
apiVersion: builder.version,
|
||||||
...build,
|
...build,
|
||||||
};
|
};
|
||||||
@@ -463,11 +470,12 @@ export default async function main(client: Client): Promise<number> {
|
|||||||
};
|
};
|
||||||
await fs.writeJSON(join(outputDir, 'config.json'), config, { spaces: 2 });
|
await fs.writeJSON(join(outputDir, 'config.json'), config, { spaces: 2 });
|
||||||
|
|
||||||
|
const relOutputDir = relative(cwd, outputDir);
|
||||||
output.print(
|
output.print(
|
||||||
`${prependEmoji(
|
`${prependEmoji(
|
||||||
`Build Completed in ${chalk.bold(OUTPUT_DIR)} ${chalk.gray(
|
`Build Completed in ${chalk.bold(
|
||||||
buildStamp()
|
relOutputDir.startsWith('..') ? outputDir : relOutputDir
|
||||||
)}`,
|
)} ${chalk.gray(buildStamp())}`,
|
||||||
emoji('success')
|
emoji('success')
|
||||||
)}\n`
|
)}\n`
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -160,12 +160,12 @@ export default async (client: Client) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const { log, debug, error, prettyError, isTTY } = output;
|
const { log, debug, error, prettyError } = output;
|
||||||
|
|
||||||
const quiet = !isTTY;
|
const quiet = !client.stdout.isTTY;
|
||||||
|
|
||||||
// check paths
|
// check paths
|
||||||
const pathValidation = await validatePaths(output, paths);
|
const pathValidation = await validatePaths(client, paths);
|
||||||
|
|
||||||
if (!pathValidation.valid) {
|
if (!pathValidation.valid) {
|
||||||
return pathValidation.exitCode;
|
return pathValidation.exitCode;
|
||||||
@@ -243,6 +243,7 @@ export default async (client: Client) => {
|
|||||||
const shouldStartSetup =
|
const shouldStartSetup =
|
||||||
autoConfirm ||
|
autoConfirm ||
|
||||||
(await confirm(
|
(await confirm(
|
||||||
|
client,
|
||||||
`Set up and deploy ${chalk.cyan(`“${toHumanPath(path)}”`)}?`,
|
`Set up and deploy ${chalk.cyan(`“${toHumanPath(path)}”`)}?`,
|
||||||
true
|
true
|
||||||
));
|
));
|
||||||
@@ -287,7 +288,7 @@ export default async (client: Client) => {
|
|||||||
|
|
||||||
if (typeof projectOrNewProjectName === 'string') {
|
if (typeof projectOrNewProjectName === 'string') {
|
||||||
newProjectName = projectOrNewProjectName;
|
newProjectName = projectOrNewProjectName;
|
||||||
rootDirectory = await inputRootDirectory(path, output, autoConfirm);
|
rootDirectory = await inputRootDirectory(client, path, autoConfirm);
|
||||||
} else {
|
} else {
|
||||||
project = projectOrNewProjectName;
|
project = projectOrNewProjectName;
|
||||||
rootDirectory = project.rootDirectory;
|
rootDirectory = project.rootDirectory;
|
||||||
@@ -521,7 +522,7 @@ export default async (client: Client) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const settings = await editProjectSettings(
|
const settings = await editProjectSettings(
|
||||||
output,
|
client,
|
||||||
projectSettings,
|
projectSettings,
|
||||||
framework,
|
framework,
|
||||||
false,
|
false,
|
||||||
|
|||||||
@@ -110,9 +110,11 @@ export default async function dev(
|
|||||||
// v3 Build Output because it will incorrectly be detected by
|
// v3 Build Output because it will incorrectly be detected by
|
||||||
// @vercel/static-build in BuildOutputV3.getBuildOutputDirectory()
|
// @vercel/static-build in BuildOutputV3.getBuildOutputDirectory()
|
||||||
if (!devCommand) {
|
if (!devCommand) {
|
||||||
output.log(`Removing ${OUTPUT_DIR}`);
|
|
||||||
const outputDir = join(cwd, OUTPUT_DIR);
|
const outputDir = join(cwd, OUTPUT_DIR);
|
||||||
await fs.remove(outputDir);
|
if (await fs.pathExists(outputDir)) {
|
||||||
|
output.log(`Removing ${OUTPUT_DIR}`);
|
||||||
|
await fs.remove(outputDir);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const devServer = new DevServer(cwd, {
|
const devServer = new DevServer(cwd, {
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ export default async function add(
|
|||||||
|
|
||||||
const addStamp = stamp();
|
const addStamp = stamp();
|
||||||
const { domain, data: argData } = parsedParams;
|
const { domain, data: argData } = parsedParams;
|
||||||
const data = await getDNSData(output, argData);
|
const data = await getDNSData(client, argData);
|
||||||
if (!data) {
|
if (!data) {
|
||||||
output.log(`Aborted`);
|
output.log(`Aborted`);
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
@@ -87,7 +87,8 @@ export default async function buy(
|
|||||||
!(await promptBool(
|
!(await promptBool(
|
||||||
`Buy now for ${chalk.bold(`$${price}`)} (${`${period}yr${
|
`Buy now for ${chalk.bold(`$${price}`)} (${`${period}yr${
|
||||||
period > 1 ? 's' : ''
|
period > 1 ? 's' : ''
|
||||||
}`})?`
|
}`})?`,
|
||||||
|
client
|
||||||
))
|
))
|
||||||
) {
|
) {
|
||||||
return 0;
|
return 0;
|
||||||
@@ -99,7 +100,7 @@ export default async function buy(
|
|||||||
: `Auto renew every ${renewalPrice.period} years for ${chalk.bold(
|
: `Auto renew every ${renewalPrice.period} years for ${chalk.bold(
|
||||||
`$${price}`
|
`$${price}`
|
||||||
)}?`,
|
)}?`,
|
||||||
{ defaultValue: true }
|
{ ...client, defaultValue: true }
|
||||||
);
|
);
|
||||||
|
|
||||||
let buyResult;
|
let buyResult;
|
||||||
|
|||||||
@@ -77,7 +77,8 @@ export default async function move(
|
|||||||
!(await promptBool(
|
!(await promptBool(
|
||||||
`Are you sure you want to move ${param(domainName)} to ${param(
|
`Are you sure you want to move ${param(domainName)} to ${param(
|
||||||
destination
|
destination
|
||||||
)}?`
|
)}?`,
|
||||||
|
client
|
||||||
))
|
))
|
||||||
) {
|
) {
|
||||||
output.log('Aborted');
|
output.log('Aborted');
|
||||||
@@ -95,7 +96,8 @@ export default async function move(
|
|||||||
);
|
);
|
||||||
if (
|
if (
|
||||||
!(await promptBool(
|
!(await promptBool(
|
||||||
`Are you sure you want to move ${param(domainName)}?`
|
`Are you sure you want to move ${param(domainName)}?`,
|
||||||
|
client
|
||||||
))
|
))
|
||||||
) {
|
) {
|
||||||
output.log('Aborted');
|
output.log('Aborted');
|
||||||
|
|||||||
@@ -92,7 +92,10 @@ export default async function rm(
|
|||||||
const skipConfirmation = opts['--yes'] || false;
|
const skipConfirmation = opts['--yes'] || false;
|
||||||
if (
|
if (
|
||||||
!skipConfirmation &&
|
!skipConfirmation &&
|
||||||
!(await promptBool(`Are you sure you want to remove ${param(domainName)}?`))
|
!(await promptBool(
|
||||||
|
`Are you sure you want to remove ${param(domainName)}?`,
|
||||||
|
client
|
||||||
|
))
|
||||||
) {
|
) {
|
||||||
output.log('Aborted');
|
output.log('Aborted');
|
||||||
return 0;
|
return 0;
|
||||||
@@ -230,7 +233,7 @@ async function removeDomain(
|
|||||||
|
|
||||||
if (
|
if (
|
||||||
!skipConfirmation &&
|
!skipConfirmation &&
|
||||||
!(await promptBool(`Remove conflicts associated with domain?`))
|
!(await promptBool(`Remove conflicts associated with domain?`, client))
|
||||||
) {
|
) {
|
||||||
output.log('Aborted');
|
output.log('Aborted');
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -81,7 +81,8 @@ export default async function transferIn(
|
|||||||
const shouldTransfer = await promptBool(
|
const shouldTransfer = await promptBool(
|
||||||
transferPolicy === 'no-change'
|
transferPolicy === 'no-change'
|
||||||
? `Transfer now for ${chalk.bold(`$${price}`)}?`
|
? `Transfer now for ${chalk.bold(`$${price}`)}?`
|
||||||
: `Transfer now with 1yr renewal for ${chalk.bold(`$${price}`)}?`
|
: `Transfer now with 1yr renewal for ${chalk.bold(`$${price}`)}?`,
|
||||||
|
client
|
||||||
);
|
);
|
||||||
if (!shouldTransfer) {
|
if (!shouldTransfer) {
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
2
packages/cli/src/commands/env/add.ts
vendored
2
packages/cli/src/commands/env/add.ts
vendored
@@ -31,7 +31,7 @@ export default async function add(
|
|||||||
// improve the way we show inquirer prompts
|
// improve the way we show inquirer prompts
|
||||||
require('../../util/input/patch-inquirer');
|
require('../../util/input/patch-inquirer');
|
||||||
|
|
||||||
const stdInput = await readStandardInput();
|
const stdInput = await readStandardInput(client.stdin);
|
||||||
let [envName, envTargetArg, envGitBranch] = args;
|
let [envName, envTargetArg, envGitBranch] = args;
|
||||||
|
|
||||||
if (args.length > 3) {
|
if (args.length > 3) {
|
||||||
|
|||||||
1
packages/cli/src/commands/env/pull.ts
vendored
1
packages/cli/src/commands/env/pull.ts
vendored
@@ -74,6 +74,7 @@ export default async function pull(
|
|||||||
exists &&
|
exists &&
|
||||||
!skipConfirmation &&
|
!skipConfirmation &&
|
||||||
!(await confirm(
|
!(await confirm(
|
||||||
|
client,
|
||||||
`Found existing file ${param(filename)}. Do you want to overwrite?`,
|
`Found existing file ${param(filename)}. Do you want to overwrite?`,
|
||||||
false
|
false
|
||||||
))
|
))
|
||||||
|
|||||||
1
packages/cli/src/commands/env/rm.ts
vendored
1
packages/cli/src/commands/env/rm.ts
vendored
@@ -104,6 +104,7 @@ export default async function rm(
|
|||||||
if (
|
if (
|
||||||
!skipConfirmation &&
|
!skipConfirmation &&
|
||||||
!(await confirm(
|
!(await confirm(
|
||||||
|
client,
|
||||||
`Removing Environment Variable ${param(env.key)} from ${formatEnvTarget(
|
`Removing Environment Variable ${param(env.key)} from ${formatEnvTarget(
|
||||||
env
|
env
|
||||||
)} in Project ${chalk.bold(project.name)}. Are you sure?`,
|
)} in Project ${chalk.bold(project.name)}. Are you sure?`,
|
||||||
|
|||||||
@@ -46,7 +46,11 @@ export default async function init(
|
|||||||
const exampleList = examples.filter(x => x.visible).map(x => x.name);
|
const exampleList = examples.filter(x => x.visible).map(x => x.name);
|
||||||
|
|
||||||
if (!name) {
|
if (!name) {
|
||||||
const chosen = await chooseFromDropdown('Select example:', exampleList);
|
const chosen = await chooseFromDropdown(
|
||||||
|
client,
|
||||||
|
'Select example:',
|
||||||
|
exampleList
|
||||||
|
);
|
||||||
|
|
||||||
if (!chosen) {
|
if (!chosen) {
|
||||||
output.log('Aborted');
|
output.log('Aborted');
|
||||||
@@ -65,7 +69,7 @@ export default async function init(
|
|||||||
return extractExample(client, name, dir, force, 'v1');
|
return extractExample(client, name, dir, force, 'v1');
|
||||||
}
|
}
|
||||||
|
|
||||||
const found = await guess(exampleList, name);
|
const found = await guess(client, exampleList, name);
|
||||||
|
|
||||||
if (typeof found === 'string') {
|
if (typeof found === 'string') {
|
||||||
return extractExample(client, found, dir, force);
|
return extractExample(client, found, dir, force);
|
||||||
@@ -90,14 +94,18 @@ async function fetchExampleList(client: Client) {
|
|||||||
/**
|
/**
|
||||||
* Prompt user for choosing which example to init
|
* Prompt user for choosing which example to init
|
||||||
*/
|
*/
|
||||||
async function chooseFromDropdown(message: string, exampleList: string[]) {
|
async function chooseFromDropdown(
|
||||||
|
client: Client,
|
||||||
|
message: string,
|
||||||
|
exampleList: string[]
|
||||||
|
) {
|
||||||
const choices = exampleList.map(name => ({
|
const choices = exampleList.map(name => ({
|
||||||
name,
|
name,
|
||||||
value: name,
|
value: name,
|
||||||
short: name,
|
short: name,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
return listInput({
|
return listInput(client, {
|
||||||
message,
|
message,
|
||||||
choices,
|
choices,
|
||||||
});
|
});
|
||||||
@@ -194,7 +202,7 @@ function prepareFolder(cwd: string, folder: string, force?: boolean) {
|
|||||||
/**
|
/**
|
||||||
* Guess which example user try to init
|
* Guess which example user try to init
|
||||||
*/
|
*/
|
||||||
async function guess(exampleList: string[], name: string) {
|
async function guess(client: Client, exampleList: string[], name: string) {
|
||||||
const GuessError = new Error(
|
const GuessError = new Error(
|
||||||
`No example found for ${chalk.bold(name)}, run ${getCommandName(
|
`No example found for ${chalk.bold(name)}, run ${getCommandName(
|
||||||
`init`
|
`init`
|
||||||
@@ -208,7 +216,7 @@ async function guess(exampleList: string[], name: string) {
|
|||||||
const found = didYouMean(name, exampleList, 0.7);
|
const found = didYouMean(name, exampleList, 0.7);
|
||||||
|
|
||||||
if (typeof found === 'string') {
|
if (typeof found === 'string') {
|
||||||
if (await promptBool(`Did you mean ${chalk.bold(found)}?`)) {
|
if (await promptBool(`Did you mean ${chalk.bold(found)}?`, client)) {
|
||||||
return found;
|
return found;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ export default async function main(client: Client, desiredSlug?: string) {
|
|||||||
];
|
];
|
||||||
|
|
||||||
output.stopSpinner();
|
output.stopSpinner();
|
||||||
desiredSlug = await listInput({
|
desiredSlug = await listInput(client, {
|
||||||
message: 'Switch to:',
|
message: 'Switch to:',
|
||||||
choices,
|
choices,
|
||||||
eraseFinalAnswer: true,
|
eraseFinalAnswer: true,
|
||||||
|
|||||||
@@ -54,12 +54,12 @@ export default async (client: Client): Promise<number> => {
|
|||||||
throw err;
|
throw err;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (output.isTTY) {
|
if (client.stdout.isTTY) {
|
||||||
output.log(contextName);
|
output.log(contextName);
|
||||||
} else {
|
} else {
|
||||||
// If stdout is not a TTY, then only print the username
|
// If stdout is not a TTY, then only print the username
|
||||||
// to support piping the output to another file / exe
|
// to support piping the output to another file / exe
|
||||||
output.print(`${contextName}\n`, { w: process.stdout });
|
client.stdout.write(`${contextName}\n`);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ import * as Sentry from '@sentry/node';
|
|||||||
import hp from './util/humanize-path';
|
import hp from './util/humanize-path';
|
||||||
import commands from './commands';
|
import commands from './commands';
|
||||||
import pkg from './util/pkg';
|
import pkg from './util/pkg';
|
||||||
import createOutput from './util/output';
|
import { Output } from './util/output';
|
||||||
import cmd from './util/output/cmd';
|
import cmd from './util/output/cmd';
|
||||||
import info from './util/output/info';
|
import info from './util/output/info';
|
||||||
import error from './util/output/error';
|
import error from './util/output/error';
|
||||||
@@ -109,7 +109,7 @@ const main = async () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const isDebugging = argv['--debug'];
|
const isDebugging = argv['--debug'];
|
||||||
const output = createOutput({ debug: isDebugging });
|
const output = new Output(process.stderr, { debug: isDebugging });
|
||||||
|
|
||||||
debug = output.debug;
|
debug = output.debug;
|
||||||
|
|
||||||
@@ -387,6 +387,9 @@ const main = async () => {
|
|||||||
// Shared API `Client` instance for all sub-commands to utilize
|
// Shared API `Client` instance for all sub-commands to utilize
|
||||||
client = new Client({
|
client = new Client({
|
||||||
apiUrl,
|
apiUrl,
|
||||||
|
stdin: process.stdin,
|
||||||
|
stdout: process.stdout,
|
||||||
|
stderr: output.stream,
|
||||||
output,
|
output,
|
||||||
config,
|
config,
|
||||||
authConfig,
|
authConfig,
|
||||||
@@ -796,7 +799,5 @@ process.on('uncaughtException', handleUnexpected);
|
|||||||
main()
|
main()
|
||||||
.then(exitCode => {
|
.then(exitCode => {
|
||||||
process.exitCode = exitCode;
|
process.exitCode = exitCode;
|
||||||
// @ts-ignore - "nowExit" is a non-standard event name
|
|
||||||
process.emit('nowExit');
|
|
||||||
})
|
})
|
||||||
.catch(handleUnexpected);
|
.catch(handleUnexpected);
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import type { Readable, Writable } from 'stream';
|
||||||
|
|
||||||
export type ProjectSettings = import('@vercel/build-utils').ProjectSettings;
|
export type ProjectSettings = import('@vercel/build-utils').ProjectSettings;
|
||||||
|
|
||||||
export type Primitive =
|
export type Primitive =
|
||||||
@@ -442,3 +444,19 @@ export interface BuildOutput {
|
|||||||
layers?: string[];
|
layers?: string[];
|
||||||
} | null;
|
} | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ReadableTTY extends Readable {
|
||||||
|
isTTY?: boolean;
|
||||||
|
isRaw?: boolean;
|
||||||
|
setRawMode?: (mode: boolean) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface WritableTTY extends Writable {
|
||||||
|
isTTY?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Stdio {
|
||||||
|
stdin: ReadableTTY;
|
||||||
|
stdout: WritableTTY;
|
||||||
|
stderr: WritableTTY;
|
||||||
|
}
|
||||||
|
|||||||
7
packages/cli/src/util/bisect/normalize-url.ts
Normal file
7
packages/cli/src/util/bisect/normalize-url.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
function hasScheme(url: string): Boolean {
|
||||||
|
return url.startsWith('http://') || url.startsWith('https://');
|
||||||
|
}
|
||||||
|
|
||||||
|
export function normalizeURL(url: string): string {
|
||||||
|
return hasScheme(url) ? url : `https://${url}`;
|
||||||
|
}
|
||||||
@@ -385,8 +385,14 @@ export async function* findDirs(
|
|||||||
}
|
}
|
||||||
for (const path of paths) {
|
for (const path of paths) {
|
||||||
const abs = join(dir, path);
|
const abs = join(dir, path);
|
||||||
const s = await fs.stat(abs);
|
let stat: fs.Stats;
|
||||||
if (s.isDirectory()) {
|
try {
|
||||||
|
stat = await fs.lstat(abs);
|
||||||
|
} catch (err: any) {
|
||||||
|
if (err.code === 'ENOENT') continue;
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
if (stat.isDirectory()) {
|
||||||
if (path === name) {
|
if (path === name) {
|
||||||
yield relative(root, abs);
|
yield relative(root, abs);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { bold } from 'chalk';
|
||||||
|
import inquirer from 'inquirer';
|
||||||
import { EventEmitter } from 'events';
|
import { EventEmitter } from 'events';
|
||||||
import { URLSearchParams } from 'url';
|
import { URLSearchParams } from 'url';
|
||||||
import { parse as parseUrl } from 'url';
|
import { parse as parseUrl } from 'url';
|
||||||
@@ -11,10 +13,16 @@ import printIndications from './print-indications';
|
|||||||
import reauthenticate from './login/reauthenticate';
|
import reauthenticate from './login/reauthenticate';
|
||||||
import { SAMLError } from './login/types';
|
import { SAMLError } from './login/types';
|
||||||
import { writeToAuthConfigFile } from './config/files';
|
import { writeToAuthConfigFile } from './config/files';
|
||||||
import { AuthConfig, GlobalConfig, JSONObject } from '../types';
|
import type {
|
||||||
|
AuthConfig,
|
||||||
|
GlobalConfig,
|
||||||
|
JSONObject,
|
||||||
|
Stdio,
|
||||||
|
ReadableTTY,
|
||||||
|
WritableTTY,
|
||||||
|
} from '../types';
|
||||||
import { sharedPromise } from './promise';
|
import { sharedPromise } from './promise';
|
||||||
import { APIError } from './errors-ts';
|
import { APIError } from './errors-ts';
|
||||||
import { bold } from 'chalk';
|
|
||||||
|
|
||||||
const isSAMLError = (v: any): v is SAMLError => {
|
const isSAMLError = (v: any): v is SAMLError => {
|
||||||
return v && v.saml;
|
return v && v.saml;
|
||||||
@@ -28,7 +36,7 @@ export interface FetchOptions extends Omit<RequestInit, 'body'> {
|
|||||||
accountId?: string;
|
accountId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ClientOptions {
|
export interface ClientOptions extends Stdio {
|
||||||
argv: string[];
|
argv: string[];
|
||||||
apiUrl: string;
|
apiUrl: string;
|
||||||
authConfig: AuthConfig;
|
authConfig: AuthConfig;
|
||||||
@@ -41,13 +49,17 @@ export const isJSONObject = (v: any): v is JSONObject => {
|
|||||||
return v && typeof v == 'object' && v.constructor === Object;
|
return v && typeof v == 'object' && v.constructor === Object;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default class Client extends EventEmitter {
|
export default class Client extends EventEmitter implements Stdio {
|
||||||
argv: string[];
|
argv: string[];
|
||||||
apiUrl: string;
|
apiUrl: string;
|
||||||
authConfig: AuthConfig;
|
authConfig: AuthConfig;
|
||||||
|
stdin: ReadableTTY;
|
||||||
|
stdout: WritableTTY;
|
||||||
|
stderr: WritableTTY;
|
||||||
output: Output;
|
output: Output;
|
||||||
config: GlobalConfig;
|
config: GlobalConfig;
|
||||||
localConfig?: VercelConfig;
|
localConfig?: VercelConfig;
|
||||||
|
prompt!: inquirer.PromptModule;
|
||||||
private requestIdCounter: number;
|
private requestIdCounter: number;
|
||||||
|
|
||||||
constructor(opts: ClientOptions) {
|
constructor(opts: ClientOptions) {
|
||||||
@@ -55,10 +67,14 @@ export default class Client extends EventEmitter {
|
|||||||
this.argv = opts.argv;
|
this.argv = opts.argv;
|
||||||
this.apiUrl = opts.apiUrl;
|
this.apiUrl = opts.apiUrl;
|
||||||
this.authConfig = opts.authConfig;
|
this.authConfig = opts.authConfig;
|
||||||
|
this.stdin = opts.stdin;
|
||||||
|
this.stdout = opts.stdout;
|
||||||
|
this.stderr = opts.stderr;
|
||||||
this.output = opts.output;
|
this.output = opts.output;
|
||||||
this.config = opts.config;
|
this.config = opts.config;
|
||||||
this.localConfig = opts.localConfig;
|
this.localConfig = opts.localConfig;
|
||||||
this.requestIdCounter = 1;
|
this.requestIdCounter = 1;
|
||||||
|
this._createPromptModule();
|
||||||
}
|
}
|
||||||
|
|
||||||
retry<T>(fn: RetryFunction<T>, { retries = 3, maxTimeout = Infinity } = {}) {
|
retry<T>(fn: RetryFunction<T>, { retries = 3, maxTimeout = Infinity } = {}) {
|
||||||
@@ -124,7 +140,7 @@ export default class Client extends EventEmitter {
|
|||||||
return this.retry(async bail => {
|
return this.retry(async bail => {
|
||||||
const res = await this._fetch(url, opts);
|
const res = await this._fetch(url, opts);
|
||||||
|
|
||||||
printIndications(res);
|
printIndications(this, res);
|
||||||
|
|
||||||
if (!res.ok) {
|
if (!res.ok) {
|
||||||
const error = await responseError(res);
|
const error = await responseError(res);
|
||||||
@@ -180,4 +196,11 @@ export default class Client extends EventEmitter {
|
|||||||
_onRetry = (error: Error) => {
|
_onRetry = (error: Error) => {
|
||||||
this.output.debug(`Retrying: ${error}\n${error.stack}`);
|
this.output.debug(`Retrying: ${error}\n${error.stack}`);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
_createPromptModule() {
|
||||||
|
this.prompt = inquirer.createPromptModule({
|
||||||
|
input: this.stdin as NodeJS.ReadStream,
|
||||||
|
output: this.stderr as NodeJS.WriteStream,
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,8 +13,8 @@ import {
|
|||||||
Lambda,
|
Lambda,
|
||||||
FileBlob,
|
FileBlob,
|
||||||
FileFsRef,
|
FileFsRef,
|
||||||
isOfficialRuntime,
|
|
||||||
} from '@vercel/build-utils';
|
} from '@vercel/build-utils';
|
||||||
|
import { isOfficialRuntime } from '@vercel/fs-detectors';
|
||||||
import plural from 'pluralize';
|
import plural from 'pluralize';
|
||||||
import minimatch from 'minimatch';
|
import minimatch from 'minimatch';
|
||||||
|
|
||||||
@@ -425,10 +425,6 @@ export async function getBuildMatches(
|
|||||||
src = extensionless;
|
src = extensionless;
|
||||||
}
|
}
|
||||||
|
|
||||||
// We need to escape brackets since `glob` will
|
|
||||||
// try to find a group otherwise
|
|
||||||
src = src.replace(/(\[|\])/g, '[$1]');
|
|
||||||
|
|
||||||
const files = fileList
|
const files = fileList
|
||||||
.filter(name => name === src || minimatch(name, src, { dot: true }))
|
.filter(name => name === src || minimatch(name, src, { dot: true }))
|
||||||
.map(name => join(cwd, name));
|
.map(name => join(cwd, name));
|
||||||
|
|||||||
18
packages/cli/src/util/dev/headers.ts
Normal file
18
packages/cli/src/util/dev/headers.ts
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { Headers } from 'node-fetch';
|
||||||
|
import { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
|
||||||
|
|
||||||
|
export function nodeHeadersToFetchHeaders(
|
||||||
|
nodeHeaders: IncomingHttpHeaders | OutgoingHttpHeaders
|
||||||
|
): Headers {
|
||||||
|
const headers = new Headers();
|
||||||
|
for (const [name, value] of Object.entries(nodeHeaders)) {
|
||||||
|
if (Array.isArray(value)) {
|
||||||
|
for (const val of value) {
|
||||||
|
headers.append(name, val);
|
||||||
|
}
|
||||||
|
} else if (typeof value !== 'undefined') {
|
||||||
|
headers.set(name, String(value));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return headers;
|
||||||
|
}
|
||||||
@@ -1,12 +1,13 @@
|
|||||||
|
import ms from 'ms';
|
||||||
import url, { URL } from 'url';
|
import url, { URL } from 'url';
|
||||||
import http from 'http';
|
import http from 'http';
|
||||||
import fs from 'fs-extra';
|
import fs from 'fs-extra';
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
|
import fetch from 'node-fetch';
|
||||||
import plural from 'pluralize';
|
import plural from 'pluralize';
|
||||||
import rawBody from 'raw-body';
|
import rawBody from 'raw-body';
|
||||||
import listen from 'async-listen';
|
import listen from 'async-listen';
|
||||||
import minimatch from 'minimatch';
|
import minimatch from 'minimatch';
|
||||||
import ms from 'ms';
|
|
||||||
import httpProxy from 'http-proxy';
|
import httpProxy from 'http-proxy';
|
||||||
import { randomBytes } from 'crypto';
|
import { randomBytes } from 'crypto';
|
||||||
import serveHandler from 'serve-handler';
|
import serveHandler from 'serve-handler';
|
||||||
@@ -16,11 +17,11 @@ import path, { isAbsolute, basename, dirname, extname, join } from 'path';
|
|||||||
import once from '@tootallnate/once';
|
import once from '@tootallnate/once';
|
||||||
import directoryTemplate from 'serve-handler/src/directory';
|
import directoryTemplate from 'serve-handler/src/directory';
|
||||||
import getPort from 'get-port';
|
import getPort from 'get-port';
|
||||||
import { ChildProcess } from 'child_process';
|
|
||||||
import isPortReachable from 'is-port-reachable';
|
import isPortReachable from 'is-port-reachable';
|
||||||
import deepEqual from 'fast-deep-equal';
|
import deepEqual from 'fast-deep-equal';
|
||||||
import which from 'which';
|
import which from 'which';
|
||||||
import npa from 'npm-package-arg';
|
import npa from 'npm-package-arg';
|
||||||
|
import type { ChildProcess } from 'child_process';
|
||||||
|
|
||||||
import { getVercelIgnore, fileNameSymbol } from '@vercel/client';
|
import { getVercelIgnore, fileNameSymbol } from '@vercel/client';
|
||||||
import {
|
import {
|
||||||
@@ -35,12 +36,14 @@ import {
|
|||||||
StartDevServerResult,
|
StartDevServerResult,
|
||||||
FileFsRef,
|
FileFsRef,
|
||||||
PackageJson,
|
PackageJson,
|
||||||
|
spawnCommand,
|
||||||
|
} from '@vercel/build-utils';
|
||||||
|
import {
|
||||||
detectBuilders,
|
detectBuilders,
|
||||||
detectApiDirectory,
|
detectApiDirectory,
|
||||||
detectApiExtensions,
|
detectApiExtensions,
|
||||||
spawnCommand,
|
|
||||||
isOfficialRuntime,
|
isOfficialRuntime,
|
||||||
} from '@vercel/build-utils';
|
} from '@vercel/fs-detectors';
|
||||||
import frameworkList from '@vercel/frameworks';
|
import frameworkList from '@vercel/frameworks';
|
||||||
|
|
||||||
import cmd from '../output/cmd';
|
import cmd from '../output/cmd';
|
||||||
@@ -90,6 +93,7 @@ import {
|
|||||||
import { ProjectEnvVariable, ProjectSettings } from '../../types';
|
import { ProjectEnvVariable, ProjectSettings } from '../../types';
|
||||||
import exposeSystemEnvs from './expose-system-envs';
|
import exposeSystemEnvs from './expose-system-envs';
|
||||||
import { treeKill } from '../tree-kill';
|
import { treeKill } from '../tree-kill';
|
||||||
|
import { nodeHeadersToFetchHeaders } from './headers';
|
||||||
|
|
||||||
const frontendRuntimeSet = new Set(
|
const frontendRuntimeSet = new Set(
|
||||||
frameworkList.map(f => f.useRuntime?.use || '@vercel/static-build')
|
frameworkList.map(f => f.useRuntime?.use || '@vercel/static-build')
|
||||||
@@ -327,6 +331,8 @@ export default class DevServer {
|
|||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const name = relative(this.cwd, fsPath);
|
const name = relative(this.cwd, fsPath);
|
||||||
try {
|
try {
|
||||||
|
await this.getVercelConfig();
|
||||||
|
|
||||||
this.files[name] = await FileFsRef.fromFsPath({ fsPath });
|
this.files[name] = await FileFsRef.fromFsPath({ fsPath });
|
||||||
const extensionless = this.getExtensionlessFile(name);
|
const extensionless = this.getExtensionlessFile(name);
|
||||||
if (extensionless) {
|
if (extensionless) {
|
||||||
@@ -593,7 +599,7 @@ export default class DevServer {
|
|||||||
await this.exit();
|
await this.exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (warnings && warnings.length > 0) {
|
if (warnings?.length > 0) {
|
||||||
warnings.forEach(warning =>
|
warnings.forEach(warning =>
|
||||||
this.output.warn(warning.message, null, warning.link, warning.action)
|
this.output.warn(warning.message, null, warning.link, warning.action)
|
||||||
);
|
);
|
||||||
@@ -1106,6 +1112,7 @@ export default class DevServer {
|
|||||||
view = errorTemplate({
|
view = errorTemplate({
|
||||||
http_status_code: statusCode,
|
http_status_code: statusCode,
|
||||||
http_status_description,
|
http_status_description,
|
||||||
|
error_code,
|
||||||
request_id: requestId,
|
request_id: requestId,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -1337,32 +1344,6 @@ export default class DevServer {
|
|||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
|
||||||
runDevMiddleware = async (
|
|
||||||
req: http.IncomingMessage,
|
|
||||||
res: http.ServerResponse
|
|
||||||
) => {
|
|
||||||
const { devMiddlewarePlugins } = await loadCliPlugins(
|
|
||||||
this.cwd,
|
|
||||||
this.output
|
|
||||||
);
|
|
||||||
try {
|
|
||||||
for (let plugin of devMiddlewarePlugins) {
|
|
||||||
const result = await plugin.plugin.runDevMiddleware(req, res, this.cwd);
|
|
||||||
if (result.finished) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return { finished: false };
|
|
||||||
} catch (e) {
|
|
||||||
return {
|
|
||||||
finished: true,
|
|
||||||
error: e,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Serve project directory as a v2 deployment.
|
* Serve project directory as a v2 deployment.
|
||||||
*/
|
*/
|
||||||
@@ -1429,13 +1410,143 @@ export default class DevServer {
|
|||||||
let statusCode: number | undefined;
|
let statusCode: number | undefined;
|
||||||
let prevUrl = req.url;
|
let prevUrl = req.url;
|
||||||
let prevHeaders: HttpHeadersConfig = {};
|
let prevHeaders: HttpHeadersConfig = {};
|
||||||
|
let middlewarePid: number | undefined;
|
||||||
|
|
||||||
/*
|
// Run the middleware file, if present, and apply any
|
||||||
const middlewareResult = await this.runDevMiddleware(req, res);
|
// mutations to the incoming request based on the
|
||||||
|
// result of the middleware invocation.
|
||||||
|
const middleware = [...this.buildMatches.values()].find(
|
||||||
|
m => m.config?.middleware === true
|
||||||
|
);
|
||||||
|
if (middleware) {
|
||||||
|
let startMiddlewareResult: StartDevServerResult | undefined;
|
||||||
|
// TODO: can we add some caching to prevent (re-)starting
|
||||||
|
// the middleware server for every HTTP request?
|
||||||
|
const { envConfigs, files, devCacheDir, cwd: workPath } = this;
|
||||||
|
try {
|
||||||
|
startMiddlewareResult =
|
||||||
|
await middleware.builderWithPkg.builder.startDevServer?.({
|
||||||
|
files,
|
||||||
|
entrypoint: middleware.entrypoint,
|
||||||
|
workPath,
|
||||||
|
repoRootPath: this.cwd,
|
||||||
|
config: middleware.config || {},
|
||||||
|
meta: {
|
||||||
|
isDev: true,
|
||||||
|
devCacheDir,
|
||||||
|
requestUrl: req.url,
|
||||||
|
env: { ...envConfigs.runEnv },
|
||||||
|
buildEnv: { ...envConfigs.buildEnv },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
if (middlewareResult) {
|
if (startMiddlewareResult) {
|
||||||
if (middlewareResult.error) {
|
const { port, pid } = startMiddlewareResult;
|
||||||
this.sendError(
|
middlewarePid = pid;
|
||||||
|
this.devServerPids.add(pid);
|
||||||
|
|
||||||
|
const middlewareReqHeaders = nodeHeadersToFetchHeaders(req.headers);
|
||||||
|
|
||||||
|
// Add the Vercel platform proxy request headers
|
||||||
|
const proxyHeaders = this.getProxyHeaders(req, requestId, true);
|
||||||
|
for (const [name, value] of nodeHeadersToFetchHeaders(proxyHeaders)) {
|
||||||
|
middlewareReqHeaders.set(name, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
const middlewareRes = await fetch(
|
||||||
|
`http://127.0.0.1:${port}${parsed.path}`,
|
||||||
|
{
|
||||||
|
headers: middlewareReqHeaders,
|
||||||
|
method: req.method,
|
||||||
|
redirect: 'manual',
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
if (middlewareRes.status === 500) {
|
||||||
|
await this.sendError(
|
||||||
|
req,
|
||||||
|
res,
|
||||||
|
requestId,
|
||||||
|
'EDGE_FUNCTION_INVOCATION_FAILED',
|
||||||
|
500
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Apply status code from middleware invocation,
|
||||||
|
// for i.e. redirects or a custom 404 page
|
||||||
|
res.statusCode = middlewareRes.status;
|
||||||
|
|
||||||
|
let rewritePath = '';
|
||||||
|
let contentType = '';
|
||||||
|
let shouldContinue = false;
|
||||||
|
const skipMiddlewareHeaders = new Set([
|
||||||
|
'date',
|
||||||
|
'connection',
|
||||||
|
'content-length',
|
||||||
|
'transfer-encoding',
|
||||||
|
]);
|
||||||
|
for (const [name, value] of middlewareRes.headers) {
|
||||||
|
if (name === 'x-middleware-next') {
|
||||||
|
shouldContinue = value === '1';
|
||||||
|
} else if (name === 'x-middleware-rewrite') {
|
||||||
|
rewritePath = value;
|
||||||
|
shouldContinue = true;
|
||||||
|
} else if (name === 'content-type') {
|
||||||
|
contentType = value;
|
||||||
|
} else if (!skipMiddlewareHeaders.has(name)) {
|
||||||
|
// Any other kind of response header should be included
|
||||||
|
// on both the incoming HTTP request (for when proxying
|
||||||
|
// to another function) and the outgoing HTTP response.
|
||||||
|
res.setHeader(name, value);
|
||||||
|
req.headers[name] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!shouldContinue) {
|
||||||
|
const middlewareBody = await middlewareRes.buffer();
|
||||||
|
this.setResponseHeaders(res, requestId);
|
||||||
|
if (middlewareBody.length > 0) {
|
||||||
|
res.setHeader('content-length', middlewareBody.length);
|
||||||
|
if (contentType) {
|
||||||
|
res.setHeader('content-type', contentType);
|
||||||
|
}
|
||||||
|
res.end(middlewareBody);
|
||||||
|
} else {
|
||||||
|
res.end();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rewritePath) {
|
||||||
|
// TODO: add validation?
|
||||||
|
debug(`Detected rewrite path from middleware: "${rewritePath}"`);
|
||||||
|
prevUrl = rewritePath;
|
||||||
|
|
||||||
|
// Retain orginal pathname, but override query parameters from the rewrite
|
||||||
|
const beforeRewriteUrl = req.url || '/';
|
||||||
|
const rewriteUrlParsed = url.parse(beforeRewriteUrl, true);
|
||||||
|
delete rewriteUrlParsed.search;
|
||||||
|
rewriteUrlParsed.query = url.parse(rewritePath, true).query;
|
||||||
|
req.url = url.format(rewriteUrlParsed);
|
||||||
|
debug(
|
||||||
|
`Rewrote incoming HTTP URL from "${beforeRewriteUrl}" to "${req.url}"`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
// `startDevServer()` threw an error. Most likely this means the dev
|
||||||
|
// server process exited before sending the port information message
|
||||||
|
// (missing dependency at runtime, for example).
|
||||||
|
if (err.code === 'ENOENT') {
|
||||||
|
err.message = `Command not found: ${chalk.cyan(
|
||||||
|
err.path,
|
||||||
|
...err.spawnargs
|
||||||
|
)}\nPlease ensure that ${cmd(err.path)} is properly installed`;
|
||||||
|
err.link = 'https://vercel.link/command-not-found';
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.sendError(
|
||||||
req,
|
req,
|
||||||
res,
|
res,
|
||||||
requestId,
|
requestId,
|
||||||
@@ -1443,24 +1554,12 @@ export default class DevServer {
|
|||||||
500
|
500
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
} finally {
|
||||||
if (middlewareResult.finished) {
|
if (middlewarePid) {
|
||||||
return;
|
this.killBuilderDevServer(middlewarePid);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (middlewareResult.pathname) {
|
|
||||||
const origUrl = url.parse(req.url || '/', true);
|
|
||||||
origUrl.pathname = middlewareResult.pathname;
|
|
||||||
prevUrl = url.format(origUrl);
|
|
||||||
}
|
|
||||||
if (middlewareResult.query && prevUrl) {
|
|
||||||
const origUrl = url.parse(req.url || '/', true);
|
|
||||||
delete origUrl.search;
|
|
||||||
Object.assign(origUrl.query, middlewareResult.query);
|
|
||||||
prevUrl = url.format(origUrl);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
|
|
||||||
for (const phase of phases) {
|
for (const phase of phases) {
|
||||||
statusCode = undefined;
|
statusCode = undefined;
|
||||||
@@ -1740,7 +1839,10 @@ export default class DevServer {
|
|||||||
isDev: true,
|
isDev: true,
|
||||||
requestPath,
|
requestPath,
|
||||||
devCacheDir,
|
devCacheDir,
|
||||||
env: { ...envConfigs.runEnv },
|
env: {
|
||||||
|
...envConfigs.runEnv,
|
||||||
|
VERCEL_BUILDER_DEBUG: this.output.debugEnabled ? '1' : undefined,
|
||||||
|
},
|
||||||
buildEnv: { ...envConfigs.buildEnv },
|
buildEnv: { ...envConfigs.buildEnv },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -2185,13 +2287,7 @@ function proxyPass(
|
|||||||
`Failed to complete request to ${req.url}: ${error}`
|
`Failed to complete request to ${req.url}: ${error}`
|
||||||
);
|
);
|
||||||
if (!res.headersSent) {
|
if (!res.headersSent) {
|
||||||
devServer.sendError(
|
devServer.sendError(req, res, requestId, 'FUNCTION_INVOCATION_FAILED');
|
||||||
req,
|
|
||||||
res,
|
|
||||||
requestId,
|
|
||||||
'NO_RESPONSE_FROM_FUNCTION',
|
|
||||||
502
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -2269,11 +2365,12 @@ async function findBuildMatch(
|
|||||||
if (!isIndex(match.src)) {
|
if (!isIndex(match.src)) {
|
||||||
return match;
|
return match;
|
||||||
} else {
|
} else {
|
||||||
// if isIndex === true and ends in .html, we're done. Otherwise, keep searching
|
// If isIndex === true and ends in `.html`, we're done.
|
||||||
bestIndexMatch = match;
|
// Otherwise, keep searching.
|
||||||
if (extname(match.src) === '.html') {
|
if (extname(match.src) === '.html') {
|
||||||
return bestIndexMatch;
|
return match;
|
||||||
}
|
}
|
||||||
|
bestIndexMatch = match;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2295,6 +2392,13 @@ async function shouldServe(
|
|||||||
config,
|
config,
|
||||||
builderWithPkg: { builder },
|
builderWithPkg: { builder },
|
||||||
} = match;
|
} = match;
|
||||||
|
|
||||||
|
// "middleware" file is not served as a regular asset,
|
||||||
|
// instead it gets invoked as part of the routing logic.
|
||||||
|
if (config?.middleware === true) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
const cleanSrc = src.endsWith('.html') ? src.slice(0, -5) : src;
|
const cleanSrc = src.endsWith('.html') ? src.slice(0, -5) : src;
|
||||||
const trimmedPath = requestPath.endsWith('/')
|
const trimmedPath = requestPath.endsWith('/')
|
||||||
? requestPath.slice(0, -1)
|
? requestPath.slice(0, -1)
|
||||||
|
|||||||
@@ -2,26 +2,29 @@ import chalk from 'chalk';
|
|||||||
import { DNSRecordData } from '../../types';
|
import { DNSRecordData } from '../../types';
|
||||||
import textInput from '../input/text';
|
import textInput from '../input/text';
|
||||||
import promptBool from '../input/prompt-bool';
|
import promptBool from '../input/prompt-bool';
|
||||||
import { Output } from '../output';
|
import Client from '../client';
|
||||||
|
|
||||||
const RECORD_TYPES = ['A', 'AAAA', 'ALIAS', 'CAA', 'CNAME', 'MX', 'SRV', 'TXT'];
|
const RECORD_TYPES = ['A', 'AAAA', 'ALIAS', 'CAA', 'CNAME', 'MX', 'SRV', 'TXT'];
|
||||||
|
|
||||||
export default async function getDNSData(
|
export default async function getDNSData(
|
||||||
output: Output,
|
client: Client,
|
||||||
data: null | DNSRecordData
|
data: null | DNSRecordData
|
||||||
): Promise<DNSRecordData | null> {
|
): Promise<DNSRecordData | null> {
|
||||||
if (data) {
|
if (data) {
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
const { output } = client;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// first ask for type, branch from there
|
// first ask for type, branch from there
|
||||||
const possibleTypes = new Set(RECORD_TYPES);
|
const possibleTypes = new Set(RECORD_TYPES);
|
||||||
const type = (await textInput({
|
const type = (
|
||||||
label: `- Record type (${RECORD_TYPES.join(', ')}): `,
|
await textInput({
|
||||||
validateValue: (v: string) =>
|
label: `- Record type (${RECORD_TYPES.join(', ')}): `,
|
||||||
Boolean(v && possibleTypes.has(v.trim().toUpperCase()))
|
validateValue: (v: string) =>
|
||||||
}))
|
Boolean(v && possibleTypes.has(v.trim().toUpperCase())),
|
||||||
|
})
|
||||||
|
)
|
||||||
.trim()
|
.trim()
|
||||||
.toUpperCase();
|
.toUpperCase();
|
||||||
|
|
||||||
@@ -39,7 +42,7 @@ export default async function getDNSData(
|
|||||||
target
|
target
|
||||||
)}.`
|
)}.`
|
||||||
);
|
);
|
||||||
return (await verifyData())
|
return (await verifyData(client))
|
||||||
? {
|
? {
|
||||||
name,
|
name,
|
||||||
type,
|
type,
|
||||||
@@ -47,8 +50,8 @@ export default async function getDNSData(
|
|||||||
priority,
|
priority,
|
||||||
weight,
|
weight,
|
||||||
port,
|
port,
|
||||||
target
|
target,
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
: null;
|
: null;
|
||||||
}
|
}
|
||||||
@@ -61,23 +64,23 @@ export default async function getDNSData(
|
|||||||
`${mxPriority}`
|
`${mxPriority}`
|
||||||
)} ${chalk.cyan(value)}`
|
)} ${chalk.cyan(value)}`
|
||||||
);
|
);
|
||||||
return (await verifyData())
|
return (await verifyData(client))
|
||||||
? {
|
? {
|
||||||
name,
|
name,
|
||||||
type,
|
type,
|
||||||
value,
|
value,
|
||||||
mxPriority
|
mxPriority,
|
||||||
}
|
}
|
||||||
: null;
|
: null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const value = await getTrimmedString(`- ${type} value: `);
|
const value = await getTrimmedString(`- ${type} value: `);
|
||||||
output.log(`${chalk.cyan(name)} ${chalk.bold(type)} ${chalk.cyan(value)}`);
|
output.log(`${chalk.cyan(name)} ${chalk.bold(type)} ${chalk.cyan(value)}`);
|
||||||
return (await verifyData())
|
return (await verifyData(client))
|
||||||
? {
|
? {
|
||||||
name,
|
name,
|
||||||
type,
|
type,
|
||||||
value
|
value,
|
||||||
}
|
}
|
||||||
: null;
|
: null;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -85,13 +88,13 @@ export default async function getDNSData(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function verifyData() {
|
async function verifyData(client: Client) {
|
||||||
return promptBool('Is this correct?');
|
return promptBool('Is this correct?', client);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getRecordName(type: string) {
|
async function getRecordName(type: string) {
|
||||||
const input = await textInput({
|
const input = await textInput({
|
||||||
label: `- ${type} name: `
|
label: `- ${type} name: `,
|
||||||
});
|
});
|
||||||
return input === '@' ? '' : input;
|
return input === '@' ? '' : input;
|
||||||
}
|
}
|
||||||
@@ -100,14 +103,14 @@ async function getNumber(label: string) {
|
|||||||
return Number(
|
return Number(
|
||||||
await textInput({
|
await textInput({
|
||||||
label,
|
label,
|
||||||
validateValue: v => Boolean(v && Number(v))
|
validateValue: v => Boolean(v && Number(v)),
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
async function getTrimmedString(label: string) {
|
async function getTrimmedString(label: string) {
|
||||||
const res = await textInput({
|
const res = await textInput({
|
||||||
label,
|
label,
|
||||||
validateValue: v => Boolean(v && v.trim().length > 0)
|
validateValue: v => Boolean(v && v.trim().length > 0),
|
||||||
});
|
});
|
||||||
return res.trim();
|
return res.trim();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,7 +54,8 @@ export default async function purchaseDomainIfAvailable(
|
|||||||
!(await promptBool(
|
!(await promptBool(
|
||||||
`Buy ${chalk.underline(domain)} for ${chalk.bold(
|
`Buy ${chalk.underline(domain)} for ${chalk.bold(
|
||||||
`$${price}`
|
`$${price}`
|
||||||
)} (${plural('yr', period, true)})?`
|
)} (${plural('yr', period, true)})?`,
|
||||||
|
client
|
||||||
))
|
))
|
||||||
) {
|
) {
|
||||||
output.print(eraseLines(1));
|
output.print(eraseLines(1));
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { resolve } from 'path';
|
|
||||||
import fs from 'fs-extra';
|
import fs from 'fs-extra';
|
||||||
|
import { resolve } from 'path';
|
||||||
import { getVercelIgnore } from '@vercel/client';
|
import { getVercelIgnore } from '@vercel/client';
|
||||||
import uniqueStrings from './unique-strings';
|
import uniqueStrings from './unique-strings';
|
||||||
import { Output } from './output/create-output';
|
import { Output } from './output/create-output';
|
||||||
|
|||||||
@@ -530,7 +530,7 @@ export default class Now extends EventEmitter {
|
|||||||
`${opts.method || 'GET'} ${this._apiUrl}${_url} ${opts.body || ''}`,
|
`${opts.method || 'GET'} ${this._apiUrl}${_url} ${opts.body || ''}`,
|
||||||
fetch(`${this._apiUrl}${_url}`, { ...opts, body })
|
fetch(`${this._apiUrl}${_url}`, { ...opts, body })
|
||||||
);
|
);
|
||||||
printIndications(res);
|
printIndications(this._client, res);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
import inquirer from 'inquirer';
|
import Client from '../client';
|
||||||
|
|
||||||
export default async function confirm(
|
export default async function confirm(
|
||||||
|
client: Client,
|
||||||
message: string,
|
message: string,
|
||||||
preferred: boolean
|
preferred: boolean
|
||||||
): Promise<boolean> {
|
): Promise<boolean> {
|
||||||
require('./patch-inquirer');
|
require('./patch-inquirer');
|
||||||
|
|
||||||
const answers = await inquirer.prompt({
|
const answers = await client.prompt({
|
||||||
type: 'confirm',
|
type: 'confirm',
|
||||||
name: 'value',
|
name: 'value',
|
||||||
message,
|
message,
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import inquirer from 'inquirer';
|
import inquirer from 'inquirer';
|
||||||
import confirm from './confirm';
|
import confirm from './confirm';
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import { Output } from '../output';
|
|
||||||
import frameworkList, { Framework } from '@vercel/frameworks';
|
import frameworkList, { Framework } from '@vercel/frameworks';
|
||||||
|
import Client from '../client';
|
||||||
import { isSettingValue } from '../is-setting-value';
|
import { isSettingValue } from '../is-setting-value';
|
||||||
import { ProjectSettings } from '../../types';
|
import { ProjectSettings } from '../../types';
|
||||||
|
|
||||||
@@ -22,12 +22,14 @@ const settingKeys = Object.keys(settingMap).sort() as unknown as readonly [
|
|||||||
export type PartialProjectSettings = Pick<ProjectSettings, ConfigKeys>;
|
export type PartialProjectSettings = Pick<ProjectSettings, ConfigKeys>;
|
||||||
|
|
||||||
export default async function editProjectSettings(
|
export default async function editProjectSettings(
|
||||||
output: Output,
|
client: Client,
|
||||||
projectSettings: PartialProjectSettings | null,
|
projectSettings: PartialProjectSettings | null,
|
||||||
framework: Framework | null,
|
framework: Framework | null,
|
||||||
autoConfirm: boolean,
|
autoConfirm: boolean,
|
||||||
localConfigurationOverrides: PartialProjectSettings | null
|
localConfigurationOverrides: PartialProjectSettings | null
|
||||||
): Promise<ProjectSettings> {
|
): Promise<ProjectSettings> {
|
||||||
|
const { output } = client;
|
||||||
|
|
||||||
// Create initial settings object defaulting everything to `null` and assigning what may exist in `projectSettings`
|
// Create initial settings object defaulting everything to `null` and assigning what may exist in `projectSettings`
|
||||||
const settings: ProjectSettings = Object.assign(
|
const settings: ProjectSettings = Object.assign(
|
||||||
{
|
{
|
||||||
@@ -118,7 +120,7 @@ export default async function editProjectSettings(
|
|||||||
// Prompt the user if they want to modify any settings not defined by local configuration.
|
// Prompt the user if they want to modify any settings not defined by local configuration.
|
||||||
if (
|
if (
|
||||||
autoConfirm ||
|
autoConfirm ||
|
||||||
!(await confirm('Want to modify these settings?', false))
|
!(await confirm(client, 'Want to modify these settings?', false))
|
||||||
) {
|
) {
|
||||||
return settings;
|
return settings;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import Client from '../client';
|
import Client from '../client';
|
||||||
import inquirer from 'inquirer';
|
|
||||||
import confirm from './confirm';
|
import confirm from './confirm';
|
||||||
import getProjectByIdOrName from '../projects/get-project-by-id-or-name';
|
import getProjectByIdOrName from '../projects/get-project-by-id-or-name';
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
@@ -47,11 +46,16 @@ export default async function inputProject(
|
|||||||
|
|
||||||
if (!detectedProject) {
|
if (!detectedProject) {
|
||||||
// did not auto-detect a project to link
|
// did not auto-detect a project to link
|
||||||
shouldLinkProject = await confirm(`Link to existing project?`, false);
|
shouldLinkProject = await confirm(
|
||||||
|
client,
|
||||||
|
`Link to existing project?`,
|
||||||
|
false
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
// auto-detected a project to link
|
// auto-detected a project to link
|
||||||
if (
|
if (
|
||||||
await confirm(
|
await confirm(
|
||||||
|
client,
|
||||||
`Found project ${chalk.cyan(
|
`Found project ${chalk.cyan(
|
||||||
`“${org.slug}/${detectedProject.name}”`
|
`“${org.slug}/${detectedProject.name}”`
|
||||||
)}. Link to it?`,
|
)}. Link to it?`,
|
||||||
@@ -63,6 +67,7 @@ export default async function inputProject(
|
|||||||
|
|
||||||
// user doesn't want to link the auto-detected project
|
// user doesn't want to link the auto-detected project
|
||||||
shouldLinkProject = await confirm(
|
shouldLinkProject = await confirm(
|
||||||
|
client,
|
||||||
`Link to different existing project?`,
|
`Link to different existing project?`,
|
||||||
true
|
true
|
||||||
);
|
);
|
||||||
@@ -73,7 +78,7 @@ export default async function inputProject(
|
|||||||
let project: Project | ProjectNotFound | null = null;
|
let project: Project | ProjectNotFound | null = null;
|
||||||
|
|
||||||
while (!project || project instanceof ProjectNotFound) {
|
while (!project || project instanceof ProjectNotFound) {
|
||||||
const answers = await inquirer.prompt({
|
const answers = await client.prompt({
|
||||||
type: 'input',
|
type: 'input',
|
||||||
name: 'existingProjectName',
|
name: 'existingProjectName',
|
||||||
message: `What’s the name of your existing project?`,
|
message: `What’s the name of your existing project?`,
|
||||||
@@ -104,7 +109,7 @@ export default async function inputProject(
|
|||||||
let newProjectName: string | null = null;
|
let newProjectName: string | null = null;
|
||||||
|
|
||||||
while (!newProjectName) {
|
while (!newProjectName) {
|
||||||
const answers = await inquirer.prompt({
|
const answers = await client.prompt({
|
||||||
type: 'input',
|
type: 'input',
|
||||||
name: 'newProjectName',
|
name: 'newProjectName',
|
||||||
message: `What’s your project’s name?`,
|
message: `What’s your project’s name?`,
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
import path from 'path';
|
import path from 'path';
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import inquirer from 'inquirer';
|
|
||||||
import { Output } from '../output';
|
|
||||||
import { validateRootDirectory } from '../validate-paths';
|
import { validateRootDirectory } from '../validate-paths';
|
||||||
|
import Client from '../client';
|
||||||
|
|
||||||
export async function inputRootDirectory(
|
export async function inputRootDirectory(
|
||||||
|
client: Client,
|
||||||
cwd: string,
|
cwd: string,
|
||||||
output: Output,
|
|
||||||
autoConfirm = false
|
autoConfirm = false
|
||||||
) {
|
) {
|
||||||
if (autoConfirm) {
|
if (autoConfirm) {
|
||||||
@@ -15,7 +14,7 @@ export async function inputRootDirectory(
|
|||||||
|
|
||||||
// eslint-disable-next-line no-constant-condition
|
// eslint-disable-next-line no-constant-condition
|
||||||
while (true) {
|
while (true) {
|
||||||
const { rootDirectory } = await inquirer.prompt({
|
const { rootDirectory } = await client.prompt({
|
||||||
type: 'input',
|
type: 'input',
|
||||||
name: 'rootDirectory',
|
name: 'rootDirectory',
|
||||||
message: `In which directory is your code located?`,
|
message: `In which directory is your code located?`,
|
||||||
@@ -38,7 +37,7 @@ export async function inputRootDirectory(
|
|||||||
|
|
||||||
if (
|
if (
|
||||||
(await validateRootDirectory(
|
(await validateRootDirectory(
|
||||||
output,
|
client.output,
|
||||||
cwd,
|
cwd,
|
||||||
fullPath,
|
fullPath,
|
||||||
'Please choose a different one.'
|
'Please choose a different one.'
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import inquirer from 'inquirer';
|
import inquirer from 'inquirer';
|
||||||
import stripAnsi from 'strip-ansi';
|
import stripAnsi from 'strip-ansi';
|
||||||
|
import Client from '../client';
|
||||||
import eraseLines from '../output/erase-lines';
|
import eraseLines from '../output/erase-lines';
|
||||||
|
|
||||||
interface ListEntry {
|
interface ListEntry {
|
||||||
@@ -35,21 +36,24 @@ function getLength(input: string): number {
|
|||||||
return biggestLength;
|
return biggestLength;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function list({
|
export default async function list(
|
||||||
message = 'the question',
|
client: Client,
|
||||||
// eslint-disable-line no-unused-vars
|
{
|
||||||
choices: _choices = [
|
message = 'the question',
|
||||||
{
|
// eslint-disable-line no-unused-vars
|
||||||
name: 'something\ndescription\ndetails\netc',
|
choices: _choices = [
|
||||||
value: 'something unique',
|
{
|
||||||
short: 'generally the first line of `name`',
|
name: 'something\ndescription\ndetails\netc',
|
||||||
},
|
value: 'something unique',
|
||||||
],
|
short: 'generally the first line of `name`',
|
||||||
pageSize = 15, // Show 15 lines without scrolling (~4 credit cards)
|
},
|
||||||
separator = false, // Puts a blank separator between each choice
|
],
|
||||||
abort = 'end', // Whether the `abort` option will be at the `start` or the `end`,
|
pageSize = 15, // Show 15 lines without scrolling (~4 credit cards)
|
||||||
eraseFinalAnswer = false, // If true, the line with the final answer that inquirer prints will be erased before returning
|
separator = false, // Puts a blank separator between each choice
|
||||||
}: ListOptions): Promise<string> {
|
abort = 'end', // Whether the `abort` option will be at the `start` or the `end`,
|
||||||
|
eraseFinalAnswer = false, // If true, the line with the final answer that inquirer prints will be erased before returning
|
||||||
|
}: ListOptions
|
||||||
|
): Promise<string> {
|
||||||
require('./patch-inquirer-legacy');
|
require('./patch-inquirer-legacy');
|
||||||
|
|
||||||
let biggestLength = 0;
|
let biggestLength = 0;
|
||||||
@@ -106,7 +110,7 @@ export default async function list({
|
|||||||
choices.push(abortSeparator, _abort);
|
choices.push(abortSeparator, _abort);
|
||||||
}
|
}
|
||||||
|
|
||||||
const answer = await inquirer.prompt({
|
const answer = await client.prompt({
|
||||||
name: 'value',
|
name: 'value',
|
||||||
type: 'list',
|
type: 'list',
|
||||||
default: selected,
|
default: selected,
|
||||||
|
|||||||
@@ -1,25 +1,26 @@
|
|||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
|
import type { ReadableTTY, WritableTTY } from '../../types';
|
||||||
|
|
||||||
type Options = {
|
type Options = {
|
||||||
abortSequences?: Set<string>;
|
abortSequences?: Set<string>;
|
||||||
defaultValue?: boolean;
|
defaultValue?: boolean;
|
||||||
noChar?: string;
|
noChar?: string;
|
||||||
resolveChars?: Set<string>;
|
resolveChars?: Set<string>;
|
||||||
stdin?: NodeJS.ReadStream;
|
stdin: ReadableTTY;
|
||||||
stdout?: NodeJS.WriteStream;
|
stdout: WritableTTY;
|
||||||
trailing?: string;
|
trailing?: string;
|
||||||
yesChar?: string;
|
yesChar?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default async function promptBool(label: string, options: Options = {}) {
|
export default async function promptBool(label: string, options: Options) {
|
||||||
const {
|
const {
|
||||||
|
stdin,
|
||||||
|
stdout,
|
||||||
defaultValue = false,
|
defaultValue = false,
|
||||||
abortSequences = new Set(['\u0003']),
|
abortSequences = new Set(['\u0003']),
|
||||||
resolveChars = new Set(['\r']),
|
resolveChars = new Set(['\r']),
|
||||||
yesChar = 'y',
|
yesChar = 'y',
|
||||||
noChar = 'n',
|
noChar = 'n',
|
||||||
stdin = process.stdin,
|
|
||||||
stdout = process.stdout,
|
|
||||||
trailing = '',
|
trailing = '',
|
||||||
} = options;
|
} = options;
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,17 @@
|
|||||||
export default async function readStandardInput(): Promise<string> {
|
import type { ReadableTTY } from '../../types';
|
||||||
|
|
||||||
|
export default async function readStandardInput(
|
||||||
|
stdin: ReadableTTY
|
||||||
|
): Promise<string> {
|
||||||
return new Promise<string>(resolve => {
|
return new Promise<string>(resolve => {
|
||||||
setTimeout(() => resolve(''), 500);
|
setTimeout(() => resolve(''), 500);
|
||||||
|
|
||||||
if (process.stdin.isTTY) {
|
if (stdin.isTTY) {
|
||||||
// found tty so we know there is nothing piped to stdin
|
// found tty so we know there is nothing piped to stdin
|
||||||
resolve('');
|
resolve('');
|
||||||
} else {
|
} else {
|
||||||
process.stdin.setEncoding('utf8');
|
stdin.setEncoding('utf8');
|
||||||
process.stdin.once('data', resolve);
|
stdin.once('data', resolve);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ export default async function setupAndLink(
|
|||||||
return { status: 'error', exitCode: 1, reason: 'PATH_IS_FILE' };
|
return { status: 'error', exitCode: 1, reason: 'PATH_IS_FILE' };
|
||||||
}
|
}
|
||||||
const link = await getLinkedProject(client, path);
|
const link = await getLinkedProject(client, path);
|
||||||
const isTTY = process.stdout.isTTY;
|
const isTTY = client.stdin.isTTY;
|
||||||
const quiet = !isTTY;
|
const quiet = !isTTY;
|
||||||
let rootDirectory: string | null = null;
|
let rootDirectory: string | null = null;
|
||||||
let sourceFilesOutsideRootDirectory = true;
|
let sourceFilesOutsideRootDirectory = true;
|
||||||
@@ -80,6 +80,7 @@ export default async function setupAndLink(
|
|||||||
const shouldStartSetup =
|
const shouldStartSetup =
|
||||||
autoConfirm ||
|
autoConfirm ||
|
||||||
(await confirm(
|
(await confirm(
|
||||||
|
client,
|
||||||
`${setupMsg} ${chalk.cyan(`“${toHumanPath(path)}”`)}?`,
|
`${setupMsg} ${chalk.cyan(`“${toHumanPath(path)}”`)}?`,
|
||||||
true
|
true
|
||||||
));
|
));
|
||||||
@@ -120,7 +121,7 @@ export default async function setupAndLink(
|
|||||||
|
|
||||||
if (typeof projectOrNewProjectName === 'string') {
|
if (typeof projectOrNewProjectName === 'string') {
|
||||||
newProjectName = projectOrNewProjectName;
|
newProjectName = projectOrNewProjectName;
|
||||||
rootDirectory = await inputRootDirectory(path, output, autoConfirm);
|
rootDirectory = await inputRootDirectory(client, path, autoConfirm);
|
||||||
} else {
|
} else {
|
||||||
const project = projectOrNewProjectName;
|
const project = projectOrNewProjectName;
|
||||||
|
|
||||||
@@ -224,7 +225,7 @@ export default async function setupAndLink(
|
|||||||
const { projectSettings, framework } = deployment;
|
const { projectSettings, framework } = deployment;
|
||||||
|
|
||||||
settings = await editProjectSettings(
|
settings = await editProjectSettings(
|
||||||
output,
|
client,
|
||||||
projectSettings,
|
projectSettings,
|
||||||
framework,
|
framework,
|
||||||
autoConfirm,
|
autoConfirm,
|
||||||
|
|||||||
@@ -176,7 +176,7 @@ async function getVerificationTokenOutOfBand(client: Client, url: URL) {
|
|||||||
output.log(
|
output.log(
|
||||||
`After login is complete, enter the verification code printed in your browser.`
|
`After login is complete, enter the verification code printed in your browser.`
|
||||||
);
|
);
|
||||||
const verificationToken = await readInput('Verification code:');
|
const verificationToken = await readInput(client, 'Verification code:');
|
||||||
output.print(eraseLines(6));
|
output.print(eraseLines(6));
|
||||||
|
|
||||||
// If the pasted token begins with "saml_", then the `ssoUserId` was returned.
|
// If the pasted token begins with "saml_", then the `ssoUserId` was returned.
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import inquirer from 'inquirer';
|
|
||||||
import Client from '../client';
|
import Client from '../client';
|
||||||
import error from '../output/error';
|
import error from '../output/error';
|
||||||
import listInput from '../input/list';
|
import listInput from '../input/list';
|
||||||
@@ -32,7 +31,7 @@ export default async function prompt(
|
|||||||
choices.pop();
|
choices.pop();
|
||||||
}
|
}
|
||||||
|
|
||||||
const choice = await listInput({
|
const choice = await listInput(client, {
|
||||||
message: 'Log in to Vercel',
|
message: 'Log in to Vercel',
|
||||||
choices,
|
choices,
|
||||||
});
|
});
|
||||||
@@ -44,22 +43,26 @@ export default async function prompt(
|
|||||||
} else if (choice === 'bitbucket') {
|
} else if (choice === 'bitbucket') {
|
||||||
result = await doBitbucketLogin(client, outOfBand, ssoUserId);
|
result = await doBitbucketLogin(client, outOfBand, ssoUserId);
|
||||||
} else if (choice === 'email') {
|
} else if (choice === 'email') {
|
||||||
const email = await readInput('Enter your email address:');
|
const email = await readInput(client, 'Enter your email address:');
|
||||||
result = await doEmailLogin(client, email, ssoUserId);
|
result = await doEmailLogin(client, email, ssoUserId);
|
||||||
} else if (choice === 'saml') {
|
} else if (choice === 'saml') {
|
||||||
const slug = error?.teamId || (await readInput('Enter your Team slug:'));
|
const slug =
|
||||||
|
error?.teamId || (await readInput(client, 'Enter your Team slug:'));
|
||||||
result = await doSamlLogin(client, slug, outOfBand, ssoUserId);
|
result = await doSamlLogin(client, slug, outOfBand, ssoUserId);
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function readInput(message: string): Promise<string> {
|
export async function readInput(
|
||||||
|
client: Client,
|
||||||
|
message: string
|
||||||
|
): Promise<string> {
|
||||||
let input;
|
let input;
|
||||||
|
|
||||||
while (!input) {
|
while (!input) {
|
||||||
try {
|
try {
|
||||||
const { val } = await inquirer.prompt({
|
const { val } = await client.prompt({
|
||||||
type: 'input',
|
type: 'input',
|
||||||
name: 'val',
|
name: 'val',
|
||||||
message,
|
message,
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ export default async function reauthenticate(
|
|||||||
client.output.log(
|
client.output.log(
|
||||||
`You must re-authenticate with SAML to use ${bold(error.scope)} scope.`
|
`You must re-authenticate with SAML to use ${bold(error.scope)} scope.`
|
||||||
);
|
);
|
||||||
if (await confirm(`Log in with SAML?`, true)) {
|
if (await confirm(client, `Log in with SAML?`, true)) {
|
||||||
return doSamlLogin(client, error.teamId);
|
return doSamlLogin(client, error.teamId);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,41 +1,39 @@
|
|||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import renderLink from './link';
|
import renderLink from './link';
|
||||||
import wait, { StopSpinner } from './wait';
|
import wait, { StopSpinner } from './wait';
|
||||||
import { Writable } from 'stream';
|
import type { WritableTTY } from '../../types';
|
||||||
|
|
||||||
export interface OutputOptions {
|
export interface OutputOptions {
|
||||||
debug?: boolean;
|
debug?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface PrintOptions {
|
export interface LogOptions {
|
||||||
w?: Writable;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface LogOptions extends PrintOptions {
|
|
||||||
color?: typeof chalk;
|
color?: typeof chalk;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class Output {
|
export class Output {
|
||||||
|
stream: WritableTTY;
|
||||||
debugEnabled: boolean;
|
debugEnabled: boolean;
|
||||||
private spinnerMessage: string;
|
private spinnerMessage: string;
|
||||||
private _spinner: StopSpinner | null;
|
private _spinner: StopSpinner | null;
|
||||||
isTTY: boolean;
|
|
||||||
|
|
||||||
constructor({ debug: debugEnabled = false }: OutputOptions = {}) {
|
constructor(
|
||||||
|
stream: WritableTTY,
|
||||||
|
{ debug: debugEnabled = false }: OutputOptions = {}
|
||||||
|
) {
|
||||||
|
this.stream = stream;
|
||||||
this.debugEnabled = debugEnabled;
|
this.debugEnabled = debugEnabled;
|
||||||
this.spinnerMessage = '';
|
this.spinnerMessage = '';
|
||||||
this._spinner = null;
|
this._spinner = null;
|
||||||
this.isTTY = process.stdout.isTTY || false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
isDebugEnabled = () => {
|
isDebugEnabled = () => {
|
||||||
return this.debugEnabled;
|
return this.debugEnabled;
|
||||||
};
|
};
|
||||||
|
|
||||||
print = (str: string, { w }: PrintOptions = { w: process.stderr }) => {
|
print = (str: string) => {
|
||||||
this.stopSpinner();
|
this.stopSpinner();
|
||||||
const stream: Writable = w || process.stderr;
|
this.stream.write(str);
|
||||||
stream.write(str);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
log = (str: string, color = chalk.grey) => {
|
log = (str: string, color = chalk.grey) => {
|
||||||
@@ -111,11 +109,17 @@ export class Output {
|
|||||||
this.debug(`Spinner invoked (${message}) with a ${delay}ms delay`);
|
this.debug(`Spinner invoked (${message}) with a ${delay}ms delay`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this.isTTY) {
|
if (this.stream.isTTY) {
|
||||||
if (this._spinner) {
|
if (this._spinner) {
|
||||||
this._spinner.text = message;
|
this._spinner.text = message;
|
||||||
} else {
|
} else {
|
||||||
this._spinner = wait(message, delay);
|
this._spinner = wait(
|
||||||
|
{
|
||||||
|
text: message,
|
||||||
|
stream: this.stream,
|
||||||
|
},
|
||||||
|
delay
|
||||||
|
);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.print(`${message}\n`);
|
this.print(`${message}\n`);
|
||||||
@@ -157,7 +161,3 @@ export class Output {
|
|||||||
return promise;
|
return promise;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function createOutput(opts?: OutputOptions) {
|
|
||||||
return new Output(opts);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
export { default, Output } from './create-output';
|
export { Output } from './create-output';
|
||||||
export { StopSpinner } from './wait';
|
export { StopSpinner } from './wait';
|
||||||
|
|||||||
@@ -8,14 +8,19 @@ export interface StopSpinner {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default function wait(
|
export default function wait(
|
||||||
msg: string,
|
opts: ora.Options,
|
||||||
delay: number = 300,
|
delay: number = 300
|
||||||
_ora = ora
|
|
||||||
): StopSpinner {
|
): StopSpinner {
|
||||||
let spinner: ReturnType<typeof _ora> | null = null;
|
let text = opts.text;
|
||||||
|
let spinner: ora.Ora | null = null;
|
||||||
|
|
||||||
|
if (typeof text !== 'string') {
|
||||||
|
throw new Error(`"text" is required for Ora spinner`);
|
||||||
|
}
|
||||||
|
|
||||||
const timeout = setTimeout(() => {
|
const timeout = setTimeout(() => {
|
||||||
spinner = _ora(chalk.gray(msg));
|
spinner = ora(opts);
|
||||||
|
spinner.text = chalk.gray(text);
|
||||||
spinner.color = 'gray';
|
spinner.color = 'gray';
|
||||||
spinner.start();
|
spinner.start();
|
||||||
}, delay);
|
}, delay);
|
||||||
@@ -29,23 +34,21 @@ export default function wait(
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
stop.text = msg;
|
stop.text = text;
|
||||||
|
|
||||||
// Allow `text` property to update the text while the spinner is in action
|
// Allow `text` property to update the text while the spinner is in action
|
||||||
Object.defineProperty(stop, 'text', {
|
Object.defineProperty(stop, 'text', {
|
||||||
get() {
|
get() {
|
||||||
return msg;
|
return text;
|
||||||
},
|
},
|
||||||
|
|
||||||
set(v: string) {
|
set(v: string) {
|
||||||
msg = v;
|
text = v;
|
||||||
if (spinner) {
|
if (spinner) {
|
||||||
spinner.text = chalk.gray(v);
|
spinner.text = chalk.gray(v);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
// @ts-ignore
|
|
||||||
process.once('nowExit', stop);
|
|
||||||
return stop;
|
return stop;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import { Response } from 'node-fetch';
|
import { Response } from 'node-fetch';
|
||||||
import { emoji, EmojiLabel, prependEmoji } from './emoji';
|
import Client from './client';
|
||||||
import createOutput from './output';
|
|
||||||
import linkStyle from './output/link';
|
import linkStyle from './output/link';
|
||||||
|
import { emoji, EmojiLabel, prependEmoji } from './emoji';
|
||||||
|
|
||||||
export default function printIndications(res: Response) {
|
export default function printIndications(client: Client, res: Response) {
|
||||||
const _output = createOutput();
|
|
||||||
const indications = new Set(['warning', 'notice', 'tip']);
|
const indications = new Set(['warning', 'notice', 'tip']);
|
||||||
const regex = /^x-(?:vercel|now)-(warning|notice|tip)-(.*)$/;
|
const regex = /^x-(?:vercel|now)-(warning|notice|tip)-(.*)$/;
|
||||||
|
|
||||||
@@ -25,7 +24,7 @@ export default function printIndications(res: Response) {
|
|||||||
chalk.dim(`${action || 'Learn More'}: ${linkStyle(link)}`) +
|
chalk.dim(`${action || 'Learn More'}: ${linkStyle(link)}`) +
|
||||||
newline;
|
newline;
|
||||||
}
|
}
|
||||||
_output.print(message + finalLink);
|
client.output.print(message + finalLink);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import chalk from 'chalk';
|
|||||||
import { homedir } from 'os';
|
import { homedir } from 'os';
|
||||||
import confirm from './input/confirm';
|
import confirm from './input/confirm';
|
||||||
import toHumanPath from './humanize-path';
|
import toHumanPath from './humanize-path';
|
||||||
|
import Client from './client';
|
||||||
|
|
||||||
const stat = promisify(lstatRaw);
|
const stat = promisify(lstatRaw);
|
||||||
|
|
||||||
@@ -51,9 +52,11 @@ export async function validateRootDirectory(
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default async function validatePaths(
|
export default async function validatePaths(
|
||||||
output: Output,
|
client: Client,
|
||||||
paths: string[]
|
paths: string[]
|
||||||
): Promise<{ valid: true; path: string } | { valid: false; exitCode: number }> {
|
): Promise<{ valid: true; path: string } | { valid: false; exitCode: number }> {
|
||||||
|
const { output } = client;
|
||||||
|
|
||||||
// can't deploy more than 1 path
|
// can't deploy more than 1 path
|
||||||
if (paths.length > 1) {
|
if (paths.length > 1) {
|
||||||
output.print(`${chalk.red('Error!')} Can't deploy more than one path.\n`);
|
output.print(`${chalk.red('Error!')} Can't deploy more than one path.\n`);
|
||||||
@@ -85,6 +88,7 @@ export default async function validatePaths(
|
|||||||
// ask confirmation if the directory is home
|
// ask confirmation if the directory is home
|
||||||
if (path === homedir()) {
|
if (path === homedir()) {
|
||||||
const shouldDeployHomeDirectory = await confirm(
|
const shouldDeployHomeDirectory = await confirm(
|
||||||
|
client,
|
||||||
`You are deploying your home directory. Do you want to continue?`,
|
`You are deploying your home directory. Do you want to continue?`,
|
||||||
false
|
false
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
export const config = {
|
||||||
|
runtime: 'invalid-runtime-value',
|
||||||
|
};
|
||||||
|
|
||||||
|
export default async function edge(request, event) {
|
||||||
|
throw new Error('intentional runtime error');
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
export const config = {
|
||||||
|
runtime: 'experimental-edge',
|
||||||
|
};
|
||||||
|
|
||||||
|
export async function notTheDefaultExport(request, event) {
|
||||||
|
// this will never be run
|
||||||
|
return new Response('some response body');
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
export const config = {
|
||||||
|
runtime: 'experimental-edge',
|
||||||
|
};
|
||||||
|
|
||||||
|
export default async function edge(request, event) {
|
||||||
|
throw new Error('intentional runtime error');
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
export const config = {
|
||||||
|
runtime: 'experimental-edge',
|
||||||
|
};
|
||||||
|
|
||||||
|
export default async function edge(request, event) {
|
||||||
|
// this should never be executed
|
||||||
|
return new Response('some response body');
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error('intentional startup error');
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
export const config = {
|
||||||
|
runtime: 'experimental-edge'
|
||||||
|
}
|
||||||
|
|
||||||
|
export default async function edge(request, event) {
|
||||||
|
return new Response('some response body');
|
||||||
|
|
||||||
|
// intentional missing closing bracket to produce syntax error
|
||||||
|
// }
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import unknownModule from 'unknown-module-893427589372458934795843';
|
||||||
|
|
||||||
|
export const config = {
|
||||||
|
runtime: 'experimental-edge',
|
||||||
|
};
|
||||||
|
|
||||||
|
export default async function edge(request, event) {
|
||||||
|
return new Response(unknownModule('some response body'));
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
export const config = {
|
||||||
|
runtime: 'experimental-edge',
|
||||||
|
};
|
||||||
|
|
||||||
|
export default async function edge(request, event) {
|
||||||
|
return new Response('responding with intentional 500 from user code', {
|
||||||
|
status: 500,
|
||||||
|
});
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user