Merge branch 'main' of https://github.com/vercel/turborepo into paul/site-analytics-optional-dependency

Author: plmrry

.github/turborepo-release.yml .github/release.yml

@@ -5,6 +5,7 @@ changelog:
     labels:
       - "area: ci"
       - "release: turborepo"
+      - "release-notes-ignore"
   categories:
     - title: Docs
       labels:

.github/turbo-orchestrator.yml

@@ -34,6 +34,10 @@ labeler:
     - label: "needs: triage"
       when:
         isNotPRAuthorMatch: "^(padmaia|anthonyshew|dimitropoulos|tknickman|chris-olszewski|NicholasLYang)$"
+    # Removes the PR from release notes when its chore or ci
+    - label: "release-notes-ignore"
+      when:
+        isPrTitleMatch: "(\bchore\b|\bci\b).*?:"
 
     # areas
     - label: "area: ci"

.github/workflows/update-examples-on-release.yml

@@ -37,6 +37,7 @@ jobs:
       - name: Commit and push
         run: |
           git commit -am "release(turborepo): update examples to latest"
+          git pull origin main
           git push origin ${{ steps.branch.outputs.STAGE_BRANCH }}
 
       - name: Create pull request

CONTRIBUTING.md

@@ -224,7 +224,7 @@ Key characteristics of a great example include:
 - One technology added to the `basic` example
 - An updated README at the root of the example directory. Make sure to include any steps required to run the example
 - All tasks in `turbo.json` in the example run successfully without any code changes needed
