Skip to content

Commit 9d1641b

Browse files
committed
refactor(app-config-pull): simplify messaging and config file resolution
1 parent 5b0e2f7 commit 9d1641b

File tree

2 files changed

+4
-19
lines changed
  • packages/app/src/cli

2 files changed

+4
-19
lines changed

packages/app/src/cli/commands/app/config/pull.ts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import {linkedAppContext} from '../../../services/app-context.js'
33
import pull from '../../../services/app/config/pull.js'
44
import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js'
55
import {renderSuccess} from '@shopify/cli-kit/node/ui'
6-
import {formatPackageManagerCommand} from '@shopify/cli-kit/node/output'
76
import {globalFlags} from '@shopify/cli-kit/node/cli'
7+
import {basename} from '@shopify/cli-kit/node/path'
88

99
export default class ConfigPull extends AppLinkedCommand {
1010
static summary = 'Refresh an already-linked app configuration without prompts.'
@@ -39,17 +39,7 @@ This command reuses the existing linked app and organization and skips all inter
3939

4040
renderSuccess({
4141
headline: `Pulled latest configuration for "${configuration.name}"`,
42-
body: `Updated ${configuration.path ?? flags.config ?? 'app configuration'} using the already-linked app "${
43-
remoteApp.title
44-
}".`,
45-
nextSteps: [
46-
[
47-
'To deploy your updated configuration, run',
48-
{
49-
command: formatPackageManagerCommand(app.packageManager, 'shopify app deploy'),
50-
},
51-
],
52-
],
42+
body: `Updated ${basename(configuration.path)} with the remote data.`,
5343
})
5444

5545
return {app}

packages/app/src/cli/services/app/config/pull.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {LinkOptions, loadLocalAppOptions, overwriteLocalConfigFileWithRemoteAppC
44
import {CurrentAppConfiguration, isCurrentAppSchema} from '../../../models/app/app.js'
55
import {OrganizationApp} from '../../../models/organization.js'
66
import {AppConfigurationFileName, getAppConfigurationFileName} from '../../../models/app/loader.js'
7-
import {configurationFileNames} from '../../../constants.js'
87
import {fetchSpecifications} from '../../generate/fetch-extension-specifications.js'
98
import {RemoteAwareExtensionSpecification} from '../../../models/extensions/specification.js'
109
import {Flag} from '../../../utilities/developer-platform-client.js'
@@ -55,12 +54,8 @@ export default async function pull(options: PullOptions): Promise<PullOutput> {
5554

5655
const localAppOptions = await loadLocalAppOptions(linkOptions, specifications, flags, remoteApp.apiKey)
5756

58-
// Decide which config file to overwrite:
59-
// - if config has a path, reuse that file
60-
// - otherwise, fallback to --config or default app config name
61-
const configFileName: AppConfigurationFileName =
62-
(configuration.path && (basename(configuration.path) as AppConfigurationFileName)) ||
63-
getAppConfigurationFileName(configName ?? configurationFileNames.app)
57+
// Decide which config file to overwrite: the configuration should always have a path here.
58+
const configFileName: AppConfigurationFileName = basename(configuration.path) as AppConfigurationFileName
6459

6560
const mergedConfiguration = await overwriteLocalConfigFileWithRemoteAppConfiguration({
6661
remoteApp,

0 commit comments

Comments
 (0)