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
This diff is collapsed.
...@@ -37,11 +37,11 @@ swc_core = { version = "0.89.4", features = [ ...@@ -37,11 +37,11 @@ swc_core = { version = "0.89.4", features = [
testing = { version = "0.35.16" } testing = { version = "0.35.16" }
# Turbo crates # 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.. # [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 # [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 # General Deps
......
...@@ -229,13 +229,19 @@ pub async fn parse_segment_config_from_source( ...@@ -229,13 +229,19 @@ pub async fn parse_segment_config_from_source(
let result = &*parse( let result = &*parse(
source, source,
turbo_tasks::Value::new( turbo_tasks::Value::new(if path.path.ends_with(".ts") {
if path.path.ends_with(".ts") || path.path.ends_with(".tsx") { EcmascriptModuleAssetType::Typescript {
EcmascriptModuleAssetType::Typescript tsx: false,
analyze_types: false,
}
} else if path.path.ends_with(".tsx") {
EcmascriptModuleAssetType::Typescript {
tsx: true,
analyze_types: false,
}
} else { } else {
EcmascriptModuleAssetType::Ecmascript EcmascriptModuleAssetType::Ecmascript
}, }),
),
EcmascriptInputTransforms::empty(), EcmascriptInputTransforms::empty(),
) )
.await?; .await?;
......
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
"@types/ws": "8.2.0", "@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0", "@vercel/ncc": "0.34.0",
"@vercel/nft": "0.26.2", "@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", "acorn": "8.5.0",
"amphtml-validator": "1.0.35", "amphtml-validator": "1.0.35",
"anser": "1.4.9", "anser": "1.4.9",
......
...@@ -1077,8 +1077,8 @@ importers: ...@@ -1077,8 +1077,8 @@ importers:
specifier: 0.26.2 specifier: 0.26.2
version: 0.26.2 version: 0.26.2
'@vercel/turbopack-ecmascript-runtime': '@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240129.1 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.1(react-refresh@0.12.0)(webpack@5.90.0)' 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: acorn:
specifier: 8.5.0 specifier: 8.5.0
version: 8.5.0 version: 8.5.0
...@@ -25611,9 +25611,9 @@ packages: ...@@ -25611,9 +25611,9 @@ packages:
/zwitch@2.0.4: /zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} 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)': '@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.1} 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.1' id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240129.3'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
......
...@@ -144,7 +144,7 @@ export function getServerSideProps() { return { props: { ...props, ...${JSON.str ...@@ -144,7 +144,7 @@ export function getServerSideProps() { return { props: { ...props, ...${JSON.str
} }
function appPageCode(text) { function appPageCode(text) {
return `import Client from "./client.ts"; return `import Client from "./client.tsx";
export default () => <div>${text}<Client /></div>;` export default () => <div>${text}<Client /></div>;`
} }
...@@ -164,16 +164,16 @@ describe('next.rs api', () => { ...@@ -164,16 +164,16 @@ describe('next.rs api', () => {
'export default () => Response.json({ hello: "world" })', 'export default () => Response.json({ hello: "world" })',
'pages/api/edge.js': 'pages/api/edge.js':
'export default () => Response.json({ hello: "world" })\nexport const config = { runtime: "edge" }', '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>)}', '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</> }', 'export default function Loading() { return <>Loading</> }',
'app/app/page.ts': appPageCode('hello world'), 'app/app/page.tsx': appPageCode('hello world'),
'app/app/client.ts': 'app/app/client.tsx':
'"use client";\nexport default () => <div>hello world</div>', '"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"', '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>', 'export default () => <div>hello world</div>',
'app/route-nodejs/route.ts': 'app/route-nodejs/route.ts':
'export function GET() { return Response.json({ hello: "world" }) }', 'export function GET() { return Response.json({ hello: "world" }) }',
...@@ -426,16 +426,16 @@ describe('next.rs api', () => { ...@@ -426,16 +426,16 @@ describe('next.rs api', () => {
name: 'client-side change on a app page', name: 'client-side change on a app page',
path: '/app', path: '/app',
type: 'app-page', type: 'app-page',
file: 'app/app/client.ts', file: 'app/app/client.tsx',
content: '"use client";\nexport default () => <div>hello world2</div>', content: '"use client";\nexport default () => <div>hello world2</div>',
expectedUpdate: '/app/app/client.ts', expectedUpdate: '/app/app/client.tsx',
expectedServerSideChange: false, expectedServerSideChange: false,
}, },
{ {
name: 'server-side change on a app page', name: 'server-side change on a app page',
path: '/app', path: '/app',
type: 'app-page', type: 'app-page',
file: 'app/app/page.ts', file: 'app/app/page.tsx',
content: appPageCode('hello world2'), content: appPageCode('hello world2'),
expectedUpdate: false, expectedUpdate: false,
expectedServerSideChange: true, 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