Remove references to baseBranch (#1681)

vercel · Aug 12, 2022 · ca3b50a · ca3b50a · vercel · Aug 12, 2022
1 parent 97320af
commit ca3b50a
Show file tree

Hide file tree

Showing 18 changed files with 1 addition and 36 deletions.
diff --git a/cli/internal/fs/turbo_json.go b/cli/internal/fs/turbo_json.go
@@ -12,8 +12,6 @@ import (
 
 // TurboJSON is the root turborepo configuration
 type TurboJSON struct {
-	// Base Git branch
-	Base string `json:"baseBranch,omitempty"`
 	// Global root filesystem dependencies
 	GlobalDependencies []string `json:"globalDependencies,omitempty"`
 	// Pipeline is a map of Turbo pipeline entries which define the task graph

diff --git a/cli/scripts/generate.mjs b/cli/scripts/generate.mjs
@@ -135,8 +135,6 @@ turbo-linux
       path.join(root, "turbo.json"),
       JSON.stringify(
         {
-          // This is required because our base branch is `main` and not `master`.
-          baseBranch: "origin/main",
           npmClient: "yarn",
           cacheStorageConfig: {
             provider: "local",

diff --git a/cli/scripts/monorepo.ts b/cli/scripts/monorepo.ts
@@ -193,7 +193,6 @@ importers:
         },
       },
       "turbo.json": {
-        baseBranch: "origin/main",
         ...turboConfig,
       },
     });

diff --git a/docs/pages/blog/turbo-1-1-0.mdx b/docs/pages/blog/turbo-1-1-0.mdx
@@ -116,7 +116,6 @@ You can now control `turbo`'s [cache fingerprinting (a.k.a. hashing)](https://tu
       "outputs": [".next/**"],
     }
   },
