Unverified Commit e4b35313 authored by Leah's avatar Leah Committed by GitHub

fix(turbopack): don't parse `.ts` files as `.tsx` (#61219)

### What?

We currently parse JSX syntax in all typescript files which is wrong.

Closes PACK-2302

Turbo PR: https://github.com/vercel/turbo/pull/7121

### Turbopack Updates

* https://github.com/vercel/turbo/pull/7099 <!-- Donny/강동윤 -
fix(turbopack): Fix panic from `EcmascriptModuleFacadeModule::content`
-->
* https://github.com/vercel/turbo/pull/7121 <!-- Leah - fix(turbopack):
don't parse `.ts` files as `.tsx` -->
parent f0ea8842
......@@ -321,7 +321,7 @@ dependencies = [
[[package]]
name = "auto-hash-map"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"serde",
"smallvec",
......@@ -3510,7 +3510,7 @@ dependencies = [
[[package]]
name = "node-file-trace"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"serde",
......@@ -7554,7 +7554,7 @@ dependencies = [
[[package]]
name = "turbo-tasks"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"async-trait",
......@@ -7586,7 +7586,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-build"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"cargo-lock",
......@@ -7598,7 +7598,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-bytes"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"bytes",
......@@ -7613,7 +7613,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-env"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"dotenvs",
......@@ -7627,7 +7627,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-fetch"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"indexmap 1.9.3",
......@@ -7644,7 +7644,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-fs"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"auto-hash-map",
......@@ -7675,7 +7675,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-hash"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"base16",
"hex",
......@@ -7687,7 +7687,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-macros"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"convert_case 0.6.0",
......@@ -7701,7 +7701,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-macros-shared"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"proc-macro2",
"quote",
......@@ -7711,7 +7711,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-malloc"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"mimalloc",
]
......@@ -7719,7 +7719,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-memory"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"auto-hash-map",
......@@ -7744,7 +7744,7 @@ dependencies = [
[[package]]
name = "turbopack"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"async-recursion",
......@@ -7776,7 +7776,7 @@ dependencies = [
[[package]]
name = "turbopack-binding"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"auto-hash-map",
"mdxjs",
......@@ -7817,7 +7817,7 @@ dependencies = [
[[package]]
name = "turbopack-build"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"indexmap 1.9.3",
......@@ -7841,7 +7841,7 @@ dependencies = [
[[package]]
name = "turbopack-cli-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"clap 4.4.2",
......@@ -7859,7 +7859,7 @@ dependencies = [
[[package]]
name = "turbopack-core"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"async-recursion",
......@@ -7889,7 +7889,7 @@ dependencies = [
[[package]]
name = "turbopack-css"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"async-trait",
......@@ -7916,7 +7916,7 @@ dependencies = [
[[package]]
name = "turbopack-dev"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"indexmap 1.9.3",
......@@ -7940,7 +7940,7 @@ dependencies = [
[[package]]
name = "turbopack-dev-server"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"async-compression",
......@@ -7977,7 +7977,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"async-trait",
......@@ -8012,7 +8012,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-hmr-protocol"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"serde",
"serde_json",
......@@ -8023,7 +8023,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-plugins"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"async-trait",
......@@ -8048,7 +8048,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-runtime"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"indoc",
......@@ -8065,7 +8065,7 @@ dependencies = [
[[package]]
name = "turbopack-env"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"indexmap 1.9.3",
......@@ -8081,7 +8081,7 @@ dependencies = [
[[package]]
name = "turbopack-image"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"base64 0.21.4",
......@@ -8101,7 +8101,7 @@ dependencies = [
[[package]]
name = "turbopack-json"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"serde",
......@@ -8116,7 +8116,7 @@ dependencies = [
[[package]]
name = "turbopack-mdx"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"mdxjs",
......@@ -8131,7 +8131,7 @@ dependencies = [
[[package]]
name = "turbopack-node"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"async-stream",
......@@ -8166,7 +8166,7 @@ dependencies = [
[[package]]
name = "turbopack-static"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"serde",
......@@ -8182,7 +8182,7 @@ dependencies = [
[[package]]
name = "turbopack-swc-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"swc_core",
"turbo-tasks",
......@@ -8193,7 +8193,7 @@ dependencies = [
[[package]]
name = "turbopack-trace-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"crossbeam-channel",
......@@ -8209,7 +8209,7 @@ dependencies = [
[[package]]
name = "turbopack-wasm"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.1#c1422e50b171c4a60b52f4b6888204e141097da6"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240129.3#550126e4a3bf84616bcd205ff49cdb50adb5754e"
dependencies = [
"anyhow",
"indexmap 1.9.3",
......
......@@ -37,11 +37,11 @@ swc_core = { version = "0.89.4", features = [
testing = { version = "0.35.16" }
# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240129.1" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240129.3" }
# [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-240129.1" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240129.3" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240129.1" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240129.3" }
# General Deps
......
......@@ -229,13 +229,19 @@ pub async fn parse_segment_config_from_source(
let result = &*parse(
source,
turbo_tasks::Value::new(
if path.path.ends_with(".ts") || path.path.ends_with(".tsx") {
EcmascriptModuleAssetType::Typescript
} else {
EcmascriptModuleAssetType::Ecmascript
},
),
turbo_tasks::Value::new(if path.path.ends_with(".ts") {
EcmascriptModuleAssetType::Typescript {
tsx: false,
analyze_types: false,
}
} else if path.path.ends_with(".tsx") {
EcmascriptModuleAssetType::Typescript {
tsx: true,
analyze_types: false,
}
} else {
EcmascriptModuleAssetType::Ecmascript
}),
EcmascriptInputTransforms::empty(),
)
.await?;
......
......@@ -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-240129.1",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240129.3",
"acorn": "8.5.0",
"amphtml-validator": "1.0.35",
"anser": "1.4.9",
......
......@@ -1077,8 +1077,8 @@ importers:
specifier: 0.26.2
version: 0.26.2
'@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240129.1
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240129.1(react-refresh@0.12.0)(webpack@5.90.0)'
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240129.3
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240129.3(react-refresh@0.12.0)(webpack@5.90.0)'
acorn:
specifier: 8.5.0
version: 8.5.0
......@@ -25611,9 +25611,9 @@ packages:
/zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240129.1(react-refresh@0.12.0)(webpack@5.90.0)':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240129.1}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240129.1'
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240129.3(react-refresh@0.12.0)(webpack@5.90.0)':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240129.3}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240129.3'
name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0
dependencies:
......
......@@ -144,7 +144,7 @@ export function getServerSideProps() { return { props: { ...props, ...${JSON.str
}
function appPageCode(text) {
return `import Client from "./client.ts";
return `import Client from "./client.tsx";
export default () => <div>${text}<Client /></div>;`
}
......@@ -164,16 +164,16 @@ describe('next.rs api', () => {
'export default () => Response.json({ hello: "world" })',
'pages/api/edge.js':
'export default () => Response.json({ hello: "world" })\nexport const config = { runtime: "edge" }',
'app/layout.ts':
'app/layout.tsx':
'export default function RootLayout({ children }: { children: any }) { return (<html><body>{children}</body></html>)}',
'app/loading.ts':
'app/loading.tsx':
'export default function Loading() { return <>Loading</> }',
'app/app/page.ts': appPageCode('hello world'),
'app/app/client.ts':
'app/app/page.tsx': appPageCode('hello world'),
'app/app/client.tsx':
'"use client";\nexport default () => <div>hello world</div>',
'app/app-edge/page.ts':
'app/app-edge/page.tsx':
'export default () => <div>hello world</div>\nexport const runtime = "edge"',
'app/app-nodejs/page.ts':
'app/app-nodejs/page.tsx':
'export default () => <div>hello world</div>',
'app/route-nodejs/route.ts':
'export function GET() { return Response.json({ hello: "world" }) }',
......@@ -426,16 +426,16 @@ describe('next.rs api', () => {
name: 'client-side change on a app page',
path: '/app',
type: 'app-page',
file: 'app/app/client.ts',
file: 'app/app/client.tsx',
content: '"use client";\nexport default () => <div>hello world2</div>',
expectedUpdate: '/app/app/client.ts',
expectedUpdate: '/app/app/client.tsx',
expectedServerSideChange: false,
},
{
name: 'server-side change on a app page',
path: '/app',
type: 'app-page',
file: 'app/app/page.ts',
file: 'app/app/page.tsx',
content: appPageCode('hello world2'),
expectedUpdate: false,
expectedServerSideChange: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment