[4.8] Keep custom theme repositories on their default branch

Use the stable release by default only for Skeleton theme. Preserve the default branch for custom repositories unless --latest is passed.

Author: karreiro

packages/theme/src/cli/commands/theme/init.test.ts

@@ -104,11 +104,18 @@ describe('theme init', () => {
     expect(cloneRepo).toHaveBeenCalledWith('https://github.com/Shopify/dawn.git', expect.any(String))
   })
 
-  test('uses the latest tag for a custom repository when stdin is not a TTY', async () => {
+  test('keeps the default branch for a custom repository when stdin is not a TTY', async () => {
     Object.defineProperty(process.stdin, 'isTTY', {configurable: true, value: false})
 
     await run(['--clone-url=https://github.com/Shopify/dawn.git'])
 
+    expect(cloneRepo).toHaveBeenCalledWith('https://github.com/Shopify/dawn.git', expect.any(String))
+    expect(cloneRepoAndCheckoutLatestTag).not.toHaveBeenCalled()
+  })
+
+  test('uses the latest tag for a custom repository with --latest', async () => {
+    await run(['--clone-url=https://github.com/Shopify/dawn.git', '--latest'])
+
     expect(cloneRepoAndCheckoutLatestTag).toHaveBeenCalledWith(
       'https://github.com/Shopify/dawn.git',
       expect.any(String),

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

@@ -65,10 +65,11 @@ export default class Init extends ThemeCommand {
     const name = args.name ?? (await this.promptName(flags.path, inputDisabled))
     const repoUrl = flags['clone-url']
     const destination = joinPath(flags.path, name)
-    let latestRelease = flags.latest || inputDisabled
+    let latestRelease = flags.latest
 
     if (!latestRelease && repoUrl === SKELETON_THEME_URL) {
       latestRelease =
+        inputDisabled ||
         !terminalSupportsPrompting() ||
         (await renderSelectPrompt({
           message: 'Which version of Skeleton theme would you like to use?',