Merge pull request #7035 from Shopify/03-17-remove-project-fields-from-app

Remove packageManager, nodeDependencies, usesWorkspaces from App

Author: ryancbahan

packages/app/src/cli/commands/app/build.ts

@@ -34,12 +34,12 @@ export default class Build extends AppUnlinkedCommand {
       cmd_app_dependency_installation_skipped: flags['skip-dependencies-installation'],
     }))
 
-    const app = await localAppContext({
+    const {app, project} = await localAppContext({
       directory: flags.path,
       userProvidedConfigName: flags.config,
     })
 
-    await build({app, skipDependenciesInstallation: flags['skip-dependencies-installation'], apiKey: clientId})
+    await build({app, project, skipDependenciesInstallation: flags['skip-dependencies-installation'], apiKey: clientId})
 
     return {app}
   }

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

@@ -35,7 +35,7 @@ export default class ConfigUse extends AppUnlinkedCommand {
   public async run(): Promise<AppUnlinkedCommandOutput> {
     const {flags, args} = await this.parse(ConfigUse)
 
-    const app = await localAppContext({
+    const {app} = await localAppContext({
       directory: flags.path,
       userProvidedConfigName: args.config,
     })

packages/app/src/cli/commands/app/deploy.ts

@@ -118,7 +118,7 @@ export default class Deploy extends AppLinkedCommand {
     }
     this.failMissingNonTTYFlags(flags, requiredNonTTYFlags)
 
-    const {app, remoteApp, developerPlatformClient, organization} = await linkedAppContext({
+    const {app, project, remoteApp, developerPlatformClient, organization} = await linkedAppContext({
       directory: flags.path,
       clientId,
       forceRelink: flags.reset,
@@ -130,6 +130,7 @@ export default class Deploy extends AppLinkedCommand {
 
     const result = await deploy({
       app,
+      project,
       remoteApp,
       organization,
       developerPlatformClient,

packages/app/src/cli/commands/app/function/build.ts

@@ -22,7 +22,7 @@ export default class FunctionBuild extends AppUnlinkedCommand {
   public async run(): Promise<AppUnlinkedCommandOutput> {
     const {flags} = await this.parse(FunctionBuild)
 
-    const app = await localAppContext({
+    const {app} = await localAppContext({
       directory: flags.path,
       userProvidedConfigName: flags.config,
     })

packages/app/src/cli/commands/app/function/info.ts

@@ -33,7 +33,7 @@ export default class FunctionInfo extends AppUnlinkedCommand {
   public async run(): Promise<AppUnlinkedCommandOutput> {
     const {flags} = await this.parse(FunctionInfo)
 
-    const app = await localAppContext({
+    const {app} = await localAppContext({
       directory: flags.path,
       userProvidedConfigName: flags.config,
     })

packages/app/src/cli/commands/app/function/run.ts

@@ -40,7 +40,7 @@ export default class FunctionRun extends AppUnlinkedCommand {
 
     let functionExport = DEFAULT_FUNCTION_EXPORT
 
-    const app = await localAppContext({
+    const {app} = await localAppContext({
       directory: flags.path,
       userProvidedConfigName: flags.config,
     })

packages/app/src/cli/commands/app/function/typegen.ts

@@ -22,7 +22,7 @@ export default class FunctionTypegen extends AppUnlinkedCommand {
   public async run(): Promise<AppUnlinkedCommandOutput> {
     const {flags} = await this.parse(FunctionTypegen)
 
-    const app = await localAppContext({
+    const {app} = await localAppContext({
       directory: flags.path,
       userProvidedConfigName: flags.config,
     })

packages/app/src/cli/commands/app/generate/extension.ts

@@ -77,7 +77,7 @@ export default class AppGenerateExtension extends AppLinkedCommand {
 
     await checkFolderIsValidApp(flags.path)
 
-    const {app, specifications, remoteApp, developerPlatformClient} = await linkedAppContext({
+    const {app, project, specifications, remoteApp, developerPlatformClient} = await linkedAppContext({
       directory: flags.path,
       clientId: flags['client-id'],
       forceRelink: flags.reset,
@@ -92,6 +92,7 @@ export default class AppGenerateExtension extends AppLinkedCommand {
       template: flags.template,
       flavor: flags.flavor,
       app,
+      project,
       specifications,
       remoteApp,
       developerPlatformClient,

packages/app/src/cli/commands/app/info.ts

@@ -34,14 +34,14 @@ export default class AppInfo extends AppLinkedCommand {
   public async run(): Promise<AppLinkedCommandOutput> {
     const {flags} = await this.parse(AppInfo)
 
-    const {app, remoteApp, organization, developerPlatformClient} = await linkedAppContext({
+    const {app, project, remoteApp, organization, developerPlatformClient} = await linkedAppContext({
       directory: flags.path,
       clientId: flags['client-id'],
       forceRelink: flags.reset,
       userProvidedConfigName: flags.config,
       unsafeReportMode: true,
     })
-    const results = await info(app, remoteApp, organization, {
+    const results = await info(app, remoteApp, organization, project, {
       format: (flags.json ? 'json' : 'text') as Format,
       webEnv: flags['web-env'],
       configName: flags.config,

packages/app/src/cli/models/app/app.test-data.ts

@@ -74,12 +74,14 @@ import {SchemaDefinitionByTargetQueryVariables} from '../../api/graphql/function
 import {SchemaDefinitionByApiTypeQueryVariables} from '../../api/graphql/functions/generated/schema-definition-by-api-type.js'
 import {AppHomeSpecIdentifier} from '../extensions/specifications/app_config_app_home.js'
 import {AppProxySpecIdentifier} from '../extensions/specifications/app_config_app_proxy.js'
-import {ExtensionSpecification, isAppConfigSpecification} from '../extensions/specification.js'
+import {ExtensionSpecification} from '../extensions/specification.js'
 import {AppLogsOptions} from '../../services/app-logs/utils.js'
 import {AppLogsSubscribeMutationVariables} from '../../api/graphql/app-management/generated/app-logs-subscribe.js'
+import {Project} from '../project/project.js'
 import {Session} from '@shopify/cli-kit/node/session'
 import {vi} from 'vitest'
 import {joinPath} from '@shopify/cli-kit/node/path'
+import {PackageManager} from '@shopify/cli-kit/node/node-package-manager'
 
 export const DEFAULT_CONFIG = {
   application_url: 'https://myapp.com',
@@ -104,9 +106,7 @@ export function testApp(app: Partial<AppInterface> = {}): AppInterface {
     name: app.name ?? 'App',
     directory: app.directory ?? '/tmp/project',
     configPath: app.configPath ?? '/tmp/project/shopify.app.toml',
-    packageManager: app.packageManager ?? 'yarn',
     configuration: app.configuration ?? getConfig(),
-    nodeDependencies: app.nodeDependencies ?? {},
     webs: app.webs ?? [
       {
         directory: '',
@@ -117,7 +117,6 @@ export function testApp(app: Partial<AppInterface> = {}): AppInterface {
       },
     ],
     modules: app.allExtensions ?? [],
-    usesWorkspaces: app.usesWorkspaces ?? false,
     dotenv: app.dotenv,
     errors: app.errors,
     specifications: app.specifications ?? [],
@@ -127,9 +126,6 @@ export function testApp(app: Partial<AppInterface> = {}): AppInterface {
     devApplicationURLs: app.devApplicationURLs,
   })
 
-  if (app.updateDependencies) {
-    Object.getPrototypeOf(newApp).updateDependencies = app.updateDependencies
-  }
   if (app.extensionsForType) {
     Object.getPrototypeOf(newApp).extensionsForType = app.extensionsForType
   }
@@ -155,6 +151,34 @@ export function testAppWithConfig(options?: TestAppWithConfigOptions): AppLinked
   return app
 }
 
+interface TestProjectOptions {
+  directory?: string
+  packageManager?: PackageManager
+  nodeDependencies?: Record<string, string>
+  usesWorkspaces?: boolean
+}
+
+/**
+ * Creates a minimal Project mock for testing.
+ * Use this when a service needs a Project for packageManager, usesWorkspaces, or directory.
+ */
+export function testProject(options: TestProjectOptions = {}): Project {
+  return {
+    directory: options.directory ?? '/tmp/project',
+    packageManager: options.packageManager ?? 'yarn',
+    nodeDependencies: options.nodeDependencies ?? {},
+    usesWorkspaces: options.usesWorkspaces ?? false,
+    appConfigFiles: [],
+    extensionConfigFiles: [],
+    webConfigFiles: [],
+    dotenvFiles: new Map(),
+    hiddenConfigRaw: {},
+    appConfigByName: () => undefined,
+    appConfigByClientId: () => undefined,
+    defaultAppConfig: undefined,
+  } as unknown as Project
+}
+
 export function getWebhookConfig(webhookConfigOverrides?: WebhooksConfig): CurrentAppConfiguration {
   return {
     ...DEFAULT_CONFIG,
@@ -1526,5 +1550,5 @@ export async function buildVersionedAppSchema() {
 }
 
 export async function configurationSpecifications() {
-  return (await loadLocalExtensionsSpecifications()).filter(isAppConfigSpecification)
+  return (await loadLocalExtensionsSpecifications()).filter((spec) => spec.uidStrategy === 'single')
 }