-  "baseBranch": "origin/main",
   "globalDependencies": [
     "$GITHUB_TOKEN"// env var that will impact the hashes of all tasks,
     "tsconfig.json" // file contents will impact the hashes of all tasks,

diff --git a/docs/pages/docs/ci/circleci.mdx b/docs/pages/docs/ci/circleci.mdx
@@ -29,7 +29,6 @@ And a `turbo.json`:
 ```json
 {
   "$schema": "https://turborepo.org/schema.json",
-  "baseBranch": "origin/main",
   "pipeline": {
     "build": {
       "dependsOn": ["^build"],

diff --git a/docs/pages/docs/ci/github-actions.mdx b/docs/pages/docs/ci/github-actions.mdx
@@ -29,7 +29,6 @@ And a `turbo.json`:
 ```json
 {
   "$schema": "https://turborepo.org/schema.json",
-  "baseBranch": "origin/main",
   "pipeline": {
     "build": {
       "dependsOn": ["^build"],

diff --git a/docs/pages/docs/ci/gitlabci.mdx b/docs/pages/docs/ci/gitlabci.mdx
@@ -29,7 +29,6 @@ And a `turbo.json`:
 ```json
 {
   "$schema": "https://turborepo.org/schema.json",
-  "baseBranch": "origin/main",
   "pipeline": {
     "build": {
       "dependsOn": ["^build"],

diff --git a/docs/pages/docs/ci/travisci.mdx b/docs/pages/docs/ci/travisci.mdx
@@ -29,7 +29,6 @@ And a `turbo.json`:
 ```json
 {
   "$schema": "https://turborepo.org/schema.json",
-  "baseBranch": "origin/main",
   "pipeline": {
     "build": {
       "dependsOn": ["^build"],

diff --git a/docs/pages/docs/core-concepts/caching.mdx b/docs/pages/docs/core-concepts/caching.mdx
@@ -137,7 +137,6 @@ Luckily, you can control `turbo`'s cache fingerprinting (a.k.a. hashing) behavio
       "outputs": [".next/**"],
     }
   },
-  "baseBranch": "origin/main",
   "globalDependencies": [
     "$GITHUB_TOKEN",// env var that will impact the hashes of all tasks,
     "tsconfig.json", // file contents will impact the hashes of all tasks,

diff --git a/docs/pages/docs/getting-started.mdx b/docs/pages/docs/getting-started.mdx
@@ -109,12 +109,9 @@ The `turbo` package is a little shell that will install the proper `turbo-<os>-<
 
 In the root of your monorepo, create an empty file named `turbo.json`. This will hold the configuration for Turborepo.
 
-If your git repo's base branch is not `origin/master`, then you need to specify a `baseBranch` too. For example, `origin/main`.
-
 ```json filename="./turbo.json"
 {
-  "$schema": "https://turborepo.org/schema.json",
-  "baseBranch": "origin/main"
+  "$schema": "https://turborepo.org/schema.json"
 }
 ```
 

diff --git a/docs/pages/docs/reference/codemods.mdx b/docs/pages/docs/reference/codemods.mdx
@@ -84,7 +84,6 @@ For example:
   "name": "Monorepo root",
   "private": true,
   "turbo": {
-    "baseBranch": "origin/main",
     "pipeline": {
       ...
     }
@@ -104,7 +103,6 @@ For example:
 // After, turbo.json
 {
   "$schema": "https://turborepo.org/schema.json",
-  "baseBranch": "origin/main",
   "pipeline": {
     ...
   }

diff --git a/docs/pages/docs/reference/configuration.mdx b/docs/pages/docs/reference/configuration.mdx
@@ -7,12 +7,6 @@ description: Learn how to configure Turborepo through `turbo.json`.
 
 You can configure the behavior of `turbo` by adding a `turbo.json` file in your monorepo's root (i.e. the same one you specify your `workspaces` key is set for Yarn and npm users).
 
-## `baseBranch`
-
-`type: string`
-
-Defaults to `origin/master`. The base branch or your git repository. Git is used by `turbo` in its [hashing algorithm](../core-concepts/caching#hashing-1) and [`--since` CLI flag](./command-line-reference#--since-1).
-
 ## `globalDependencies`
 
 `type: string[]`

diff --git a/docs/schema.d.ts b/docs/schema.d.ts
@@ -4,14 +4,6 @@ export interface Schema {
   /** @default https://turborepo.org/schema.json */
   $schema?: string;
 
-  /**
-   * The base branch or your git repository. Git is used by turbo in its hashing algorithm
-   * and --since CLI flag.
-   *
-   * @default origin/master
-   */
-  baseBranch?: string;
-
   /**
    * A list of globs and environment variables for implicit global hash dependencies.
    * Environment variables should be prefixed with $ (e.g. $GITHUB_TOKEN).

diff --git a/examples/design-system/.changeset/config.json b/examples/design-system/.changeset/config.json
@@ -5,7 +5,6 @@
   "fixed": [],
   "linked": [],
   "access": "public",
-  "baseBranch": "main",
   "updateInternalDependencies": "patch",
   "ignore": ["@acme/docs"]
 }
diff --git a/examples/with-changesets/.changeset/config.json b/examples/with-changesets/.changeset/config.json
@@ -5,7 +5,6 @@
   "fixed": [],
   "linked": [],
   "access": "public",
-  "baseBranch": "main",
   "updateInternalDependencies": "patch",
   "ignore": ["@acme/docs"]
 }
diff --git a/packages/eslint-plugin-turbo/__tests__/lib/no-undeclared-env-vars.test.ts b/packages/eslint-plugin-turbo/__tests__/lib/no-undeclared-env-vars.test.ts
@@ -9,7 +9,6 @@ const ruleTester = new RuleTester({
 const getTestTurboConfig = () => {
   return {
     $schema: "./docs/public/schema.json",
-    baseBranch: "origin/main",
     globalDependencies: ["$GLOBAL_ENV_KEY"],
     pipeline: {
       test: {

diff --git a/packages/eslint-plugin-turbo/lib/types.ts b/packages/eslint-plugin-turbo/lib/types.ts
@@ -5,7 +5,6 @@ export interface Pipeline {
 }
 
 export interface TurboConfig {
-  baseBranch?: string;
   globalDependencies?: Array<string>;
   pipeline?: Record<string, Pipeline>;
 }
diff --git a/turbo.json b/turbo.json
@@ -1,6 +1,5 @@
 {
   "$schema": "./docs/public/schema.json",
-  "baseBranch": "origin/main",
   "pipeline": {
     "test": {
       "outputs": ["coverage/**/*"],