Change defaultWrittenConfig's baseBranch to main (#1650)

Author: bluwy

.changeset/plenty-forks-sip.md

@@ -0,0 +1,5 @@
+---
+"@changesets/config": major
+---
+
+Change the `defaultWrittenConfig` `baseBranch` value from `"master"` to `"main"`

packages/cli/src/commands/init/__tests__/command.ts

@@ -39,7 +39,7 @@ describe("init", () => {
       JSON.parse(
         await fs.readFile(path.join(cwd, ".changeset/config.json"), "utf8")
       )
-    ).toEqual({ ...defaultWrittenConfig, baseBranch: "main" });
+    ).toEqual(defaultWrittenConfig);
   });
   it("should add newline at the end of config", async () => {
     const cwd = await testdir({

packages/cli/src/commands/init/index.ts

@@ -17,13 +17,7 @@ async function pathExists(p: string) {
 
 const pkgPath = path.dirname(require.resolve("@changesets/cli/package.json"));
 
-// Modify base branch to "main" without changing defaultWrittenConfig since it also serves as a fallback
-// for config files that don't specify a base branch. Changing that to main would be a breaking change.
-const defaultConfig = `${JSON.stringify(
-  { ...defaultWrittenConfig, baseBranch: "main" },
-  null,
-  2
-)}\n`;
+const defaultConfig = `${JSON.stringify(defaultWrittenConfig, null, 2)}\n`;
 
 export default async function init(cwd: string) {
   const changesetBase = path.resolve(cwd, ".changeset");

packages/config/schema.json

@@ -102,7 +102,7 @@
     },
     "baseBranch": {
       "type": "string",
-      "default": "master",
+      "default": "main",
       "description": "Determines the branch that Changesets uses when finding what packages have changed."
     },
     "changedFilePatterns": {

packages/config/src/index.test.ts

@@ -45,7 +45,7 @@ test("read reads the config", async () => {
     changelog: false,
     commit: ["@changesets/cli/commit", { skipCI: "version" }],
     access: "restricted",
-    baseBranch: "master",
+    baseBranch: "main",
     changedFilePatterns: ["**"],
     updateInternalDependencies: "patch",
     ignore: [],
@@ -85,7 +85,7 @@ test("read can read config based on the passed in `cwd`", async () => {
     changelog: false,
     commit: ["@changesets/cli/commit", { skipCI: "version" }],
     access: "restricted",
-    baseBranch: "master",
+    baseBranch: "main",
     changedFilePatterns: ["**"],
     updateInternalDependencies: "patch",
     ignore: [],
@@ -144,7 +144,7 @@ let defaults: Config = {
   changelog: ["@changesets/cli/changelog", null],
   commit: false,
   access: "restricted",
-  baseBranch: "master",
+  baseBranch: "main",
   changedFilePatterns: ["**"],
   updateInternalDependencies: "patch",
   ignore: [],

packages/config/src/index.ts

@@ -25,7 +25,7 @@ export let defaultWrittenConfig = {
   fixed: [] as Fixed,
   linked: [] as Linked,
   access: "restricted",
-  baseBranch: "master",
+  baseBranch: "main",
   updateInternalDependencies: "patch",
   ignore: [] as ReadonlyArray<string>,
 } as const;