Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix tsconfig alias cycle #59232

Merged
merged 4 commits into from
Dec 4, 2023
Merged

fix tsconfig alias cycle #59232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2c2ec0
enable test case for turbopack
sokra Dec 4, 2023
e17d0d8
enable jsconfig-paths-wildcard test case
sokra Dec 4, 2023
debaea0
link
sokra Dec 4, 2023
c9058ce
upgrade turbopack
sokra Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 35 additions & 34 deletions Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ swc_core = { version = "0.86.81", features = [
testing = { version = "0.35.11" }

# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231128.2" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231204.2" }
# [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-231128.2" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231204.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231128.2" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231204.2" }

# General Deps

Expand Down
2 changes: 1 addition & 1 deletion packages/next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
"@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0",
"@vercel/nft": "0.24.4",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231128.2",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231204.2",
"acorn": "8.5.0",
"amphtml-validator": "1.0.35",
"anser": "1.4.9",
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml
View file
Open in desktop

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

14 changes: 12 additions & 2 deletions test/turbopack-tests-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5696,6 +5696,16 @@
"flakey": [],
"runtimeError": false
},
"test/e2e/react-dnd-compile/react-dnd-compile.test.ts": {
"passed": [
"react-dnd-compile should work",
"react-dnd-compile should work on react-dnd import page"
],
"failed": [],
"pending": [],
"flakey": [],
"runtimeError": false
},
"test/e2e/reload-scroll-backforward-restoration/index.test.ts": {
"passed": [
"reload-scroll-back-restoration should restore the scroll position on navigating back",
Expand Down Expand Up @@ -12129,11 +12139,11 @@
"runtimeError": false
},
"test/integration/jsconfig-paths-wildcard/test/index.test.js": {
"passed": [],
"failed": [
"passed": [
"jsconfig paths wildcard default behavior should resolve a wildcard alias",
"jsconfig paths without baseurl wildcard default behavior should resolve a wildcard alias"
],
"failed": [],
"pending": [],
"flakey": [],
"runtimeError": false
Expand Down