-- Works with every package manager listed in our [Support Policy](https://turbo.build/repo/docs/getting-started/support-policy#package-managers)
+- Works with every package manager listed in our [Support Policy](https://turbo.build/docs/getting-started/support-policy#package-managers)
 
 Once you've created your example (with prior approval, as discussed above), you can submit a pull request to the repository.
 

crates/turborepo-env/src/platform.rs

@@ -64,7 +64,7 @@ impl PlatformEnv {
         let docs_message = color!(
             color_config,
             UNDERLINE,
-            "https://turbo.build/repo/docs/platform-environment-variables"
+            "https://turbo.build/docs/platform-environment-variables"
         );
 
         match ci {

crates/turborepo-lib/src/cli/mod.rs

@@ -653,7 +653,7 @@ pub enum Command {
         /// Use the given selector to specify package(s) to act as
         /// entry points. The syntax mirrors pnpm's syntax, and
         /// additional documentation and examples can be found in
-        /// turbo's documentation https://turbo.build/repo/docs/reference/command-line-reference/run#--filter
+        /// turbo's documentation https://turbo.build/docs/reference/command-line-reference/run#--filter
         #[clap(short = 'F', long, group = "scope-filter-group")]
         filter: Vec<String>,
         /// Get insight into a specific package, such as
@@ -895,7 +895,7 @@ pub struct ExecutionArgs {
     /// Use the given selector to specify package(s) to act as
     /// entry points. The syntax mirrors pnpm's syntax, and
     /// additional documentation and examples can be found in
-    /// turbo's documentation https://turbo.build/repo/docs/reference/command-line-reference/run#--filter
+    /// turbo's documentation https://turbo.build/docs/reference/command-line-reference/run#--filter
     #[clap(short = 'F', long, group = "scope-filter-group")]
     pub filter: Vec<String>,
 

crates/turborepo-lib/src/commands/link.rs

@@ -75,8 +75,7 @@ pub(crate) enum SelectedTeam<'a> {
 pub(crate) const REMOTE_CACHING_INFO: &str =
     "Remote Caching makes your caching multiplayer,\nsharing build outputs and logs between \
      developers and CI/CD systems.\n\nBuild and deploy faster.";
-pub(crate) const REMOTE_CACHING_URL: &str =
-    "https://turbo.build/repo/docs/core-concepts/remote-caching";
+pub(crate) const REMOTE_CACHING_URL: &str = "https://turbo.build/docs/core-concepts/remote-caching";
 
 /// Verifies that caching status for a team is enabled, or prompts the user to
 /// enable it.

crates/turborepo-lib/src/commands/telemetry.rs

@@ -25,7 +25,7 @@ fn log_status(config: TelemetryConfig, base: &CommandBase) {
             );
         }
     }
-    println!("Learn more: https://turbo.build/repo/docs/telemetry");
+    println!("Learn more: https://turbo.build/docs/telemetry");
 }
 
 fn log_error(message: &str, error: &str, base: &CommandBase) {

crates/turborepo-lib/src/config/mod.rs

@@ -74,8 +74,8 @@ pub enum Error {
     #[error(transparent)]
     PackageJson(#[from] turborepo_repository::package_json::Error),
     #[error(
-        "Could not find turbo.json or turbo.jsonc.\nFollow directions at https://turbo.build/repo/docs to create \
-         one."
+        "Could not find turbo.json or turbo.jsonc.\nFollow directions at https://turbo.build/docs \
+         to create one."
     )]
     NoTurboJSON,
     #[error(

crates/turborepo-lib/src/diagnostics.rs

@@ -221,7 +221,7 @@ impl Diagnostic for GitDaemonDiagnostic {
                     if fsmonitor.trim() != "true" || untrackedcache.trim() != "true" {
                         chan.log_line("Git FS Monitor not configured".to_string())
                             .await;
-                        chan.log_line( "For more information, see https://turbo.build/repo/docs/reference/command-line-reference/scan#fs-monitor".to_string()).await;
+                        chan.log_line( "For more information, see https://turbo.build/docs/reference/command-line-reference/scan#fs-monitor".to_string()).await;
                         let Some(resp) = chan
                             .request(
                                 "Configure it for this repo now?".to_string(),
@@ -372,7 +372,7 @@ impl Diagnostic for LSPDiagnostic {
                 Ok(None) => {
                     chan.log_line("Unable to find LSP instance".to_string())
                         .await;
-                    chan.log_line( "For more information, see https://turbo.build/repo/docs/reference/command-line-reference/scan#lsp".to_string()).await;
+                    chan.log_line( "For more information, see https://turbo.build/docs/reference/command-line-reference/scan#lsp".to_string()).await;
                     chan.failed("Turborepo Extension is not running".to_string())
                         .await;
                 }

crates/turborepo-lib/src/turbo_json/mod.rs

@@ -679,6 +679,7 @@ impl TurboJson {
                     )))])
                 }),
                 persistent: Some(Spanned::new(true)),
+                env_mode: Some(EnvMode::Loose),
                 ..Default::default()
             }),
         );

crates/turborepo-telemetry/README.md

@@ -7,7 +7,7 @@ Any changes made here should also be made to that package as well.
 ## Overview
 
 This crate provides a way to optionally record anonymous usage data.
-This information is used to shape the Turborepo roadmap and prioritize features. You can learn more, including how to opt-out if you'd not like to participate in this anonymous program, by visiting the [documentation](https://turbo.build/repo/docs/telemetry):
+This information is used to shape the Turborepo roadmap and prioritize features. You can learn more, including how to opt-out if you'd not like to participate in this anonymous program, by visiting the [documentation](https://turbo.build/docs/telemetry):
 
 ## Events
 

crates/turborepo-telemetry/src/config.rs

@@ -167,7 +167,7 @@ impl TelemetryConfig {
                         color_config,
                         GREY,
                         "{}",
-                        "https://turbo.build/repo/docs/telemetry"
+                        "https://turbo.build/docs/telemetry"
                     )
                 ),
             );

crates/turborepo-telemetry/src/lib.rs

@@ -1,7 +1,7 @@
 //! Turborepo's telemetry library. Handles sending anonymous telemetry events to
 //! the Vercel API in the background.
 //!
-//! More detail is available at https://turbo.build/repo/docs/telemetry.
+//! More detail is available at https://turbo.build/docs/telemetry.
 
 #![feature(error_generic_member_access)]
 

crates/turborepo-ui/src/tui/app.rs

