Unverified Commit 9572dfd8 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

update turbopack (#62080)

* https://github.com/vercel/turbo/pull/7347 <!-- Tobias Koppers - avoid
resolving recursive main field -->
* https://github.com/vercel/turbo/pull/7349 <!-- Tobias Koppers - dedupe
resolving independent on reference type -->
* https://github.com/vercel/turbo/pull/7391 <!-- OJ Kwon -
feat(tasks-fs): allow to skip subpath invalidation -->
parent e1a2d132
This diff is collapsed.
...@@ -37,11 +37,11 @@ swc_core = { version = "0.90.8", features = [ ...@@ -37,11 +37,11 @@ swc_core = { version = "0.90.8", features = [
testing = { version = "0.35.18" } testing = { version = "0.35.18" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240214.1" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240215.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-240214.1" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240215.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-240214.1" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240215.3" }
# General Deps # General Deps
......
...@@ -27,7 +27,11 @@ use crate::register; ...@@ -27,7 +27,11 @@ use crate::register;
#[turbo_tasks::function] #[turbo_tasks::function]
async fn project_fs(project_dir: String, watching: bool) -> Result<Vc<Box<dyn FileSystem>>> { async fn project_fs(project_dir: String, watching: bool) -> Result<Vc<Box<dyn FileSystem>>> {
let disk_fs = DiskFileSystem::new(PROJECT_FILESYSTEM_NAME.to_string(), project_dir.to_string()); let disk_fs = DiskFileSystem::new(
PROJECT_FILESYSTEM_NAME.to_string(),
project_dir.to_string(),
vec![],
);
if watching { if watching {
disk_fs.await?.start_watching_with_invalidation_reason()?; disk_fs.await?.start_watching_with_invalidation_reason()?;
} }
......
...@@ -359,6 +359,7 @@ impl Project { ...@@ -359,6 +359,7 @@ impl Project {
let disk_fs = DiskFileSystem::new( let disk_fs = DiskFileSystem::new(
PROJECT_FILESYSTEM_NAME.to_string(), PROJECT_FILESYSTEM_NAME.to_string(),
this.root_path.to_string(), this.root_path.to_string(),
vec![],
); );
if this.watch { if this.watch {
disk_fs.await?.start_watching_with_invalidation_reason()?; disk_fs.await?.start_watching_with_invalidation_reason()?;
...@@ -375,7 +376,7 @@ impl Project { ...@@ -375,7 +376,7 @@ impl Project {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn node_fs(self: Vc<Self>) -> Result<Vc<Box<dyn FileSystem>>> { pub async fn node_fs(self: Vc<Self>) -> Result<Vc<Box<dyn FileSystem>>> {
let this = self.await?; let this = self.await?;
let disk_fs = DiskFileSystem::new("node".to_string(), this.project_path.clone()); let disk_fs = DiskFileSystem::new("node".to_string(), this.project_path.clone(), vec![]);
disk_fs.await?.start_watching_with_invalidation_reason()?; disk_fs.await?.start_watching_with_invalidation_reason()?;
Ok(Vc::upcast(disk_fs)) Ok(Vc::upcast(disk_fs))
} }
......
...@@ -616,6 +616,7 @@ async fn get_mock_stylesheet( ...@@ -616,6 +616,7 @@ async fn get_mock_stylesheet(
.to_str() .to_str()
.context("Must exist")? .context("Must exist")?
.to_string(), .to_string(),
vec![],
)); ));
let ExecutionContext { let ExecutionContext {
......
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,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.4", "@vercel/nft": "0.26.4",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240214.1", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.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",
......
...@@ -1074,8 +1074,8 @@ importers: ...@@ -1074,8 +1074,8 @@ importers:
specifier: 0.26.4 specifier: 0.26.4
version: 0.26.4 version: 0.26.4
'@vercel/turbopack-ecmascript-runtime': '@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240214.1 specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.3
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240214.1(react-refresh@0.12.0)(webpack@5.90.0)' version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.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
...@@ -25639,9 +25639,9 @@ packages: ...@@ -25639,9 +25639,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-240214.1(react-refresh@0.12.0)(webpack@5.90.0)': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.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-240214.1} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.3}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240214.1' id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.3'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
......
...@@ -55,7 +55,7 @@ describe('Edge runtime configurable guards', () => { ...@@ -55,7 +55,7 @@ describe('Edge runtime configurable guards', () => {
}) })
describe('Multiple functions with different configurations', () => { describe('Multiple functions with different configurations', () => {
beforeEach(() => { beforeEach(async () => {
context.middleware.write(` context.middleware.write(`
import { NextResponse } from 'next/server' import { NextResponse } from 'next/server'
...@@ -77,6 +77,7 @@ describe('Edge runtime configurable guards', () => { ...@@ -77,6 +77,7 @@ describe('Edge runtime configurable guards', () => {
unstable_allowDynamic: '/lib/**' unstable_allowDynamic: '/lib/**'
} }
`) `)
await waitFor(500)
}) })
it('warns in dev for allowed code', async () => { it('warns in dev for allowed code', async () => {
......
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