mirror of
https://github.com/LukeHagar/vercel.git
synced 2025-12-12 21:07:46 +00:00
Compare commits
60 Commits
@vercel/py
...
@vercel/py
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
08b04d0bda | ||
|
|
92ae51c6a6 | ||
|
|
909c493d1e | ||
|
|
98b54ff61f | ||
|
|
3defd0b2fd | ||
|
|
5a7851a7f7 | ||
|
|
7f0caa7dec | ||
|
|
89b5aad367 | ||
|
|
c13775ba07 | ||
|
|
cc3c1d1eeb | ||
|
|
3aa2fbbb53 | ||
|
|
3a8b8aa03a | ||
|
|
d008617c0b | ||
|
|
8aecb99447 | ||
|
|
1793fa643f | ||
|
|
913683a8e6 | ||
|
|
0d1dc23d0d | ||
|
|
e829ce47c3 | ||
|
|
474770e9b0 | ||
|
|
e762d8d4e8 | ||
|
|
6e8935883b | ||
|
|
1c3497dc74 | ||
|
|
9836fdb5ca | ||
|
|
d6f88f019f | ||
|
|
0f720472c4 | ||
|
|
8d0c5114e4 | ||
|
|
e3c4435606 | ||
|
|
234c4dfa84 | ||
|
|
acd756436c | ||
|
|
f26858b735 | ||
|
|
623e43f865 | ||
|
|
3e696513a2 | ||
|
|
285f62c9d0 | ||
|
|
c43db1788c | ||
|
|
fc2eb1a30d | ||
|
|
ecf194b7c1 | ||
|
|
c14e5689f1 | ||
|
|
54dfe747e2 | ||
|
|
2afc8db8e7 | ||
|
|
cc628dd9fb | ||
|
|
dfb6ef949b | ||
|
|
cd4799b5d5 | ||
|
|
5e66d4b2cc | ||
|
|
44d7473e7c | ||
|
|
fddec1286c | ||
|
|
6e5e700e8d | ||
|
|
b6e8609b83 | ||
|
|
78b7bd5ec8 | ||
|
|
4104a45c2d | ||
|
|
4c20218e05 | ||
|
|
02a0004719 | ||
|
|
123bffb776 | ||
|
|
074535f27c | ||
|
|
05243fb6e9 | ||
|
|
097725580c | ||
|
|
4b09c89e7d | ||
|
|
3a1eede63b | ||
|
|
9cee0dd5d7 | ||
|
|
b801c6e593 | ||
|
|
505050b923 |
@@ -19,6 +19,10 @@ packages/cli/src/util/dev/templates/*.ts
|
|||||||
packages/client/tests/fixtures
|
packages/client/tests/fixtures
|
||||||
packages/client/lib
|
packages/client/lib
|
||||||
|
|
||||||
|
# next
|
||||||
|
packages/next/test/integration/middleware
|
||||||
|
packages/next/test/integration/middleware-eval
|
||||||
|
|
||||||
# node-bridge
|
# node-bridge
|
||||||
packages/node-bridge/bridge.js
|
packages/node-bridge/bridge.js
|
||||||
packages/node-bridge/launcher.js
|
packages/node-bridge/launcher.js
|
||||||
|
|||||||
39
.github/CODEOWNERS
vendored
39
.github/CODEOWNERS
vendored
@@ -1,29 +1,26 @@
|
|||||||
# Documentation
|
# Documentation
|
||||||
# https://help.github.com/en/articles/about-code-owners
|
# https://help.github.com/en/articles/about-code-owners
|
||||||
|
|
||||||
* @TooTallNate
|
* @TooTallNate @EndangeredMassa @styfle
|
||||||
/.github/workflows @AndyBitz @styfle
|
/.github/workflows @TooTallNate @EndangeredMassa @styfle @ijjk
|
||||||
/packages/frameworks @AndyBitz
|
/packages/frameworks @TooTallNate @EndangeredMassa @styfle @AndyBitz
|
||||||
/packages/cli/src/commands/build @TooTallNate @styfle @AndyBitz @gdborton @jaredpalmer
|
|
||||||
/packages/cli/src/commands/dev @TooTallNate @styfle @AndyBitz
|
|
||||||
/packages/cli/src/util/dev @TooTallNate @styfle @AndyBitz
|
|
||||||
/packages/cli/src/commands/domains @javivelasco @mglagola @anatrajkovska
|
/packages/cli/src/commands/domains @javivelasco @mglagola @anatrajkovska
|
||||||
/packages/cli/src/commands/certs @javivelasco @mglagola @anatrajkovska
|
/packages/cli/src/commands/certs @javivelasco @mglagola @anatrajkovska
|
||||||
/packages/cli/src/commands/env @styfle @lucleray
|
/packages/cli/src/commands/env @styfle @lucleray
|
||||||
/packages/client @styfle @TooTallNate
|
/packages/client @TooTallNate @EndangeredMassa @styfle
|
||||||
/packages/build-utils @styfle @AndyBitz @TooTallNate
|
/packages/build-utils @TooTallNate @EndangeredMassa @styfle @AndyBitz
|
||||||
/packages/middleware @gdborton @javivelasco
|
/packages/middleware @gdborton @javivelasco
|
||||||
/packages/node @styfle @TooTallNate @lucleray
|
/packages/node @TooTallNate @EndangeredMassa @styfle
|
||||||
/packages/node-bridge @styfle @TooTallNate @lucleray
|
/packages/node-bridge @TooTallNate @EndangeredMassa @styfle @ijjk
|
||||||
/packages/next @Timer @ijjk
|
/packages/next @TooTallNate @ijjk
|
||||||
/packages/go @styfle @TooTallNate
|
/packages/go @TooTallNate @EndangeredMassa @styfle
|
||||||
/packages/python @styfle @TooTallNate
|
/packages/python @TooTallNate @EndangeredMassa @styfle
|
||||||
/packages/ruby @styfle @TooTallNate
|
/packages/ruby @TooTallNate @EndangeredMassa @styfle
|
||||||
/packages/static-build @styfle @AndyBitz
|
/packages/static-build @TooTallNate @EndangeredMassa @styfle @AndyBitz
|
||||||
/packages/routing-utils @styfle @dav-is @ijjk
|
/packages/routing-utils @TooTallNate @EndangeredMassa @styfle @ijjk
|
||||||
/examples @mcsdevv
|
/examples @leerob
|
||||||
/examples/create-react-app @Timer
|
/examples/create-react-app @Timer
|
||||||
/examples/nextjs @timneutkens @Timer
|
/examples/nextjs @timneutkens @ijjk @styfle
|
||||||
/examples/hugo @mcsdevv @styfle
|
/examples/hugo @styfle
|
||||||
/examples/jekyll @mcsdevv @styfle
|
/examples/jekyll @styfle
|
||||||
/examples/zola @mcsdevv @styfle
|
/examples/zola @styfle
|
||||||
|
|||||||
3
.github/workflows/cancel.yml
vendored
3
.github/workflows/cancel.yml
vendored
@@ -13,6 +13,5 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: styfle/cancel-workflow-action@0.9.1
|
- uses: styfle/cancel-workflow-action@0.9.1
|
||||||
with:
|
with:
|
||||||
workflow_id: 849295, 849296, 849297, 849298
|
workflow_id: test.yml, test-integration-cli.yml, test-unit.yml
|
||||||
access_token: ${{ github.token }}
|
access_token: ${{ github.token }}
|
||||||
|
|
||||||
|
|||||||
4
.github/workflows/test-integration-cli.yml
vendored
4
.github/workflows/test-integration-cli.yml
vendored
@@ -18,6 +18,10 @@ jobs:
|
|||||||
os: [ubuntu-latest]
|
os: [ubuntu-latest]
|
||||||
node: [12]
|
node: [12]
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
env:
|
||||||
|
TURBO_REMOTE_ONLY: true
|
||||||
|
TURBO_TEAM: vercel
|
||||||
|
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/setup-go@v2
|
- uses: actions/setup-go@v2
|
||||||
with:
|
with:
|
||||||
|
|||||||
43
.github/workflows/test-integration-dev.yml
vendored
43
.github/workflows/test-integration-dev.yml
vendored
@@ -1,43 +0,0 @@
|
|||||||
name: Dev
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
tags:
|
|
||||||
- '!*'
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
name: Dev
|
|
||||||
timeout-minutes: 75
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
os: [ubuntu-latest, macos-latest]
|
|
||||||
node: [12]
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/setup-go@v2
|
|
||||||
with:
|
|
||||||
go-version: '1.13.15'
|
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: ${{ matrix.node }}
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
fetch-depth: 100
|
|
||||||
- run: git --version
|
|
||||||
- run: git fetch origin main --depth=100
|
|
||||||
- run: git fetch origin ${{ github.ref }} --depth=100
|
|
||||||
- run: git diff origin/main...HEAD --name-only
|
|
||||||
- name: Install Hugo
|
|
||||||
if: matrix.os == 'macos-latest'
|
|
||||||
run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/cli/test/dev/fixtures/08-hugo/
|
|
||||||
- run: yarn install --network-timeout 1000000
|
|
||||||
- run: yarn run build
|
|
||||||
- run: yarn test-integration-dev
|
|
||||||
env:
|
|
||||||
VERCEL_TEAM_TOKEN: ${{ secrets.VERCEL_TEAM_TOKEN }}
|
|
||||||
VERCEL_REGISTRATION_URL: ${{ secrets.VERCEL_REGISTRATION_URL }}
|
|
||||||
35
.github/workflows/test-integration-once.yml
vendored
35
.github/workflows/test-integration-once.yml
vendored
@@ -1,35 +0,0 @@
|
|||||||
name: E2E
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
tags:
|
|
||||||
- '!*'
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
name: E2E
|
|
||||||
timeout-minutes: 120
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/setup-go@v2
|
|
||||||
with:
|
|
||||||
go-version: '1.13.15'
|
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 12
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
fetch-depth: 100
|
|
||||||
- run: git --version
|
|
||||||
- run: git fetch origin main --depth=100
|
|
||||||
- run: git fetch origin ${{ github.ref }} --depth=100
|
|
||||||
- run: git diff origin/main...HEAD --name-only
|
|
||||||
- run: yarn install --network-timeout 1000000
|
|
||||||
- run: yarn run build
|
|
||||||
- run: yarn test-integration-once
|
|
||||||
env:
|
|
||||||
VERCEL_TEAM_TOKEN: ${{ secrets.VERCEL_TEAM_TOKEN }}
|
|
||||||
VERCEL_REGISTRATION_URL: ${{ secrets.VERCEL_REGISTRATION_URL }}
|
|
||||||
12
.github/workflows/test-unit.yml
vendored
12
.github/workflows/test-unit.yml
vendored
@@ -16,8 +16,12 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||||
node: [12]
|
node: [14]
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
env:
|
||||||
|
TURBO_REMOTE_ONLY: true
|
||||||
|
TURBO_TEAM: vercel
|
||||||
|
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/setup-go@v2
|
- uses: actions/setup-go@v2
|
||||||
with:
|
with:
|
||||||
@@ -35,9 +39,9 @@ jobs:
|
|||||||
- run: yarn install --network-timeout 1000000
|
- run: yarn install --network-timeout 1000000
|
||||||
- run: yarn run build
|
- run: yarn run build
|
||||||
- run: yarn run lint
|
- run: yarn run lint
|
||||||
if: matrix.os == 'ubuntu-latest' && matrix.node == 12 # only run lint once
|
if: matrix.os == 'ubuntu-latest' && matrix.node == 14 # only run lint once
|
||||||
- run: yarn run test-unit
|
- run: yarn run test-unit
|
||||||
- run: yarn workspace vercel run coverage
|
- run: yarn workspace vercel run coverage
|
||||||
if: matrix.os == 'ubuntu-latest' && matrix.node == 12 # only run coverage once
|
if: matrix.os == 'ubuntu-latest' && matrix.node == 14 # only run coverage once
|
||||||
env:
|
env:
|
||||||
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
|
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
|
||||||
88
.github/workflows/test.yml
vendored
Normal file
88
.github/workflows/test.yml
vendored
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
name: Tests
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
tags:
|
||||||
|
- '!*'
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
env:
|
||||||
|
NODE_VERSION: '14'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
setup:
|
||||||
|
name: Find Changes
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
tests: ${{ steps['set-tests'].outputs['tests'] }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- run: git --version
|
||||||
|
- run: git fetch origin main
|
||||||
|
- uses: actions/setup-node@v2
|
||||||
|
with:
|
||||||
|
node-version: ${{ env.NODE_VERSION }}
|
||||||
|
cache: 'yarn'
|
||||||
|
- run: yarn install --network-timeout 1000000
|
||||||
|
- id: set-tests
|
||||||
|
run: |
|
||||||
|
TESTS_ARRAY=$(node utils/chunk-tests.js $SCRIPT_NAME)
|
||||||
|
echo "Files to test:"
|
||||||
|
echo "$TESTS_ARRAY"
|
||||||
|
echo "::set-output name=tests::$TESTS_ARRAY"
|
||||||
|
|
||||||
|
test:
|
||||||
|
timeout-minutes: 120
|
||||||
|
runs-on: ${{ matrix.runner }}
|
||||||
|
name: ${{matrix.scriptName}} (${{matrix.packageName}}, ${{matrix.chunkNumber}}, ${{ matrix.runner }})
|
||||||
|
if: ${{ needs.setup.outputs['tests'] != '[]' }}
|
||||||
|
env:
|
||||||
|
TURBO_REMOTE_ONLY: true
|
||||||
|
TURBO_TEAM: vercel
|
||||||
|
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
|
||||||
|
needs:
|
||||||
|
- setup
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include: ${{ fromJson(needs.setup.outputs['tests']) }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
fetch-depth: 2
|
||||||
|
- uses: actions/setup-go@v2
|
||||||
|
with:
|
||||||
|
go-version: '1.13.15'
|
||||||
|
- uses: actions/setup-node@v2
|
||||||
|
with:
|
||||||
|
node-version: ${{ env.NODE_VERSION }}
|
||||||
|
cache: 'yarn'
|
||||||
|
|
||||||
|
- name: Install Hugo
|
||||||
|
if: matrix.runner == 'macos-latest'
|
||||||
|
run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/cli/test/dev/fixtures/08-hugo/
|
||||||
|
|
||||||
|
- run: yarn install --network-timeout 1000000
|
||||||
|
|
||||||
|
- name: Build ${{matrix.packageName}} and all its dependencies
|
||||||
|
run: yarn turbo run build --cache-dir=".turbo" --scope=${{matrix.packageName}} --include-dependencies --no-deps
|
||||||
|
env:
|
||||||
|
FORCE_COLOR: '1'
|
||||||
|
- name: Test ${{matrix.packageName}}
|
||||||
|
run: node_modules/.bin/turbo run test --cache-dir=".turbo" --scope=${{matrix.packageName}} --no-deps -- ${{ join(matrix.testPaths, ' ') }}
|
||||||
|
shell: bash
|
||||||
|
env:
|
||||||
|
VERCEL_TEAM_TOKEN: ${{ secrets.VERCEL_TEAM_TOKEN }}
|
||||||
|
VERCEL_REGISTRATION_URL: ${{ secrets.VERCEL_REGISTRATION_URL }}
|
||||||
|
FORCE_COLOR: '1'
|
||||||
|
|
||||||
|
conclusion:
|
||||||
|
needs:
|
||||||
|
- test
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
name: E2E
|
||||||
|
steps:
|
||||||
|
- name: Done
|
||||||
|
run: echo "Done."
|
||||||
@@ -48,6 +48,6 @@
|
|||||||
"qunit-dom": "^0.8.4"
|
"qunit-dom": "^0.8.4"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "8.* || >= 10.*"
|
"node": "14.x"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,3 +2,4 @@ README.md
|
|||||||
.nuxt
|
.nuxt
|
||||||
node_modules
|
node_modules
|
||||||
*.log
|
*.log
|
||||||
|
.output
|
||||||
|
|||||||
2
examples/remix/package-lock.json
generated
2
examples/remix/package-lock.json
generated
@@ -21,7 +21,7 @@
|
|||||||
"typescript": "^4.1.2"
|
"typescript": "^4.1.2"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=14"
|
"node": "14.x"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/code-frame": {
|
"node_modules/@babel/code-frame": {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
"typescript": "^4.1.2"
|
"typescript": "^4.1.2"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=14"
|
"node": "14.x"
|
||||||
},
|
},
|
||||||
"sideEffects": false
|
"sideEffects": false
|
||||||
}
|
}
|
||||||
|
|||||||
1
examples/solidstart/.gitignore
vendored
1
examples/solidstart/.gitignore
vendored
@@ -2,6 +2,7 @@ dist
|
|||||||
worker
|
worker
|
||||||
.solid
|
.solid
|
||||||
.vercel
|
.vercel
|
||||||
|
.output
|
||||||
|
|
||||||
# dependencies
|
# dependencies
|
||||||
/node_modules
|
/node_modules
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# SolidStart
|
# SolidStart
|
||||||
|
|
||||||
This directory is a brief example of a [SolidStart](https://github.com/ryansolid/solid-startp) site that can be deployed to Vercel with zero configuration.
|
This directory is a brief example of a [SolidStart](https://github.com/ryansolid/solid-start) site that can be deployed to Vercel with zero configuration.
|
||||||
|
|
||||||
## Deploy Your Own
|
## Deploy Your Own
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"jsx": "preserve",
|
|
||||||
"jsxImportSource": "solid-js",
|
|
||||||
"paths": {
|
|
||||||
"~/*": ["./src/*"]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,14 +7,14 @@
|
|||||||
"type": "module",
|
"type": "module",
|
||||||
"private": true,
|
"private": true,
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"solid-app-router": "^0.1.14",
|
"solid-app-router": "^0.3.2",
|
||||||
"solid-js": "^1.2.6",
|
"solid-js": "^1.3.15",
|
||||||
"solid-meta": "^0.27.2",
|
"solid-meta": "^0.27.3",
|
||||||
"solid-start": "next",
|
"solid-start": "next",
|
||||||
"solid-start-vercel": "next",
|
"solid-start-vercel": "next",
|
||||||
"vite": "^2.7.1"
|
"vite": "^2.9.9"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=14"
|
"node": "16.x"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
4
examples/solidstart/src/entry-client.tsx
Normal file
4
examples/solidstart/src/entry-client.tsx
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
import { hydrate } from "solid-js/web";
|
||||||
|
import { StartClient } from "solid-start/entry-client";
|
||||||
|
|
||||||
|
hydrate(() => <StartClient />, document);
|
||||||
7
examples/solidstart/src/entry-server.tsx
Normal file
7
examples/solidstart/src/entry-server.tsx
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import { StartServer, createHandler, renderAsync } from "solid-start/entry-server";
|
||||||
|
import { inlineServerModules } from "solid-start/server";
|
||||||
|
|
||||||
|
export default createHandler(
|
||||||
|
inlineServerModules,
|
||||||
|
renderAsync((context) => <StartServer context={context} />)
|
||||||
|
);
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
// @refresh reload
|
|
||||||
import { Links, Meta, Outlet, Scripts } from "solid-start/components";
|
|
||||||
|
|
||||||
export default function Root({ Start }) {
|
|
||||||
return (
|
|
||||||
<Start>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
||||||
<Meta />
|
|
||||||
<Links />
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<Outlet />
|
|
||||||
<Scripts />
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
</Start>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
25
examples/solidstart/src/root.tsx
Normal file
25
examples/solidstart/src/root.tsx
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
// @refresh reload
|
||||||
|
import { Links, Meta, Routes, Scripts } from "solid-start/root";
|
||||||
|
import { ErrorBoundary } from "solid-start/error-boundary";
|
||||||
|
import { Suspense } from "solid-js";
|
||||||
|
|
||||||
|
export default function Root() {
|
||||||
|
return (
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
|
<Meta />
|
||||||
|
<Links />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<ErrorBoundary>
|
||||||
|
<Suspense>
|
||||||
|
<Routes />
|
||||||
|
</Suspense>
|
||||||
|
</ErrorBoundary>
|
||||||
|
<Scripts />
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
);
|
||||||
|
}
|
||||||
16
examples/solidstart/tsconfig.json
Normal file
16
examples/solidstart/tsconfig.json
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"allowSyntheticDefaultImports": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"target": "ESNext",
|
||||||
|
"module": "ESNext",
|
||||||
|
"moduleResolution": "node",
|
||||||
|
"jsxImportSource": "solid-js",
|
||||||
|
"jsx": "preserve",
|
||||||
|
"types": ["vite/client"],
|
||||||
|
"baseUrl": "./",
|
||||||
|
"paths": {
|
||||||
|
"~/*": ["./src/*"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
7
examples/solidstart/vercel.json
Normal file
7
examples/solidstart/vercel.json
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"build": {
|
||||||
|
"env": {
|
||||||
|
"ENABLE_VC_BUILD": "1"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import { defineConfig } from "vite";
|
import { defineConfig } from "vite";
|
||||||
import solid from "solid-start";
|
import solid from "solid-start";
|
||||||
import vercel from "solid-start-vercel"
|
import vercel from "solid-start-vercel";
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
plugins: [solid({ adapter: vercel() })]
|
plugins: [solid({ adapter: vercel() })],
|
||||||
});
|
});
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
10
package.json
10
package.json
@@ -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.0-next.1",
|
"ts-jest": "28.0.0-next.1",
|
||||||
"turbo": "1.2.5"
|
"turbo": "1.2.9"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"lerna": "lerna",
|
"lerna": "lerna",
|
||||||
@@ -44,10 +44,10 @@
|
|||||||
"vercel-build": "yarn build && cd api && node -r ts-eager/register ./_lib/script/build.ts",
|
"vercel-build": "yarn build && cd api && node -r ts-eager/register ./_lib/script/build.ts",
|
||||||
"pre-commit": "lint-staged",
|
"pre-commit": "lint-staged",
|
||||||
"test": "jest --rootDir=\"test\" --testPathPattern=\"\\.test.js\"",
|
"test": "jest --rootDir=\"test\" --testPathPattern=\"\\.test.js\"",
|
||||||
"test-unit": "yarn test && node utils/run.js test-unit",
|
"test-unit": "yarn test && turbo run test-unit",
|
||||||
"test-integration-cli": "node utils/run.js test-integration-cli",
|
"test-integration-cli": "turbo run test-integration-cli",
|
||||||
"test-integration-once": "node utils/run.js test-integration-once",
|
"test-integration-once": "turbo run test-integration-once",
|
||||||
"test-integration-dev": "node utils/run.js test-integration-dev",
|
"test-integration-dev": "turbo run test-integration-dev",
|
||||||
"lint": "eslint . --ext .ts,.js",
|
"lint": "eslint . --ext .ts,.js",
|
||||||
"prepare": "husky install"
|
"prepare": "husky install"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@vercel/build-utils",
|
"name": "@vercel/build-utils",
|
||||||
"version": "2.17.0",
|
"version": "3.1.1-canary.1",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.js",
|
"types": "./dist/index.d.js",
|
||||||
@@ -12,8 +12,9 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "node build",
|
"build": "node build",
|
||||||
"test-unit": "jest --env node --verbose --runInBand --bail test/unit.*test.*",
|
"test": "jest --env node --verbose --runInBand --bail",
|
||||||
"test-integration-once": "jest --env node --verbose --runInBand --bail test/integration.test.ts",
|
"test-unit": "yarn test test/unit.*test.*",
|
||||||
|
"test-integration-once": "yarn test test/integration.test.ts",
|
||||||
"prepublishOnly": "node build"
|
"prepublishOnly": "node build"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -30,7 +31,7 @@
|
|||||||
"@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": "0.9.0",
|
"@vercel/frameworks": "0.9.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",
|
||||||
|
|||||||
@@ -1,12 +1,17 @@
|
|||||||
import { Framework, FrameworkDetectionItem } from '@vercel/frameworks';
|
import { Framework, FrameworkDetectionItem } from '@vercel/frameworks';
|
||||||
import { DetectorFilesystem } from './detectors/filesystem';
|
import { DetectorFilesystem } from './detectors/filesystem';
|
||||||
|
|
||||||
export interface DetectFrameworkOptions {
|
interface BaseFramework {
|
||||||
fs: DetectorFilesystem;
|
slug: Framework['slug'];
|
||||||
frameworkList: readonly Framework[];
|
detectors?: Framework['detectors'];
|
||||||
}
|
}
|
||||||
|
|
||||||
async function matches(fs: DetectorFilesystem, framework: Framework) {
|
export interface DetectFrameworkOptions {
|
||||||
|
fs: DetectorFilesystem;
|
||||||
|
frameworkList: readonly BaseFramework[];
|
||||||
|
}
|
||||||
|
|
||||||
|
async function matches(fs: DetectorFilesystem, framework: BaseFramework) {
|
||||||
const { detectors } = framework;
|
const { detectors } = framework;
|
||||||
|
|
||||||
if (!detectors) {
|
if (!detectors) {
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
export interface Stat {
|
||||||
|
name: string;
|
||||||
|
path: string;
|
||||||
|
type: 'file' | 'dir';
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* `DetectorFilesystem` is an abstract class that represents a virtual filesystem
|
* `DetectorFilesystem` is an abstract class that represents a virtual filesystem
|
||||||
* to perform read-only operations on in order to detect which framework is being
|
* to perform read-only operations on in order to detect which framework is being
|
||||||
@@ -27,15 +32,19 @@ export abstract class DetectorFilesystem {
|
|||||||
protected abstract _hasPath(name: string): Promise<boolean>;
|
protected abstract _hasPath(name: string): Promise<boolean>;
|
||||||
protected abstract _readFile(name: string): Promise<Buffer>;
|
protected abstract _readFile(name: string): Promise<Buffer>;
|
||||||
protected abstract _isFile(name: string): Promise<boolean>;
|
protected abstract _isFile(name: string): Promise<boolean>;
|
||||||
|
protected abstract _readdir(name: string): Promise<Stat[]>;
|
||||||
|
protected abstract _chdir(name: string): DetectorFilesystem;
|
||||||
|
|
||||||
private pathCache: Map<string, Promise<boolean>>;
|
private pathCache: Map<string, Promise<boolean>>;
|
||||||
private fileCache: Map<string, Promise<boolean>>;
|
private fileCache: Map<string, Promise<boolean>>;
|
||||||
private readFileCache: Map<string, Promise<Buffer>>;
|
private readFileCache: Map<string, Promise<Buffer>>;
|
||||||
|
private readdirCache: Map<string, Promise<Stat[]>>;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
this.pathCache = new Map();
|
this.pathCache = new Map();
|
||||||
this.fileCache = new Map();
|
this.fileCache = new Map();
|
||||||
this.readFileCache = new Map();
|
this.readFileCache = new Map();
|
||||||
|
this.readdirCache = new Map();
|
||||||
}
|
}
|
||||||
|
|
||||||
public hasPath = async (path: string): Promise<boolean> => {
|
public hasPath = async (path: string): Promise<boolean> => {
|
||||||
@@ -64,4 +73,23 @@ export abstract class DetectorFilesystem {
|
|||||||
}
|
}
|
||||||
return p;
|
return p;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a list of Stat objects from the current working directory.
|
||||||
|
*/
|
||||||
|
public readdir = async (name: string): Promise<Stat[]> => {
|
||||||
|
let p = this.readdirCache.get(name);
|
||||||
|
if (!p) {
|
||||||
|
p = this._readdir(name);
|
||||||
|
this.readdirCache.set(name, p);
|
||||||
|
}
|
||||||
|
return p;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Changes the current directory to the specified path and returns a new instance of DetectorFilesystem.
|
||||||
|
*/
|
||||||
|
public chdir = (name: string): DetectorFilesystem => {
|
||||||
|
return this._chdir(name);
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,12 @@ import debug from '../debug';
|
|||||||
const allOptions = [
|
const allOptions = [
|
||||||
{ major: 16, range: '16.x', runtime: 'nodejs16.x' },
|
{ major: 16, range: '16.x', runtime: 'nodejs16.x' },
|
||||||
{ major: 14, range: '14.x', runtime: 'nodejs14.x' },
|
{ major: 14, range: '14.x', runtime: 'nodejs14.x' },
|
||||||
{ major: 12, range: '12.x', runtime: 'nodejs12.x' },
|
{
|
||||||
|
major: 12,
|
||||||
|
range: '12.x',
|
||||||
|
runtime: 'nodejs12.x',
|
||||||
|
discontinueDate: new Date('2022-08-09'),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
major: 10,
|
major: 10,
|
||||||
range: '10.x',
|
range: '10.x',
|
||||||
|
|||||||
@@ -437,13 +437,9 @@ export function getEnvForPackageManager({
|
|||||||
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 (
|
if (typeof lockfileVersion === 'number' && lockfileVersion === 5.4) {
|
||||||
typeof lockfileVersion === 'number' &&
|
|
||||||
lockfileVersion === 5.4 &&
|
|
||||||
(nodeVersion?.major || 0) > 12
|
|
||||||
) {
|
|
||||||
// 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/pnpm:${env.PATH}`;
|
newEnv.PATH = `/pnpm7/node_modules/.bin:${env.PATH}`;
|
||||||
console.log('Detected `pnpm-lock.yaml` generated by pnpm 7...');
|
console.log('Detected `pnpm-lock.yaml` generated by pnpm 7...');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -117,3 +117,4 @@ export const isStaticRuntime = (name?: string): boolean => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export { workspaceManagers } from './workspaces/workspace-managers';
|
export { workspaceManagers } from './workspaces/workspace-managers';
|
||||||
|
export { monorepoManagers } from './monorepos/monorepo-managers';
|
||||||
|
|||||||
36
packages/build-utils/src/monorepos/monorepo-managers.ts
Normal file
36
packages/build-utils/src/monorepos/monorepo-managers.ts
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
import type { Framework } from '@vercel/frameworks';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The supported list of monorepo managers.
|
||||||
|
*
|
||||||
|
* This list is designed to work with the @see {@link detectFramework} function.
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* import { monorepoManagers as frameworkList } from '@vercel/build-utils'
|
||||||
|
* import { detectFramework } from '@vercel/build-utils'
|
||||||
|
*
|
||||||
|
* const fs = new GitDetectorFilesystem(...)
|
||||||
|
* detectFramwork({ fs, frameworkList }) // returns the 'slug' field if detected, otherwise null
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
export const monorepoManagers: Array<
|
||||||
|
Omit<Framework, 'description' | 'logo' | 'settings' | 'getOutputDirName'>
|
||||||
|
> = [
|
||||||
|
{
|
||||||
|
name: 'Turborepo',
|
||||||
|
slug: 'turbo',
|
||||||
|
detectors: {
|
||||||
|
some: [
|
||||||
|
{
|
||||||
|
path: 'turbo.json',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'package.json',
|
||||||
|
matchContent: '"turbo":\\s*{[^}]*.+[^}]*}',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
export default monorepoManagers;
|
||||||
@@ -327,6 +327,7 @@ export interface ProjectSettings {
|
|||||||
buildCommand?: string | null;
|
buildCommand?: string | null;
|
||||||
outputDirectory?: string | null;
|
outputDirectory?: string | null;
|
||||||
rootDirectory?: string | null;
|
rootDirectory?: string | null;
|
||||||
|
nodeVersion?: string;
|
||||||
createdAt?: number;
|
createdAt?: number;
|
||||||
autoExposeSystemEnvs?: boolean;
|
autoExposeSystemEnvs?: boolean;
|
||||||
sourceFilesOutsideRootDirectory?: boolean;
|
sourceFilesOutsideRootDirectory?: boolean;
|
||||||
@@ -351,11 +352,41 @@ export interface BuilderV3 {
|
|||||||
|
|
||||||
type ImageFormat = 'image/avif' | 'image/webp';
|
type ImageFormat = 'image/avif' | 'image/webp';
|
||||||
|
|
||||||
|
export type RemotePattern = {
|
||||||
|
/**
|
||||||
|
* Must be `http` or `https`.
|
||||||
|
*/
|
||||||
|
protocol?: 'http' | 'https';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Can be literal or wildcard.
|
||||||
|
* Single `*` matches a single subdomain.
|
||||||
|
* Double `**` matches any number of subdomains.
|
||||||
|
*/
|
||||||
|
hostname: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Can be literal port such as `8080` or empty string
|
||||||
|
* meaning no port.
|
||||||
|
*/
|
||||||
|
port?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Can be literal or wildcard.
|
||||||
|
* Single `*` matches a single path segment.
|
||||||
|
* Double `**` matches any number of path segments.
|
||||||
|
*/
|
||||||
|
pathname?: string;
|
||||||
|
};
|
||||||
|
|
||||||
export interface Images {
|
export interface Images {
|
||||||
domains: string[];
|
domains: string[];
|
||||||
|
remotePatterns?: RemotePattern[];
|
||||||
sizes: number[];
|
sizes: number[];
|
||||||
minimumCacheTTL?: number;
|
minimumCacheTTL?: number;
|
||||||
formats?: ImageFormat[];
|
formats?: ImageFormat[];
|
||||||
|
dangerouslyAllowSVG?: boolean;
|
||||||
|
contentSecurityPolicy?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -6,15 +6,16 @@ import type { Framework } from '@vercel/frameworks';
|
|||||||
* This list is designed to work with the @see {@link detectFramework} function.
|
* This list is designed to work with the @see {@link detectFramework} function.
|
||||||
*
|
*
|
||||||
* @example
|
* @example
|
||||||
* import { workspaceManagers as frameworkList } from '@vercel/build-utils/workspaces'
|
* import { workspaceManagers as frameworkList } from '@vercel/build-utils'
|
||||||
* import { detectFramework } from '@vercel/build-utils'
|
* import { detectFramework } from '@vercel/build-utils'
|
||||||
*
|
*
|
||||||
* const fs = new GitDetectorFilesystem(...)
|
* const fs = new GitDetectorFilesystem(...)
|
||||||
* detectFramwork({ fs, frameworkList }) // returns the 'slug' field if detected, otherwise null
|
* detectFramwork({ fs, frameworkList }) // returns the 'slug' field if detected, otherwise null
|
||||||
*
|
*
|
||||||
* @todo Will be used by the detect-eligible-projects API endpoint for a given git url.
|
|
||||||
*/
|
*/
|
||||||
export const workspaceManagers: Array<Framework> = [
|
export const workspaceManagers: Array<
|
||||||
|
Omit<Framework, 'description' | 'logo' | 'settings' | 'getOutputDirName'>
|
||||||
|
> = [
|
||||||
{
|
{
|
||||||
name: 'Yarn',
|
name: 'Yarn',
|
||||||
slug: 'yarn',
|
slug: 'yarn',
|
||||||
@@ -30,28 +31,6 @@ export const workspaceManagers: Array<Framework> = [
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
// unused props - needed for typescript
|
|
||||||
description: '',
|
|
||||||
logo: '',
|
|
||||||
settings: {
|
|
||||||
buildCommand: {
|
|
||||||
value: '',
|
|
||||||
placeholder: '',
|
|
||||||
},
|
|
||||||
devCommand: {
|
|
||||||
value: '',
|
|
||||||
placeholder: '',
|
|
||||||
},
|
|
||||||
installCommand: {
|
|
||||||
value: '',
|
|
||||||
placeholder: '',
|
|
||||||
},
|
|
||||||
outputDirectory: {
|
|
||||||
value: '',
|
|
||||||
placeholder: '',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
getOutputDirName: () => Promise.resolve(''),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'pnpm',
|
name: 'pnpm',
|
||||||
@@ -63,28 +42,6 @@ export const workspaceManagers: Array<Framework> = [
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
// unused props - needed for typescript
|
|
||||||
description: '',
|
|
||||||
logo: '',
|
|
||||||
settings: {
|
|
||||||
buildCommand: {
|
|
||||||
value: '',
|
|
||||||
placeholder: '',
|
|
||||||
},
|
|
||||||
devCommand: {
|
|
||||||
value: '',
|
|
||||||
placeholder: '',
|
|
||||||
},
|
|
||||||
installCommand: {
|
|
||||||
value: '',
|
|
||||||
placeholder: '',
|
|
||||||
},
|
|
||||||
outputDirectory: {
|
|
||||||
value: '',
|
|
||||||
placeholder: '',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
getOutputDirName: () => Promise.resolve(''),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'npm',
|
name: 'npm',
|
||||||
@@ -101,28 +58,6 @@ export const workspaceManagers: Array<Framework> = [
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
// unused props - needed for typescript
|
|
||||||
description: '',
|
|
||||||
logo: '',
|
|
||||||
settings: {
|
|
||||||
buildCommand: {
|
|
||||||
value: '',
|
|
||||||
placeholder: '',
|
|
||||||
},
|
|
||||||
devCommand: {
|
|
||||||
value: '',
|
|
||||||
placeholder: '',
|
|
||||||
},
|
|
||||||
installCommand: {
|
|
||||||
value: '',
|
|
||||||
placeholder: '',
|
|
||||||
},
|
|
||||||
outputDirectory: {
|
|
||||||
value: '',
|
|
||||||
placeholder: '',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
getOutputDirName: () => Promise.resolve(''),
|
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,7 @@
|
|||||||
"probes": [
|
"probes": [
|
||||||
{
|
{
|
||||||
"path": "/",
|
"path": "/",
|
||||||
"mustContain": "pnpm version: 7",
|
"mustContain": "pnpm version: 7"
|
||||||
"logMustContain": "pnpm run build"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
15
packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/a/package.json
vendored
Normal file
15
packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/a/package.json
vendored
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"name": "a",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "",
|
||||||
|
"main": "index.js",
|
||||||
|
"scripts": {
|
||||||
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
|
},
|
||||||
|
"keywords": [],
|
||||||
|
"author": "",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"debug": "^4.3.2"
|
||||||
|
}
|
||||||
|
}
|
||||||
15
packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/b/package.json
vendored
Normal file
15
packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/b/package.json
vendored
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"name": "b",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "",
|
||||||
|
"main": "index.js",
|
||||||
|
"scripts": {
|
||||||
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
|
},
|
||||||
|
"keywords": [],
|
||||||
|
"author": "",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"cowsay": "^1.5.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
9
packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/package.json
vendored
Normal file
9
packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/package.json
vendored
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"name": "21-npm-workspaces",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"private": true,
|
||||||
|
"workspaces": [
|
||||||
|
"a",
|
||||||
|
"b"
|
||||||
|
]
|
||||||
|
}
|
||||||
20
packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/turbo.json
vendored
Normal file
20
packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/turbo.json
vendored
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://turborepo.org/schema.json",
|
||||||
|
"baseBranch": "origin/main",
|
||||||
|
"pipeline": {
|
||||||
|
"build": {
|
||||||
|
"dependsOn": ["^build"],
|
||||||
|
"outputs": [".next/**"]
|
||||||
|
},
|
||||||
|
"test": {
|
||||||
|
"dependsOn": ["^build"],
|
||||||
|
"outputs": []
|
||||||
|
},
|
||||||
|
"lint": {
|
||||||
|
"outputs": []
|
||||||
|
},
|
||||||
|
"dev": {
|
||||||
|
"cache": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
232
packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/yarn.lock
vendored
Normal file
232
packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/yarn.lock
vendored
Normal file
@@ -0,0 +1,232 @@
|
|||||||
|
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
||||||
|
# yarn lockfile v1
|
||||||
|
|
||||||
|
|
||||||
|
ansi-regex@^3.0.0:
|
||||||
|
version "3.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
|
||||||
|
integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
|
||||||
|
|
||||||
|
ansi-regex@^5.0.1:
|
||||||
|
version "5.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
|
||||||
|
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
|
||||||
|
|
||||||
|
ansi-styles@^4.0.0:
|
||||||
|
version "4.3.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
|
||||||
|
integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
|
||||||
|
dependencies:
|
||||||
|
color-convert "^2.0.1"
|
||||||
|
|
||||||
|
camelcase@^5.0.0:
|
||||||
|
version "5.3.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
|
||||||
|
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
|
||||||
|
|
||||||
|
cliui@^6.0.0:
|
||||||
|
version "6.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
|
||||||
|
integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
|
||||||
|
dependencies:
|
||||||
|
string-width "^4.2.0"
|
||||||
|
strip-ansi "^6.0.0"
|
||||||
|
wrap-ansi "^6.2.0"
|
||||||
|
|
||||||
|
color-convert@^2.0.1:
|
||||||
|
version "2.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
|
||||||
|
integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
|
||||||
|
dependencies:
|
||||||
|
color-name "~1.1.4"
|
||||||
|
|
||||||
|
color-name@~1.1.4:
|
||||||
|
version "1.1.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
|
||||||
|
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
|
||||||
|
|
||||||
|
cowsay@^1.5.0:
|
||||||
|
version "1.5.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/cowsay/-/cowsay-1.5.0.tgz#4a2a453b8b59383c7d7a50e44d765c5de0bf615f"
|
||||||
|
integrity sha512-8Ipzr54Z8zROr/62C8f0PdhQcDusS05gKTS87xxdji8VbWefWly0k8BwGK7+VqamOrkv3eGsCkPtvlHzrhWsCA==
|
||||||
|
dependencies:
|
||||||
|
get-stdin "8.0.0"
|
||||||
|
string-width "~2.1.1"
|
||||||
|
strip-final-newline "2.0.0"
|
||||||
|
yargs "15.4.1"
|
||||||
|
|
||||||
|
debug@^4.3.2:
|
||||||
|
version "4.3.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
|
||||||
|
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
|
||||||
|
dependencies:
|
||||||
|
ms "2.1.2"
|
||||||
|
|
||||||
|
decamelize@^1.2.0:
|
||||||
|
version "1.2.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
|
||||||
|
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
|
||||||
|
|
||||||
|
emoji-regex@^8.0.0:
|
||||||
|
version "8.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
|
||||||
|
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
|
||||||
|
|
||||||
|
find-up@^4.1.0:
|
||||||
|
version "4.1.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
|
||||||
|
integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
|
||||||
|
dependencies:
|
||||||
|
locate-path "^5.0.0"
|
||||||
|
path-exists "^4.0.0"
|
||||||
|
|
||||||
|
get-caller-file@^2.0.1:
|
||||||
|
version "2.0.5"
|
||||||
|
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
|
||||||
|
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
|
||||||
|
|
||||||
|
get-stdin@8.0.0:
|
||||||
|
version "8.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
|
||||||
|
integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
|
||||||
|
|
||||||
|
is-fullwidth-code-point@^2.0.0:
|
||||||
|
version "2.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
|
||||||
|
integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
|
||||||
|
|
||||||
|
is-fullwidth-code-point@^3.0.0:
|
||||||
|
version "3.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
|
||||||
|
integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
|
||||||
|
|
||||||
|
locate-path@^5.0.0:
|
||||||
|
version "5.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
|
||||||
|
integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
|
||||||
|
dependencies:
|
||||||
|
p-locate "^4.1.0"
|
||||||
|
|
||||||
|
ms@2.1.2:
|
||||||
|
version "2.1.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
|
||||||
|
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
|
||||||
|
|
||||||
|
p-limit@^2.2.0:
|
||||||
|
version "2.3.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
|
||||||
|
integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
|
||||||
|
dependencies:
|
||||||
|
p-try "^2.0.0"
|
||||||
|
|
||||||
|
p-locate@^4.1.0:
|
||||||
|
version "4.1.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
|
||||||
|
integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
|
||||||
|
dependencies:
|
||||||
|
p-limit "^2.2.0"
|
||||||
|
|
||||||
|
p-try@^2.0.0:
|
||||||
|
version "2.2.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
|
||||||
|
integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
|
||||||
|
|
||||||
|
path-exists@^4.0.0:
|
||||||
|
version "4.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
|
||||||
|
integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
|
||||||
|
|
||||||
|
require-directory@^2.1.1:
|
||||||
|
version "2.1.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
|
||||||
|
integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
|
||||||
|
|
||||||
|
require-main-filename@^2.0.0:
|
||||||
|
version "2.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
|
||||||
|
integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
|
||||||
|
|
||||||
|
set-blocking@^2.0.0:
|
||||||
|
version "2.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
|
||||||
|
integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
|
||||||
|
|
||||||
|
string-width@^4.1.0, string-width@^4.2.0:
|
||||||
|
version "4.2.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
|
||||||
|
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
|
||||||
|
dependencies:
|
||||||
|
emoji-regex "^8.0.0"
|
||||||
|
is-fullwidth-code-point "^3.0.0"
|
||||||
|
strip-ansi "^6.0.1"
|
||||||
|
|
||||||
|
string-width@~2.1.1:
|
||||||
|
version "2.1.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
|
||||||
|
integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
|
||||||
|
dependencies:
|
||||||
|
is-fullwidth-code-point "^2.0.0"
|
||||||
|
strip-ansi "^4.0.0"
|
||||||
|
|
||||||
|
strip-ansi@^4.0.0:
|
||||||
|
version "4.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
|
||||||
|
integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
|
||||||
|
dependencies:
|
||||||
|
ansi-regex "^3.0.0"
|
||||||
|
|
||||||
|
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
|
||||||
|
version "6.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
|
||||||
|
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
|
||||||
|
dependencies:
|
||||||
|
ansi-regex "^5.0.1"
|
||||||
|
|
||||||
|
strip-final-newline@2.0.0:
|
||||||
|
version "2.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
|
||||||
|
integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
|
||||||
|
|
||||||
|
which-module@^2.0.0:
|
||||||
|
version "2.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
|
||||||
|
integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
|
||||||
|
|
||||||
|
wrap-ansi@^6.2.0:
|
||||||
|
version "6.2.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
|
||||||
|
integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
|
||||||
|
dependencies:
|
||||||
|
ansi-styles "^4.0.0"
|
||||||
|
string-width "^4.1.0"
|
||||||
|
strip-ansi "^6.0.0"
|
||||||
|
|
||||||
|
y18n@^4.0.0:
|
||||||
|
version "4.0.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
|
||||||
|
integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
|
||||||
|
|
||||||
|
yargs-parser@^18.1.2:
|
||||||
|
version "18.1.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
|
||||||
|
integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
|
||||||
|
dependencies:
|
||||||
|
camelcase "^5.0.0"
|
||||||
|
decamelize "^1.2.0"
|
||||||
|
|
||||||
|
yargs@15.4.1:
|
||||||
|
version "15.4.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
|
||||||
|
integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
|
||||||
|
dependencies:
|
||||||
|
cliui "^6.0.0"
|
||||||
|
decamelize "^1.2.0"
|
||||||
|
find-up "^4.1.0"
|
||||||
|
get-caller-file "^2.0.1"
|
||||||
|
require-directory "^2.1.1"
|
||||||
|
require-main-filename "^2.0.0"
|
||||||
|
set-blocking "^2.0.0"
|
||||||
|
string-width "^4.2.0"
|
||||||
|
which-module "^2.0.0"
|
||||||
|
y18n "^4.0.0"
|
||||||
|
yargs-parser "^18.1.2"
|
||||||
15
packages/build-utils/test/fixtures/29-turborepo-in-package-json/a/package.json
vendored
Normal file
15
packages/build-utils/test/fixtures/29-turborepo-in-package-json/a/package.json
vendored
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"name": "a",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "",
|
||||||
|
"main": "index.js",
|
||||||
|
"scripts": {
|
||||||
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
|
},
|
||||||
|
"keywords": [],
|
||||||
|
"author": "",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"debug": "^4.3.2"
|
||||||
|
}
|
||||||
|
}
|
||||||
15
packages/build-utils/test/fixtures/29-turborepo-in-package-json/b/package.json
vendored
Normal file
15
packages/build-utils/test/fixtures/29-turborepo-in-package-json/b/package.json
vendored
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"name": "b",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "",
|
||||||
|
"main": "index.js",
|
||||||
|
"scripts": {
|
||||||
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
|
},
|
||||||
|
"keywords": [],
|
||||||
|
"author": "",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"cowsay": "^1.5.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
34
packages/build-utils/test/fixtures/29-turborepo-in-package-json/package.json
vendored
Normal file
34
packages/build-utils/test/fixtures/29-turborepo-in-package-json/package.json
vendored
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
{
|
||||||
|
"name": "21-npm-workspaces",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"private": true,
|
||||||
|
"workspaces": [
|
||||||
|
"a",
|
||||||
|
"b"
|
||||||
|
],
|
||||||
|
"turbo": {
|
||||||
|
"baseBranch": "origin/main",
|
||||||
|
"pipeline": {
|
||||||
|
"build": {
|
||||||
|
"dependsOn": [
|
||||||
|
"^build"
|
||||||
|
],
|
||||||
|
"outputs": [
|
||||||
|
".next/**"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"test": {
|
||||||
|
"dependsOn": [
|
||||||
|
"^build"
|
||||||
|
],
|
||||||
|
"outputs": []
|
||||||
|
},
|
||||||
|
"lint": {
|
||||||
|
"outputs": []
|
||||||
|
},
|
||||||
|
"dev": {
|
||||||
|
"cache": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
232
packages/build-utils/test/fixtures/29-turborepo-in-package-json/yarn.lock
vendored
Normal file
232
packages/build-utils/test/fixtures/29-turborepo-in-package-json/yarn.lock
vendored
Normal file
@@ -0,0 +1,232 @@
|
|||||||
|
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
||||||
|
# yarn lockfile v1
|
||||||
|
|
||||||
|
|
||||||
|
ansi-regex@^3.0.0:
|
||||||
|
version "3.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
|
||||||
|
integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
|
||||||
|
|
||||||
|
ansi-regex@^5.0.1:
|
||||||
|
version "5.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
|
||||||
|
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
|
||||||
|
|
||||||
|
ansi-styles@^4.0.0:
|
||||||
|
version "4.3.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
|
||||||
|
integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
|
||||||
|
dependencies:
|
||||||
|
color-convert "^2.0.1"
|
||||||
|
|
||||||
|
camelcase@^5.0.0:
|
||||||
|
version "5.3.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
|
||||||
|
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
|
||||||
|
|
||||||
|
cliui@^6.0.0:
|
||||||
|
version "6.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
|
||||||
|
integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
|
||||||
|
dependencies:
|
||||||
|
string-width "^4.2.0"
|
||||||
|
strip-ansi "^6.0.0"
|
||||||
|
wrap-ansi "^6.2.0"
|
||||||
|
|
||||||
|
color-convert@^2.0.1:
|
||||||
|
version "2.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
|
||||||
|
integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
|
||||||
|
dependencies:
|
||||||
|
color-name "~1.1.4"
|
||||||
|
|
||||||
|
color-name@~1.1.4:
|
||||||
|
version "1.1.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
|
||||||
|
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
|
||||||
|
|
||||||
|
cowsay@^1.5.0:
|
||||||
|
version "1.5.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/cowsay/-/cowsay-1.5.0.tgz#4a2a453b8b59383c7d7a50e44d765c5de0bf615f"
|
||||||
|
integrity sha512-8Ipzr54Z8zROr/62C8f0PdhQcDusS05gKTS87xxdji8VbWefWly0k8BwGK7+VqamOrkv3eGsCkPtvlHzrhWsCA==
|
||||||
|
dependencies:
|
||||||
|
get-stdin "8.0.0"
|
||||||
|
string-width "~2.1.1"
|
||||||
|
strip-final-newline "2.0.0"
|
||||||
|
yargs "15.4.1"
|
||||||
|
|
||||||
|
debug@^4.3.2:
|
||||||
|
version "4.3.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
|
||||||
|
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
|
||||||
|
dependencies:
|
||||||
|
ms "2.1.2"
|
||||||
|
|
||||||
|
decamelize@^1.2.0:
|
||||||
|
version "1.2.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
|
||||||
|
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
|
||||||
|
|
||||||
|
emoji-regex@^8.0.0:
|
||||||
|
version "8.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
|
||||||
|
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
|
||||||
|
|
||||||
|
find-up@^4.1.0:
|
||||||
|
version "4.1.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
|
||||||
|
integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
|
||||||
|
dependencies:
|
||||||
|
locate-path "^5.0.0"
|
||||||
|
path-exists "^4.0.0"
|
||||||
|
|
||||||
|
get-caller-file@^2.0.1:
|
||||||
|
version "2.0.5"
|
||||||
|
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
|
||||||
|
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
|
||||||
|
|
||||||
|
get-stdin@8.0.0:
|
||||||
|
version "8.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
|
||||||
|
integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
|
||||||
|
|
||||||
|
is-fullwidth-code-point@^2.0.0:
|
||||||
|
version "2.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
|
||||||
|
integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
|
||||||
|
|
||||||
|
is-fullwidth-code-point@^3.0.0:
|
||||||
|
version "3.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
|
||||||
|
integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
|
||||||
|
|
||||||
|
locate-path@^5.0.0:
|
||||||
|
version "5.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
|
||||||
|
integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
|
||||||
|
dependencies:
|
||||||
|
p-locate "^4.1.0"
|
||||||
|
|
||||||
|
ms@2.1.2:
|
||||||
|
version "2.1.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
|
||||||
|
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
|
||||||
|
|
||||||
|
p-limit@^2.2.0:
|
||||||
|
version "2.3.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
|
||||||
|
integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
|
||||||
|
dependencies:
|
||||||
|
p-try "^2.0.0"
|
||||||
|
|
||||||
|
p-locate@^4.1.0:
|
||||||
|
version "4.1.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
|
||||||
|
integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
|
||||||
|
dependencies:
|
||||||
|
p-limit "^2.2.0"
|
||||||
|
|
||||||
|
p-try@^2.0.0:
|
||||||
|
version "2.2.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
|
||||||
|
integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
|
||||||
|
|
||||||
|
path-exists@^4.0.0:
|
||||||
|
version "4.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
|
||||||
|
integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
|
||||||
|
|
||||||
|
require-directory@^2.1.1:
|
||||||
|
version "2.1.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
|
||||||
|
integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
|
||||||
|
|
||||||
|
require-main-filename@^2.0.0:
|
||||||
|
version "2.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
|
||||||
|
integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
|
||||||
|
|
||||||
|
set-blocking@^2.0.0:
|
||||||
|
version "2.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
|
||||||
|
integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
|
||||||
|
|
||||||
|
string-width@^4.1.0, string-width@^4.2.0:
|
||||||
|
version "4.2.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
|
||||||
|
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
|
||||||
|
dependencies:
|
||||||
|
emoji-regex "^8.0.0"
|
||||||
|
is-fullwidth-code-point "^3.0.0"
|
||||||
|
strip-ansi "^6.0.1"
|
||||||
|
|
||||||
|
string-width@~2.1.1:
|
||||||
|
version "2.1.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
|
||||||
|
integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
|
||||||
|
dependencies:
|
||||||
|
is-fullwidth-code-point "^2.0.0"
|
||||||
|
strip-ansi "^4.0.0"
|
||||||
|
|
||||||
|
strip-ansi@^4.0.0:
|
||||||
|
version "4.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
|
||||||
|
integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
|
||||||
|
dependencies:
|
||||||
|
ansi-regex "^3.0.0"
|
||||||
|
|
||||||
|
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
|
||||||
|
version "6.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
|
||||||
|
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
|
||||||
|
dependencies:
|
||||||
|
ansi-regex "^5.0.1"
|
||||||
|
|
||||||
|
strip-final-newline@2.0.0:
|
||||||
|
version "2.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
|
||||||
|
integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
|
||||||
|
|
||||||
|
which-module@^2.0.0:
|
||||||
|
version "2.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
|
||||||
|
integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
|
||||||
|
|
||||||
|
wrap-ansi@^6.2.0:
|
||||||
|
version "6.2.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
|
||||||
|
integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
|
||||||
|
dependencies:
|
||||||
|
ansi-styles "^4.0.0"
|
||||||
|
string-width "^4.1.0"
|
||||||
|
strip-ansi "^6.0.0"
|
||||||
|
|
||||||
|
y18n@^4.0.0:
|
||||||
|
version "4.0.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
|
||||||
|
integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
|
||||||
|
|
||||||
|
yargs-parser@^18.1.2:
|
||||||
|
version "18.1.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
|
||||||
|
integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
|
||||||
|
dependencies:
|
||||||
|
camelcase "^5.0.0"
|
||||||
|
decamelize "^1.2.0"
|
||||||
|
|
||||||
|
yargs@15.4.1:
|
||||||
|
version "15.4.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
|
||||||
|
integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
|
||||||
|
dependencies:
|
||||||
|
cliui "^6.0.0"
|
||||||
|
decamelize "^1.2.0"
|
||||||
|
find-up "^4.1.0"
|
||||||
|
get-caller-file "^2.0.1"
|
||||||
|
require-directory "^2.1.1"
|
||||||
|
require-main-filename "^2.0.0"
|
||||||
|
set-blocking "^2.0.0"
|
||||||
|
string-width "^4.2.0"
|
||||||
|
which-module "^2.0.0"
|
||||||
|
y18n "^4.0.0"
|
||||||
|
yargs-parser "^18.1.2"
|
||||||
@@ -33,6 +33,8 @@ const skipFixtures: string[] = [
|
|||||||
'21-npm-workspaces',
|
'21-npm-workspaces',
|
||||||
'23-pnpm-workspaces',
|
'23-pnpm-workspaces',
|
||||||
'27-yarn-workspaces',
|
'27-yarn-workspaces',
|
||||||
|
'28-turborepo-with-yarn-workspaces',
|
||||||
|
'29-turborepo-in-package-json',
|
||||||
];
|
];
|
||||||
|
|
||||||
// eslint-disable-next-line no-restricted-syntax
|
// eslint-disable-next-line no-restricted-syntax
|
||||||
|
|||||||
28
packages/build-utils/test/unit.detect-monorepo-managers.test.ts
vendored
Normal file
28
packages/build-utils/test/unit.detect-monorepo-managers.test.ts
vendored
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
import path from 'path';
|
||||||
|
import { detectFramework } from '../src/detect-framework';
|
||||||
|
import monorepoManagers from '../src/monorepos/monorepo-managers';
|
||||||
|
import { FixtureFilesystem } from './utils/fixture-filesystem';
|
||||||
|
|
||||||
|
describe('monorepo-managers', () => {
|
||||||
|
describe.each([
|
||||||
|
['turbo', '28-turborepo-with-yarn-workspaces'],
|
||||||
|
['turbo', '29-turborepo-in-package-json'],
|
||||||
|
[null, '22-pnpm'],
|
||||||
|
])('with detectFramework', (frameworkSlug, fixturePath) => {
|
||||||
|
const testName = frameworkSlug
|
||||||
|
? `should detect a ${frameworkSlug} workspace for ${fixturePath}`
|
||||||
|
: `should not detect a monorepo manager for ${fixturePath}`;
|
||||||
|
|
||||||
|
it(testName, async () => {
|
||||||
|
const fixture = path.join(__dirname, 'fixtures', fixturePath);
|
||||||
|
const fs = new FixtureFilesystem(fixture);
|
||||||
|
|
||||||
|
const result = await detectFramework({
|
||||||
|
fs,
|
||||||
|
frameworkList: monorepoManagers,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(result).toBe(frameworkSlug);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,21 +1,32 @@
|
|||||||
|
import path from 'path';
|
||||||
import frameworkList from '@vercel/frameworks';
|
import frameworkList from '@vercel/frameworks';
|
||||||
import { detectFramework, DetectorFilesystem } from '../src';
|
import { detectFramework, DetectorFilesystem } from '../src';
|
||||||
|
import { Stat } from '../src/detectors/filesystem';
|
||||||
|
|
||||||
|
const posixPath = path.posix;
|
||||||
|
|
||||||
class VirtualFilesystem extends DetectorFilesystem {
|
class VirtualFilesystem extends DetectorFilesystem {
|
||||||
private files: Map<string, Buffer>;
|
private files: Map<string, Buffer>;
|
||||||
|
private cwd: string;
|
||||||
|
|
||||||
constructor(files: { [key: string]: string | Buffer }) {
|
constructor(files: { [key: string]: string | Buffer }, cwd = '') {
|
||||||
super();
|
super();
|
||||||
this.files = new Map();
|
this.files = new Map();
|
||||||
|
this.cwd = cwd;
|
||||||
Object.entries(files).map(([key, value]) => {
|
Object.entries(files).map(([key, value]) => {
|
||||||
const buffer = typeof value === 'string' ? Buffer.from(value) : value;
|
const buffer = typeof value === 'string' ? Buffer.from(value) : value;
|
||||||
this.files.set(key, buffer);
|
this.files.set(key, buffer);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async _hasPath(path: string): Promise<boolean> {
|
private _normalizePath(rawPath: string): string {
|
||||||
|
return posixPath.normalize(rawPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
async _hasPath(name: string): Promise<boolean> {
|
||||||
|
const basePath = this._normalizePath(posixPath.join(this.cwd, name));
|
||||||
for (const file of this.files.keys()) {
|
for (const file of this.files.keys()) {
|
||||||
if (file.startsWith(path)) {
|
if (file.startsWith(basePath)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -24,11 +35,13 @@ class VirtualFilesystem extends DetectorFilesystem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async _isFile(name: string): Promise<boolean> {
|
async _isFile(name: string): Promise<boolean> {
|
||||||
return this.files.has(name);
|
const basePath = this._normalizePath(posixPath.join(this.cwd, name));
|
||||||
|
return this.files.has(basePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
async _readFile(name: string): Promise<Buffer> {
|
async _readFile(name: string): Promise<Buffer> {
|
||||||
const file = this.files.get(name);
|
const basePath = this._normalizePath(posixPath.join(this.cwd, name));
|
||||||
|
const file = this.files.get(basePath);
|
||||||
|
|
||||||
if (file === undefined) {
|
if (file === undefined) {
|
||||||
throw new Error('File does not exist');
|
throw new Error('File does not exist');
|
||||||
@@ -40,115 +53,291 @@ class VirtualFilesystem extends DetectorFilesystem {
|
|||||||
|
|
||||||
return file;
|
return file;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An example of how to implement readdir for a virtual filesystem.
|
||||||
|
*/
|
||||||
|
async _readdir(name = '/'): Promise<Stat[]> {
|
||||||
|
return (
|
||||||
|
[...this.files.keys()]
|
||||||
|
.map(filepath => {
|
||||||
|
const basePath = this._normalizePath(
|
||||||
|
posixPath.join(this.cwd, name === '/' ? '' : name)
|
||||||
|
);
|
||||||
|
const fileDirectoryName = posixPath.dirname(filepath);
|
||||||
|
|
||||||
|
if (fileDirectoryName === basePath) {
|
||||||
|
return {
|
||||||
|
name: posixPath.basename(filepath),
|
||||||
|
path: filepath.replace(
|
||||||
|
this.cwd === '' ? this.cwd : `${this.cwd}/`,
|
||||||
|
''
|
||||||
|
),
|
||||||
|
type: 'file',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
(basePath === '.' && fileDirectoryName !== '.') ||
|
||||||
|
fileDirectoryName.startsWith(basePath)
|
||||||
|
) {
|
||||||
|
let subDirectoryName = fileDirectoryName.replace(
|
||||||
|
basePath === '.' ? '' : `${basePath}/`,
|
||||||
|
''
|
||||||
|
);
|
||||||
|
|
||||||
|
if (subDirectoryName.includes('/')) {
|
||||||
|
subDirectoryName = subDirectoryName.split('/')[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
name: subDirectoryName,
|
||||||
|
path:
|
||||||
|
name === '/'
|
||||||
|
? subDirectoryName
|
||||||
|
: this._normalizePath(posixPath.join(name, subDirectoryName)),
|
||||||
|
type: 'dir',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
})
|
||||||
|
// remove nulls
|
||||||
|
.filter((stat): stat is Stat => stat !== null)
|
||||||
|
// remove duplicates
|
||||||
|
.filter(
|
||||||
|
(stat, index, self) =>
|
||||||
|
index ===
|
||||||
|
self.findIndex(s => s.name === stat.name && s.path === stat.path)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An example of how to implement chdir for a virtual filesystem.
|
||||||
|
*/
|
||||||
|
_chdir(name: string): DetectorFilesystem {
|
||||||
|
const basePath = this._normalizePath(posixPath.join(this.cwd, name));
|
||||||
|
const files = Object.fromEntries(
|
||||||
|
[...this.files.keys()].map(key => [key, this.files.get(key) ?? ''])
|
||||||
|
);
|
||||||
|
|
||||||
|
return new VirtualFilesystem(files, basePath);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
describe('#detectFramework', () => {
|
describe('DetectorFilesystem', () => {
|
||||||
it('Do not detect anything', async () => {
|
it('should return the directory contents relative to the cwd', async () => {
|
||||||
const fs = new VirtualFilesystem({
|
const files = {
|
||||||
'README.md': '# hi',
|
'package.json': '{}',
|
||||||
'api/cheese.js': 'export default (req, res) => res.end("cheese");',
|
'packages/app1/package.json': '{}',
|
||||||
});
|
'packages/app2/package.json': '{}',
|
||||||
|
};
|
||||||
|
|
||||||
expect(await detectFramework({ fs, frameworkList })).toBe(null);
|
const fs = new VirtualFilesystem(files);
|
||||||
|
|
||||||
|
expect(await fs.readdir('/')).toEqual([
|
||||||
|
{ name: 'package.json', path: 'package.json', type: 'file' },
|
||||||
|
{ name: 'packages', path: 'packages', type: 'dir' },
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(await fs.readdir('packages')).toEqual([
|
||||||
|
{ name: 'app1', path: 'packages/app1', type: 'dir' },
|
||||||
|
{ name: 'app2', path: 'packages/app2', type: 'dir' },
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(await fs.readdir('./packages')).toEqual([
|
||||||
|
{ name: 'app1', path: 'packages/app1', type: 'dir' },
|
||||||
|
{ name: 'app2', path: 'packages/app2', type: 'dir' },
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(await fs.readdir('packages/app1')).toEqual([
|
||||||
|
{
|
||||||
|
name: 'package.json',
|
||||||
|
path: 'packages/app1/package.json',
|
||||||
|
type: 'file',
|
||||||
|
},
|
||||||
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Detect Next.js', async () => {
|
it('should be able to change directories', async () => {
|
||||||
const fs = new VirtualFilesystem({
|
const nextPackageJson = JSON.stringify({
|
||||||
'package.json': JSON.stringify({
|
dependencies: {
|
||||||
dependencies: {
|
next: '9.0.0',
|
||||||
next: '9.0.0',
|
},
|
||||||
},
|
});
|
||||||
}),
|
const gatsbyPackageJson = JSON.stringify({
|
||||||
|
dependencies: {
|
||||||
|
gatsby: '1.0.0',
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(await detectFramework({ fs, frameworkList })).toBe('nextjs');
|
const files = {
|
||||||
|
'package.json': '{}',
|
||||||
|
'packages/app1/package.json': nextPackageJson,
|
||||||
|
'packages/app2/package.json': gatsbyPackageJson,
|
||||||
|
};
|
||||||
|
|
||||||
|
const fs = new VirtualFilesystem(files);
|
||||||
|
const packagesFs = fs.chdir('packages');
|
||||||
|
|
||||||
|
expect(await packagesFs.readdir('/')).toEqual([
|
||||||
|
{ name: 'app1', path: 'app1', type: 'dir' },
|
||||||
|
{ name: 'app2', path: 'app2', type: 'dir' },
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(await packagesFs.hasPath('app1')).toBe(true);
|
||||||
|
expect(await packagesFs.hasPath('app3')).toBe(false);
|
||||||
|
expect(await packagesFs.isFile('app1')).toBe(false);
|
||||||
|
expect(await packagesFs.isFile('app2')).toBe(false);
|
||||||
|
expect(await packagesFs.isFile('app1/package.json')).toBe(true);
|
||||||
|
expect(await packagesFs.isFile('app2/package.json')).toBe(true);
|
||||||
|
expect(
|
||||||
|
await (await packagesFs.readFile('app1/package.json')).toString()
|
||||||
|
).toEqual(nextPackageJson);
|
||||||
|
expect(
|
||||||
|
await (await packagesFs.readFile('app2/package.json')).toString()
|
||||||
|
).toEqual(gatsbyPackageJson);
|
||||||
|
|
||||||
|
expect(await detectFramework({ fs: packagesFs, frameworkList })).toBe(null);
|
||||||
|
|
||||||
|
const nextAppFs = packagesFs.chdir('app1');
|
||||||
|
|
||||||
|
expect(await nextAppFs.readdir('/')).toEqual([
|
||||||
|
{ name: 'package.json', path: 'package.json', type: 'file' },
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(await (await nextAppFs.readFile('package.json')).toString()).toEqual(
|
||||||
|
nextPackageJson
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(await detectFramework({ fs: nextAppFs, frameworkList })).toBe(
|
||||||
|
'nextjs'
|
||||||
|
);
|
||||||
|
|
||||||
|
const gatsbyAppFs = packagesFs.chdir('./app2');
|
||||||
|
|
||||||
|
expect(await gatsbyAppFs.readdir('/')).toEqual([
|
||||||
|
{ name: 'package.json', path: 'package.json', type: 'file' },
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(
|
||||||
|
await (await gatsbyAppFs.readFile('package.json')).toString()
|
||||||
|
).toEqual(gatsbyPackageJson);
|
||||||
|
|
||||||
|
expect(await detectFramework({ fs: gatsbyAppFs, frameworkList })).toBe(
|
||||||
|
'gatsby'
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Detect Nuxt.js', async () => {
|
describe('#detectFramework', () => {
|
||||||
const fs = new VirtualFilesystem({
|
it('Do not detect anything', async () => {
|
||||||
'package.json': JSON.stringify({
|
const fs = new VirtualFilesystem({
|
||||||
dependencies: {
|
'README.md': '# hi',
|
||||||
nuxt: '1.0.0',
|
'api/cheese.js': 'export default (req, res) => res.end("cheese");',
|
||||||
},
|
});
|
||||||
}),
|
|
||||||
|
expect(await detectFramework({ fs, frameworkList })).toBe(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(await detectFramework({ fs, frameworkList })).toBe('nuxtjs');
|
it('Detect Next.js', async () => {
|
||||||
});
|
const fs = new VirtualFilesystem({
|
||||||
|
'package.json': JSON.stringify({
|
||||||
|
dependencies: {
|
||||||
|
next: '9.0.0',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
it('Detect Gatsby', async () => {
|
expect(await detectFramework({ fs, frameworkList })).toBe('nextjs');
|
||||||
const fs = new VirtualFilesystem({
|
|
||||||
'package.json': JSON.stringify({
|
|
||||||
dependencies: {
|
|
||||||
gatsby: '1.0.0',
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(await detectFramework({ fs, frameworkList })).toBe('gatsby');
|
it('Detect Nuxt.js', async () => {
|
||||||
});
|
const fs = new VirtualFilesystem({
|
||||||
|
'package.json': JSON.stringify({
|
||||||
|
dependencies: {
|
||||||
|
nuxt: '1.0.0',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
it('Detect Hugo #1', async () => {
|
expect(await detectFramework({ fs, frameworkList })).toBe('nuxtjs');
|
||||||
const fs = new VirtualFilesystem({
|
|
||||||
'config.yaml': 'baseURL: http://example.org/',
|
|
||||||
'content/post.md': '# hello world',
|
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
|
it('Detect Gatsby', async () => {
|
||||||
});
|
const fs = new VirtualFilesystem({
|
||||||
|
'package.json': JSON.stringify({
|
||||||
|
dependencies: {
|
||||||
|
gatsby: '1.0.0',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
it('Detect Hugo #2', async () => {
|
expect(await detectFramework({ fs, frameworkList })).toBe('gatsby');
|
||||||
const fs = new VirtualFilesystem({
|
|
||||||
'config.json': '{ "baseURL": "http://example.org/" }',
|
|
||||||
'content/post.md': '# hello world',
|
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
|
it('Detect Hugo #1', async () => {
|
||||||
});
|
const fs = new VirtualFilesystem({
|
||||||
|
'config.yaml': 'baseURL: http://example.org/',
|
||||||
|
'content/post.md': '# hello world',
|
||||||
|
});
|
||||||
|
|
||||||
it('Detect Hugo #3', async () => {
|
expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
|
||||||
const fs = new VirtualFilesystem({
|
|
||||||
'config.toml': 'baseURL = "http://example.org/"',
|
|
||||||
'content/post.md': '# hello world',
|
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
|
it('Detect Hugo #2', async () => {
|
||||||
});
|
const fs = new VirtualFilesystem({
|
||||||
|
'config.json': '{ "baseURL": "http://example.org/" }',
|
||||||
|
'content/post.md': '# hello world',
|
||||||
|
});
|
||||||
|
|
||||||
it('Detect Jekyll', async () => {
|
expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
|
||||||
const fs = new VirtualFilesystem({
|
|
||||||
'_config.yml': 'config',
|
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(await detectFramework({ fs, frameworkList })).toBe('jekyll');
|
it('Detect Hugo #3', async () => {
|
||||||
});
|
const fs = new VirtualFilesystem({
|
||||||
|
'config.toml': 'baseURL = "http://example.org/"',
|
||||||
|
'content/post.md': '# hello world',
|
||||||
|
});
|
||||||
|
|
||||||
it('Detect Middleman', async () => {
|
expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
|
||||||
const fs = new VirtualFilesystem({
|
|
||||||
'config.rb': 'config',
|
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(await detectFramework({ fs, frameworkList })).toBe('middleman');
|
it('Detect Jekyll', async () => {
|
||||||
});
|
const fs = new VirtualFilesystem({
|
||||||
|
'_config.yml': 'config',
|
||||||
|
});
|
||||||
|
|
||||||
it('Detect Scully', async () => {
|
expect(await detectFramework({ fs, frameworkList })).toBe('jekyll');
|
||||||
const fs = new VirtualFilesystem({
|
|
||||||
'package.json': JSON.stringify({
|
|
||||||
dependencies: {
|
|
||||||
'@angular/cli': 'latest',
|
|
||||||
'@scullyio/init': 'latest',
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(await detectFramework({ fs, frameworkList })).toBe('scully');
|
it('Detect Middleman', async () => {
|
||||||
});
|
const fs = new VirtualFilesystem({
|
||||||
|
'config.rb': 'config',
|
||||||
|
});
|
||||||
|
|
||||||
it('Detect Zola', async () => {
|
expect(await detectFramework({ fs, frameworkList })).toBe('middleman');
|
||||||
const fs = new VirtualFilesystem({
|
|
||||||
'config.toml': 'base_url = "/"',
|
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(await detectFramework({ fs, frameworkList })).toBe('zola');
|
it('Detect Scully', async () => {
|
||||||
|
const fs = new VirtualFilesystem({
|
||||||
|
'package.json': JSON.stringify({
|
||||||
|
dependencies: {
|
||||||
|
'@angular/cli': 'latest',
|
||||||
|
'@scullyio/init': 'latest',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(await detectFramework({ fs, frameworkList })).toBe('scully');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Detect Zola', async () => {
|
||||||
|
const fs = new VirtualFilesystem({
|
||||||
|
'config.toml': 'base_url = "/"',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(await detectFramework({ fs, frameworkList })).toBe('zola');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ describe('Test `getEnvForPackageManager()`', () => {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'should set path if pnpm 7+ is detected and Node version is greater than 12',
|
name: 'should set path if pnpm 7+ is detected',
|
||||||
args: {
|
args: {
|
||||||
cliType: 'pnpm',
|
cliType: 'pnpm',
|
||||||
nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
|
nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
|
||||||
@@ -97,21 +97,7 @@ describe('Test `getEnvForPackageManager()`', () => {
|
|||||||
},
|
},
|
||||||
want: {
|
want: {
|
||||||
FOO: 'bar',
|
FOO: 'bar',
|
||||||
PATH: '/pnpm7/pnpm:foo',
|
PATH: '/pnpm7/node_modules/.bin:foo',
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'should not set path if pnpm 7+ is detected and Node version is less than or equal to 12',
|
|
||||||
args: {
|
|
||||||
cliType: 'pnpm',
|
|
||||||
nodeVersion: { major: 12, range: '12.x', runtime: 'nodejs12.x' },
|
|
||||||
lockfileVersion: 5.4,
|
|
||||||
env: {
|
|
||||||
FOO: 'bar',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
want: {
|
|
||||||
FOO: 'bar',
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
21
packages/build-utils/test/unit.test.ts
vendored
21
packages/build-utils/test/unit.test.ts
vendored
@@ -296,17 +296,20 @@ it('should get latest node version', async () => {
|
|||||||
it('should throw for discontinued versions', async () => {
|
it('should throw for discontinued versions', async () => {
|
||||||
// Mock a future date so that Node 8 and 10 become discontinued
|
// Mock a future date so that Node 8 and 10 become discontinued
|
||||||
const realDateNow = Date.now.bind(global.Date);
|
const realDateNow = Date.now.bind(global.Date);
|
||||||
global.Date.now = () => new Date('2021-05-01').getTime();
|
global.Date.now = () => new Date('2022-09-01').getTime();
|
||||||
|
|
||||||
expect(getSupportedNodeVersion('8.10.x', false)).rejects.toThrow();
|
expect(getSupportedNodeVersion('8.10.x', false)).rejects.toThrow();
|
||||||
expect(getSupportedNodeVersion('8.10.x', true)).rejects.toThrow();
|
expect(getSupportedNodeVersion('8.10.x', true)).rejects.toThrow();
|
||||||
expect(getSupportedNodeVersion('10.x', false)).rejects.toThrow();
|
expect(getSupportedNodeVersion('10.x', false)).rejects.toThrow();
|
||||||
expect(getSupportedNodeVersion('10.x', true)).rejects.toThrow();
|
expect(getSupportedNodeVersion('10.x', true)).rejects.toThrow();
|
||||||
|
expect(getSupportedNodeVersion('12.x', false)).rejects.toThrow();
|
||||||
|
expect(getSupportedNodeVersion('12.x', true)).rejects.toThrow();
|
||||||
|
|
||||||
const discontinued = getDiscontinuedNodeVersions();
|
const discontinued = getDiscontinuedNodeVersions();
|
||||||
expect(discontinued.length).toBe(2);
|
expect(discontinued.length).toBe(3);
|
||||||
expect(discontinued[0]).toHaveProperty('range', '10.x');
|
expect(discontinued[0]).toHaveProperty('range', '12.x');
|
||||||
expect(discontinued[1]).toHaveProperty('range', '8.10.x');
|
expect(discontinued[1]).toHaveProperty('range', '10.x');
|
||||||
|
expect(discontinued[2]).toHaveProperty('range', '8.10.x');
|
||||||
|
|
||||||
global.Date.now = realDateNow;
|
global.Date.now = realDateNow;
|
||||||
});
|
});
|
||||||
@@ -324,9 +327,19 @@ it('should warn for deprecated versions, soon to be discontinued', async () => {
|
|||||||
'major',
|
'major',
|
||||||
10
|
10
|
||||||
);
|
);
|
||||||
|
expect(await getSupportedNodeVersion('12.x', false)).toHaveProperty(
|
||||||
|
'major',
|
||||||
|
12
|
||||||
|
);
|
||||||
|
expect(await getSupportedNodeVersion('12.x', true)).toHaveProperty(
|
||||||
|
'major',
|
||||||
|
12
|
||||||
|
);
|
||||||
expect(warningMessages).toStrictEqual([
|
expect(warningMessages).toStrictEqual([
|
||||||
'Error: Node.js version 10.x is deprecated. Deployments created on or after 2021-04-20 will fail to build. Please set "engines": { "node": "16.x" } in your `package.json` file to use Node.js 16. This change is the result of a decision made by an upstream infrastructure provider (AWS).',
|
'Error: Node.js version 10.x is deprecated. Deployments created on or after 2021-04-20 will fail to build. Please set "engines": { "node": "16.x" } in your `package.json` file to use Node.js 16. This change is the result of a decision made by an upstream infrastructure provider (AWS).',
|
||||||
'Error: Node.js version 10.x is deprecated. Deployments created on or after 2021-04-20 will fail to build. Please set Node.js Version to 16.x in your Project Settings to use Node.js 16. This change is the result of a decision made by an upstream infrastructure provider (AWS).',
|
'Error: Node.js version 10.x is deprecated. Deployments created on or after 2021-04-20 will fail to build. Please set Node.js Version to 16.x in your Project Settings to use Node.js 16. This change is the result of a decision made by an upstream infrastructure provider (AWS).',
|
||||||
|
'Error: Node.js version 12.x is deprecated. Deployments created on or after 2022-08-09 will fail to build. Please set "engines": { "node": "16.x" } in your `package.json` file to use Node.js 16. This change is the result of a decision made by an upstream infrastructure provider (AWS).',
|
||||||
|
'Error: Node.js version 12.x is deprecated. Deployments created on or after 2022-08-09 will fail to build. Please set Node.js Version to 16.x in your Project Settings to use Node.js 16. This change is the result of a decision made by an upstream infrastructure provider (AWS).',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
global.Date.now = realDateNow;
|
global.Date.now = realDateNow;
|
||||||
|
|||||||
@@ -2,8 +2,9 @@ import { promises } from 'fs';
|
|||||||
import path from 'path';
|
import path from 'path';
|
||||||
|
|
||||||
import { DetectorFilesystem } from '../../src';
|
import { DetectorFilesystem } from '../../src';
|
||||||
|
import { Stat } from '../../src/detectors/filesystem';
|
||||||
|
|
||||||
const { stat, readFile } = promises;
|
const { stat, readFile, readdir } = promises;
|
||||||
|
|
||||||
export class FixtureFilesystem extends DetectorFilesystem {
|
export class FixtureFilesystem extends DetectorFilesystem {
|
||||||
private rootPath: string;
|
private rootPath: string;
|
||||||
@@ -32,4 +33,19 @@ export class FixtureFilesystem extends DetectorFilesystem {
|
|||||||
const filePath = path.join(this.rootPath, name);
|
const filePath = path.join(this.rootPath, name);
|
||||||
return (await stat(filePath)).isFile();
|
return (await stat(filePath)).isFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async _readdir(name: string): Promise<Stat[]> {
|
||||||
|
const dirPath = path.join(this.rootPath, name);
|
||||||
|
const files = await readdir(dirPath, { withFileTypes: true });
|
||||||
|
|
||||||
|
return files.map(file => ({
|
||||||
|
name: file.name,
|
||||||
|
type: file.isFile() ? 'file' : 'dir',
|
||||||
|
path: path.join(name, file.name),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
_chdir(name: string): DetectorFilesystem {
|
||||||
|
return new FixtureFilesystem(path.join(this.rootPath, name));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "vercel",
|
"name": "vercel",
|
||||||
"version": "24.2.1",
|
"version": "24.2.5-canary.1",
|
||||||
"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",
|
||||||
@@ -12,10 +12,10 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"preinstall": "node ./scripts/preinstall.js",
|
"preinstall": "node ./scripts/preinstall.js",
|
||||||
"test": "jest",
|
"test": "jest --env node --verbose --runInBand --bail --forceExit",
|
||||||
"test-unit": "jest --coverage --verbose",
|
"test-unit": "yarn test test/unit/",
|
||||||
"test-integration-cli": "rimraf test/fixtures/integration && ava test/integration.js --serial --fail-fast --verbose",
|
"test-integration-cli": "rimraf test/fixtures/integration && ava test/integration.js --serial --fail-fast --verbose",
|
||||||
"test-integration-dev": "ava test/dev/integration.js --serial --fail-fast --verbose",
|
"test-integration-dev": "yarn test test/dev/",
|
||||||
"prepublishOnly": "yarn build",
|
"prepublishOnly": "yarn build",
|
||||||
"coverage": "codecov",
|
"coverage": "codecov",
|
||||||
"build": "node -r ts-eager/register ./scripts/build.ts",
|
"build": "node -r ts-eager/register ./scripts/build.ts",
|
||||||
@@ -43,11 +43,15 @@
|
|||||||
"node": ">= 12"
|
"node": ">= 12"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vercel/build-utils": "2.17.0",
|
"@vercel/build-utils": "3.1.1-canary.1",
|
||||||
"@vercel/go": "1.4.1",
|
"@vercel/go": "1.4.4-canary.1",
|
||||||
"@vercel/node": "1.15.1",
|
"@vercel/next": "2.8.67-canary.1",
|
||||||
"@vercel/python": "2.3.1",
|
"@vercel/node": "1.15.4-canary.1",
|
||||||
"@vercel/ruby": "1.3.4",
|
"@vercel/python": "2.3.4-canary.1",
|
||||||
|
"@vercel/redwood": "0.8.4-canary.1",
|
||||||
|
"@vercel/remix": "0.0.2-canary.1",
|
||||||
|
"@vercel/ruby": "1.3.7-canary.1",
|
||||||
|
"@vercel/static-build": "0.25.3-canary.1",
|
||||||
"update-notifier": "4.1.0"
|
"update-notifier": "4.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -90,8 +94,9 @@
|
|||||||
"@types/update-notifier": "5.1.0",
|
"@types/update-notifier": "5.1.0",
|
||||||
"@types/which": "1.3.2",
|
"@types/which": "1.3.2",
|
||||||
"@types/write-json-file": "2.2.1",
|
"@types/write-json-file": "2.2.1",
|
||||||
"@vercel/client": "11.0.1",
|
"@types/yauzl-promise": "2.1.0",
|
||||||
"@vercel/frameworks": "0.9.0",
|
"@vercel/client": "11.0.4-canary.1",
|
||||||
|
"@vercel/frameworks": "0.9.2-canary.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",
|
||||||
@@ -167,7 +172,8 @@
|
|||||||
"utility-types": "2.1.0",
|
"utility-types": "2.1.0",
|
||||||
"which": "2.0.2",
|
"which": "2.0.2",
|
||||||
"write-json-file": "2.2.0",
|
"write-json-file": "2.2.0",
|
||||||
"xdg-app-paths": "5.1.0"
|
"xdg-app-paths": "5.1.0",
|
||||||
|
"yauzl-promise": "2.1.3"
|
||||||
},
|
},
|
||||||
"jest": {
|
"jest": {
|
||||||
"preset": "ts-jest",
|
"preset": "ts-jest",
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ async function createConstants() {
|
|||||||
export const GA_TRACKING_ID: string | undefined = ${envToString(
|
export const GA_TRACKING_ID: string | undefined = ${envToString(
|
||||||
'GA_TRACKING_ID'
|
'GA_TRACKING_ID'
|
||||||
)};
|
)};
|
||||||
export const SENTRY_DSN: string | undefined = ${envToString('SENTRY_DSN')};
|
export const SENTRY_DSN: string | undefined = ${envToString('SENTRY_DSN')};
|
||||||
`;
|
`;
|
||||||
await writeFile(filename, contents, 'utf8');
|
await writeFile(filename, contents, 'utf8');
|
||||||
}
|
}
|
||||||
|
|||||||
510
packages/cli/src/commands/build.ts
Normal file
510
packages/cli/src/commands/build.ts
Normal file
@@ -0,0 +1,510 @@
|
|||||||
|
import fs from 'fs-extra';
|
||||||
|
import chalk from 'chalk';
|
||||||
|
import dotenv from 'dotenv';
|
||||||
|
import { join, relative } from 'path';
|
||||||
|
import {
|
||||||
|
detectBuilders,
|
||||||
|
Files,
|
||||||
|
FileFsRef,
|
||||||
|
PackageJson,
|
||||||
|
BuildOptions,
|
||||||
|
Config,
|
||||||
|
Meta,
|
||||||
|
Builder,
|
||||||
|
BuildResultV2,
|
||||||
|
BuildResultV2Typical,
|
||||||
|
BuildResultV3,
|
||||||
|
} from '@vercel/build-utils';
|
||||||
|
import minimatch from 'minimatch';
|
||||||
|
import {
|
||||||
|
appendRoutesToPhase,
|
||||||
|
getTransformedRoutes,
|
||||||
|
mergeRoutes,
|
||||||
|
MergeRoutesProps,
|
||||||
|
Route,
|
||||||
|
} from '@vercel/routing-utils';
|
||||||
|
import { VercelConfig } from '@vercel/client';
|
||||||
|
|
||||||
|
import pull from './pull';
|
||||||
|
import { staticFiles as getFiles } from '../util/get-files';
|
||||||
|
import Client from '../util/client';
|
||||||
|
import getArgs from '../util/get-args';
|
||||||
|
import cmd from '../util/output/cmd';
|
||||||
|
import * as cli from '../util/pkg-name';
|
||||||
|
import cliPkg from '../util/pkg';
|
||||||
|
import readJSONFile from '../util/read-json-file';
|
||||||
|
import { CantParseJSONFile } from '../util/errors-ts';
|
||||||
|
import { readProjectSettings } from '../util/projects/project-settings';
|
||||||
|
import { VERCEL_DIR } from '../util/projects/link';
|
||||||
|
import confirm from '../util/input/confirm';
|
||||||
|
import { emoji, prependEmoji } from '../util/emoji';
|
||||||
|
import stamp from '../util/output/stamp';
|
||||||
|
import {
|
||||||
|
OUTPUT_DIR,
|
||||||
|
PathOverride,
|
||||||
|
writeBuildResult,
|
||||||
|
} from '../util/build/write-build-result';
|
||||||
|
import { importBuilders, BuilderWithPkg } from '../util/build/import-builders';
|
||||||
|
|
||||||
|
type BuildResult = BuildResultV2 | BuildResultV3;
|
||||||
|
|
||||||
|
const help = () => {
|
||||||
|
return console.log(`
|
||||||
|
${chalk.bold(`${cli.logo} ${cli.name} build`)}
|
||||||
|
|
||||||
|
${chalk.dim('Options:')}
|
||||||
|
|
||||||
|
-h, --help Output usage information
|
||||||
|
-A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
|
||||||
|
'FILE'
|
||||||
|
)} Path to the local ${'`vercel.json`'} file
|
||||||
|
-Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
|
||||||
|
'DIR'
|
||||||
|
)} Path to the global ${'`.vercel`'} directory
|
||||||
|
--cwd [path] The current working directory
|
||||||
|
--prod Build a production deployment
|
||||||
|
-d, --debug Debug mode [off]
|
||||||
|
-y, --yes Skip the confirmation prompt
|
||||||
|
|
||||||
|
${chalk.dim('Examples:')}
|
||||||
|
|
||||||
|
${chalk.gray('–')} Build the project
|
||||||
|
|
||||||
|
${chalk.cyan(`$ ${cli.name} build`)}
|
||||||
|
${chalk.cyan(`$ ${cli.name} build --cwd ./path-to-project`)}
|
||||||
|
`);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default async function main(client: Client): Promise<number> {
|
||||||
|
const { output } = client;
|
||||||
|
|
||||||
|
// Ensure that `vc build` is not being invoked recursively
|
||||||
|
if (process.env.__VERCEL_BUILD_RUNNING) {
|
||||||
|
output.error(
|
||||||
|
`${cmd(
|
||||||
|
`${cli.name} build`
|
||||||
|
)} must not recursively invoke itself. Check the Build Command in the Project Settings or the ${cmd(
|
||||||
|
'build'
|
||||||
|
)} script in ${cmd('package.json')}`
|
||||||
|
);
|
||||||
|
output.error(
|
||||||
|
`Learn More: https://vercel.link/recursive-invocation-of-commands`
|
||||||
|
);
|
||||||
|
return 1;
|
||||||
|
} else {
|
||||||
|
process.env.__VERCEL_BUILD_RUNNING = '1';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse CLI args
|
||||||
|
const argv = getArgs(client.argv.slice(2), {
|
||||||
|
'--cwd': String,
|
||||||
|
'--prod': Boolean,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (argv['--help']) {
|
||||||
|
help();
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set the working directory if necessary
|
||||||
|
if (argv['--cwd']) {
|
||||||
|
process.chdir(argv['--cwd']);
|
||||||
|
}
|
||||||
|
const cwd = process.cwd();
|
||||||
|
|
||||||
|
// TODO: read project settings from the API, fall back to local `project.json` if that fails
|
||||||
|
|
||||||
|
// Read project settings, and pull them from Vercel if necessary
|
||||||
|
let project = await readProjectSettings(join(cwd, VERCEL_DIR));
|
||||||
|
const isTTY = process.stdin.isTTY;
|
||||||
|
while (!project?.settings) {
|
||||||
|
if (!isTTY) {
|
||||||
|
client.output.print(
|
||||||
|
`No Project Settings found locally. Run ${cli.getCommandName(
|
||||||
|
'pull --yes'
|
||||||
|
)} to retreive them.`
|
||||||
|
);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
const confirmed = await confirm(
|
||||||
|
`No Project Settings found locally. Run ${cli.getCommandName(
|
||||||
|
'pull'
|
||||||
|
)} for retrieving them?`,
|
||||||
|
true
|
||||||
|
);
|
||||||
|
if (!confirmed) {
|
||||||
|
client.output.print(`Aborted. No Project Settings retrieved.\n`);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
client.argv = [];
|
||||||
|
const result = await pull(client);
|
||||||
|
if (result !== 0) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
project = await readProjectSettings(join(cwd, VERCEL_DIR));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build `target` influences which environment variables will be used
|
||||||
|
const target = argv['--prod'] ? 'production' : 'preview';
|
||||||
|
|
||||||
|
// TODO: load env vars from the API, fall back to local files if that fails
|
||||||
|
|
||||||
|
const envPath = await checkExists([
|
||||||
|
join(cwd, VERCEL_DIR, `.env.${target}.local`),
|
||||||
|
join(cwd, `.env`),
|
||||||
|
]);
|
||||||
|
if (envPath) {
|
||||||
|
dotenv.config({ path: envPath, debug: client.output.isDebugEnabled() });
|
||||||
|
output.log(`Loaded env from "${relative(cwd, envPath)}"`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Some build processes use these env vars to platform detect Vercel
|
||||||
|
process.env.VERCEL = '1';
|
||||||
|
process.env.NOW_BUILDER = '1';
|
||||||
|
|
||||||
|
const workPath = join(cwd, project.settings.rootDirectory || '.');
|
||||||
|
|
||||||
|
// Load `package.json` and `vercel.json` files
|
||||||
|
const [pkg, vercelConfig] = await Promise.all([
|
||||||
|
readJSONFile<PackageJson>(join(workPath, 'package.json')),
|
||||||
|
readJSONFile<VercelConfig>(join(workPath, 'vercel.json')).then(
|
||||||
|
config => config || readJSONFile<VercelConfig>(join(workPath, 'now.json'))
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
if (pkg instanceof CantParseJSONFile) throw pkg;
|
||||||
|
if (vercelConfig instanceof CantParseJSONFile) throw vercelConfig;
|
||||||
|
|
||||||
|
// Get a list of source files
|
||||||
|
const files = (await getFiles(workPath, client)).map(f =>
|
||||||
|
relative(workPath, f)
|
||||||
|
);
|
||||||
|
|
||||||
|
const routesResult = getTransformedRoutes({ nowConfig: vercelConfig || {} });
|
||||||
|
if (routesResult.error) {
|
||||||
|
output.prettyError(routesResult.error);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (vercelConfig?.builds && vercelConfig.functions) {
|
||||||
|
output.prettyError({
|
||||||
|
message:
|
||||||
|
'The `functions` property cannot be used in conjunction with the `builds` property. Please remove one of them.',
|
||||||
|
link: 'https://vercel.link/functions-and-builds',
|
||||||
|
});
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
let builds = vercelConfig?.builds || [];
|
||||||
|
let zeroConfigRoutes: Route[] = [];
|
||||||
|
|
||||||
|
if (builds.length > 0) {
|
||||||
|
output.warn(
|
||||||
|
'Due to `builds` existing in your configuration file, the Build and Development Settings defined in your Project Settings will not apply. Learn More: https://vercel.link/unused-build-settings'
|
||||||
|
);
|
||||||
|
builds = builds.map(b => expandBuild(files, b)).flat();
|
||||||
|
} else {
|
||||||
|
// Zero config
|
||||||
|
|
||||||
|
// Detect the Vercel Builders that will need to be invoked
|
||||||
|
const detectedBuilders = await detectBuilders(files, pkg, {
|
||||||
|
...vercelConfig,
|
||||||
|
projectSettings: project.settings,
|
||||||
|
featHandleMiss: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (detectedBuilders.errors && detectedBuilders.errors.length > 0) {
|
||||||
|
output.prettyError(detectedBuilders.errors[0]);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const w of detectedBuilders.warnings) {
|
||||||
|
console.log(
|
||||||
|
`Warning: ${w.message} ${w.action || 'Learn More'}: ${w.link}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (detectedBuilders.builders) {
|
||||||
|
builds = detectedBuilders.builders;
|
||||||
|
} else {
|
||||||
|
builds = [{ src: '**', use: '@vercel/static' }];
|
||||||
|
}
|
||||||
|
|
||||||
|
zeroConfigRoutes.push(...(detectedBuilders.redirectRoutes || []));
|
||||||
|
zeroConfigRoutes.push(
|
||||||
|
...appendRoutesToPhase({
|
||||||
|
routes: [],
|
||||||
|
newRoutes: detectedBuilders.rewriteRoutes,
|
||||||
|
phase: 'filesystem',
|
||||||
|
})
|
||||||
|
);
|
||||||
|
zeroConfigRoutes = appendRoutesToPhase({
|
||||||
|
routes: zeroConfigRoutes,
|
||||||
|
newRoutes: detectedBuilders.errorRoutes,
|
||||||
|
phase: 'error',
|
||||||
|
});
|
||||||
|
zeroConfigRoutes.push(...(detectedBuilders.defaultRoutes || []));
|
||||||
|
}
|
||||||
|
|
||||||
|
const builderSpecs = new Set(builds.map(b => b.use));
|
||||||
|
|
||||||
|
let buildersWithPkgs: Map<string, BuilderWithPkg>;
|
||||||
|
try {
|
||||||
|
buildersWithPkgs = await importBuilders(builderSpecs, cwd, output);
|
||||||
|
} catch (err: any) {
|
||||||
|
output.prettyError(err);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Populate Files -> FileFsRef mapping
|
||||||
|
const filesMap: Files = {};
|
||||||
|
for (const path of files) {
|
||||||
|
const fsPath = join(workPath, path);
|
||||||
|
const { mode } = await fs.stat(fsPath);
|
||||||
|
filesMap[path] = new FileFsRef({ mode, fsPath });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete output directory from potential previous build
|
||||||
|
await fs.remove(OUTPUT_DIR);
|
||||||
|
|
||||||
|
const buildStamp = stamp();
|
||||||
|
|
||||||
|
// Create fresh new output directory
|
||||||
|
await fs.mkdirp(OUTPUT_DIR);
|
||||||
|
|
||||||
|
const ops: Promise<Error | void>[] = [];
|
||||||
|
|
||||||
|
// Write the `detectedBuilders` result to output dir
|
||||||
|
ops.push(
|
||||||
|
fs.writeJSON(
|
||||||
|
join(OUTPUT_DIR, 'builds.json'),
|
||||||
|
{
|
||||||
|
'//': 'This file was generated by the `vercel build` command. It is not part of the Build Output API.',
|
||||||
|
target,
|
||||||
|
builds: builds.map(build => {
|
||||||
|
const builderWithPkg = buildersWithPkgs.get(build.use);
|
||||||
|
if (!builderWithPkg) {
|
||||||
|
throw new Error(`Failed to load Builder "${build.use}"`);
|
||||||
|
}
|
||||||
|
const { builder, pkg: builderPkg } = builderWithPkg;
|
||||||
|
return {
|
||||||
|
require: builderPkg.name,
|
||||||
|
apiVersion: builder.version,
|
||||||
|
...build,
|
||||||
|
};
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
spaces: 2,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
// The `meta` config property is re-used for each Builder
|
||||||
|
// invocation so that Builders can share state between
|
||||||
|
// subsequent entrypoint builds.
|
||||||
|
const meta: Meta = {
|
||||||
|
skipDownload: true,
|
||||||
|
cliVersion: cliPkg.version,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Execute Builders for detected entrypoints
|
||||||
|
// TODO: parallelize builds
|
||||||
|
const buildResults: Map<Builder, BuildResult> = new Map();
|
||||||
|
const overrides: PathOverride[] = [];
|
||||||
|
for (const build of builds) {
|
||||||
|
if (typeof build.src !== 'string') continue;
|
||||||
|
|
||||||
|
const builderWithPkg = buildersWithPkgs.get(build.use);
|
||||||
|
if (!builderWithPkg) {
|
||||||
|
throw new Error(`Failed to load Builder "${build.use}"`);
|
||||||
|
}
|
||||||
|
const { builder, pkg: builderPkg } = builderWithPkg;
|
||||||
|
|
||||||
|
const buildConfig: Config = {
|
||||||
|
outputDirectory: project.settings.outputDirectory ?? undefined,
|
||||||
|
...build.config,
|
||||||
|
projectSettings: project.settings,
|
||||||
|
installCommand: project.settings.installCommand ?? undefined,
|
||||||
|
devCommand: project.settings.devCommand ?? undefined,
|
||||||
|
buildCommand: project.settings.buildCommand ?? undefined,
|
||||||
|
framework: project.settings.framework,
|
||||||
|
nodeVersion: project.settings.nodeVersion,
|
||||||
|
};
|
||||||
|
const repoRootPath = cwd === workPath ? undefined : cwd;
|
||||||
|
const buildOptions: BuildOptions = {
|
||||||
|
files: filesMap,
|
||||||
|
entrypoint: build.src,
|
||||||
|
workPath,
|
||||||
|
repoRootPath,
|
||||||
|
config: buildConfig,
|
||||||
|
meta,
|
||||||
|
};
|
||||||
|
output.debug(
|
||||||
|
`Building entrypoint "${build.src}" with "${builderPkg.name}"`
|
||||||
|
);
|
||||||
|
const buildResult = await builder.build(buildOptions);
|
||||||
|
|
||||||
|
// Store the build result to generate the final `config.json` after
|
||||||
|
// all builds have completed
|
||||||
|
buildResults.set(build, buildResult);
|
||||||
|
|
||||||
|
// Start flushing the file outputs to the filesystem asynchronously
|
||||||
|
ops.push(
|
||||||
|
writeBuildResult(
|
||||||
|
buildResult,
|
||||||
|
build,
|
||||||
|
builder,
|
||||||
|
builderPkg,
|
||||||
|
vercelConfig?.cleanUrls
|
||||||
|
).then(
|
||||||
|
override => {
|
||||||
|
if (override) overrides.push(override);
|
||||||
|
},
|
||||||
|
err => err
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait for filesystem operations to complete
|
||||||
|
// TODO render progress bar?
|
||||||
|
let hadError = false;
|
||||||
|
const errors = await Promise.all(ops);
|
||||||
|
for (const error of errors) {
|
||||||
|
if (error) {
|
||||||
|
hadError = true;
|
||||||
|
output.prettyError(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (hadError) return 1;
|
||||||
|
|
||||||
|
// Merge existing `config.json` file into the one that will be produced
|
||||||
|
const configPath = join(OUTPUT_DIR, 'config.json');
|
||||||
|
// TODO: properly type
|
||||||
|
const existingConfig = await readJSONFile<any>(configPath);
|
||||||
|
if (existingConfig instanceof CantParseJSONFile) {
|
||||||
|
throw existingConfig;
|
||||||
|
}
|
||||||
|
if (existingConfig) {
|
||||||
|
if (existingConfig.overrides) {
|
||||||
|
overrides.push(existingConfig.overrides);
|
||||||
|
}
|
||||||
|
// Find the `Build` entry for this config file and update the build result
|
||||||
|
for (const [build, buildResult] of buildResults.entries()) {
|
||||||
|
if ('buildOutputPath' in buildResult) {
|
||||||
|
output.debug(`Using "config.json" for "${build.use}`);
|
||||||
|
buildResults.set(build, existingConfig);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const builderRoutes: MergeRoutesProps['builds'] = Array.from(
|
||||||
|
buildResults.entries()
|
||||||
|
)
|
||||||
|
.filter(b => 'routes' in b[1] && Array.isArray(b[1].routes))
|
||||||
|
.map(b => {
|
||||||
|
return {
|
||||||
|
use: b[0].use,
|
||||||
|
entrypoint: b[0].src!,
|
||||||
|
routes: (b[1] as BuildResultV2Typical).routes,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
if (zeroConfigRoutes.length) {
|
||||||
|
builderRoutes.unshift({
|
||||||
|
use: '@vercel/zero-config-routes',
|
||||||
|
entrypoint: '/',
|
||||||
|
routes: zeroConfigRoutes,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const mergedRoutes = mergeRoutes({
|
||||||
|
userRoutes: routesResult.routes,
|
||||||
|
builds: builderRoutes,
|
||||||
|
});
|
||||||
|
|
||||||
|
const mergedImages = mergeImages(buildResults.values());
|
||||||
|
const mergedWildcard = mergeWildcard(buildResults.values());
|
||||||
|
const mergedOverrides: Record<string, PathOverride> =
|
||||||
|
overrides.length > 0 ? Object.assign({}, ...overrides) : undefined;
|
||||||
|
|
||||||
|
// Write out the final `config.json` file based on the
|
||||||
|
// user configuration and Builder build results
|
||||||
|
// TODO: properly type
|
||||||
|
const config = {
|
||||||
|
version: 3,
|
||||||
|
routes: mergedRoutes,
|
||||||
|
images: mergedImages,
|
||||||
|
wildcard: mergedWildcard,
|
||||||
|
overrides: mergedOverrides,
|
||||||
|
};
|
||||||
|
await fs.writeJSON(join(OUTPUT_DIR, 'config.json'), config, { spaces: 2 });
|
||||||
|
|
||||||
|
output.print(
|
||||||
|
`${prependEmoji(
|
||||||
|
`Build Completed in ${chalk.bold(OUTPUT_DIR)} ${chalk.gray(
|
||||||
|
buildStamp()
|
||||||
|
)}`,
|
||||||
|
emoji('success')
|
||||||
|
)}\n`
|
||||||
|
);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
function expandBuild(files: string[], build: Builder): Builder[] {
|
||||||
|
if (!build.src) return [];
|
||||||
|
|
||||||
|
let pattern = build.src;
|
||||||
|
if (pattern[0] === '/') {
|
||||||
|
// Remove a leading slash so that the globbing is relative
|
||||||
|
// to `cwd` instead of the root of the filesystem.
|
||||||
|
pattern = pattern.substring(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const matches = files.filter(
|
||||||
|
name => name === pattern || minimatch(name, pattern, { dot: true })
|
||||||
|
);
|
||||||
|
|
||||||
|
return matches.map(m => {
|
||||||
|
return {
|
||||||
|
...build,
|
||||||
|
src: m,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function mergeImages(
|
||||||
|
buildResults: Iterable<BuildResult>
|
||||||
|
): BuildResultV2Typical['images'] {
|
||||||
|
let images: BuildResultV2Typical['images'] = undefined;
|
||||||
|
for (const result of buildResults) {
|
||||||
|
if ('images' in result && result.images) {
|
||||||
|
images = Object.assign({} || images, result.images);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return images;
|
||||||
|
}
|
||||||
|
|
||||||
|
function mergeWildcard(
|
||||||
|
buildResults: Iterable<BuildResult>
|
||||||
|
): BuildResultV2Typical['wildcard'] {
|
||||||
|
let wildcard: BuildResultV2Typical['wildcard'] = undefined;
|
||||||
|
for (const result of buildResults) {
|
||||||
|
if ('wildcard' in result && result.wildcard) {
|
||||||
|
if (!wildcard) wildcard = [];
|
||||||
|
wildcard.push(...result.wildcard);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return wildcard;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function checkExists(paths: Iterable<string>) {
|
||||||
|
for (const path of paths) {
|
||||||
|
try {
|
||||||
|
await fs.stat(path);
|
||||||
|
return path;
|
||||||
|
} catch (err: any) {
|
||||||
|
if (err.code !== 'ENOENT') throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -91,7 +91,7 @@ export default async function dev(
|
|||||||
}
|
}
|
||||||
|
|
||||||
[{ envs: projectEnvs }, { systemEnvValues }] = await Promise.all([
|
[{ envs: projectEnvs }, { systemEnvValues }] = await Promise.all([
|
||||||
getDecryptedEnvRecords(output, client, project.id),
|
getDecryptedEnvRecords(output, client, project.id, 'vercel-cli:dev'),
|
||||||
project.autoExposeSystemEnvs
|
project.autoExposeSystemEnvs
|
||||||
? getSystemEnvValues(output, client, project.id)
|
? getSystemEnvValues(output, client, project.id)
|
||||||
: { systemEnvValues: [] },
|
: { systemEnvValues: [] },
|
||||||
|
|||||||
7
packages/cli/src/commands/env/add.ts
vendored
7
packages/cli/src/commands/env/add.ts
vendored
@@ -79,7 +79,12 @@ export default async function add(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const { envs } = await getEnvRecords(output, client, project.id);
|
const { envs } = await getEnvRecords(
|
||||||
|
output,
|
||||||
|
client,
|
||||||
|
project.id,
|
||||||
|
'vercel-cli:env:add'
|
||||||
|
);
|
||||||
const existing = new Set(
|
const existing = new Set(
|
||||||
envs.filter(r => r.key === envName).map(r => r.target)
|
envs.filter(r => r.key === envName).map(r => r.target)
|
||||||
);
|
);
|
||||||
|
|||||||
3
packages/cli/src/commands/env/index.ts
vendored
3
packages/cli/src/commands/env/index.ts
vendored
@@ -147,7 +147,8 @@ export default async function main(client: Client) {
|
|||||||
argv,
|
argv,
|
||||||
args,
|
args,
|
||||||
output,
|
output,
|
||||||
cwd
|
cwd,
|
||||||
|
'vercel-cli:env:pull'
|
||||||
);
|
);
|
||||||
default:
|
default:
|
||||||
output.error(getInvalidSubcommand(COMMAND_CONFIG));
|
output.error(getInvalidSubcommand(COMMAND_CONFIG));
|
||||||
|
|||||||
14
packages/cli/src/commands/env/ls.ts
vendored
14
packages/cli/src/commands/env/ls.ts
vendored
@@ -48,10 +48,16 @@ export default async function ls(
|
|||||||
|
|
||||||
const lsStamp = stamp();
|
const lsStamp = stamp();
|
||||||
|
|
||||||
const { envs } = await getEnvRecords(output, client, project.id, {
|
const { envs } = await getEnvRecords(
|
||||||
target: envTarget,
|
output,
|
||||||
gitBranch: envGitBranch,
|
client,
|
||||||
});
|
project.id,
|
||||||
|
'vercel-cli:env:ls',
|
||||||
|
{
|
||||||
|
target: envTarget,
|
||||||
|
gitBranch: envGitBranch,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
if (envs.length === 0) {
|
if (envs.length === 0) {
|
||||||
output.log(
|
output.log(
|
||||||
|
|||||||
6
packages/cli/src/commands/env/pull.ts
vendored
6
packages/cli/src/commands/env/pull.ts
vendored
@@ -13,6 +13,7 @@ import { Output } from '../../util/output';
|
|||||||
import param from '../../util/output/param';
|
import param from '../../util/output/param';
|
||||||
import stamp from '../../util/output/stamp';
|
import stamp from '../../util/output/stamp';
|
||||||
import { getCommandName } from '../../util/pkg-name';
|
import { getCommandName } from '../../util/pkg-name';
|
||||||
|
import { EnvRecordsSource } from '../../util/env/get-env-records';
|
||||||
|
|
||||||
const CONTENTS_PREFIX = '# Created by Vercel CLI\n';
|
const CONTENTS_PREFIX = '# Created by Vercel CLI\n';
|
||||||
|
|
||||||
@@ -49,7 +50,8 @@ export default async function pull(
|
|||||||
opts: Partial<Options>,
|
opts: Partial<Options>,
|
||||||
args: string[],
|
args: string[],
|
||||||
output: Output,
|
output: Output,
|
||||||
cwd: string
|
cwd: string,
|
||||||
|
source: Extract<EnvRecordsSource, 'vercel-cli:env:pull' | 'vercel-cli:pull'>
|
||||||
) {
|
) {
|
||||||
if (args.length > 1) {
|
if (args.length > 1) {
|
||||||
output.error(
|
output.error(
|
||||||
@@ -90,7 +92,7 @@ export default async function pull(
|
|||||||
output.spinner('Downloading');
|
output.spinner('Downloading');
|
||||||
|
|
||||||
const [{ envs: projectEnvs }, { systemEnvValues }] = await Promise.all([
|
const [{ envs: projectEnvs }, { systemEnvValues }] = await Promise.all([
|
||||||
getDecryptedEnvRecords(output, client, project.id, environment),
|
getDecryptedEnvRecords(output, client, project.id, source, environment),
|
||||||
project.autoExposeSystemEnvs
|
project.autoExposeSystemEnvs
|
||||||
? getSystemEnvValues(output, client, project.id)
|
? getSystemEnvValues(output, client, project.id)
|
||||||
: { systemEnvValues: [] },
|
: { systemEnvValues: [] },
|
||||||
|
|||||||
14
packages/cli/src/commands/env/rm.ts
vendored
14
packages/cli/src/commands/env/rm.ts
vendored
@@ -67,10 +67,16 @@ export default async function rm(
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
const result = await getEnvRecords(output, client, project.id, {
|
const result = await getEnvRecords(
|
||||||
target: envTarget,
|
output,
|
||||||
gitBranch: envGitBranch,
|
client,
|
||||||
});
|
project.id,
|
||||||
|
'vercel-cli:env:rm',
|
||||||
|
{
|
||||||
|
target: envTarget,
|
||||||
|
gitBranch: envGitBranch,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
let envs = result.envs.filter(env => env.key === envName);
|
let envs = result.envs.filter(env => env.key === envName);
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ export default new Map([
|
|||||||
['aliases', 'alias'],
|
['aliases', 'alias'],
|
||||||
['billing', 'billing'],
|
['billing', 'billing'],
|
||||||
['bisect', 'bisect'],
|
['bisect', 'bisect'],
|
||||||
|
['build', 'build'],
|
||||||
['cc', 'billing'],
|
['cc', 'billing'],
|
||||||
['cert', 'certs'],
|
['cert', 'certs'],
|
||||||
['certs', 'certs'],
|
['certs', 'certs'],
|
||||||
|
|||||||
@@ -131,7 +131,8 @@ async function pullAllEnvFiles(
|
|||||||
argv,
|
argv,
|
||||||
[join('.vercel', environmentFile)],
|
[join('.vercel', environmentFile)],
|
||||||
client.output,
|
client.output,
|
||||||
cwd
|
cwd,
|
||||||
|
'vercel-cli:pull'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,12 @@ import { getPkgName, getCommandName } from '../util/pkg-name.ts';
|
|||||||
|
|
||||||
const help = () => {
|
const help = () => {
|
||||||
console.log(`
|
console.log(`
|
||||||
|
${chalk.yellow(
|
||||||
|
`${chalk.bold('NOTE:')} The ${getCommandName(
|
||||||
|
'env'
|
||||||
|
)} command is recommended instead of ${getCommandName('secrets')}`
|
||||||
|
)}
|
||||||
|
|
||||||
${chalk.bold(`${logo} ${getPkgName()} secrets`)} [options] <command>
|
${chalk.bold(`${logo} ${getPkgName()} secrets`)} [options] <command>
|
||||||
|
|
||||||
${chalk.dim('Commands:')}
|
${chalk.dim('Commands:')}
|
||||||
@@ -64,7 +70,7 @@ const help = () => {
|
|||||||
|
|
||||||
${chalk.gray('–')} Paginate results, where ${chalk.dim(
|
${chalk.gray('–')} Paginate results, where ${chalk.dim(
|
||||||
'`1584722256178`'
|
'`1584722256178`'
|
||||||
)} is the time in milliseconds since the UNIX epoch.
|
)} is the time in milliseconds since the UNIX epoch
|
||||||
|
|
||||||
${chalk.cyan(`$ ${getPkgName()} secrets ls --next 1584722256178`)}
|
${chalk.cyan(`$ ${getPkgName()} secrets ls --next 1584722256178`)}
|
||||||
`);
|
`);
|
||||||
@@ -130,8 +136,14 @@ async function run({ output, contextName, currentTeam, client }) {
|
|||||||
const args = argv._.slice(1);
|
const args = argv._.slice(1);
|
||||||
const start = Date.now();
|
const start = Date.now();
|
||||||
const { 'test-warning': testWarningFlag } = argv;
|
const { 'test-warning': testWarningFlag } = argv;
|
||||||
|
const commandName = getCommandName('secret ' + subcommand);
|
||||||
|
|
||||||
if (subcommand === 'ls' || subcommand === 'list') {
|
if (subcommand === 'ls' || subcommand === 'list') {
|
||||||
|
output.note(
|
||||||
|
`The ${getCommandName(
|
||||||
|
'env ls'
|
||||||
|
)} command is recommended instead of ${commandName}\n`
|
||||||
|
);
|
||||||
if (args.length > 1) {
|
if (args.length > 1) {
|
||||||
console.error(
|
console.error(
|
||||||
error(
|
error(
|
||||||
@@ -194,6 +206,11 @@ async function run({ output, contextName, currentTeam, client }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (subcommand === 'rm' || subcommand === 'remove') {
|
if (subcommand === 'rm' || subcommand === 'remove') {
|
||||||
|
output.note(
|
||||||
|
`The ${getCommandName(
|
||||||
|
'env rm'
|
||||||
|
)} command is recommended instead of ${commandName}\n`
|
||||||
|
);
|
||||||
if (args.length !== 1) {
|
if (args.length !== 1) {
|
||||||
console.error(
|
console.error(
|
||||||
error(
|
error(
|
||||||
@@ -236,6 +253,11 @@ async function run({ output, contextName, currentTeam, client }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (subcommand === 'rename') {
|
if (subcommand === 'rename') {
|
||||||
|
output.note(
|
||||||
|
`The ${getCommandName('env rm')} and ${getCommandName(
|
||||||
|
'env add'
|
||||||
|
)} commands are recommended instead of ${commandName}\n`
|
||||||
|
);
|
||||||
if (args.length !== 2) {
|
if (args.length !== 2) {
|
||||||
console.error(
|
console.error(
|
||||||
error(
|
error(
|
||||||
@@ -259,6 +281,11 @@ async function run({ output, contextName, currentTeam, client }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (subcommand === 'add' || subcommand === 'set') {
|
if (subcommand === 'add' || subcommand === 'set') {
|
||||||
|
output.note(
|
||||||
|
`The ${getCommandName(
|
||||||
|
'env add'
|
||||||
|
)} command is recommended instead of ${commandName}\n`
|
||||||
|
);
|
||||||
if (args.length !== 2) {
|
if (args.length !== 2) {
|
||||||
console.error(
|
console.error(
|
||||||
error(
|
error(
|
||||||
|
|||||||
@@ -171,7 +171,7 @@ const main = async () => {
|
|||||||
// * a subcommand (as in: `vercel ls`)
|
// * a subcommand (as in: `vercel ls`)
|
||||||
const targetOrSubcommand = argv._[2];
|
const targetOrSubcommand = argv._[2];
|
||||||
|
|
||||||
const betaCommands: string[] = [];
|
const betaCommands: string[] = ['build'];
|
||||||
if (betaCommands.includes(targetOrSubcommand)) {
|
if (betaCommands.includes(targetOrSubcommand)) {
|
||||||
console.log(
|
console.log(
|
||||||
`${chalk.grey(
|
`${chalk.grey(
|
||||||
@@ -303,7 +303,14 @@ const main = async () => {
|
|||||||
|
|
||||||
let authConfig = null;
|
let authConfig = null;
|
||||||
|
|
||||||
const subcommandsWithoutToken = ['login', 'logout', 'help', 'init', 'update'];
|
const subcommandsWithoutToken = [
|
||||||
|
'login',
|
||||||
|
'logout',
|
||||||
|
'help',
|
||||||
|
'init',
|
||||||
|
'update',
|
||||||
|
'build',
|
||||||
|
];
|
||||||
|
|
||||||
if (authConfigExists) {
|
if (authConfigExists) {
|
||||||
try {
|
try {
|
||||||
@@ -524,6 +531,7 @@ const main = async () => {
|
|||||||
typeof scope === 'string' &&
|
typeof scope === 'string' &&
|
||||||
targetCommand !== 'login' &&
|
targetCommand !== 'login' &&
|
||||||
targetCommand !== 'dev' &&
|
targetCommand !== 'dev' &&
|
||||||
|
targetCommand !== 'build' &&
|
||||||
!(targetCommand === 'teams' && argv._[3] !== 'invite')
|
!(targetCommand === 'teams' && argv._[3] !== 'invite')
|
||||||
) {
|
) {
|
||||||
let user = null;
|
let user = null;
|
||||||
@@ -598,6 +606,9 @@ const main = async () => {
|
|||||||
case 'bisect':
|
case 'bisect':
|
||||||
func = require('./commands/bisect').default;
|
func = require('./commands/bisect').default;
|
||||||
break;
|
break;
|
||||||
|
case 'build':
|
||||||
|
func = require('./commands/build').default;
|
||||||
|
break;
|
||||||
case 'certs':
|
case 'certs':
|
||||||
func = require('./commands/certs').default;
|
func = require('./commands/certs').default;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -251,9 +251,6 @@ export interface Project extends ProjectSettings {
|
|||||||
updatedAt: number;
|
updatedAt: number;
|
||||||
createdAt: number;
|
createdAt: number;
|
||||||
alias?: ProjectAliasTarget[];
|
alias?: ProjectAliasTarget[];
|
||||||
devCommand?: string | null;
|
|
||||||
framework?: string | null;
|
|
||||||
rootDirectory?: string | null;
|
|
||||||
latestDeployments?: Partial<Deployment>[];
|
latestDeployments?: Partial<Deployment>[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
225
packages/cli/src/util/build/import-builders.ts
Normal file
225
packages/cli/src/util/build/import-builders.ts
Normal file
@@ -0,0 +1,225 @@
|
|||||||
|
import npa from 'npm-package-arg';
|
||||||
|
import { satisfies } from 'semver';
|
||||||
|
import { dirname, join } from 'path';
|
||||||
|
import { outputJSON, readJSON } from 'fs-extra';
|
||||||
|
import {
|
||||||
|
BuilderV2,
|
||||||
|
BuilderV3,
|
||||||
|
PackageJson,
|
||||||
|
spawnAsync,
|
||||||
|
} from '@vercel/build-utils';
|
||||||
|
import * as staticBuilder from './static-builder';
|
||||||
|
import { VERCEL_DIR } from '../projects/link';
|
||||||
|
import { Output } from '../output';
|
||||||
|
import readJSONFile from '../read-json-file';
|
||||||
|
import { CantParseJSONFile } from '../errors-ts';
|
||||||
|
|
||||||
|
export interface BuilderWithPkg {
|
||||||
|
path: string;
|
||||||
|
pkgPath: string;
|
||||||
|
builder: BuilderV2 | BuilderV3;
|
||||||
|
pkg: PackageJson;
|
||||||
|
}
|
||||||
|
|
||||||
|
type ResolveBuildersResult =
|
||||||
|
| { buildersToAdd: Set<string> }
|
||||||
|
| { builders: Map<string, BuilderWithPkg> };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Imports the specified Vercel Builders, installing any missing ones
|
||||||
|
* into `.vercel/builders` if necessary.
|
||||||
|
*/
|
||||||
|
export async function importBuilders(
|
||||||
|
builderSpecs: Set<string>,
|
||||||
|
cwd: string,
|
||||||
|
output: Output
|
||||||
|
): Promise<Map<string, BuilderWithPkg>> {
|
||||||
|
const buildersDir = join(cwd, VERCEL_DIR, 'builders');
|
||||||
|
|
||||||
|
let importResult = await resolveBuilders(buildersDir, builderSpecs, output);
|
||||||
|
|
||||||
|
if ('buildersToAdd' in importResult) {
|
||||||
|
const installResult = await installBuilders(
|
||||||
|
buildersDir,
|
||||||
|
importResult.buildersToAdd,
|
||||||
|
output
|
||||||
|
);
|
||||||
|
|
||||||
|
importResult = await resolveBuilders(
|
||||||
|
buildersDir,
|
||||||
|
builderSpecs,
|
||||||
|
output,
|
||||||
|
installResult.resolvedSpecs
|
||||||
|
);
|
||||||
|
|
||||||
|
if ('buildersToAdd' in importResult) {
|
||||||
|
throw new Error('Something went wrong!');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return importResult.builders;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function resolveBuilders(
|
||||||
|
buildersDir: string,
|
||||||
|
builderSpecs: Set<string>,
|
||||||
|
output: Output,
|
||||||
|
resolvedSpecs?: Map<string, string>
|
||||||
|
): Promise<ResolveBuildersResult> {
|
||||||
|
const builders = new Map<string, BuilderWithPkg>();
|
||||||
|
const buildersToAdd = new Set<string>();
|
||||||
|
|
||||||
|
for (const spec of builderSpecs) {
|
||||||
|
const resolvedSpec = resolvedSpecs?.get(spec) || spec;
|
||||||
|
const parsed = npa(resolvedSpec);
|
||||||
|
|
||||||
|
let { name } = parsed;
|
||||||
|
if (!name) {
|
||||||
|
// A URL was specified - will need to install it and resolve the
|
||||||
|
// proper package name from the written `package.json` file
|
||||||
|
buildersToAdd.add(spec);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (name === '@vercel/static') {
|
||||||
|
// `@vercel/static` is a special-case built-in builder
|
||||||
|
builders.set(name, {
|
||||||
|
builder: staticBuilder,
|
||||||
|
pkg: { name },
|
||||||
|
path: '',
|
||||||
|
pkgPath: '',
|
||||||
|
});
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
let pkgPath: string | undefined;
|
||||||
|
let builderPkg: PackageJson | undefined;
|
||||||
|
|
||||||
|
try {
|
||||||
|
// First try `.vercel/builders`. The package name should always be available
|
||||||
|
// at the top-level of `node_modules` since CLI is installing those directly.
|
||||||
|
pkgPath = join(buildersDir, 'node_modules', name, 'package.json');
|
||||||
|
builderPkg = await readJSON(pkgPath);
|
||||||
|
} catch (err: any) {
|
||||||
|
if (err?.code !== 'ENOENT') throw err;
|
||||||
|
// If `pkgPath` wasn't found in `.vercel/builders` then try as a CLI local
|
||||||
|
// dependency. `require.resolve()` will throw if the Builder is not a CLI
|
||||||
|
// dep, in which case we'll install it into `.vercel/builders`.
|
||||||
|
pkgPath = require.resolve(`${name}/package.json`, {
|
||||||
|
paths: [__dirname],
|
||||||
|
});
|
||||||
|
builderPkg = await readJSON(pkgPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!builderPkg || !pkgPath) {
|
||||||
|
throw new Error(`Failed to load \`package.json\` for "${name}"`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof builderPkg.version !== 'string') {
|
||||||
|
throw new Error(
|
||||||
|
`\`package.json\` for "${name}" does not contain a "version" field`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (parsed.type === 'version' && parsed.rawSpec !== builderPkg.version) {
|
||||||
|
// An explicit Builder version was specified but it does
|
||||||
|
// not match the version that is currently installed
|
||||||
|
output.debug(
|
||||||
|
`Installed version "${name}@${builderPkg.version}" does not match "${parsed.rawSpec}"`
|
||||||
|
);
|
||||||
|
buildersToAdd.add(spec);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
parsed.type === 'range' &&
|
||||||
|
!satisfies(builderPkg.version, parsed.rawSpec)
|
||||||
|
) {
|
||||||
|
// An explicit Builder range was specified but it is not
|
||||||
|
// compatible with the version that is currently installed
|
||||||
|
output.debug(
|
||||||
|
`Installed version "${name}@${builderPkg.version}" is not compatible with "${parsed.rawSpec}"`
|
||||||
|
);
|
||||||
|
buildersToAdd.add(spec);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: handle `parsed.type === 'tag'` ("latest" vs. anything else?)
|
||||||
|
|
||||||
|
const path = join(dirname(pkgPath), builderPkg.main || 'index.js');
|
||||||
|
const builder = require(path);
|
||||||
|
|
||||||
|
builders.set(spec, {
|
||||||
|
builder,
|
||||||
|
pkg: builderPkg,
|
||||||
|
path,
|
||||||
|
pkgPath,
|
||||||
|
});
|
||||||
|
output.debug(`Imported Builder "${name}" from "${dirname(pkgPath)}"`);
|
||||||
|
} catch (err: any) {
|
||||||
|
// `resolvedSpecs` is only passed into this function on the 2nd run,
|
||||||
|
// so if MODULE_NOT_FOUND happens in that case then we don't want to
|
||||||
|
// try to install again. Instead just pass through the error to the user
|
||||||
|
if (err.code === 'MODULE_NOT_FOUND' && !resolvedSpecs) {
|
||||||
|
output.debug(`Failed to import "${name}": ${err}`);
|
||||||
|
buildersToAdd.add(spec);
|
||||||
|
} else {
|
||||||
|
err.message = `Importing "${name}": ${err.message}`;
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add any Builders that are not yet present into `.vercel/builders`
|
||||||
|
if (buildersToAdd.size > 0) {
|
||||||
|
return { buildersToAdd };
|
||||||
|
}
|
||||||
|
|
||||||
|
return { builders };
|
||||||
|
}
|
||||||
|
|
||||||
|
async function installBuilders(
|
||||||
|
buildersDir: string,
|
||||||
|
buildersToAdd: Set<string>,
|
||||||
|
output: Output
|
||||||
|
) {
|
||||||
|
const resolvedSpecs = new Map<string, string>();
|
||||||
|
const buildersPkgPath = join(buildersDir, 'package.json');
|
||||||
|
try {
|
||||||
|
const emptyPkgJson = {
|
||||||
|
private: true,
|
||||||
|
license: 'UNLICENSED',
|
||||||
|
};
|
||||||
|
await outputJSON(buildersPkgPath, emptyPkgJson, {
|
||||||
|
flag: 'wx',
|
||||||
|
});
|
||||||
|
} catch (err: any) {
|
||||||
|
if (err.code !== 'EEXIST') throw err;
|
||||||
|
}
|
||||||
|
|
||||||
|
output.debug(`Installing Builders: ${Array.from(buildersToAdd).join(', ')}`);
|
||||||
|
await spawnAsync('yarn', ['add', '@vercel/build-utils', ...buildersToAdd], {
|
||||||
|
cwd: buildersDir,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Cross-reference any builderSpecs from the saved `package.json` file,
|
||||||
|
// in case they were installed from a URL
|
||||||
|
const buildersPkg = await readJSONFile<PackageJson>(buildersPkgPath);
|
||||||
|
if (buildersPkg instanceof CantParseJSONFile) throw buildersPkg;
|
||||||
|
if (!buildersPkg) {
|
||||||
|
throw new Error(`Failed to load "${buildersPkgPath}"`);
|
||||||
|
}
|
||||||
|
for (const spec of buildersToAdd) {
|
||||||
|
for (const [name, version] of Object.entries(
|
||||||
|
buildersPkg.dependencies || {}
|
||||||
|
)) {
|
||||||
|
if (version === spec) {
|
||||||
|
output.debug(`Resolved Builder spec "${spec}" to name "${name}"`);
|
||||||
|
resolvedSpecs.set(spec, name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return { resolvedSpecs };
|
||||||
|
}
|
||||||
41
packages/cli/src/util/build/static-builder.ts
Normal file
41
packages/cli/src/util/build/static-builder.ts
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
import minimatch from 'minimatch';
|
||||||
|
import { BuildV2, Files } from '@vercel/build-utils';
|
||||||
|
|
||||||
|
export const version = 2;
|
||||||
|
|
||||||
|
export const build: BuildV2 = async ({ entrypoint, files, config }) => {
|
||||||
|
const output: Files = {};
|
||||||
|
const outputDirectory = config.zeroConfig ? config.outputDirectory : '';
|
||||||
|
|
||||||
|
for (let [filename, fileFsRef] of Object.entries(files)) {
|
||||||
|
if (
|
||||||
|
filename.startsWith('.git/') ||
|
||||||
|
filename === 'vercel.json' ||
|
||||||
|
filename === 'now.json'
|
||||||
|
) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
entrypoint &&
|
||||||
|
!(
|
||||||
|
entrypoint === filename ||
|
||||||
|
minimatch(filename, entrypoint, { dot: true })
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (outputDirectory) {
|
||||||
|
const outputMatch = outputDirectory + '/';
|
||||||
|
if (filename.startsWith(outputMatch)) {
|
||||||
|
// static output files are moved to the root directory
|
||||||
|
filename = filename.slice(outputMatch.length);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
output[filename] = fileFsRef;
|
||||||
|
}
|
||||||
|
|
||||||
|
return { output };
|
||||||
|
};
|
||||||
108
packages/cli/src/util/build/unzip.ts
Normal file
108
packages/cli/src/util/build/unzip.ts
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
/**
|
||||||
|
* Code modified from `extract-zip` to accept Buffer.
|
||||||
|
* https://github.com/maxogden/extract-zip/blob/master/index.js
|
||||||
|
* BSD-2 Copyright (c) 2014 Max Ogden and other contributors
|
||||||
|
*/
|
||||||
|
|
||||||
|
import path from 'path';
|
||||||
|
import pipe from 'promisepipe';
|
||||||
|
import * as fs from 'fs-extra';
|
||||||
|
import { streamToBuffer } from '@vercel/build-utils';
|
||||||
|
import { Entry, ZipFile, fromBuffer as zipFromBuffer } from 'yauzl-promise';
|
||||||
|
|
||||||
|
async function* createZipIterator(zipFile: ZipFile) {
|
||||||
|
let entry: Entry;
|
||||||
|
while ((entry = await zipFile.readEntry()) !== null) {
|
||||||
|
yield entry;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function unzip(buffer: Buffer, dir: string): Promise<void> {
|
||||||
|
const zipFile = await zipFromBuffer(buffer);
|
||||||
|
for await (const entry of createZipIterator(zipFile)) {
|
||||||
|
if (entry.fileName.startsWith('__MACOSX/')) continue;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const destDir = path.dirname(path.join(dir, entry.fileName));
|
||||||
|
await fs.mkdirp(destDir);
|
||||||
|
|
||||||
|
const canonicalDestDir = await fs.realpath(destDir);
|
||||||
|
const relativeDestDir = path.relative(dir, canonicalDestDir);
|
||||||
|
|
||||||
|
if (relativeDestDir.split(path.sep).includes('..')) {
|
||||||
|
throw new Error(
|
||||||
|
`Out of bound path "${canonicalDestDir}" found while processing file ${entry.fileName}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
await extractEntry(zipFile, entry, dir);
|
||||||
|
} catch (err) {
|
||||||
|
await zipFile.close();
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function extractEntry(
|
||||||
|
zipFile: ZipFile,
|
||||||
|
entry: Entry,
|
||||||
|
dir: string
|
||||||
|
): Promise<void> {
|
||||||
|
const dest = path.join(dir, entry.fileName);
|
||||||
|
|
||||||
|
// convert external file attr int into a fs stat mode int
|
||||||
|
const mode = (entry.externalFileAttributes >> 16) & 0xffff;
|
||||||
|
// check if it's a symlink or dir (using stat mode constants)
|
||||||
|
const IFMT = 61440;
|
||||||
|
const IFDIR = 16384;
|
||||||
|
const IFLNK = 40960;
|
||||||
|
const symlink = (mode & IFMT) === IFLNK;
|
||||||
|
let isDir = (mode & IFMT) === IFDIR;
|
||||||
|
|
||||||
|
// Failsafe, borrowed from jsZip
|
||||||
|
if (!isDir && entry.fileName.endsWith('/')) {
|
||||||
|
isDir = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// check for windows weird way of specifying a directory
|
||||||
|
// https://github.com/maxogden/extract-zip/issues/13#issuecomment-154494566
|
||||||
|
const madeBy = entry.versionMadeBy >> 8;
|
||||||
|
if (!isDir) isDir = madeBy === 0 && entry.externalFileAttributes === 16;
|
||||||
|
|
||||||
|
const procMode = getExtractedMode(mode, isDir) & 0o777;
|
||||||
|
|
||||||
|
// always ensure folders are created
|
||||||
|
const destDir = isDir ? dest : path.dirname(dest);
|
||||||
|
|
||||||
|
const mkdirOptions = { recursive: true };
|
||||||
|
if (isDir) {
|
||||||
|
// @ts-ignore
|
||||||
|
mkdirOptions.mode = procMode;
|
||||||
|
}
|
||||||
|
await fs.mkdir(destDir, mkdirOptions);
|
||||||
|
if (isDir) return;
|
||||||
|
|
||||||
|
const readStream = await zipFile.openReadStream(entry);
|
||||||
|
|
||||||
|
if (symlink) {
|
||||||
|
const link = await streamToBuffer(readStream);
|
||||||
|
await fs.symlink(link.toString('utf8'), dest);
|
||||||
|
} else {
|
||||||
|
await pipe(readStream, fs.createWriteStream(dest, { mode: procMode }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getExtractedMode(entryMode: number, isDir: boolean): number {
|
||||||
|
let mode = entryMode;
|
||||||
|
|
||||||
|
// Set defaults, if necessary
|
||||||
|
if (mode === 0) {
|
||||||
|
if (isDir) {
|
||||||
|
mode = 0o755;
|
||||||
|
} else {
|
||||||
|
mode = 0o644;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return mode;
|
||||||
|
}
|
||||||
373
packages/cli/src/util/build/write-build-result.ts
Normal file
373
packages/cli/src/util/build/write-build-result.ts
Normal file
@@ -0,0 +1,373 @@
|
|||||||
|
import fs from 'fs-extra';
|
||||||
|
import mimeTypes from 'mime-types';
|
||||||
|
import { basename, dirname, extname, join, relative, resolve } from 'path';
|
||||||
|
import {
|
||||||
|
Builder,
|
||||||
|
BuildResultV2,
|
||||||
|
BuildResultV3,
|
||||||
|
File,
|
||||||
|
FileFsRef,
|
||||||
|
BuilderV2,
|
||||||
|
BuilderV3,
|
||||||
|
Lambda,
|
||||||
|
PackageJson,
|
||||||
|
Prerender,
|
||||||
|
download,
|
||||||
|
EdgeFunction,
|
||||||
|
BuildResultBuildOutput,
|
||||||
|
} from '@vercel/build-utils';
|
||||||
|
import pipe from 'promisepipe';
|
||||||
|
import { unzip } from './unzip';
|
||||||
|
import { VERCEL_DIR } from '../projects/link';
|
||||||
|
|
||||||
|
export const OUTPUT_DIR = join(VERCEL_DIR, 'output');
|
||||||
|
|
||||||
|
export async function writeBuildResult(
|
||||||
|
buildResult: BuildResultV2 | BuildResultV3,
|
||||||
|
build: Builder,
|
||||||
|
builder: BuilderV2 | BuilderV3,
|
||||||
|
builderPkg: PackageJson,
|
||||||
|
cleanUrls?: boolean
|
||||||
|
) {
|
||||||
|
const { version } = builder;
|
||||||
|
if (version === 2) {
|
||||||
|
return writeBuildResultV2(buildResult as BuildResultV2, cleanUrls);
|
||||||
|
} else if (version === 3) {
|
||||||
|
return writeBuildResultV3(buildResult as BuildResultV3, build);
|
||||||
|
}
|
||||||
|
throw new Error(
|
||||||
|
`Unsupported Builder version \`${version}\` from "${builderPkg.name}"`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function isEdgeFunction(v: any): v is EdgeFunction {
|
||||||
|
return v?.type === 'EdgeFunction';
|
||||||
|
}
|
||||||
|
|
||||||
|
function isLambda(v: any): v is Lambda {
|
||||||
|
return v?.type === 'Lambda';
|
||||||
|
}
|
||||||
|
|
||||||
|
function isPrerender(v: any): v is Prerender {
|
||||||
|
return v?.type === 'Prerender';
|
||||||
|
}
|
||||||
|
|
||||||
|
function isFile(v: any): v is File {
|
||||||
|
const type = v?.type;
|
||||||
|
return type === 'FileRef' || type === 'FileFsRef' || type === 'FileBlob';
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PathOverride {
|
||||||
|
contentType?: string;
|
||||||
|
path?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Writes the output from the `build()` return value of a v2 Builder to
|
||||||
|
* the filesystem.
|
||||||
|
*/
|
||||||
|
async function writeBuildResultV2(
|
||||||
|
buildResult: BuildResultV2,
|
||||||
|
cleanUrls?: boolean
|
||||||
|
) {
|
||||||
|
if ('buildOutputPath' in buildResult) {
|
||||||
|
await mergeBuilderOutput(buildResult);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const lambdas = new Map<Lambda, string>();
|
||||||
|
const overrides: Record<string, PathOverride> = {};
|
||||||
|
for (const [path, output] of Object.entries(buildResult.output)) {
|
||||||
|
if (isLambda(output)) {
|
||||||
|
await writeLambda(output, path, lambdas);
|
||||||
|
} else if (isPrerender(output)) {
|
||||||
|
await writeLambda(output.lambda, path, lambdas);
|
||||||
|
|
||||||
|
// Write the fallback file alongside the Lambda directory
|
||||||
|
let fallback = output.fallback;
|
||||||
|
if (fallback) {
|
||||||
|
const ext = getFileExtension(fallback);
|
||||||
|
const fallbackName = `${path}.prerender-fallback${ext}`;
|
||||||
|
const fallbackPath = join(OUTPUT_DIR, 'functions', fallbackName);
|
||||||
|
const stream = fallback.toStream();
|
||||||
|
await pipe(
|
||||||
|
stream,
|
||||||
|
fs.createWriteStream(fallbackPath, { mode: fallback.mode })
|
||||||
|
);
|
||||||
|
fallback = new FileFsRef({
|
||||||
|
...output.fallback,
|
||||||
|
fsPath: basename(fallbackName),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const prerenderConfigPath = join(
|
||||||
|
OUTPUT_DIR,
|
||||||
|
'functions',
|
||||||
|
`${path}.prerender-config.json`
|
||||||
|
);
|
||||||
|
const prerenderConfig = {
|
||||||
|
...output,
|
||||||
|
lambda: undefined,
|
||||||
|
fallback,
|
||||||
|
};
|
||||||
|
await fs.writeJSON(prerenderConfigPath, prerenderConfig, { spaces: 2 });
|
||||||
|
} else if (isFile(output)) {
|
||||||
|
await writeStaticFile(output, path, overrides, cleanUrls);
|
||||||
|
} else if (isEdgeFunction(output)) {
|
||||||
|
await writeEdgeFunction(output, path);
|
||||||
|
} else {
|
||||||
|
throw new Error(
|
||||||
|
`Unsupported output type: "${(output as any).type}" for ${path}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Object.keys(overrides).length > 0 ? overrides : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Writes the output from the `build()` return value of a v3 Builder to
|
||||||
|
* the filesystem.
|
||||||
|
*/
|
||||||
|
async function writeBuildResultV3(buildResult: BuildResultV3, build: Builder) {
|
||||||
|
const { output } = buildResult;
|
||||||
|
if (isLambda(output)) {
|
||||||
|
const src = build.src!;
|
||||||
|
const ext = extname(src);
|
||||||
|
const path = build.config?.zeroConfig
|
||||||
|
? src.substring(0, src.length - ext.length)
|
||||||
|
: src;
|
||||||
|
await writeLambda(output, path);
|
||||||
|
} else {
|
||||||
|
throw new Error(
|
||||||
|
`Unsupported output type: "${(output as any).type}" for ${build.src}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Writes a static `File` instance to the file system in the "static" directory.
|
||||||
|
* If the filename does not have a file extension then one attempts to be inferred
|
||||||
|
* from the extension of the `fsPath`.
|
||||||
|
*
|
||||||
|
* @param file The `File` instance to write
|
||||||
|
* @param path The URL path where the `File` can be accessed from
|
||||||
|
* @param overrides Record of override configuration when a File is renamed or has other metadata
|
||||||
|
*/
|
||||||
|
async function writeStaticFile(
|
||||||
|
file: File,
|
||||||
|
path: string,
|
||||||
|
overrides: Record<string, PathOverride>,
|
||||||
|
cleanUrls = false
|
||||||
|
) {
|
||||||
|
let fsPath = path;
|
||||||
|
let override: PathOverride | null = null;
|
||||||
|
|
||||||
|
// If the output path doesn't match the determined file extension of
|
||||||
|
// the File then add the extension. This is to help avoid conflicts
|
||||||
|
// where an output path matches a directory name of another output path
|
||||||
|
// (i.e. `blog` -> `blog.html` and `blog/hello` -> `blog/hello.html`)
|
||||||
|
const ext = getFileExtension(file);
|
||||||
|
if (ext && extname(path) !== ext) {
|
||||||
|
fsPath += ext;
|
||||||
|
if (!override) override = {};
|
||||||
|
override.path = path;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If `cleanUrls` is true then remove the `.html` file extension
|
||||||
|
// for HTML files.
|
||||||
|
if (cleanUrls && path.endsWith('.html')) {
|
||||||
|
if (!override) override = {};
|
||||||
|
override.path = path.slice(0, -5);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure an explicit "content-type" on the `File` is returned in
|
||||||
|
// the final output asset.
|
||||||
|
if (file.contentType) {
|
||||||
|
if (!override) override = {};
|
||||||
|
override.contentType = file.contentType;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (override) {
|
||||||
|
overrides[fsPath] = override;
|
||||||
|
}
|
||||||
|
|
||||||
|
const dest = join(OUTPUT_DIR, 'static', fsPath);
|
||||||
|
await fs.mkdirp(dirname(dest));
|
||||||
|
|
||||||
|
// TODO: handle (or skip) symlinks?
|
||||||
|
const stream = file.toStream();
|
||||||
|
await pipe(stream, fs.createWriteStream(dest, { mode: file.mode }));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Serializes the `EdgeFunction` instance to the file system.
|
||||||
|
*
|
||||||
|
* @param edgeFunction The `EdgeFunction` instance
|
||||||
|
* @param path The URL path where the `EdgeFunction` can be accessed from
|
||||||
|
*/
|
||||||
|
async function writeEdgeFunction(edgeFunction: EdgeFunction, path: string) {
|
||||||
|
const dest = join(OUTPUT_DIR, 'functions', `${path}.func`);
|
||||||
|
|
||||||
|
await fs.mkdirp(dest);
|
||||||
|
const ops: Promise<any>[] = [];
|
||||||
|
ops.push(download(edgeFunction.files, dest));
|
||||||
|
|
||||||
|
const config = {
|
||||||
|
runtime: 'edge',
|
||||||
|
...edgeFunction,
|
||||||
|
files: undefined,
|
||||||
|
type: undefined,
|
||||||
|
};
|
||||||
|
const configPath = join(dest, '.vc-config.json');
|
||||||
|
ops.push(
|
||||||
|
fs.writeJSON(configPath, config, {
|
||||||
|
spaces: 2,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
await Promise.all(ops);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Writes the file references from the `Lambda` instance to the file system.
|
||||||
|
*
|
||||||
|
* @param lambda The `Lambda` instance
|
||||||
|
* @param path The URL path where the `Lambda` can be accessed from
|
||||||
|
* @param lambdas (optional) Map of `Lambda` instances that have previously been written
|
||||||
|
*/
|
||||||
|
async function writeLambda(
|
||||||
|
lambda: Lambda,
|
||||||
|
path: string,
|
||||||
|
lambdas?: Map<Lambda, string>
|
||||||
|
) {
|
||||||
|
const dest = join(OUTPUT_DIR, 'functions', `${path}.func`);
|
||||||
|
|
||||||
|
// If the `lambda` has already been written to the filesystem at a different
|
||||||
|
// location then create a symlink to the previous location instead of copying
|
||||||
|
// the files again.
|
||||||
|
const existingLambdaPath = lambdas?.get(lambda);
|
||||||
|
if (existingLambdaPath) {
|
||||||
|
const destDir = dirname(dest);
|
||||||
|
const targetDest = join(
|
||||||
|
OUTPUT_DIR,
|
||||||
|
'functions',
|
||||||
|
`${existingLambdaPath}.func`
|
||||||
|
);
|
||||||
|
const target = relative(destDir, targetDest);
|
||||||
|
await fs.mkdirp(destDir);
|
||||||
|
await fs.symlink(target, dest);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
lambdas?.set(lambda, path);
|
||||||
|
|
||||||
|
await fs.mkdirp(dest);
|
||||||
|
const ops: Promise<any>[] = [];
|
||||||
|
if (lambda.files) {
|
||||||
|
// `files` is defined
|
||||||
|
ops.push(download(lambda.files, dest));
|
||||||
|
} else if (lambda.zipBuffer) {
|
||||||
|
// Builders that use the deprecated `createLambda()` might only have `zipBuffer`
|
||||||
|
ops.push(unzip(lambda.zipBuffer, dest));
|
||||||
|
} else {
|
||||||
|
throw new Error('Malformed `Lambda` - no "files" present');
|
||||||
|
}
|
||||||
|
|
||||||
|
const config = {
|
||||||
|
...lambda,
|
||||||
|
type: undefined,
|
||||||
|
files: undefined,
|
||||||
|
zipBuffer: undefined,
|
||||||
|
};
|
||||||
|
const configPath = join(dest, '.vc-config.json');
|
||||||
|
ops.push(
|
||||||
|
fs.writeJSON(configPath, config, {
|
||||||
|
spaces: 2,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
await Promise.all(ops);
|
||||||
|
|
||||||
|
// XXX: remove any `.vercel/builders` directories that were
|
||||||
|
// extracted into the `dest` dir. This is a temporary band-aid
|
||||||
|
// to make `vercel-php` work since it is inadvertently including
|
||||||
|
// `.vercel/builders` into the Lambda files due to glob syntax.
|
||||||
|
// See: https://github.com/juicyfx/vercel-php/pull/232
|
||||||
|
for await (const dir of findDirs('.vercel', dest)) {
|
||||||
|
const absDir = join(dest, dir);
|
||||||
|
const entries = await fs.readdir(absDir);
|
||||||
|
if (entries.includes('cache')) {
|
||||||
|
// Delete everything except for "cache"
|
||||||
|
await Promise.all(
|
||||||
|
entries
|
||||||
|
.filter(e => e !== 'cache')
|
||||||
|
.map(entry => fs.remove(join(absDir, entry)))
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// Delete the entire `.vercel` directory
|
||||||
|
await fs.remove(absDir);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When the Root Directory setting is utilized, merge the contents of the
|
||||||
|
* `.vercel/output` directory that was specified by the Builder into the
|
||||||
|
* `vc build` output directory.
|
||||||
|
*/
|
||||||
|
async function mergeBuilderOutput(buildResult: BuildResultBuildOutput) {
|
||||||
|
const absOutputDir = resolve(OUTPUT_DIR);
|
||||||
|
if (absOutputDir === buildResult.buildOutputPath) {
|
||||||
|
// `.vercel/output` dir is already in the correct location,
|
||||||
|
// so no need to do anything
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await fs.copy(buildResult.buildOutputPath, OUTPUT_DIR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attempts to return the file extension (i.e. `.html`) from the given
|
||||||
|
* `File` instance, based on its actual filesystem path and/or the
|
||||||
|
* "content-type" of the File.
|
||||||
|
*/
|
||||||
|
function getFileExtension(file: File): string {
|
||||||
|
let ext = '';
|
||||||
|
if (file.type === 'FileFsRef') {
|
||||||
|
ext = extname(file.fsPath);
|
||||||
|
}
|
||||||
|
if (!ext && file.contentType) {
|
||||||
|
const e = mimeTypes.extension(file.contentType);
|
||||||
|
if (e) {
|
||||||
|
ext = `.${e}`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ext;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates an async iterator that scans a directory
|
||||||
|
* for sub-directories with the matching `name`.
|
||||||
|
*/
|
||||||
|
export async function* findDirs(
|
||||||
|
name: string,
|
||||||
|
dir: string,
|
||||||
|
root = dir
|
||||||
|
): AsyncIterable<string> {
|
||||||
|
let paths: string[];
|
||||||
|
try {
|
||||||
|
paths = await fs.readdir(dir);
|
||||||
|
} catch (err: any) {
|
||||||
|
if (err.code !== 'ENOENT') {
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
paths = [];
|
||||||
|
}
|
||||||
|
for (const path of paths) {
|
||||||
|
const abs = join(dir, path);
|
||||||
|
const s = await fs.stat(abs);
|
||||||
|
if (s.isDirectory()) {
|
||||||
|
if (path === name) {
|
||||||
|
yield relative(root, abs);
|
||||||
|
} else {
|
||||||
|
yield* findDirs(name, abs, root);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -89,6 +89,7 @@ import {
|
|||||||
} from './types';
|
} from './types';
|
||||||
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';
|
||||||
|
|
||||||
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')
|
||||||
@@ -998,20 +999,7 @@ export default class DevServer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (devProcess) {
|
if (devProcess) {
|
||||||
ops.push(
|
ops.push(treeKill(devProcess.pid));
|
||||||
new Promise<void>((resolve, reject) => {
|
|
||||||
devProcess.once('exit', () => resolve());
|
|
||||||
try {
|
|
||||||
process.kill(devProcess.pid);
|
|
||||||
} catch (err) {
|
|
||||||
if (err.code === 'ESRCH') {
|
|
||||||
// Process already exited
|
|
||||||
return resolve();
|
|
||||||
}
|
|
||||||
reject(err);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ops.push(close(this.server));
|
ops.push(close(this.server));
|
||||||
@@ -2120,7 +2108,7 @@ export default class DevServer {
|
|||||||
.replace(/%PORT%/g, `${port}`);
|
.replace(/%PORT%/g, `${port}`);
|
||||||
|
|
||||||
this.output.debug(
|
this.output.debug(
|
||||||
`Starting dev command with parameters : ${JSON.stringify({
|
`Starting dev command with parameters: ${JSON.stringify({
|
||||||
cwd,
|
cwd,
|
||||||
command,
|
command,
|
||||||
port,
|
port,
|
||||||
@@ -2152,6 +2140,7 @@ export default class DevServer {
|
|||||||
cwd,
|
cwd,
|
||||||
env,
|
env,
|
||||||
});
|
});
|
||||||
|
this.devProcess = p;
|
||||||
|
|
||||||
if (!p.stdout || !p.stderr) {
|
if (!p.stdout || !p.stderr) {
|
||||||
throw new Error('Expected child process to have stdout and stderr');
|
throw new Error('Expected child process to have stdout and stderr');
|
||||||
@@ -2164,17 +2153,14 @@ export default class DevServer {
|
|||||||
process.stdout.write(data.replace(proxyPort, devPort));
|
process.stdout.write(data.replace(proxyPort, devPort));
|
||||||
});
|
});
|
||||||
|
|
||||||
p.on('exit', (code: number) => {
|
p.on('exit', (code, signal) => {
|
||||||
if (code > 0) {
|
this.output.debug(`Dev command exited with "${signal || code}"`);
|
||||||
process.exit(code);
|
|
||||||
}
|
|
||||||
this.devProcessPort = undefined;
|
this.devProcessPort = undefined;
|
||||||
});
|
});
|
||||||
|
|
||||||
await checkForPort(port, 1000 * 60 * 5);
|
await checkForPort(port, 1000 * 60 * 5);
|
||||||
|
|
||||||
this.devProcessPort = port;
|
this.devProcessPort = port;
|
||||||
this.devProcess = p;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
13
packages/cli/src/util/env/get-env-records.ts
vendored
13
packages/cli/src/util/env/get-env-records.ts
vendored
@@ -3,10 +3,20 @@ import Client from '../client';
|
|||||||
import { ProjectEnvVariable, ProjectEnvTarget } from '../../types';
|
import { ProjectEnvVariable, ProjectEnvTarget } from '../../types';
|
||||||
import { URLSearchParams } from 'url';
|
import { URLSearchParams } from 'url';
|
||||||
|
|
||||||
|
/** The CLI command that was used that needs the environment variables. */
|
||||||
|
export type EnvRecordsSource =
|
||||||
|
| 'vercel-cli:env:ls'
|
||||||
|
| 'vercel-cli:env:add'
|
||||||
|
| 'vercel-cli:env:rm'
|
||||||
|
| 'vercel-cli:env:pull'
|
||||||
|
| 'vercel-cli:dev'
|
||||||
|
| 'vercel-cli:pull';
|
||||||
|
|
||||||
export default async function getEnvRecords(
|
export default async function getEnvRecords(
|
||||||
output: Output,
|
output: Output,
|
||||||
client: Client,
|
client: Client,
|
||||||
projectId: string,
|
projectId: string,
|
||||||
|
source: EnvRecordsSource,
|
||||||
{
|
{
|
||||||
target,
|
target,
|
||||||
gitBranch,
|
gitBranch,
|
||||||
@@ -31,6 +41,9 @@ export default async function getEnvRecords(
|
|||||||
if (decrypt) {
|
if (decrypt) {
|
||||||
query.set('decrypt', decrypt.toString());
|
query.set('decrypt', decrypt.toString());
|
||||||
}
|
}
|
||||||
|
if (source) {
|
||||||
|
query.set('source', source);
|
||||||
|
}
|
||||||
|
|
||||||
const url = `/v8/projects/${projectId}/env?${query}`;
|
const url = `/v8/projects/${projectId}/env?${query}`;
|
||||||
|
|
||||||
|
|||||||
@@ -6,15 +6,16 @@ import {
|
|||||||
ProjectEnvVariable,
|
ProjectEnvVariable,
|
||||||
Secret,
|
Secret,
|
||||||
} from '../types';
|
} from '../types';
|
||||||
import getEnvRecords from './env/get-env-records';
|
import getEnvRecords, { EnvRecordsSource } from './env/get-env-records';
|
||||||
|
|
||||||
export default async function getDecryptedEnvRecords(
|
export default async function getDecryptedEnvRecords(
|
||||||
output: Output,
|
output: Output,
|
||||||
client: Client,
|
client: Client,
|
||||||
projectId: string,
|
projectId: string,
|
||||||
|
source: EnvRecordsSource,
|
||||||
target?: ProjectEnvTarget
|
target?: ProjectEnvTarget
|
||||||
): Promise<{ envs: ProjectEnvVariable[] }> {
|
): Promise<{ envs: ProjectEnvVariable[] }> {
|
||||||
const { envs } = await getEnvRecords(output, client, projectId, {
|
const { envs } = await getEnvRecords(output, client, projectId, source, {
|
||||||
target: target || ProjectEnvTarget.Development,
|
target: target || ProjectEnvTarget.Development,
|
||||||
decrypt: true,
|
decrypt: true,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -2,6 +2,16 @@ import title from 'title';
|
|||||||
import pkg from './pkg';
|
import pkg from './pkg';
|
||||||
import cmd from './output/cmd';
|
import cmd from './output/cmd';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The package name defined in the CLI's `package.json` file (`vercel`).
|
||||||
|
*/
|
||||||
|
export const name = pkg.name;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unicode symbol used to represent the CLI.
|
||||||
|
*/
|
||||||
|
export const logo = '▲';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the package name such as `vercel` or `now`.
|
* Returns the package name such as `vercel` or `now`.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { promisify } from 'util';
|
|||||||
|
|
||||||
import getProjectByIdOrName from '../projects/get-project-by-id-or-name';
|
import getProjectByIdOrName from '../projects/get-project-by-id-or-name';
|
||||||
import Client from '../client';
|
import Client from '../client';
|
||||||
import { ProjectNotFound } from '../errors-ts';
|
import { InvalidToken, ProjectNotFound } from '../errors-ts';
|
||||||
import getUser from '../get-user';
|
import getUser from '../get-user';
|
||||||
import getTeamById from '../teams/get-team-by-id';
|
import getTeamById from '../teams/get-team-by-id';
|
||||||
import { Output } from '../output';
|
import { Output } from '../output';
|
||||||
@@ -150,15 +150,20 @@ export async function getLinkedProject(
|
|||||||
getProjectByIdOrName(client, link.projectId, link.orgId),
|
getProjectByIdOrName(client, link.projectId, link.orgId),
|
||||||
]);
|
]);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err?.status === 403) {
|
if (err && err.status === 403) {
|
||||||
output.stopSpinner();
|
output.stopSpinner();
|
||||||
throw new NowBuildError({
|
|
||||||
message: `Could not retrieve Project Settings. To link your Project, remove the ${outputCode(
|
if (err.missingToken) {
|
||||||
VERCEL_DIR
|
throw new InvalidToken();
|
||||||
)} directory and deploy again.`,
|
} else {
|
||||||
code: 'PROJECT_UNAUTHORIZED',
|
throw new NowBuildError({
|
||||||
link: 'https://vercel.link/cannot-load-project-settings',
|
message: `Could not retrieve Project Settings. To link your Project, remove the ${outputCode(
|
||||||
});
|
VERCEL_DIR
|
||||||
|
)} directory and deploy again.`,
|
||||||
|
code: 'PROJECT_UNAUTHORIZED',
|
||||||
|
link: 'https://vercel.link/cannot-load-project-settings',
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Not a special case 403, we should still throw it
|
// Not a special case 403, we should still throw it
|
||||||
|
|||||||
@@ -5,12 +5,14 @@ import { join } from 'path';
|
|||||||
|
|
||||||
export type ProjectLinkAndSettings = ProjectLink & {
|
export type ProjectLinkAndSettings = ProjectLink & {
|
||||||
settings: {
|
settings: {
|
||||||
|
installCommand: Project['installCommand'];
|
||||||
buildCommand: Project['buildCommand'];
|
buildCommand: Project['buildCommand'];
|
||||||
devCommand: Project['devCommand'];
|
devCommand: Project['devCommand'];
|
||||||
outputDirectory: Project['outputDirectory'];
|
outputDirectory: Project['outputDirectory'];
|
||||||
directoryListing: Project['directoryListing'];
|
directoryListing: Project['directoryListing'];
|
||||||
rootDirectory: Project['rootDirectory'];
|
rootDirectory: Project['rootDirectory'];
|
||||||
framework: Project['framework'];
|
framework: Project['framework'];
|
||||||
|
nodeVersion: Project['nodeVersion'];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -22,20 +24,22 @@ export async function writeProjectSettings(
|
|||||||
project: Project,
|
project: Project,
|
||||||
org: Org
|
org: Org
|
||||||
) {
|
) {
|
||||||
const data = {
|
const projectLinkAndSettings: ProjectLinkAndSettings = {
|
||||||
projectId: project.id,
|
projectId: project.id,
|
||||||
orgId: org.id,
|
orgId: org.id,
|
||||||
settings: {
|
settings: {
|
||||||
buildCommand: project.buildCommand,
|
|
||||||
devCommand: project.devCommand,
|
|
||||||
outputDirectory: project.outputDirectory,
|
|
||||||
directoryListing: project.directoryListing,
|
|
||||||
rootDirectory: project.rootDirectory,
|
|
||||||
framework: project.framework,
|
framework: project.framework,
|
||||||
|
devCommand: project.devCommand,
|
||||||
|
installCommand: project.installCommand,
|
||||||
|
buildCommand: project.buildCommand,
|
||||||
|
outputDirectory: project.outputDirectory,
|
||||||
|
rootDirectory: project.rootDirectory,
|
||||||
|
directoryListing: project.directoryListing,
|
||||||
|
nodeVersion: project.nodeVersion,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
const path = join(cwd, VERCEL_DIR, VERCEL_DIR_PROJECT);
|
const path = join(cwd, VERCEL_DIR, VERCEL_DIR_PROJECT);
|
||||||
return await outputJSON(path, data, {
|
return await outputJSON(path, projectLinkAndSettings, {
|
||||||
spaces: 2,
|
spaces: 2,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
ANOTHER_SECRET=runtime
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
SECRET=buildtime
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
.now
|
|
||||||
.vercel
|
|
||||||
.next
|
|
||||||
.idea
|
|
||||||
node_modules
|
|
||||||
!.env
|
|
||||||
!.env.build
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
console.log({
|
|
||||||
SECRET: process.env.SECRET,
|
|
||||||
ANOTHER_SECRET: process.env.ANOTHER_SECRET,
|
|
||||||
});
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
env: {
|
|
||||||
SECRET: process.env.SECRET,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export default async (_req, res) => {
|
|
||||||
return res.end(process.env.ANOTHER_SECRET);
|
|
||||||
};
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export default () => <p>{process.env.SECRET}</p>;
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
"build": {
|
|
||||||
"env": {
|
|
||||||
"SECRET": "@buildtime"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"env": {
|
|
||||||
"ANOTHER_SECRET": "@runtime"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
assetPrefix: '/blog',
|
|
||||||
env: {
|
|
||||||
ASSET_PREFIX: '/blog',
|
|
||||||
},
|
|
||||||
};
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
import Link from 'next/link';
|
|
||||||
|
|
||||||
export default function Blog() {
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<h3>This is our blog</h3>
|
|
||||||
<ul>
|
|
||||||
<li>
|
|
||||||
<Link href="/blog/post/[id]" as="/blog/post/1">
|
|
||||||
<a>Post 1</a>
|
|
||||||
</Link>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<Link href="/blog/post/[id]" as="/blog/post/2">
|
|
||||||
<a>Post 2</a>
|
|
||||||
</Link>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
<a href="/">Home</a>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
import Link from 'next/link'
|
|
||||||
import { useRouter } from 'next/router'
|
|
||||||
|
|
||||||
export default function Post() {
|
|
||||||
const router = useRouter()
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<h3>Post #{router.query.id}</h3>
|
|
||||||
<p>Lorem ipsum</p>
|
|
||||||
<Link href="/blog">
|
|
||||||
<a>Back to blog</a>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
const Header = () => (
|
|
||||||
<div>
|
|
||||||
<h2>The Company</h2>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
|
|
||||||
export default Header;
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
import Link from 'next/link';
|
|
||||||
|
|
||||||
const About = ({ id }) => {
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<p>This is the {id} page with static props.</p>
|
|
||||||
<div>
|
|
||||||
<Link href="/">
|
|
||||||
<a>Go Back</a>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getStaticProps = ({ params }) => {
|
|
||||||
return { props: { id: params.id } };
|
|
||||||
};
|
|
||||||
export const getStaticPaths = () => ({ paths: ['/1/dynamic'], fallback: true });
|
|
||||||
|
|
||||||
export default About;
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
import Link from 'next/link';
|
|
||||||
import { useRouter } from 'next/router';
|
|
||||||
|
|
||||||
const About = () => {
|
|
||||||
const router = useRouter();
|
|
||||||
const { id } = router.query;
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<p>This is the {id} page without static props.</p>
|
|
||||||
<div>
|
|
||||||
<Link href="/">
|
|
||||||
<a>Go Back</a>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default About;
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
import Link from 'next/link';
|
|
||||||
import { useRouter } from 'next/router';
|
|
||||||
|
|
||||||
const About = () => {
|
|
||||||
const router = useRouter();
|
|
||||||
const { id } = router.query;
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<p>This is the about static page.</p>
|
|
||||||
<div>
|
|
||||||
<Link href="/">
|
|
||||||
<a>Go Back</a>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default About;
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
import Link from 'next/link';
|
|
||||||
import dynamic from 'next/dynamic';
|
|
||||||
|
|
||||||
const Header = dynamic(import('../components/Header'));
|
|
||||||
|
|
||||||
export default function Home() {
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<Header />
|
|
||||||
<p>This is our homepage</p>
|
|
||||||
<div>
|
|
||||||
<a href="/blog">Blog</a>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<Link href="/about">
|
|
||||||
<a>About us</a>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<Link href="/foo">
|
|
||||||
<a>foo</a>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<Link href="/1/dynamic">
|
|
||||||
<a>1/dynamic</a>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<Link href="/1/foo">
|
|
||||||
<a>1/foo</a>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "with-zones-example",
|
|
||||||
"private": true,
|
|
||||||
"workspaces": [
|
|
||||||
"home",
|
|
||||||
"blog"
|
|
||||||
],
|
|
||||||
"devDependencies": {
|
|
||||||
"vercel": "canary"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"version": 2,
|
|
||||||
"builds": [
|
|
||||||
{ "src": "blog/package.json", "use": "@vercel/next@canary" },
|
|
||||||
{ "src": "home/package.json", "use": "@vercel/next@canary" }
|
|
||||||
],
|
|
||||||
"routes": [
|
|
||||||
{ "src": "/blog/_next(.*)", "dest": "blog/_next$1" },
|
|
||||||
{ "src": "/blog(.*)", "dest": "blog/blog$1" },
|
|
||||||
{ "src": "(.*)", "dest": "home$1" }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
356
packages/cli/test/dev/integration-1.test.ts
Normal file
356
packages/cli/test/dev/integration-1.test.ts
Normal file
@@ -0,0 +1,356 @@
|
|||||||
|
import os from 'os';
|
||||||
|
import fs from 'fs-extra';
|
||||||
|
import { join } from 'path';
|
||||||
|
|
||||||
|
const {
|
||||||
|
exec,
|
||||||
|
fetch,
|
||||||
|
fixture,
|
||||||
|
testFixture,
|
||||||
|
testFixtureStdio,
|
||||||
|
} = require('./utils.js');
|
||||||
|
|
||||||
|
test('[vercel dev] prints `npm install` errors', async () => {
|
||||||
|
const dir = fixture('runtime-not-installed');
|
||||||
|
const result = await exec(dir);
|
||||||
|
expect(result.stderr.includes('npm ERR! 404')).toBeTruthy();
|
||||||
|
expect(
|
||||||
|
result.stderr.includes('Failed to install `vercel dev` dependencies')
|
||||||
|
).toBeTruthy();
|
||||||
|
expect(
|
||||||
|
result.stderr.includes('https://vercel.link/npm-install-failed-dev')
|
||||||
|
).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('[vercel dev] `vercel.json` should be invalidated if deleted', async () => {
|
||||||
|
const dir = fixture('invalidate-vercel-config');
|
||||||
|
const configPath = join(dir, 'vercel.json');
|
||||||
|
const originalConfig = await fs.readJSON(configPath);
|
||||||
|
const { dev, port, readyResolver } = await testFixture(dir);
|
||||||
|
|
||||||
|
try {
|
||||||
|
await readyResolver;
|
||||||
|
|
||||||
|
{
|
||||||
|
// Env var should be set from `vercel.json`
|
||||||
|
const res = await fetch(`http://localhost:${port}/api`);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.FOO).toBe('bar');
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
// Env var should not be set after `vercel.json` is deleted
|
||||||
|
await fs.remove(configPath);
|
||||||
|
|
||||||
|
const res = await fetch(`http://localhost:${port}/api`);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.FOO).toBe(undefined);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
dev.kill('SIGTERM');
|
||||||
|
await fs.writeJSON(configPath, originalConfig);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('[vercel dev] reflects changes to config and env without restart', async () => {
|
||||||
|
const dir = fixture('node-helpers');
|
||||||
|
const configPath = join(dir, 'vercel.json');
|
||||||
|
const originalConfig = await fs.readJSON(configPath);
|
||||||
|
const { dev, port, readyResolver } = await testFixture(dir);
|
||||||
|
|
||||||
|
try {
|
||||||
|
await readyResolver;
|
||||||
|
|
||||||
|
{
|
||||||
|
// Node.js helpers should be available by default
|
||||||
|
const res = await fetch(`http://localhost:${port}/?foo=bar`);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.hasHelpers).toBe(true);
|
||||||
|
expect(body.query.foo).toBe('bar');
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
// Disable the helpers via `config.helpers = false`
|
||||||
|
const config = {
|
||||||
|
...originalConfig,
|
||||||
|
builds: [
|
||||||
|
{
|
||||||
|
...originalConfig.builds[0],
|
||||||
|
config: {
|
||||||
|
helpers: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
await fs.writeJSON(configPath, config);
|
||||||
|
|
||||||
|
const res = await fetch(`http://localhost:${port}/?foo=bar`);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.hasHelpers).toBe(false);
|
||||||
|
expect(body.query).toBe(undefined);
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
// Enable the helpers via `config.helpers = true`
|
||||||
|
const config = {
|
||||||
|
...originalConfig,
|
||||||
|
builds: [
|
||||||
|
{
|
||||||
|
...originalConfig.builds[0],
|
||||||
|
config: {
|
||||||
|
helpers: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
await fs.writeJSON(configPath, config);
|
||||||
|
|
||||||
|
const res = await fetch(`http://localhost:${port}/?foo=baz`);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.hasHelpers).toBe(true);
|
||||||
|
expect(body.query.foo).toBe('baz');
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
// Disable the helpers via `NODEJS_HELPERS = '0'`
|
||||||
|
const config = {
|
||||||
|
...originalConfig,
|
||||||
|
build: {
|
||||||
|
env: {
|
||||||
|
NODEJS_HELPERS: '0',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
await fs.writeJSON(configPath, config);
|
||||||
|
|
||||||
|
const res = await fetch(`http://localhost:${port}/?foo=baz`);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.hasHelpers).toBe(false);
|
||||||
|
expect(body.query).toBe(undefined);
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
// Enable the helpers via `NODEJS_HELPERS = '1'`
|
||||||
|
const config = {
|
||||||
|
...originalConfig,
|
||||||
|
build: {
|
||||||
|
env: {
|
||||||
|
NODEJS_HELPERS: '1',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
await fs.writeJSON(configPath, config);
|
||||||
|
|
||||||
|
const res = await fetch(`http://localhost:${port}/?foo=boo`);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.hasHelpers).toBe(true);
|
||||||
|
expect(body.query.foo).toBe('boo');
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
dev.kill('SIGTERM');
|
||||||
|
await fs.writeJSON(configPath, originalConfig);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('[vercel dev] `@vercel/node` TypeScript should be resolved by default', async () => {
|
||||||
|
// The purpose of this test is to test that `@vercel/node` can properly
|
||||||
|
// resolve the default "typescript" module when the project doesn't include
|
||||||
|
// its own version. To properly test for this, a fixture needs to be created
|
||||||
|
// *outside* of the `vercel` repo, since otherwise the root-level
|
||||||
|
// "node_modules/typescript" is resolved as relative to the project, and
|
||||||
|
// not relative to `@vercel/node` which is what we are testing for here.
|
||||||
|
const dir = join(os.tmpdir(), 'vercel-node-typescript-resolve-test');
|
||||||
|
const apiDir = join(dir, 'api');
|
||||||
|
await fs.mkdirp(apiDir);
|
||||||
|
await fs.writeFile(
|
||||||
|
join(apiDir, 'hello.js'),
|
||||||
|
'export default (req, res) => { res.end("world"); }'
|
||||||
|
);
|
||||||
|
|
||||||
|
const { dev, port, readyResolver } = await testFixture(dir);
|
||||||
|
|
||||||
|
try {
|
||||||
|
await readyResolver;
|
||||||
|
|
||||||
|
const res = await fetch(`http://localhost:${port}/api/hello`);
|
||||||
|
const body = await res.text();
|
||||||
|
expect(body).toBe('world');
|
||||||
|
} finally {
|
||||||
|
dev.kill('SIGTERM');
|
||||||
|
await fs.remove(dir);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] validate routes that use `check: true`',
|
||||||
|
testFixtureStdio('routes-check-true', async (testPath: any) => {
|
||||||
|
await testPath(200, '/blog/post', 'Blog Home');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] validate routes that use `check: true` and `status` code',
|
||||||
|
testFixtureStdio('routes-check-true-status', async (testPath: any) => {
|
||||||
|
await testPath(403, '/secret');
|
||||||
|
await testPath(200, '/post', 'This is a post.');
|
||||||
|
await testPath(200, '/post.html', 'This is a post.');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] validate routes that use custom 404 page',
|
||||||
|
testFixtureStdio('routes-custom-404', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', 'Home Page');
|
||||||
|
await testPath(404, '/nothing', 'Custom User 404');
|
||||||
|
await testPath(404, '/exact', 'Exact Custom 404');
|
||||||
|
await testPath(200, '/api/hello', 'Hello');
|
||||||
|
await testPath(404, '/api/nothing', 'Custom User 404');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] handles miss after route',
|
||||||
|
testFixtureStdio('handle-miss-after-route', async (testPath: any) => {
|
||||||
|
await testPath(200, '/post', 'Blog Post Page', {
|
||||||
|
test: '1',
|
||||||
|
override: 'one',
|
||||||
|
});
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] handles miss after rewrite',
|
||||||
|
testFixtureStdio('handle-miss-after-rewrite', async (testPath: any) => {
|
||||||
|
await testPath(200, '/post', 'Blog Post Page', {
|
||||||
|
test: '1',
|
||||||
|
override: 'one',
|
||||||
|
});
|
||||||
|
await testPath(200, '/blog/post', 'Blog Post Page', {
|
||||||
|
test: '1',
|
||||||
|
override: 'two',
|
||||||
|
});
|
||||||
|
await testPath(404, '/blog/about.html', undefined, {
|
||||||
|
test: '1',
|
||||||
|
override: 'two',
|
||||||
|
});
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] does not display directory listing after 404',
|
||||||
|
testFixtureStdio('handle-miss-hide-dir-list', async (testPath: any) => {
|
||||||
|
await testPath(404, '/post');
|
||||||
|
await testPath(200, '/post/one.html', 'First Post');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] should preserve query string even after miss phase',
|
||||||
|
testFixtureStdio('handle-miss-querystring', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', 'Index Page');
|
||||||
|
if (process.env.CI && process.platform === 'darwin') {
|
||||||
|
console.log('Skipping since GH Actions hangs for some reason');
|
||||||
|
} else {
|
||||||
|
await testPath(200, '/echo/first/second', 'a=first,b=second');
|
||||||
|
await testPath(200, '/functions/echo.js?a=one&b=two', 'a=one,b=two');
|
||||||
|
}
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] handles hit after handle: filesystem',
|
||||||
|
testFixtureStdio('handle-hit-after-fs', async (testPath: any) => {
|
||||||
|
await testPath(200, '/blog.html', 'Blog Page', { test: '1' });
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] handles hit after dest',
|
||||||
|
testFixtureStdio('handle-hit-after-dest', async (testPath: any) => {
|
||||||
|
await testPath(200, '/post', 'Blog Post', { test: '1', override: 'one' });
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] handles hit after rewrite',
|
||||||
|
testFixtureStdio('handle-hit-after-rewrite', async (testPath: any) => {
|
||||||
|
await testPath(200, '/post', 'Blog Post', { test: '1', override: 'one' });
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] should serve the public directory and api functions',
|
||||||
|
testFixtureStdio('public-and-api', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', 'This is the home page');
|
||||||
|
await testPath(200, '/about.html', 'This is the about page');
|
||||||
|
await testPath(200, '/.well-known/humans.txt', 'We come in peace');
|
||||||
|
await testPath(200, '/api/date', /current date/);
|
||||||
|
await testPath(200, '/api/rand', /random number/);
|
||||||
|
await testPath(200, '/api/rand.js', /random number/);
|
||||||
|
await testPath(404, '/api/api', /NOT_FOUND/m);
|
||||||
|
await testPath(404, '/nothing', /Custom 404 Page/);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] should allow user rewrites for path segment files',
|
||||||
|
testFixtureStdio('test-zero-config-rewrite', async (testPath: any) => {
|
||||||
|
await testPath(404, '/');
|
||||||
|
await testPath(200, '/echo/1', '{"id":"1"}', {
|
||||||
|
'Access-Control-Allow-Origin': '*',
|
||||||
|
});
|
||||||
|
await testPath(200, '/echo/2', '{"id":"2"}', {
|
||||||
|
'Access-Control-Allow-Headers': '*',
|
||||||
|
});
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test('[vercel dev] validate builds', async () => {
|
||||||
|
const directory = fixture('invalid-builds');
|
||||||
|
const output = await exec(directory);
|
||||||
|
|
||||||
|
expect(output.exitCode).toBe(1);
|
||||||
|
expect(output.stderr).toMatch(
|
||||||
|
/Invalid vercel\.json - `builds\[0\].src` should be string/m
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('[vercel dev] validate routes', async () => {
|
||||||
|
const directory = fixture('invalid-routes');
|
||||||
|
const output = await exec(directory);
|
||||||
|
|
||||||
|
expect(output.exitCode).toBe(1);
|
||||||
|
expect(output.stderr).toMatch(
|
||||||
|
/Invalid vercel\.json - `routes\[0\].src` should be string/m
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('[vercel dev] validate cleanUrls', async () => {
|
||||||
|
const directory = fixture('invalid-clean-urls');
|
||||||
|
const output = await exec(directory);
|
||||||
|
|
||||||
|
expect(output.exitCode).toBe(1);
|
||||||
|
expect(output.stderr).toMatch(
|
||||||
|
/Invalid vercel\.json - `cleanUrls` should be boolean/m
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('[vercel dev] validate trailingSlash', async () => {
|
||||||
|
const directory = fixture('invalid-trailing-slash');
|
||||||
|
const output = await exec(directory);
|
||||||
|
|
||||||
|
expect(output.exitCode).toBe(1);
|
||||||
|
expect(output.stderr).toMatch(
|
||||||
|
/Invalid vercel\.json - `trailingSlash` should be boolean/m
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('[vercel dev] validate rewrites', async () => {
|
||||||
|
const directory = fixture('invalid-rewrites');
|
||||||
|
const output = await exec(directory);
|
||||||
|
|
||||||
|
expect(output.exitCode).toBe(1);
|
||||||
|
expect(output.stderr).toMatch(
|
||||||
|
/Invalid vercel\.json - `rewrites\[0\].destination` should be string/m
|
||||||
|
);
|
||||||
|
});
|
||||||
336
packages/cli/test/dev/integration-2.test.ts
Normal file
336
packages/cli/test/dev/integration-2.test.ts
Normal file
@@ -0,0 +1,336 @@
|
|||||||
|
// eslint-disable-next-line
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
|
const { exec, fixture, testFixture, testFixtureStdio } = require('./utils.js');
|
||||||
|
|
||||||
|
test('[vercel dev] validate redirects', async () => {
|
||||||
|
const directory = fixture('invalid-redirects');
|
||||||
|
const output = await exec(directory);
|
||||||
|
|
||||||
|
expect(output.exitCode).toBe(1);
|
||||||
|
expect(output.stderr).toMatch(
|
||||||
|
/Invalid vercel\.json - `redirects\[0\].statusCode` should be integer/m
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('[vercel dev] validate headers', async () => {
|
||||||
|
const directory = fixture('invalid-headers');
|
||||||
|
const output = await exec(directory);
|
||||||
|
|
||||||
|
expect(output.exitCode).toBe(1);
|
||||||
|
expect(output.stderr).toMatch(
|
||||||
|
/Invalid vercel\.json - `headers\[0\].headers\[0\].value` should be string/m
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('[vercel dev] validate mixed routes and rewrites', async () => {
|
||||||
|
const directory = fixture('invalid-mixed-routes-rewrites');
|
||||||
|
const output = await exec(directory);
|
||||||
|
|
||||||
|
expect(output.exitCode).toBe(1);
|
||||||
|
expect(output.stderr).toMatch(
|
||||||
|
/If `rewrites`, `redirects`, `headers`, `cleanUrls` or `trailingSlash` are used, then `routes` cannot be present./m
|
||||||
|
);
|
||||||
|
expect(output.stderr).toMatch(/vercel\.link\/mix-routing-props/m);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Test seems unstable: It won't return sometimes.
|
||||||
|
test('[vercel dev] validate env var names', async () => {
|
||||||
|
const directory = fixture('invalid-env-var-name');
|
||||||
|
const { dev } = await testFixture(directory, { stdio: 'pipe' });
|
||||||
|
|
||||||
|
try {
|
||||||
|
let stderr = '';
|
||||||
|
dev.stderr.setEncoding('utf8');
|
||||||
|
|
||||||
|
await new Promise<void>((resolve, reject) => {
|
||||||
|
dev.stderr.on('data', (b: any) => {
|
||||||
|
stderr += b.toString();
|
||||||
|
|
||||||
|
if (
|
||||||
|
stderr.includes('Ignoring env var "1" because name is invalid') &&
|
||||||
|
stderr.includes(
|
||||||
|
'Ignoring build env var "_a" because name is invalid'
|
||||||
|
) &&
|
||||||
|
stderr.includes(
|
||||||
|
'Env var names must start with letters, and can only contain alphanumeric characters and underscores'
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
resolve();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
dev.on('error', reject);
|
||||||
|
dev.on('exit', resolve);
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
dev.kill('SIGTERM');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] test rewrites with segments serve correct content',
|
||||||
|
testFixtureStdio('test-rewrites-with-segments', async (testPath: any) => {
|
||||||
|
await testPath(200, '/api/users/first', 'first');
|
||||||
|
await testPath(200, '/api/fourty-two', '42');
|
||||||
|
await testPath(200, '/rand', '42');
|
||||||
|
await testPath(200, '/api/dynamic', 'dynamic');
|
||||||
|
await testPath(404, '/api');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] test rewrites serve correct content',
|
||||||
|
testFixtureStdio('test-rewrites', async (testPath: any) => {
|
||||||
|
await testPath(200, '/hello', 'Hello World');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] test rewrites and redirects serve correct external content',
|
||||||
|
testFixtureStdio(
|
||||||
|
'test-external-rewrites-and-redirects',
|
||||||
|
async (testPath: any) => {
|
||||||
|
const vcRobots = `https://vercel.com/robots.txt`;
|
||||||
|
await testPath(200, '/rewrite', /User-Agent: \*/m);
|
||||||
|
await testPath(308, '/redirect', `Redirecting to ${vcRobots} (308)`, {
|
||||||
|
Location: vcRobots,
|
||||||
|
});
|
||||||
|
await testPath(307, '/tempRedirect', `Redirecting to ${vcRobots} (307)`, {
|
||||||
|
Location: vcRobots,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] test rewrites and redirects is case sensitive',
|
||||||
|
testFixtureStdio('test-routing-case-sensitive', async (testPath: any) => {
|
||||||
|
await testPath(200, '/Path', 'UPPERCASE');
|
||||||
|
await testPath(200, '/path', 'lowercase');
|
||||||
|
await testPath(308, '/GoTo', 'Redirecting to /upper.html (308)', {
|
||||||
|
Location: '/upper.html',
|
||||||
|
});
|
||||||
|
await testPath(308, '/goto', 'Redirecting to /lower.html (308)', {
|
||||||
|
Location: '/lower.html',
|
||||||
|
});
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] test cleanUrls serve correct content',
|
||||||
|
testFixtureStdio('test-clean-urls', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', 'Index Page');
|
||||||
|
await testPath(200, '/about', 'About Page');
|
||||||
|
await testPath(200, '/sub', 'Sub Index Page');
|
||||||
|
await testPath(200, '/sub/another', 'Sub Another Page');
|
||||||
|
await testPath(200, '/style.css', 'body { color: green }');
|
||||||
|
await testPath(308, '/index.html', 'Redirecting to / (308)', {
|
||||||
|
Location: '/',
|
||||||
|
});
|
||||||
|
await testPath(308, '/about.html', 'Redirecting to /about (308)', {
|
||||||
|
Location: '/about',
|
||||||
|
});
|
||||||
|
await testPath(308, '/sub/index.html', 'Redirecting to /sub (308)', {
|
||||||
|
Location: '/sub',
|
||||||
|
});
|
||||||
|
await testPath(
|
||||||
|
308,
|
||||||
|
'/sub/another.html',
|
||||||
|
'Redirecting to /sub/another (308)',
|
||||||
|
{ Location: '/sub/another' }
|
||||||
|
);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] test cleanUrls serve correct content when using `outputDirectory`',
|
||||||
|
testFixtureStdio(
|
||||||
|
'test-clean-urls-with-output-directory',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', 'Index Page');
|
||||||
|
await testPath(200, '/about', 'About Page');
|
||||||
|
await testPath(200, '/sub', 'Sub Index Page');
|
||||||
|
await testPath(200, '/sub/another', 'Sub Another Page');
|
||||||
|
await testPath(200, '/style.css', 'body { color: green }');
|
||||||
|
await testPath(308, '/index.html', 'Redirecting to / (308)', {
|
||||||
|
Location: '/',
|
||||||
|
});
|
||||||
|
await testPath(308, '/about.html', 'Redirecting to /about (308)', {
|
||||||
|
Location: '/about',
|
||||||
|
});
|
||||||
|
await testPath(308, '/sub/index.html', 'Redirecting to /sub (308)', {
|
||||||
|
Location: '/sub',
|
||||||
|
});
|
||||||
|
await testPath(
|
||||||
|
308,
|
||||||
|
'/sub/another.html',
|
||||||
|
'Redirecting to /sub/another (308)',
|
||||||
|
{ Location: '/sub/another' }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] should serve custom 404 when `cleanUrls: true`',
|
||||||
|
testFixtureStdio('test-clean-urls-custom-404', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', 'This is the home page');
|
||||||
|
await testPath(200, '/about', 'The about page');
|
||||||
|
await testPath(200, '/contact/me', 'Contact Me Subdirectory');
|
||||||
|
await testPath(404, '/nothing', 'Custom 404 Page');
|
||||||
|
await testPath(404, '/nothing/', 'Custom 404 Page');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] test cleanUrls and trailingSlash serve correct content',
|
||||||
|
testFixtureStdio('test-clean-urls-trailing-slash', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', 'Index Page');
|
||||||
|
await testPath(200, '/about/', 'About Page');
|
||||||
|
await testPath(200, '/sub/', 'Sub Index Page');
|
||||||
|
await testPath(200, '/sub/another/', 'Sub Another Page');
|
||||||
|
await testPath(200, '/style.css', 'body { color: green }');
|
||||||
|
//TODO: fix this test so that location is `/` instead of `//`
|
||||||
|
//await testPath(308, '/index.html', 'Redirecting to / (308)', { Location: '/' });
|
||||||
|
await testPath(308, '/about.html', 'Redirecting to /about/ (308)', {
|
||||||
|
Location: '/about/',
|
||||||
|
});
|
||||||
|
await testPath(308, '/sub/index.html', 'Redirecting to /sub/ (308)', {
|
||||||
|
Location: '/sub/',
|
||||||
|
});
|
||||||
|
await testPath(
|
||||||
|
308,
|
||||||
|
'/sub/another.html',
|
||||||
|
'Redirecting to /sub/another/ (308)',
|
||||||
|
{
|
||||||
|
Location: '/sub/another/',
|
||||||
|
}
|
||||||
|
);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] test cors headers work with OPTIONS',
|
||||||
|
testFixtureStdio('test-cors-routes', async (testPath: any) => {
|
||||||
|
const headers = {
|
||||||
|
'Access-Control-Allow-Origin': '*',
|
||||||
|
'Access-Control-Allow-Headers':
|
||||||
|
'Content-Type, Authorization, Accept, Content-Length, Origin, User-Agent',
|
||||||
|
'Access-Control-Allow-Methods':
|
||||||
|
'GET, POST, OPTIONS, HEAD, PATCH, PUT, DELETE',
|
||||||
|
};
|
||||||
|
await testPath(200, '/', 'status api', headers, { method: 'GET' });
|
||||||
|
await testPath(200, '/', 'status api', headers, { method: 'POST' });
|
||||||
|
await testPath(200, '/api/status.js', 'status api', headers, {
|
||||||
|
method: 'GET',
|
||||||
|
});
|
||||||
|
await testPath(200, '/api/status.js', 'status api', headers, {
|
||||||
|
method: 'POST',
|
||||||
|
});
|
||||||
|
await testPath(204, '/', '', headers, { method: 'OPTIONS' });
|
||||||
|
await testPath(204, '/api/status.js', '', headers, { method: 'OPTIONS' });
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] test trailingSlash true serve correct content',
|
||||||
|
testFixtureStdio('test-trailing-slash', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', 'Index Page');
|
||||||
|
await testPath(200, '/index.html', 'Index Page');
|
||||||
|
await testPath(200, '/about.html', 'About Page');
|
||||||
|
await testPath(200, '/sub/', 'Sub Index Page');
|
||||||
|
await testPath(200, '/sub/index.html', 'Sub Index Page');
|
||||||
|
await testPath(200, '/sub/another.html', 'Sub Another Page');
|
||||||
|
await testPath(200, '/style.css', 'body { color: green }');
|
||||||
|
await testPath(308, '/about.html/', 'Redirecting to /about.html (308)', {
|
||||||
|
Location: '/about.html',
|
||||||
|
});
|
||||||
|
await testPath(308, '/style.css/', 'Redirecting to /style.css (308)', {
|
||||||
|
Location: '/style.css',
|
||||||
|
});
|
||||||
|
await testPath(308, '/sub', 'Redirecting to /sub/ (308)', {
|
||||||
|
Location: '/sub/',
|
||||||
|
});
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] should serve custom 404 when `trailingSlash: true`',
|
||||||
|
testFixtureStdio('test-trailing-slash-custom-404', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', 'This is the home page');
|
||||||
|
await testPath(200, '/about.html', 'The about page');
|
||||||
|
await testPath(200, '/contact/', 'Contact Subdirectory');
|
||||||
|
await testPath(404, '/nothing/', 'Custom 404 Page');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] test trailingSlash false serve correct content',
|
||||||
|
testFixtureStdio('test-trailing-slash-false', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', 'Index Page');
|
||||||
|
await testPath(200, '/index.html', 'Index Page');
|
||||||
|
await testPath(200, '/about.html', 'About Page');
|
||||||
|
await testPath(200, '/sub', 'Sub Index Page');
|
||||||
|
await testPath(200, '/sub/index.html', 'Sub Index Page');
|
||||||
|
await testPath(200, '/sub/another.html', 'Sub Another Page');
|
||||||
|
await testPath(200, '/style.css', 'body { color: green }');
|
||||||
|
await testPath(308, '/about.html/', 'Redirecting to /about.html (308)', {
|
||||||
|
Location: '/about.html',
|
||||||
|
});
|
||||||
|
await testPath(308, '/sub/', 'Redirecting to /sub (308)', {
|
||||||
|
Location: '/sub',
|
||||||
|
});
|
||||||
|
await testPath(
|
||||||
|
308,
|
||||||
|
'/sub/another.html/',
|
||||||
|
'Redirecting to /sub/another.html (308)',
|
||||||
|
{
|
||||||
|
Location: '/sub/another.html',
|
||||||
|
}
|
||||||
|
);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] throw when invalid builder routes detected',
|
||||||
|
testFixtureStdio(
|
||||||
|
'invalid-builder-routes',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(
|
||||||
|
500,
|
||||||
|
'/',
|
||||||
|
/Route at index 0 has invalid `src` regular expression/m
|
||||||
|
);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] support legacy `@now` scope runtimes',
|
||||||
|
testFixtureStdio('legacy-now-runtime', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /A simple deployment with the Vercel API!/m);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 00-list-directory',
|
||||||
|
testFixtureStdio(
|
||||||
|
'00-list-directory',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Files within/m);
|
||||||
|
await testPath(200, '/', /test[0-3]\.txt/m);
|
||||||
|
await testPath(200, '/', /\.well-known/m);
|
||||||
|
await testPath(200, '/.well-known/keybase.txt', 'proof goes here');
|
||||||
|
},
|
||||||
|
{ projectSettings: { directoryListing: true } }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 01-node',
|
||||||
|
testFixtureStdio('01-node', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /A simple deployment with the Vercel API!/m);
|
||||||
|
})
|
||||||
|
);
|
||||||
348
packages/cli/test/dev/integration-3.test.ts
Normal file
348
packages/cli/test/dev/integration-3.test.ts
Normal file
@@ -0,0 +1,348 @@
|
|||||||
|
import { resolve, delimiter } from 'path';
|
||||||
|
|
||||||
|
const {
|
||||||
|
fetch,
|
||||||
|
sleep,
|
||||||
|
fixture,
|
||||||
|
isCanary,
|
||||||
|
shouldSkip,
|
||||||
|
testFixture,
|
||||||
|
fetchWithRetry,
|
||||||
|
testFixtureStdio,
|
||||||
|
validateResponseHeaders,
|
||||||
|
} = require('./utils.js');
|
||||||
|
|
||||||
|
// Angular has `engines: { node: "10.x" }` in its `package.json`
|
||||||
|
test('[vercel dev] 02-angular-node', async () => {
|
||||||
|
if (shouldSkip('02-angular-node', '10.x')) return;
|
||||||
|
|
||||||
|
const directory = fixture('02-angular-node');
|
||||||
|
const { dev, port } = await testFixture(directory, { stdio: 'pipe' }, [
|
||||||
|
'--debug',
|
||||||
|
]);
|
||||||
|
|
||||||
|
let stderr = '';
|
||||||
|
|
||||||
|
try {
|
||||||
|
dev.stderr.on('data', async (data: any) => {
|
||||||
|
stderr += data.toString();
|
||||||
|
});
|
||||||
|
|
||||||
|
// start `vercel dev` detached in child_process
|
||||||
|
dev.unref();
|
||||||
|
|
||||||
|
const response = await fetchWithRetry(`http://localhost:${port}`, {
|
||||||
|
retries: 180,
|
||||||
|
status: 200,
|
||||||
|
});
|
||||||
|
|
||||||
|
validateResponseHeaders(response);
|
||||||
|
|
||||||
|
const body = await response.text();
|
||||||
|
expect(body).toMatch(/Angular \+ Node.js API/m);
|
||||||
|
} finally {
|
||||||
|
dev.kill('SIGTERM');
|
||||||
|
}
|
||||||
|
|
||||||
|
await sleep(5000);
|
||||||
|
|
||||||
|
if (isCanary()) {
|
||||||
|
stderr.includes('@now/build-utils@canary');
|
||||||
|
} else {
|
||||||
|
stderr.includes('@now/build-utils@latest');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 03-aurelia',
|
||||||
|
testFixtureStdio(
|
||||||
|
'03-aurelia',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Aurelia Navigation Skeleton/m);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 04-create-react-app',
|
||||||
|
testFixtureStdio('04-create-react-app', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /React App/m);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
/*
|
||||||
|
test(
|
||||||
|
'[vercel dev] 05-gatsby',
|
||||||
|
testFixtureStdio('05-gatsby', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Gatsby Default Starter/m);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
*/
|
||||||
|
test(
|
||||||
|
'[vercel dev] 06-gridsome',
|
||||||
|
testFixtureStdio('06-gridsome', async (testPath: any) => {
|
||||||
|
await testPath(200, '/');
|
||||||
|
await testPath(200, '/about');
|
||||||
|
await testPath(308, '/support', 'Redirecting to /about?ref=support (308)', {
|
||||||
|
Location: '/about?ref=support',
|
||||||
|
});
|
||||||
|
// Bug with gridsome's dev server: https://github.com/gridsome/gridsome/issues/831
|
||||||
|
// Works in prod only so leave out for now
|
||||||
|
// await testPath(404, '/nothing');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 07-hexo-node',
|
||||||
|
testFixtureStdio('07-hexo-node', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Hexo \+ Node.js API/m);
|
||||||
|
await testPath(200, '/api/date', new RegExp(new Date().getFullYear() + ''));
|
||||||
|
await testPath(200, '/contact.html', /Contact Us/m);
|
||||||
|
await testPath(200, '/support', /Contact Us/m);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test('[vercel dev] 08-hugo', async () => {
|
||||||
|
if (process.platform === 'darwin') {
|
||||||
|
// Update PATH to find the Hugo executable installed via GH Actions
|
||||||
|
process.env.PATH = `${resolve(fixture('08-hugo'))}${delimiter}${
|
||||||
|
process.env.PATH
|
||||||
|
}`;
|
||||||
|
const tester = testFixtureStdio('08-hugo', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Hugo/m);
|
||||||
|
});
|
||||||
|
await tester();
|
||||||
|
} else {
|
||||||
|
console.log(`Skipping 08-hugo on platform ${process.platform}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 10-nextjs-node',
|
||||||
|
testFixtureStdio('10-nextjs-node', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Next.js \+ Node.js API/m);
|
||||||
|
await testPath(200, '/api/date', new RegExp(new Date().getFullYear() + ''));
|
||||||
|
await testPath(200, '/contact', /Contact Page/);
|
||||||
|
await testPath(200, '/support', /Contact Page/);
|
||||||
|
// TODO: Fix this test assertion that fails intermittently
|
||||||
|
// await testPath(404, '/nothing', /Custom Next 404/);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 10a-nextjs-routes',
|
||||||
|
testFixtureStdio('10a-nextjs-routes', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Next.js with routes/m);
|
||||||
|
await testPath(200, '/hello', /Hello Routes/m);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 12-polymer-node',
|
||||||
|
testFixtureStdio(
|
||||||
|
'12-polymer-node',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Polymer \+ Node.js API/m);
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
'/api/date',
|
||||||
|
new RegExp(new Date().getFullYear() + '')
|
||||||
|
);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 13-preact-node',
|
||||||
|
testFixtureStdio(
|
||||||
|
'13-preact-node',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Preact/m);
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
'/api/date',
|
||||||
|
new RegExp(new Date().getFullYear() + '')
|
||||||
|
);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 14-svelte-node',
|
||||||
|
testFixtureStdio(
|
||||||
|
'14-svelte-node',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Svelte/m);
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
'/api/date',
|
||||||
|
new RegExp(new Date().getFullYear() + '')
|
||||||
|
);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 16-vue-node',
|
||||||
|
testFixtureStdio(
|
||||||
|
'16-vue-node',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Vue.js \+ Node.js API/m);
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
'/api/date',
|
||||||
|
new RegExp(new Date().getFullYear() + '')
|
||||||
|
);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 17-vuepress-node',
|
||||||
|
testFixtureStdio(
|
||||||
|
'17-vuepress-node',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /VuePress \+ Node.js API/m);
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
'/api/date',
|
||||||
|
new RegExp(new Date().getFullYear() + '')
|
||||||
|
);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] double slashes redirect',
|
||||||
|
testFixtureStdio(
|
||||||
|
'01-node',
|
||||||
|
async (_testPath: any, port: any) => {
|
||||||
|
{
|
||||||
|
const res = await fetch(`http://localhost:${port}////?foo=bar`, {
|
||||||
|
redirect: 'manual',
|
||||||
|
});
|
||||||
|
|
||||||
|
validateResponseHeaders(res);
|
||||||
|
|
||||||
|
const body = await res.text();
|
||||||
|
expect(res.status).toBe(301);
|
||||||
|
expect(res.headers.get('location')).toBe(
|
||||||
|
`http://localhost:${port}/?foo=bar`
|
||||||
|
);
|
||||||
|
expect(body).toBe('Redirecting to /?foo=bar (301)\n');
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
const res = await fetch(`http://localhost:${port}///api////date.js`, {
|
||||||
|
method: 'POST',
|
||||||
|
redirect: 'manual',
|
||||||
|
});
|
||||||
|
|
||||||
|
validateResponseHeaders(res);
|
||||||
|
|
||||||
|
const body = await res.text();
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
expect(
|
||||||
|
body.startsWith('January') ||
|
||||||
|
body.startsWith('February') ||
|
||||||
|
body.startsWith('March') ||
|
||||||
|
body.startsWith('April') ||
|
||||||
|
body.startsWith('May') ||
|
||||||
|
body.startsWith('June') ||
|
||||||
|
body.startsWith('July') ||
|
||||||
|
body.startsWith('August') ||
|
||||||
|
body.startsWith('September') ||
|
||||||
|
body.startsWith('October') ||
|
||||||
|
body.startsWith('November') ||
|
||||||
|
body.startsWith('December')
|
||||||
|
).toBeTruthy();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 18-marko',
|
||||||
|
testFixtureStdio(
|
||||||
|
'18-marko',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Marko Starter/m);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 19-mithril',
|
||||||
|
testFixtureStdio(
|
||||||
|
'19-mithril',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Mithril on Vercel/m);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 20-riot',
|
||||||
|
testFixtureStdio(
|
||||||
|
'20-riot',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Riot on Vercel/m);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 21-charge',
|
||||||
|
testFixtureStdio(
|
||||||
|
'21-charge',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Welcome to my new Charge site/m);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 22-brunch',
|
||||||
|
testFixtureStdio(
|
||||||
|
'22-brunch',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Bon Appétit./m);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 23-docusaurus',
|
||||||
|
testFixtureStdio(
|
||||||
|
'23-docusaurus',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /My Site/m);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test('[vercel dev] 24-ember', async () => {
|
||||||
|
if (shouldSkip('24-ember', '>^6.14.0 || ^8.10.0 || >=9.10.0')) return;
|
||||||
|
|
||||||
|
const tester = testFixtureStdio(
|
||||||
|
'24-ember',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /HelloWorld/m);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
);
|
||||||
|
|
||||||
|
await tester();
|
||||||
|
});
|
||||||
427
packages/cli/test/dev/integration-4.test.ts
Normal file
427
packages/cli/test/dev/integration-4.test.ts
Normal file
@@ -0,0 +1,427 @@
|
|||||||
|
import ms from 'ms';
|
||||||
|
import fs from 'fs-extra';
|
||||||
|
import { isIP } from 'net';
|
||||||
|
import { join } from 'path';
|
||||||
|
|
||||||
|
const {
|
||||||
|
fetch,
|
||||||
|
sleep,
|
||||||
|
fixture,
|
||||||
|
testFixture,
|
||||||
|
testFixtureStdio,
|
||||||
|
validateResponseHeaders,
|
||||||
|
} = require('./utils.js');
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] temporary directory listing',
|
||||||
|
testFixtureStdio(
|
||||||
|
'temporary-directory-listing',
|
||||||
|
async (_testPath: any, port: any) => {
|
||||||
|
const directory = fixture('temporary-directory-listing');
|
||||||
|
await fs.unlink(join(directory, 'index.txt')).catch(() => null);
|
||||||
|
|
||||||
|
await sleep(ms('20s'));
|
||||||
|
|
||||||
|
const firstResponse = await fetch(`http://localhost:${port}`);
|
||||||
|
validateResponseHeaders(firstResponse);
|
||||||
|
const body = await firstResponse.text();
|
||||||
|
console.log(body);
|
||||||
|
expect(firstResponse.status).toBe(404);
|
||||||
|
|
||||||
|
await fs.writeFile(join(directory, 'index.txt'), 'hello');
|
||||||
|
|
||||||
|
for (let i = 0; i < 20; i++) {
|
||||||
|
const response = await fetch(`http://localhost:${port}`);
|
||||||
|
validateResponseHeaders(response);
|
||||||
|
|
||||||
|
if (response.status === 200) {
|
||||||
|
const body = await response.text();
|
||||||
|
expect(body).toBe('hello');
|
||||||
|
}
|
||||||
|
|
||||||
|
await sleep(ms('1s'));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test('[vercel dev] add a `package.json` to trigger `@vercel/static-build`', async () => {
|
||||||
|
const directory = fixture('trigger-static-build');
|
||||||
|
|
||||||
|
await fs.unlink(join(directory, 'package.json')).catch(() => null);
|
||||||
|
|
||||||
|
await fs.unlink(join(directory, 'public', 'index.txt')).catch(() => null);
|
||||||
|
|
||||||
|
await fs.rmdir(join(directory, 'public')).catch(() => null);
|
||||||
|
|
||||||
|
const tester = testFixtureStdio(
|
||||||
|
'trigger-static-build',
|
||||||
|
async (_testPath: any, port: any) => {
|
||||||
|
{
|
||||||
|
const response = await fetch(`http://localhost:${port}`);
|
||||||
|
validateResponseHeaders(response);
|
||||||
|
const body = await response.text();
|
||||||
|
expect(body.trim()).toBe('hello:index.txt');
|
||||||
|
}
|
||||||
|
|
||||||
|
const rnd = Math.random().toString();
|
||||||
|
const pkg = {
|
||||||
|
private: true,
|
||||||
|
scripts: { build: `mkdir -p public && echo ${rnd} > public/index.txt` },
|
||||||
|
};
|
||||||
|
|
||||||
|
await fs.writeFile(join(directory, 'package.json'), JSON.stringify(pkg));
|
||||||
|
|
||||||
|
// Wait until file events have been processed
|
||||||
|
await sleep(ms('2s'));
|
||||||
|
|
||||||
|
{
|
||||||
|
const response = await fetch(`http://localhost:${port}`);
|
||||||
|
validateResponseHeaders(response);
|
||||||
|
const body = await response.text();
|
||||||
|
expect(body.trim()).toBe(rnd);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
);
|
||||||
|
|
||||||
|
await tester();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('[vercel dev] no build matches warning', async () => {
|
||||||
|
const directory = fixture('no-build-matches');
|
||||||
|
const { dev } = await testFixture(directory, {
|
||||||
|
stdio: ['ignore', 'pipe', 'pipe'],
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
// start `vercel dev` detached in child_process
|
||||||
|
dev.unref();
|
||||||
|
|
||||||
|
dev.stderr.setEncoding('utf8');
|
||||||
|
await new Promise<void>(resolve => {
|
||||||
|
dev.stderr.on('data', (str: string) => {
|
||||||
|
if (str.includes('did not match any source files')) {
|
||||||
|
resolve();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
dev.kill('SIGTERM');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] do not recursivly check the path',
|
||||||
|
testFixtureStdio('handle-filesystem-missing', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /hello/m);
|
||||||
|
await testPath(404, '/favicon.txt');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test('[vercel dev] render warning for empty cwd dir', async () => {
|
||||||
|
const directory = fixture('empty');
|
||||||
|
const { dev, port } = await testFixture(directory, {
|
||||||
|
stdio: ['ignore', 'pipe', 'pipe'],
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
dev.unref();
|
||||||
|
|
||||||
|
// Monitor `stderr` for the warning
|
||||||
|
dev.stderr.setEncoding('utf8');
|
||||||
|
const msg = 'There are no files inside your deployment.';
|
||||||
|
await new Promise<void>(resolve => {
|
||||||
|
dev.stderr.on('data', (str: string) => {
|
||||||
|
if (str.includes(msg)) {
|
||||||
|
resolve();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Issue a request to ensure a 404 response
|
||||||
|
await sleep(ms('3s'));
|
||||||
|
const response = await fetch(`http://localhost:${port}`);
|
||||||
|
validateResponseHeaders(response);
|
||||||
|
expect(response.status).toBe(404);
|
||||||
|
} finally {
|
||||||
|
dev.kill('SIGTERM');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('[vercel dev] do not rebuild for changes in the output directory', async () => {
|
||||||
|
const directory = fixture('output-is-source');
|
||||||
|
|
||||||
|
const { dev, port } = await testFixture(directory, {
|
||||||
|
stdio: ['ignore', 'pipe', 'pipe'],
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
dev.unref();
|
||||||
|
|
||||||
|
let stderr: any = [];
|
||||||
|
const start = Date.now();
|
||||||
|
|
||||||
|
dev.stderr.on('data', (str: any) => stderr.push(str));
|
||||||
|
|
||||||
|
while (stderr.join('').includes('Ready') === false) {
|
||||||
|
await sleep(ms('3s'));
|
||||||
|
|
||||||
|
if (Date.now() - start > ms('30s')) {
|
||||||
|
console.log('stderr:', stderr.join(''));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const resp1 = await fetch(`http://localhost:${port}`);
|
||||||
|
const text1 = await resp1.text();
|
||||||
|
expect(text1.trim()).toBe('hello first');
|
||||||
|
|
||||||
|
await fs.writeFile(join(directory, 'public', 'index.html'), 'hello second');
|
||||||
|
|
||||||
|
await sleep(ms('3s'));
|
||||||
|
|
||||||
|
const resp2 = await fetch(`http://localhost:${port}`);
|
||||||
|
const text2 = await resp2.text();
|
||||||
|
expect(text2.trim()).toBe('hello second');
|
||||||
|
} finally {
|
||||||
|
dev.kill('SIGTERM');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 25-nextjs-src-dir',
|
||||||
|
testFixtureStdio('25-nextjs-src-dir', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Next.js \+ Node.js API/m);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 27-zero-config-env',
|
||||||
|
testFixtureStdio(
|
||||||
|
'27-zero-config-env',
|
||||||
|
async (testPath: any) => {
|
||||||
|
await testPath(200, '/api/print', /build-and-runtime/m);
|
||||||
|
await testPath(200, '/', /build-and-runtime/m);
|
||||||
|
},
|
||||||
|
{ skipDeploy: true }
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 28-vercel-json-and-ignore',
|
||||||
|
testFixtureStdio('28-vercel-json-and-ignore', async (testPath: any) => {
|
||||||
|
await testPath(200, '/api/one', 'One');
|
||||||
|
await testPath(404, '/api/two');
|
||||||
|
await testPath(200, '/api/three', 'One');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 30-next-image-optimization',
|
||||||
|
testFixtureStdio('30-next-image-optimization', async (testPath: any) => {
|
||||||
|
const toUrl = (url: any, w: any, q: any) => {
|
||||||
|
// @ts-ignore
|
||||||
|
const query = new URLSearchParams();
|
||||||
|
query.append('url', url);
|
||||||
|
query.append('w', w);
|
||||||
|
query.append('q', q);
|
||||||
|
return `/_next/image?${query}`;
|
||||||
|
};
|
||||||
|
|
||||||
|
const expectHeader = (accept: any) => ({
|
||||||
|
'content-type': accept,
|
||||||
|
'cache-control': 'public, max-age=0, must-revalidate',
|
||||||
|
});
|
||||||
|
const fetchOpts = (accept: any) => ({ method: 'GET', headers: { accept } });
|
||||||
|
await testPath(200, '/', /Home Page/m);
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
toUrl('/test.jpg', 64, 100),
|
||||||
|
null,
|
||||||
|
expectHeader('image/webp'),
|
||||||
|
fetchOpts('image/webp')
|
||||||
|
);
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
toUrl('/test.png', 64, 90),
|
||||||
|
null,
|
||||||
|
expectHeader('image/webp'),
|
||||||
|
fetchOpts('image/webp')
|
||||||
|
);
|
||||||
|
/*
|
||||||
|
* Disabled gif in https://github.com/vercel/next.js/pull/22253
|
||||||
|
* Eventually we should enable again when `next dev` supports it
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
toUrl('/test.gif', 64, 80),
|
||||||
|
null,
|
||||||
|
expectHeader('image/webp'),
|
||||||
|
fetchOpts('image/webp')
|
||||||
|
);
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
* Disabled svg in https://github.com/vercel/next.js/pull/34431
|
||||||
|
* We can test for 400 status since config option is not enabled.
|
||||||
|
*/
|
||||||
|
await testPath(400, toUrl('/test.svg', 64, 70));
|
||||||
|
/* Disabled bmp because `next dev` bypasses
|
||||||
|
* and production will convert. Eventually
|
||||||
|
* we can enable once `next dev` supports it.
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
toUrl('/test.bmp', 64, 50),
|
||||||
|
null,
|
||||||
|
expectHeader('image/bmp'),
|
||||||
|
fetchOpts('image/webp')
|
||||||
|
);
|
||||||
|
*/
|
||||||
|
// animated gif should bypass: serve as-is
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
toUrl('/animated.gif', 64, 60),
|
||||||
|
null,
|
||||||
|
expectHeader('image/gif'),
|
||||||
|
fetchOpts('image/webp')
|
||||||
|
);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 40-mixed-modules',
|
||||||
|
testFixtureStdio('40-mixed-modules', async (testPath: any) => {
|
||||||
|
await testPath(200, '/entrypoint.js', 'mixed-modules:js');
|
||||||
|
await testPath(200, '/entrypoint.mjs', 'mixed-modules:mjs');
|
||||||
|
await testPath(200, '/entrypoint.ts', 'mixed-modules:ts');
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
'/type-module-package-json/auto.js',
|
||||||
|
'mixed-modules:auto'
|
||||||
|
);
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
'/type-module-package-json/nested/also.js',
|
||||||
|
'mixed-modules:also'
|
||||||
|
);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] 41-tsconfig-jsx',
|
||||||
|
testFixtureStdio('41-tsconfig-jsx', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /Solid App/m);
|
||||||
|
await testPath(200, '/api/test', 'working');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] Use `@vercel/python` with Flask requirements.txt',
|
||||||
|
testFixtureStdio('python-flask', async (testPath: any) => {
|
||||||
|
const name = 'Alice';
|
||||||
|
const year = new Date().getFullYear();
|
||||||
|
await testPath(200, `/api/user?name=${name}`, new RegExp(`Hello ${name}`));
|
||||||
|
await testPath(200, `/api/date`, new RegExp(`Current date is ${year}`));
|
||||||
|
await testPath(200, `/api/date.py`, new RegExp(`Current date is ${year}`));
|
||||||
|
await testPath(200, `/api/headers`, (body: any, res: any) => {
|
||||||
|
// @ts-ignore
|
||||||
|
const { host } = new URL(res.url);
|
||||||
|
expect(body).toBe(host);
|
||||||
|
});
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] Use custom runtime from the "functions" property',
|
||||||
|
testFixtureStdio('custom-runtime', async (testPath: any) => {
|
||||||
|
await testPath(200, `/api/user`, /Hello, from Bash!/m);
|
||||||
|
await testPath(200, `/api/user.sh`, /Hello, from Bash!/m);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] Should work with nested `tsconfig.json` files',
|
||||||
|
testFixtureStdio('nested-tsconfig', async (testPath: any) => {
|
||||||
|
await testPath(200, `/`, /Nested tsconfig.json test page/);
|
||||||
|
await testPath(200, `/api`, 'Nested `tsconfig.json` API endpoint');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] Should force `tsc` option "module: commonjs" for `startDevServer()`',
|
||||||
|
testFixtureStdio('force-module-commonjs', async (testPath: any) => {
|
||||||
|
await testPath(200, `/`, /Force "module: commonjs" test page/);
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
`/api`,
|
||||||
|
'Force "module: commonjs" JavaScript with ES Modules API endpoint'
|
||||||
|
);
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
`/api/ts`,
|
||||||
|
'Force "module: commonjs" TypeScript API endpoint'
|
||||||
|
);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] should prioritize index.html over other file named index.*',
|
||||||
|
testFixtureStdio('index-html-priority', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', 'This is index.html');
|
||||||
|
await testPath(200, '/index.css', 'This is index.css');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] Should support `*.go` API serverless functions',
|
||||||
|
testFixtureStdio('go', async (testPath: any) => {
|
||||||
|
await testPath(200, `/api`, 'This is the index page');
|
||||||
|
await testPath(200, `/api/index`, 'This is the index page');
|
||||||
|
await testPath(200, `/api/index.go`, 'This is the index page');
|
||||||
|
await testPath(200, `/api/another`, 'This is another page');
|
||||||
|
await testPath(200, '/api/another.go', 'This is another page');
|
||||||
|
await testPath(200, `/api/foo`, 'Req Path: /api/foo');
|
||||||
|
await testPath(200, `/api/bar`, 'Req Path: /api/bar');
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] Should set the `ts-node` "target" to match Node.js version',
|
||||||
|
testFixtureStdio('node-ts-node-target', async (testPath: any) => {
|
||||||
|
await testPath(200, `/api/subclass`, '{"ok":true}');
|
||||||
|
await testPath(
|
||||||
|
200,
|
||||||
|
`/api/array`,
|
||||||
|
'{"months":[1,2,3,4,5,6,7,8,9,10,11,12]}'
|
||||||
|
);
|
||||||
|
|
||||||
|
await testPath(200, `/api/dump`, (body: any, res: any, isDev: any) => {
|
||||||
|
// @ts-ignore
|
||||||
|
const { host } = new URL(res.url);
|
||||||
|
const { env, headers } = JSON.parse(body);
|
||||||
|
|
||||||
|
// Test that the API endpoint receives the Vercel proxy request headers
|
||||||
|
expect(headers['x-forwarded-host']).toBe(host);
|
||||||
|
expect(headers['x-vercel-deployment-url']).toBe(host);
|
||||||
|
expect(isIP(headers['x-real-ip'])).toBeTruthy();
|
||||||
|
expect(isIP(headers['x-forwarded-for'])).toBeTruthy();
|
||||||
|
expect(isIP(headers['x-vercel-forwarded-for'])).toBeTruthy();
|
||||||
|
|
||||||
|
// Test that the API endpoint has the Vercel platform env vars defined.
|
||||||
|
expect(env.NOW_REGION).toMatch(/^[a-z]{3}\d$/);
|
||||||
|
if (isDev) {
|
||||||
|
// Only dev is tested because in production these are opt-in.
|
||||||
|
expect(env.VERCEL_URL).toBe(host);
|
||||||
|
expect(env.VERCEL_REGION).toBe('dev1');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'[vercel dev] Do not fail if `src` is missing',
|
||||||
|
testFixtureStdio('missing-src-property', async (testPath: any) => {
|
||||||
|
await testPath(200, '/', /hello:index.txt/m);
|
||||||
|
await testPath(404, '/i-do-not-exist');
|
||||||
|
})
|
||||||
|
);
|
||||||
File diff suppressed because it is too large
Load Diff
495
packages/cli/test/dev/utils.js
Normal file
495
packages/cli/test/dev/utils.js
Normal file
@@ -0,0 +1,495 @@
|
|||||||
|
const fs = require('fs-extra');
|
||||||
|
const { join, resolve } = require('path');
|
||||||
|
const _execa = require('execa');
|
||||||
|
const fetch = require('node-fetch');
|
||||||
|
const retry = require('async-retry');
|
||||||
|
const { satisfies } = require('semver');
|
||||||
|
const stripAnsi = require('strip-ansi');
|
||||||
|
const { getDistTag } = require('../../src/util/get-dist-tag');
|
||||||
|
const { version: cliVersion } = require('../../package.json');
|
||||||
|
const {
|
||||||
|
fetchCachedToken,
|
||||||
|
} = require('../../../../test/lib/deployment/now-deploy');
|
||||||
|
|
||||||
|
jest.setTimeout(6 * 60 * 1000);
|
||||||
|
|
||||||
|
const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
|
||||||
|
const isCanary = () => getDistTag(cliVersion) === 'canary';
|
||||||
|
|
||||||
|
let port = 3000;
|
||||||
|
|
||||||
|
const binaryPath = resolve(__dirname, `../../scripts/start.js`);
|
||||||
|
const fixture = name => join('test', 'dev', 'fixtures', name);
|
||||||
|
const fixtureAbsolute = name => join(__dirname, 'fixtures', name);
|
||||||
|
const exampleAbsolute = name =>
|
||||||
|
join(__dirname, '..', '..', '..', '..', 'examples', name);
|
||||||
|
|
||||||
|
let processCounter = 0;
|
||||||
|
const processList = new Map();
|
||||||
|
|
||||||
|
function execa(...args) {
|
||||||
|
const procId = ++processCounter;
|
||||||
|
const child = _execa(...args);
|
||||||
|
|
||||||
|
processList.set(procId, child);
|
||||||
|
child.on('exit', () => processList.delete(procId));
|
||||||
|
|
||||||
|
return child;
|
||||||
|
}
|
||||||
|
|
||||||
|
function fetchWithRetry(url, opts = {}) {
|
||||||
|
return retry(
|
||||||
|
async () => {
|
||||||
|
const res = await fetch(url, opts);
|
||||||
|
|
||||||
|
if (res.status !== opts.status) {
|
||||||
|
const text = await res.text();
|
||||||
|
throw new Error(
|
||||||
|
`Failed to fetch ${url} with status ${res.status} (expected ${opts.status}):\n\n${text}\n\n`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return res;
|
||||||
|
},
|
||||||
|
{
|
||||||
|
retries: opts.retries || 3,
|
||||||
|
factor: 1,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function createResolver() {
|
||||||
|
let resolver;
|
||||||
|
const p = new Promise(res => (resolver = res));
|
||||||
|
p.resolve = resolver;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatOutput({ stderr, stdout }) {
|
||||||
|
return `Received:\n"${stderr}"\n"${stdout}"`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function printOutput(fixture, stdout, stderr) {
|
||||||
|
const lines = (
|
||||||
|
`\nOutput for "${fixture}"\n` +
|
||||||
|
`\n----- stdout -----\n` +
|
||||||
|
stdout +
|
||||||
|
`\n----- stderr -----\n` +
|
||||||
|
stderr
|
||||||
|
).split('\n');
|
||||||
|
|
||||||
|
const getPrefix = nr => {
|
||||||
|
return nr === 0 ? '╭' : nr === lines.length - 1 ? '╰' : '│';
|
||||||
|
};
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
lines.map((line, index) => ` ${getPrefix(index)} ${line}`).join('\n')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function shouldSkip(name, versions) {
|
||||||
|
if (!satisfies(process.version, versions)) {
|
||||||
|
console.log(`Skipping "${name}" because it requires "${versions}".`);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
function validateResponseHeaders(res) {
|
||||||
|
if (res.status < 500) {
|
||||||
|
expect(res.headers.get('x-vercel-id')).toBeTruthy();
|
||||||
|
expect(res.headers.get('cache-control').length > 0).toBeTruthy;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function exec(directory, args = []) {
|
||||||
|
const token = await fetchCachedToken();
|
||||||
|
return execa(
|
||||||
|
binaryPath,
|
||||||
|
[
|
||||||
|
'dev',
|
||||||
|
directory,
|
||||||
|
'-t',
|
||||||
|
token,
|
||||||
|
...(process.env.VERCEL_TEAM_ID
|
||||||
|
? ['--scope', process.env.VERCEL_TEAM_ID]
|
||||||
|
: []),
|
||||||
|
...args,
|
||||||
|
],
|
||||||
|
{
|
||||||
|
reject: false,
|
||||||
|
shell: true,
|
||||||
|
env: { __VERCEL_SKIP_DEV_CMD: 1 },
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function runNpmInstall(fixturePath) {
|
||||||
|
if (await fs.pathExists(join(fixturePath, 'package.json'))) {
|
||||||
|
await execa('yarn', ['install'], {
|
||||||
|
cwd: fixturePath,
|
||||||
|
shell: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function testPath(
|
||||||
|
isDev,
|
||||||
|
origin,
|
||||||
|
status,
|
||||||
|
path,
|
||||||
|
expectedText,
|
||||||
|
expectedHeaders = {},
|
||||||
|
fetchOpts = {}
|
||||||
|
) {
|
||||||
|
const opts = {
|
||||||
|
...fetchOpts,
|
||||||
|
redirect: 'manual-dont-change',
|
||||||
|
retries: 5,
|
||||||
|
status,
|
||||||
|
};
|
||||||
|
const url = `${origin}${path}`;
|
||||||
|
const res = await fetchWithRetry(url, opts);
|
||||||
|
const msg = `Testing response from ${fetchOpts.method || 'GET'} ${url}`;
|
||||||
|
console.log(msg);
|
||||||
|
expect(res.status).toBe(status);
|
||||||
|
validateResponseHeaders(res);
|
||||||
|
if (typeof expectedText === 'string') {
|
||||||
|
const actualText = await res.text();
|
||||||
|
expect(actualText.trim()).toBe(expectedText.trim());
|
||||||
|
} else if (typeof expectedText === 'function') {
|
||||||
|
const actualText = await res.text();
|
||||||
|
await expectedText(actualText, res, isDev);
|
||||||
|
} else if (expectedText instanceof RegExp) {
|
||||||
|
const actualText = await res.text();
|
||||||
|
expectedText.lastIndex = 0; // reset since we test twice
|
||||||
|
expect(actualText).toMatch(expectedText);
|
||||||
|
}
|
||||||
|
if (expectedHeaders) {
|
||||||
|
Object.entries(expectedHeaders).forEach(([key, expectedValue]) => {
|
||||||
|
let actualValue = res.headers.get(key);
|
||||||
|
if (key.toLowerCase() === 'location' && actualValue === '//') {
|
||||||
|
// HACK: `node-fetch` has strange behavior for location header so fix it
|
||||||
|
// with `manual-dont-change` opt and convert double slash to single.
|
||||||
|
// See https://github.com/node-fetch/node-fetch/issues/417#issuecomment-587233352
|
||||||
|
actualValue = '/';
|
||||||
|
}
|
||||||
|
expect(actualValue).toBe(expectedValue);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function testFixture(directory, opts = {}, args = []) {
|
||||||
|
await runNpmInstall(directory);
|
||||||
|
|
||||||
|
const token = await fetchCachedToken();
|
||||||
|
const dev = execa(
|
||||||
|
binaryPath,
|
||||||
|
[
|
||||||
|
'dev',
|
||||||
|
directory,
|
||||||
|
'-t',
|
||||||
|
token,
|
||||||
|
...(process.env.VERCEL_TEAM_ID
|
||||||
|
? ['--scope', process.env.VERCEL_TEAM_ID]
|
||||||
|
: []),
|
||||||
|
'-l',
|
||||||
|
String(port),
|
||||||
|
...args,
|
||||||
|
],
|
||||||
|
{
|
||||||
|
reject: false,
|
||||||
|
detached: true,
|
||||||
|
shell: true,
|
||||||
|
stdio: 'pipe',
|
||||||
|
...opts,
|
||||||
|
env: { ...opts.env, __VERCEL_SKIP_DEV_CMD: 1 },
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
let stdout = '';
|
||||||
|
let stderr = '';
|
||||||
|
const readyResolver = createResolver();
|
||||||
|
const exitResolver = createResolver();
|
||||||
|
|
||||||
|
dev.stdout.setEncoding('utf8');
|
||||||
|
dev.stderr.setEncoding('utf8');
|
||||||
|
|
||||||
|
dev.stdout.on('data', data => {
|
||||||
|
stdout += data;
|
||||||
|
});
|
||||||
|
dev.stderr.on('data', data => {
|
||||||
|
stderr += data;
|
||||||
|
|
||||||
|
if (stripAnsi(stderr).includes('Ready! Available at')) {
|
||||||
|
readyResolver.resolve();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let printedOutput = false;
|
||||||
|
|
||||||
|
dev.on('exit', () => {
|
||||||
|
if (!printedOutput) {
|
||||||
|
printOutput(directory, stdout, stderr);
|
||||||
|
printedOutput = true;
|
||||||
|
}
|
||||||
|
exitResolver.resolve();
|
||||||
|
readyResolver.resolve();
|
||||||
|
});
|
||||||
|
|
||||||
|
dev.on('error', () => {
|
||||||
|
if (!printedOutput) {
|
||||||
|
printOutput(directory, stdout, stderr);
|
||||||
|
printedOutput = true;
|
||||||
|
}
|
||||||
|
exitResolver.resolve();
|
||||||
|
readyResolver.resolve();
|
||||||
|
});
|
||||||
|
|
||||||
|
dev._kill = dev.kill;
|
||||||
|
dev.kill = async (...args) => {
|
||||||
|
dev._kill(...args);
|
||||||
|
await exitResolver;
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
dev,
|
||||||
|
port,
|
||||||
|
readyResolver,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function testFixtureStdio(
|
||||||
|
directory,
|
||||||
|
fn,
|
||||||
|
{ expectedCode = 0, skipDeploy, isExample, projectSettings } = {}
|
||||||
|
) {
|
||||||
|
return async () => {
|
||||||
|
const nodeMajor = Number(process.versions.node.split('.')[0]);
|
||||||
|
if (isExample && nodeMajor < 12) {
|
||||||
|
console.log(`Skipping ${directory} on Node ${process.version}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const cwd = isExample
|
||||||
|
? exampleAbsolute(directory)
|
||||||
|
: fixtureAbsolute(directory);
|
||||||
|
const token = await fetchCachedToken();
|
||||||
|
let deploymentUrl;
|
||||||
|
|
||||||
|
// Deploy fixture and link project
|
||||||
|
if (!skipDeploy) {
|
||||||
|
const projectJsonPath = join(cwd, '.vercel', 'project.json');
|
||||||
|
await fs.remove(projectJsonPath);
|
||||||
|
const gitignore = join(cwd, '.gitignore');
|
||||||
|
const hasGitignore = await fs.pathExists(gitignore);
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Run `vc link`
|
||||||
|
const linkResult = await execa(
|
||||||
|
binaryPath,
|
||||||
|
[
|
||||||
|
'-t',
|
||||||
|
token,
|
||||||
|
...(process.env.VERCEL_TEAM_ID
|
||||||
|
? ['--scope', process.env.VERCEL_TEAM_ID]
|
||||||
|
: []),
|
||||||
|
'link',
|
||||||
|
'--confirm',
|
||||||
|
],
|
||||||
|
{ cwd, stdio: 'pipe', reject: false }
|
||||||
|
);
|
||||||
|
console.log({
|
||||||
|
stderr: linkResult.stderr,
|
||||||
|
stdout: linkResult.stdout,
|
||||||
|
});
|
||||||
|
expect(linkResult.exitCode).toBe(0);
|
||||||
|
|
||||||
|
// Patch the project with any non-default properties
|
||||||
|
if (projectSettings) {
|
||||||
|
const { projectId } = await fs.readJson(projectJsonPath);
|
||||||
|
const res = await fetchWithRetry(
|
||||||
|
`https://api.vercel.com/v2/projects/${projectId}${
|
||||||
|
process.env.VERCEL_TEAM_ID
|
||||||
|
? `?teamId=${process.env.VERCEL_TEAM_ID}`
|
||||||
|
: ''
|
||||||
|
}`,
|
||||||
|
{
|
||||||
|
method: 'PATCH',
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${token}`,
|
||||||
|
},
|
||||||
|
body: JSON.stringify(projectSettings),
|
||||||
|
retries: 3,
|
||||||
|
status: 200,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Run `vc deploy`
|
||||||
|
let deployResult = await execa(
|
||||||
|
binaryPath,
|
||||||
|
[
|
||||||
|
'-t',
|
||||||
|
token,
|
||||||
|
...(process.env.VERCEL_TEAM_ID
|
||||||
|
? ['--scope', process.env.VERCEL_TEAM_ID]
|
||||||
|
: []),
|
||||||
|
'deploy',
|
||||||
|
'--public',
|
||||||
|
'--no-clipboard',
|
||||||
|
'--debug',
|
||||||
|
],
|
||||||
|
{ cwd, stdio: 'pipe', reject: false }
|
||||||
|
);
|
||||||
|
console.log({
|
||||||
|
exitCode: deployResult.exitCode,
|
||||||
|
stdout: deployResult.stdout,
|
||||||
|
stderr: deployResult.stderr,
|
||||||
|
});
|
||||||
|
expect(deployResult.exitCode).toBe(expectedCode);
|
||||||
|
if (expectedCode === 0) {
|
||||||
|
deploymentUrl = new URL(deployResult.stdout).host;
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
if (!hasGitignore) {
|
||||||
|
await fs.remove(gitignore);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start dev
|
||||||
|
let dev;
|
||||||
|
|
||||||
|
await runNpmInstall(cwd);
|
||||||
|
|
||||||
|
let stdout = '';
|
||||||
|
let stderr = '';
|
||||||
|
const readyResolver = createResolver();
|
||||||
|
const exitResolver = createResolver();
|
||||||
|
|
||||||
|
try {
|
||||||
|
let printedOutput = false;
|
||||||
|
|
||||||
|
const env = skipDeploy
|
||||||
|
? { ...process.env, __VERCEL_SKIP_DEV_CMD: 1 }
|
||||||
|
: process.env;
|
||||||
|
dev = execa(
|
||||||
|
binaryPath,
|
||||||
|
[
|
||||||
|
'dev',
|
||||||
|
'-l',
|
||||||
|
port,
|
||||||
|
'-t',
|
||||||
|
token,
|
||||||
|
...(process.env.VERCEL_TEAM_ID
|
||||||
|
? ['--scope', process.env.VERCEL_TEAM_ID]
|
||||||
|
: []),
|
||||||
|
'--debug',
|
||||||
|
],
|
||||||
|
{
|
||||||
|
cwd,
|
||||||
|
env,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
dev.stdout.setEncoding('utf8');
|
||||||
|
dev.stderr.setEncoding('utf8');
|
||||||
|
|
||||||
|
dev.stdout.pipe(process.stdout);
|
||||||
|
dev.stderr.pipe(process.stderr);
|
||||||
|
|
||||||
|
dev.stdout.on('data', data => {
|
||||||
|
stdout += data;
|
||||||
|
});
|
||||||
|
|
||||||
|
dev.stderr.on('data', data => {
|
||||||
|
stderr += data;
|
||||||
|
|
||||||
|
if (stripAnsi(data).includes('Ready! Available at')) {
|
||||||
|
readyResolver.resolve();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stderr.includes(`Requested port ${port} is already in use`)) {
|
||||||
|
dev.kill('SIGTERM');
|
||||||
|
throw new Error(
|
||||||
|
`Failed for "${directory}" with port ${port} with stderr "${stderr}".`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stderr.includes('Command failed') || stderr.includes('Error!')) {
|
||||||
|
dev.kill('SIGTERM');
|
||||||
|
throw new Error(`Failed for "${directory}" with stderr "${stderr}".`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
dev.on('exit', () => {
|
||||||
|
if (!printedOutput) {
|
||||||
|
printOutput(directory, stdout, stderr);
|
||||||
|
printedOutput = true;
|
||||||
|
}
|
||||||
|
exitResolver.resolve();
|
||||||
|
});
|
||||||
|
|
||||||
|
dev.on('error', () => {
|
||||||
|
if (!printedOutput) {
|
||||||
|
printOutput(directory, stdout, stderr);
|
||||||
|
printedOutput = true;
|
||||||
|
}
|
||||||
|
exitResolver.resolve();
|
||||||
|
});
|
||||||
|
|
||||||
|
await readyResolver;
|
||||||
|
|
||||||
|
const helperTestPath = async (...args) => {
|
||||||
|
if (!skipDeploy) {
|
||||||
|
await testPath(false, `https://${deploymentUrl}`, ...args);
|
||||||
|
}
|
||||||
|
await testPath(true, `http://localhost:${port}`, ...args);
|
||||||
|
};
|
||||||
|
await fn(helperTestPath, port);
|
||||||
|
} finally {
|
||||||
|
dev.kill('SIGTERM');
|
||||||
|
await exitResolver;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
port = ++port;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
await Promise.all(
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
|
Array.from(processList).map(([_procId, proc]) => {
|
||||||
|
if (proc.killed === false) {
|
||||||
|
console.log(
|
||||||
|
`killing process ${proc.pid} "${proc.spawnargs.join(' ')}"`
|
||||||
|
);
|
||||||
|
|
||||||
|
try {
|
||||||
|
process.kill(proc.pid, 'SIGTERM');
|
||||||
|
} catch (err) {
|
||||||
|
// Was already killed
|
||||||
|
console.error(`Failed to kill process`, proc.pid, err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
sleep,
|
||||||
|
isCanary,
|
||||||
|
testPath,
|
||||||
|
testFixture,
|
||||||
|
testFixtureStdio,
|
||||||
|
exec,
|
||||||
|
formatOutput,
|
||||||
|
shouldSkip,
|
||||||
|
fixture,
|
||||||
|
fetch,
|
||||||
|
validateResponseHeaders,
|
||||||
|
};
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user