@@ -201,6 +201,15 @@ impl<W> App<W> {
         Ok(())
     }
 
+    pub fn scroll_terminal_output_by_page(&mut self, direction: Direction) -> Result<(), Error> {
+        let pane_rows = self.size.pane_rows();
+        let task = self.get_full_task_mut()?;
+        // Scroll by the height of the terminal pane
+        task.scroll_by(direction, usize::from(pane_rows))?;
+
+        Ok(())
+    }
+
     pub fn enter_search(&mut self) -> Result<(), Error> {
         self.section_focus = LayoutSections::Search {
             previous_selection: self.active_task()?.to_string(),
@@ -550,6 +559,18 @@ impl<W> App<W> {
             term.resize(pane_rows, pane_cols);
         })
     }
+
+    pub fn jump_to_logs_top(&mut self) -> Result<(), Error> {
+        let task = self.get_full_task_mut()?;
+        task.parser.screen_mut().set_scrollback(usize::MAX);
+        Ok(())
+    }
+
+    pub fn jump_to_logs_bottom(&mut self) -> Result<(), Error> {
+        let task = self.get_full_task_mut()?;
+        task.parser.screen_mut().set_scrollback(0);
+        Ok(())
+    }
 }
 
 impl<W: Write> App<W> {
@@ -817,6 +838,22 @@ fn update(
             app.is_task_selection_pinned = true;
             app.scroll_terminal_output(Direction::Down)?;
         }
+        Event::PageUp => {
+            app.is_task_selection_pinned = true;
+            app.scroll_terminal_output_by_page(Direction::Up)?;
+        }
+        Event::PageDown => {
+            app.is_task_selection_pinned = true;
+            app.scroll_terminal_output_by_page(Direction::Down)?;
+        }
+        Event::JumpToLogsTop => {
+            app.is_task_selection_pinned = true;
+            app.jump_to_logs_top()?;
+        }
+        Event::JumpToLogsBottom => {
+            app.is_task_selection_pinned = true;
+            app.jump_to_logs_bottom()?;
+        }
         Event::EnterInteractive => {
             app.is_task_selection_pinned = true;
             app.interact()?;

crates/turborepo-ui/src/tui/event.rs

@@ -29,6 +29,10 @@ pub enum Event {
     Down,
     ScrollUp,
     ScrollDown,
+    PageUp,
+    PageDown,
+    JumpToLogsTop,
+    JumpToLogsBottom,
     SetStdin {
         task: String,
         stdin: Box<dyn std::io::Write + Send>,
@@ -64,6 +68,7 @@ pub enum Event {
     SearchBackspace,
 }
 
+#[derive(Copy, Clone)]
 pub enum Direction {
     Up,
     Down,

crates/turborepo-ui/src/tui/input.rs

@@ -112,6 +112,10 @@ fn translate_key_event(options: InputOptions, key_event: KeyEvent) -> Option<Eve
         KeyCode::Char('h') => Some(Event::ToggleSidebar),
         KeyCode::Char('u') => Some(Event::ScrollUp),
         KeyCode::Char('d') => Some(Event::ScrollDown),
+        KeyCode::PageUp | KeyCode::Char('U') => Some(Event::PageUp),
+        KeyCode::PageDown | KeyCode::Char('D') => Some(Event::PageDown),
+        KeyCode::Char('t') => Some(Event::JumpToLogsTop),
+        KeyCode::Char('b') => Some(Event::JumpToLogsBottom),
         KeyCode::Char('m') => Some(Event::ToggleHelpPopup),
         KeyCode::Char('p') => Some(Event::TogglePinnedTask),
         KeyCode::Up | KeyCode::Char('k') => Some(Event::Up),

crates/turborepo-ui/src/tui/pane.rs

@@ -11,6 +11,8 @@ const EXIT_INTERACTIVE_HINT: &str = "Ctrl-z - Stop interacting";
 const ENTER_INTERACTIVE_HINT: &str = "i - Interact";
 const HAS_SELECTION: &str = "c - Copy selection";
 const SCROLL_LOGS: &str = "u/d - Scroll logs";
+const PAGE_LOGS: &str = "U/D - Page logs";
+const JUMP_IN_LOGS: &str = "t/b - Jump to top/buttom";
 const TASK_LIST_HIDDEN: &str = "h - Show task list";
 
 pub struct TerminalPane<'a, W> {
@@ -65,9 +67,9 @@ impl<'a, W> TerminalPane<'a, W> {
         match self.section {
             LayoutSections::Pane => build_message_vec(&[EXIT_INTERACTIVE_HINT]),
             LayoutSections::TaskList if self.has_stdin() => {
-                build_message_vec(&[ENTER_INTERACTIVE_HINT, SCROLL_LOGS])
+                build_message_vec(&[ENTER_INTERACTIVE_HINT, SCROLL_LOGS, PAGE_LOGS, JUMP_IN_LOGS])
             }
-            LayoutSections::TaskList => build_message_vec(&[SCROLL_LOGS]),
+            LayoutSections::TaskList => build_message_vec(&[SCROLL_LOGS, PAGE_LOGS, JUMP_IN_LOGS]),
             LayoutSections::Search { results, .. } => {
                 Line::from(format!("/ {}", results.query())).left_aligned()
             }
@@ -104,14 +106,17 @@ mod test {
         let pane = TerminalPane::new(&term, "foo", &LayoutSections::TaskList, true);
         assert_eq!(
             String::from(pane.footer()),
-            "   i - Interact   u/d - Scroll logs"
+            "   i - Interact   u/d - Scroll logs   U/D - Page logs   t/b - Jump to top/buttom"
         );
     }
 
     #[test]
     fn test_footer_non_interactive() {
         let term: TerminalOutput<Vec<u8>> = TerminalOutput::new(16, 16, None);
         let pane = TerminalPane::new(&term, "foo", &LayoutSections::TaskList, true);
-        assert_eq!(String::from(pane.footer()), "   u/d - Scroll logs");
+        assert_eq!(
+            String::from(pane.footer()),
+            "   u/d - Scroll logs   U/D - Page logs   t/b - Jump to top/buttom"
+        );
     }
 }

crates/turborepo-ui/src/tui/popup.rs

@@ -6,20 +6,25 @@ use ratatui::{
     widgets::{Block, List, ListItem, Padding},
 };
 
-const BIND_LIST: [&str; 12] = [
-    "m      - Toggle this help popup",
-    "↑ or j - Select previous task",
-    "↓ or k - Select next task",
-    "h      - Toggle task list",
-    "p      - Toggle pinned task selection",
-    "/      - Filter tasks to search term",
-    "ESC    - Clear filter",
-    "i      - Interact with task",
-    "Ctrl+z - Stop interacting with task",
-    "c      - Copy logs selection (Only when logs are selected)",
-    "u      - Scroll logs up",
-    "d      - Scroll logs down",
-];
+const BIND_LIST: &[&str] = [
+    "m       - Toggle this help popup",
+    "↑ or j  - Select previous task",
+    "↓ or k  - Select next task",
+    "h       - Toggle task list",
+    "p       - Toggle pinned task selection",
+    "/       - Filter tasks to search term",
+    "ESC     - Clear filter",
+    "i       - Interact with task",
+    "Ctrl+z  - Stop interacting with task",
+    "c       - Copy logs selection (Only when logs are selected)",
+    "u       - Scroll logs up",
+    "d       - Scroll logs down",
+    "Shift+u - Page logs up",
+    "Shift+d - Page logs down",
+    "t       - Jump to top of logs",
+    "b       - Jump to bottom of logs",
+]
+.as_slice();
 
 pub fn popup_area(area: Rect) -> Rect {
     let screen_width = area.width;

crates/turborepo-ui/src/tui/term_output.rs

@@ -67,10 +67,14 @@ impl<W> TerminalOutput<W> {
     }
 
     pub fn scroll(&mut self, direction: Direction) -> Result<(), Error> {
+        self.scroll_by(direction, 1)
+    }
+
+    pub fn scroll_by(&mut self, direction: Direction, magnitude: usize) -> Result<(), Error> {
         let scrollback = self.parser.screen().scrollback();
         let new_scrollback = match direction {
-            Direction::Up => scrollback + 1,
-            Direction::Down => scrollback.saturating_sub(1),
+            Direction::Up => scrollback.saturating_add(magnitude),
+            Direction::Down => scrollback.saturating_sub(magnitude),
         };
         self.parser.screen_mut().set_scrollback(new_scrollback);
         Ok(())

docs/link-checker/src/markdown.ts

@@ -86,7 +86,7 @@ const markdownProcessor = unified()
   });
 
 const filePathToUrl = (filePath: string): string =>
-  filePath.replace("repo-docs", "/repo/docs").replace(".mdx", "");
+  filePath.replace("repo-docs", "/docs").replace(".mdx", "");
 
 const validateFrontmatter = (path: string, data: Record<string, unknown>) => {
   if (!data.title) {

docs/site/app/(no-sidebar)/blog/[...slug]/page.tsx

@@ -48,21 +48,18 @@ export default async function Page(props: {
   const Mdx = page.data.body;
 
   return (
-    <article className="prose mx-auto mt-14 mb-10 w-full min-w-0 max-w-4xl px-6 pt-4 md:px-12">
+    <article className="prose mx-auto mb-10 w-full min-w-0 max-w-4xl px-6 pt-4 md:px-12">
       <FaviconHandler />
       <div className="my-4">
         <Link
-          className="hover:text-foreground flex flex-row gap-2 text-sm text-gray-900  transition-all dark:text-gray-900"
+          className="hover:text-foreground mb-16 flex flex-row gap-2 text-sm text-gray-900 no-underline transition-all dark:text-gray-900"
           href="/blog"
         >
           <ArrowLeftIcon width=".75rem" />
           Back to blog
         </Link>
       </div>
 
-      {/* TODO: Currently, the content is controlling the <h1 className="text-center"> to get the heading centered.
-      /* Needs to be controlled here so we can just write the markdown and it will do the right thing.
-       * */}
       <Mdx components={mdxComponents} />
     </article>
   );

docs/site/app/(no-sidebar)/blog/page.tsx

@@ -24,11 +24,11 @@ export function generateMetadata(): Metadata {
 }
 
 function Page(): JSX.Element {
-  const posts = [...blog.getPages(), ...externalBlog.getPages()]
-    .filter((post) => post.data.title !== "Turbopack Performance Benchmarks")
-    .sort((a, b) => {
+  const posts = [...blog.getPages(), ...externalBlog.getPages()].sort(
+    (a, b) => {
       return Number(new Date(b.data.date)) - Number(new Date(a.data.date));
-    });
+    }
+  );
 
   return (
     <main className="mx-auto mt-8 flex w-full min-w-0 max-w-6xl flex-col gap-4 px-6 pt-14 md:px-12">

docs/site/app/(openapi)/repo/source.ts

@@ -4,7 +4,7 @@ import { loader } from "fumadocs-core/source";
 import { openapiDocs, openapiMeta } from "@/.source";
 
 export const openapiPages = loader({
-  baseUrl: "/repo/docs/openapi",
+  baseUrl: "/docs/openapi",
   source: createMDXSource(openapiDocs, openapiMeta),
   pageTree: {
     attachFile,

docs/site/app/(sidebar)/repo/docs/[[...slug]]/layout.tsx docs/site/app/(sidebar)/docs/[[...slug]]/layout.tsx

@@ -10,7 +10,7 @@ export function SystemEnvironmentVariablesHashHighlighter(): JSX.Element {
 
   useEffect(() => {
     const hash = window.location.hash.substring(1);
-    if (path === "/repo/docs/reference/system-environment-variables" && hash) {
+    if (path === "/docs/reference/system-environment-variables" && hash) {
       const element = document.getElementById(hash);
       if (!element) return;
       element.classList.add("focus");