Merge branch 'main' into mk/task-dependencies-docs

vercel · May 10, 2023 · c8ceffb · c8ceffb
2 parents 0effb01 + 96db056
commit c8ceffb
Show file tree

Hide file tree

Showing 148 changed files with 4,090 additions and 4,771 deletions.
diff --git a/.github/workflows/nextjs-integration-test.yml b/.github/workflows/nextjs-integration-test.yml
@@ -210,7 +210,8 @@ jobs:
         test/development/acceptance-app/ReactRefresh.test.ts \
         test/development/basic/legacy-decorators.test.ts \
         test/integration/plugin-mdx-rs/test/index.test.js \
-        test/e2e/app-dir/underscore-ignore-app-paths/underscore-ignore-app-paths.test.ts
+        test/e2e/app-dir/underscore-ignore-app-paths/underscore-ignore-app-paths.test.ts \
+        test/e2e/app-dir/app-alias/app-alias.test.ts
 
     strategy:
       matrix:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,6 +18,7 @@ members = [
   "crates/turbo-tasks-hash",
   "crates/turbo-tasks-macros",
   "crates/turbo-tasks-macros-shared",
+  "crates/turbo-tasks-macros-tests",
   "crates/turbo-tasks-memory",
   "crates/turbo-tasks-testing",
   "crates/turbo-updater",
@@ -50,6 +51,9 @@ members = [
   "crates/turborepo-lockfiles",
   "crates/turborepo-scm",
   "crates/turborepo-vercel-api-mock",
+  "crates/utils/signposter",
+  "crates/utils/signposter-sys",
+  "crates/utils/tracing-signpost",
   "xtask",
 ]
 
@@ -67,6 +71,7 @@ default-members = [
   "crates/turbo-tasks-hash",
   "crates/turbo-tasks-macros",
   "crates/turbo-tasks-macros-shared",
+  "crates/turbo-tasks-macros-tests",
   "crates/turbo-tasks-memory",
   "crates/turbo-tasks-testing",
   "crates/turbopack",
@@ -86,6 +91,9 @@ default-members = [
   "crates/turbopack-swc-utils",
   "crates/turbopack-test-utils",
   "crates/turbopack-tests",
+  "crates/utils/signposter",
+  "crates/utils/signposter-sys",
+  "crates/utils/tracing-signpost",
   "xtask",
 ]
 
@@ -112,7 +120,10 @@ testing = { version = "0.33.6" }
 
 auto-hash-map = { path = "crates/auto-hash-map" }
 node-file-trace = { path = "crates/node-file-trace", default-features = false }
+signposter = { path = "crates/utils/signposter" }
+signposter-sys = { path = "crates/utils/signposter-sys" }
 swc-ast-explorer = { path = "crates/swc-ast-explorer" }
+tracing-signpost = { path = "crates/utils/tracing-signpost" }
 turbo-malloc = { path = "crates/turbo-malloc", default-features = false }
 turbo-tasks = { path = "crates/turbo-tasks" }
 turbo-tasks-build = { path = "crates/turbo-tasks-build" }
@@ -123,6 +134,7 @@ turbo-tasks-fs = { path = "crates/turbo-tasks-fs" }
 turbo-tasks-hash = { path = "crates/turbo-tasks-hash" }
 turbo-tasks-macros = { path = "crates/turbo-tasks-macros" }
 turbo-tasks-macros-shared = { path = "crates/turbo-tasks-macros-shared" }
+turbo-tasks-macros-tests = { path = "crates/turbo-tasks-macros-tests" }
 turbo-tasks-memory = { path = "crates/turbo-tasks-memory" }
 turbo-tasks-testing = { path = "crates/turbo-tasks-testing" }
 turbo-updater = { path = "crates/turbo-updater" }
@@ -229,6 +241,7 @@ tiny-gradient = "0.1.0"
 tokio = "1.25.0"
 tokio-util = { version = "0.7.7", features = ["io"] }
 tracing = "0.1.37"
+tracing-subscriber = "0.3.16"
 url = "2.2.2"
 urlencoding = "2.1.2"
 webbrowser = "0.8.7"
diff --git a/cli/cmd/turbo/version.go b/cli/cmd/turbo/version.go
@@ -1,3 +1,3 @@
 package main
 
-const turboVersion = "1.9.4-canary.10"
+const turboVersion = "1.9.4-canary.11"
diff --git a/cli/internal/fs/recursive_copy_rust.go → cli/internal/fs/recursive_copy.go b/cli/internal/fs/recursive_copy_rust.go → cli/internal/fs/recursive_copy.go
diff --git a/cli/internal/fs/recursive_copy_go.go b/cli/internal/fs/recursive_copy_go.go