Merge branch 'main' into blog_author_updates

.github/CODEOWNERS

@@ -12,6 +12,8 @@
 /examples @vercel/turbo-oss
 /shim @vercel/turbo-oss
 /docs/pages/repo @vercel/turbo-oss
+.github/workflows/pr-go-*.yml @vercel/turbo-oss
+.github/workflows/pr-js-tests-*.yml @vercel/turbo-oss
 
 # Turbopack-specific things
 

README.md

@@ -59,7 +59,7 @@ Follow [@turborepo](https://twitter.com/turborepo) on Twitter and for project up
 
 - Jared Palmer ([@jaredpalmer](https://twitter.com/jaredpalmer))
 
-**Turbopack and Turboengine**
+**Turbopack and the Turbo engine**
 
 - Tobias Koppers ([@wSokra](https://twitter.com/wSokra))
 - Maia Teegarden ([@padmaia](https://twitter.com/padmaia))

cli/internal/context/context.go

@@ -355,6 +355,10 @@ func (c *Context) parsePackageJSON(repoRoot turbopath.AbsoluteSystemPath, pkgJSO
 		c.TopologicalGraph.Add(pkg.Name)
 		pkg.PackageJSONPath = turbopath.AnchoredSystemPathFromUpstream(relativePkgJSONPath)
 		pkg.Dir = turbopath.AnchoredSystemPathFromUpstream(filepath.Dir(relativePkgJSONPath))
+		if c.PackageInfos[pkg.Name] != nil {
+			existing := c.PackageInfos[pkg.Name]
+			return fmt.Errorf("Failed to add workspace \"%s\" from %s, it already exists at %s", pkg.Name, pkg.Dir, existing.Dir)
+		}
 		c.PackageInfos[pkg.Name] = pkg
 		c.PackageNames = append(c.PackageNames, pkg.Name)
 	}

cli/internal/context/context_test.go

@@ -1,8 +1,14 @@
 package context
 
 import (
+	"os"
 	"path/filepath"
+	"regexp"
 	"testing"
+
+	testifyAssert "github.com/stretchr/testify/assert"
+	"github.com/vercel/turbo/cli/internal/fs"
+	"github.com/vercel/turbo/cli/internal/turbopath"
 )
 
 func Test_isWorkspaceReference(t *testing.T) {
@@ -121,3 +127,36 @@ func Test_isWorkspaceReference(t *testing.T) {
 		})
 	}
 }
+
+func TestBuildPackageGraph_DuplicateNames(t *testing.T) {
+	path := getTestDir(t, "repo-with-dupe-workspaces")
+	pkgJSON := &fs.PackageJSON{
+		Name:           "repo-with-dupe-workspaces",
+		PackageManager: "npm@8.1.2",
+	}
+
+	_, actualErr := BuildPackageGraph(path, pkgJSON)
+
+	// Not asserting the full error message, because it includes a path with slashes and backslashes
+	// getting the regex incantation to check that is not worth it.
+	// We have to use regex because the actual error may be different depending on which workspace was
+	// added first and which one was second, causing the error.
+	testifyAssert.Regexp(t, regexp.MustCompile("^Failed to add workspace \"same-name\".+$"), actualErr)
+}
+
+// This is duplicated from fs.turbo_json_test.go.
+// I wasn't able to pull it into a helper file/package because
+// it requires the `fs` package and it would cause cyclical dependencies
+// when used in turbo_json_test.go and would require more changes to fix that.
+func getTestDir(t *testing.T, testName string) turbopath.AbsoluteSystemPath {
+	defaultCwd, err := os.Getwd()
+	if err != nil {
+		t.Errorf("failed to get cwd: %v", err)
+	}
+	cwd, err := fs.CheckedToAbsoluteSystemPath(defaultCwd)
+	if err != nil {
+		t.Fatalf("cwd is not an absolute directory %v: %v", defaultCwd, err)
+	}
+
+	return cwd.UntypedJoin("testdata", testName)
+}

cli/internal/context/testdata/repo-with-dupe-workspaces/apps/a/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "same-name"
+}

cli/internal/context/testdata/repo-with-dupe-workspaces/apps/b/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "same-name"
+}

cli/internal/context/testdata/repo-with-dupe-workspaces/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "repo-with-dupe-workspaces",
+  "workspaces": [
+    "apps/*"
+  ],
+  "packageManager": "pnpm@7.15.0"
+}

cli/internal/context/testdata/repo-with-dupe-workspaces/pnpm-workspace.yaml

@@ -0,0 +1,2 @@
+packages:
+  - "apps/*"

crates/next-dev/src/devserver_options.rs

@@ -66,18 +66,23 @@ pub struct DevServerOptions {
     pub log_detail: bool,
 
     // Inherited options from next-dev, need revisit later.
-    // These are not supported by CLI yet.
-    #[cfg(feature = "serializable")]
+    #[cfg_attr(feature = "cli", clap(long))]
     #[cfg_attr(feature = "serializable", serde(default))]
+    /// If port is not explicitly specified, use different port if it's already
+    /// in use.
     pub allow_retry: bool,
-    #[cfg(feature = "serializable")]
+    #[cfg_attr(feature = "cli", clap(long))]
     #[cfg_attr(feature = "serializable", serde(default))]
+    /// Internal for next.js, no specific usage yet.
     pub dev: bool,
-    #[cfg(feature = "serializable")]
+    #[cfg_attr(feature = "cli", clap(long))]
     #[cfg_attr(feature = "serializable", serde(default))]
+    /// Internal for next.js, no specific usage yet.
     pub is_next_dev_command: bool,
-    #[cfg(feature = "serializable")]
+    #[cfg_attr(feature = "cli", clap(long))]
     #[cfg_attr(feature = "serializable", serde(default))]
+    /// Specify server component external packages explicitly. This is an
+    /// experimental flag.
     pub server_components_external_packages: Vec<String>,
 }
 

docs/components/clients/users.ts

@@ -487,4 +487,10 @@ export const users: Array<TurboUser> = [
       width: 175,
     },
   },
+  {
+    caption: "SolanaFM",
+    image: "/images/logos/solanafm.svg",
+    infoLink: "https://solana.fm/",
+    pinned: true,
+  },
 ];

docs/pages/repo/docs/reference/codemods.mdx

@@ -149,7 +149,7 @@ For example:
 }
 ```
 
-````diff
+```diff
 // After, turbo.json
 {
   "$schema": "https://turbo.build/schema.json",
@@ -171,14 +171,15 @@ For example:
     }
   }
 }
+```
 
 #### Usage
 
 Go to your project:
 
 ```sh
 cd path-to-your-turborepo/
-````
+```
 
 Run the codemod: