Skip to content

Commit

Permalink
Merge branch 'canary' into docs-ug78
Browse files Browse the repository at this point in the history
  • Loading branch information
leerob committed Jan 22, 2024
2 parents 04293e5 + 5f67de6 commit 43a2f0d
Show file tree
Hide file tree
Showing 14 changed files with 1,120 additions and 1,030 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/issue_validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
}
reproduction-comment: '.github/invalid-link.md'
reproduction-hosts: 'github.com,codesandbox.io'
reproduction-blocklist: 'github.com/vercel/next.js.*'
reproduction-blocklist: 'github.com/vercel/next.js.*,github.com/\\w*/?$,github.com'
reproduction-link-section: '### Link to the code that reproduces this issue(.*)### To Reproduce'
reproduction-invalid-label: 'invalid link'
reproduction-issue-labels: 'template: bug'
72 changes: 36 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ swc_core = { version = "0.87.16", features = [
testing = { version = "0.35.14" }

# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.3" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240122.1" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.3" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240122.1" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.3" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240122.1" }

# General Deps

Expand Down
2 changes: 1 addition & 1 deletion packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0",
"@vercel/nft": "0.26.2",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.3",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240122.1",
"acorn": "8.5.0",
"amphtml-validator": "1.0.35",
"anser": "1.4.9",
Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/build/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ export default async function build(
)

// Always log next version first then start rest jobs
const { envInfo, expFeatureInfo } = await getStartServerInfo(dir)
const { envInfo, expFeatureInfo } = await getStartServerInfo(dir, false)
logStartInfo({
networkUrl: null,
appUrl: null,
Expand Down

0 comments on commit 43a2f0d

Please sign in to comment.