Merge branch 'main' into dependabot-npm_and_yarn-packages-ui-extensions-server-kit-vite-6.3.6

Author: isaacroldan

.changeset/heavy-berries-notice.md

@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Show IDs next to organization names when there are duplicates

.changeset/poor-ghosts-mix.md

@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Modify app access config update message for legacy install flow

.github/workflows/shopify-cli.yml

@@ -35,7 +35,15 @@ on:
     branches:
       - main
       - stable/3.*
+    paths-ignore:
+      - '**.md'
+      - 'docs/**'
+      - 'RELEASE_NOTES/**'
   pull_request:
+    paths-ignore:
+      - '**.md'
+      - 'docs/**'
+      - 'RELEASE_NOTES/**'
   merge_group:
 
 
@@ -205,14 +213,15 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - name: Post the knip results
+        if: github.event.pull_request.user.login != 'dependabot[bot]'
         uses: codex-/knip-reporter@f717532b6707d95de06b9bb2eb8ece46393f018f # pin@v2
         with:
           verbose: true
 
   pr-platform-agnostic-graphql-schema:
     name: '[PR] Check graphql-codegen has been run'
     runs-on: ${{ matrix.os }}
-    if: ${{ github.event_name == 'pull_request' }}
+    if: ${{ github.event_name == 'pull_request' && github.event.pull_request.user.login != 'dependabot[bot]' }}
     timeout-minutes: 30
     strategy:
       matrix:

README.md

@@ -13,7 +13,7 @@ Learn more in the [commands docs](./packages/cli/README.md#commands).
 
 <p>&nbsp;</p>
 
-### Before you begin ###
+## Before you begin
 
 Install the latest version of  [Node.js](https://nodejs.org/en/download/) and [npm](https://docs.npmjs.com/getting-started) (or another package manager of your choice).
 

docs-shopify.dev/generated/generated_static_pages.json

@@ -95,7 +95,7 @@
         "type": "Generic",
         "anchorLink": "help",
         "title": "Where to get help",
-        "sectionContent": "\n- [Shopify Community Forums](https://community.shopify.com/) - Visit our forums to connect with the community and learn more about Shopify CLI development.\n- [Open a GitHub issue](https://github.com/shopify/cli/issues) - To report bugs or request new features, open an issue in the Shopify CLI repository.\n"
+        "sectionContent": "\n- [Shopify Community Forums](https://community.shopify.dev/c/shopify-cli-libraries/14) - Visit our forums to connect with the community and learn more about Shopify CLI development.\n- [Open a GitHub issue](https://github.com/shopify/cli/issues) - To report bugs or request new features, open an issue in the Shopify CLI repository.\n"
       },
       {
         "type": "Resource",

docs-shopify.dev/static/cli.doc.ts

@@ -109,7 +109,7 @@ Or, run the \`help\` command to get this information right in your terminal.
       anchorLink: 'help',
       title: 'Where to get help',
       sectionContent: `
-- [Shopify Community Forums](https://community.shopify.com/) - Visit our forums to connect with the community and learn more about Shopify CLI development.
+- [Shopify Community Forums](https://community.shopify.dev/c/shopify-cli-libraries/14) - Visit our forums to connect with the community and learn more about Shopify CLI development.
 - [Open a GitHub issue](https://github.com/shopify/cli/issues) - To report bugs or request new features, open an issue in the Shopify CLI repository.
 `,
     },

package.json

@@ -44,8 +44,8 @@
     "@graphql-codegen/near-operation-file-preset": "3.0.0",
     "@graphql-codegen/typed-document-node": "5.0.11",
     "@graphql-codegen/typescript-operations": "4.6.1",
-    "@nx/eslint-plugin": "21.1.2",
-    "@nx/workspace": "21.1.2",
+    "@nx/eslint-plugin": "21.5.2",
+    "@nx/workspace": "21.5.2",
     "@octokit/rest": "22.0.0",
     "@shopify/eslint-plugin-cli": "file:packages/eslint-plugin-cli",
     "@shopify/generate-docs": "0.15.6",
@@ -69,7 +69,7 @@
     "knip": "5.59.1",
     "liquidjs": "10.20.1",
     "node-fetch": "^3.3.2",
-    "nx": "21.1.2",
+    "nx": "21.5.2",
     "oclif": "4.20.1",
     "octokit-plugin-create-pull-request": "^3.12.2",
     "pathe": "1.1.1",

packages/app/src/cli/api/graphql/app-management/generated/specifications.ts

@@ -16,6 +16,7 @@ export type FetchSpecificationsQuery = {
     uidStrategy:
       | {appModuleLimit: number; isClientProvided: boolean}
       | {appModuleLimit: number; isClientProvided: boolean}
+      | {appModuleLimit: number; isClientProvided: boolean}
     validationSchema?: {jsonSchema: string} | null
   }[]
 }

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

@@ -325,6 +325,7 @@ export async function testAppConfigExtensions(emptyConfig = false, directory?: s
 export async function testAppAccessConfigExtension(
   emptyConfig = false,
   directory?: string,
+  useLegacyInstallFlow = true,
 ): Promise<ExtensionInstance> {
   const configuration = emptyConfig
     ? ({} as unknown as BaseConfigType)
@@ -334,7 +335,7 @@ export async function testAppAccessConfigExtension(
         },
         access_scopes: {
           scopes: 'read_products,write_products',
-          use_legacy_install_flow: true,
+          use_legacy_install_flow: useLegacyInstallFlow,
         },
         auth: {
           redirect_urls: ['https://example.com/auth/callback'],

packages/app/src/cli/models/extensions/extension-instance.ts

@@ -45,8 +45,6 @@ export const CONFIG_EXTENSION_IDS: string[] = [
   WebhooksSpecIdentifier,
 ]
 
-type BuildMode = 'theme' | 'function' | 'ui' | 'flow' | 'tax_calculation' | 'none'
-
 /**
  * Class that represents an instance of a local extension
  * Before creating this class we've validated that:
@@ -342,7 +340,7 @@ export class ExtensionInstance<TConfiguration extends BaseConfigType = BaseConfi
   }
 
   async build(options: ExtensionBuildOptions): Promise<void> {
-    const mode = this.buildMode(options)
+    const mode = this.specification.buildConfig.mode
 
     switch (mode) {
       case 'theme':
@@ -363,10 +361,7 @@ export class ExtensionInstance<TConfiguration extends BaseConfigType = BaseConfi
   }
 
   async buildForBundle(options: ExtensionBuildOptions, bundleDirectory: string, outputId?: string) {
-    if (this.features.includes('bundling')) {
-      // Modules that are going to be inclued in the bundle should be built in the bundle directory
-      this.outputPath = this.getOutputPathForDirectory(bundleDirectory, outputId)
-    }
+    this.outputPath = this.getOutputPathForDirectory(bundleDirectory, outputId)
 
     await this.build(options)
     if (this.isThemeExtension) {
@@ -380,11 +375,9 @@ export class ExtensionInstance<TConfiguration extends BaseConfigType = BaseConfi
   async copyIntoBundle(options: ExtensionBuildOptions, bundleDirectory: string, extensionUuid?: string) {
     const defaultOutputPath = this.outputPath
 
-    if (this.features.includes('bundling')) {
-      this.outputPath = this.getOutputPathForDirectory(bundleDirectory, extensionUuid)
-    }
+    this.outputPath = this.getOutputPathForDirectory(bundleDirectory, extensionUuid)
 
-    const buildMode = this.buildMode(options)
+    const buildMode = this.specification.buildConfig.mode
 
     if (this.isThemeExtension) {
       await bundleThemeExtension(this, options)
@@ -464,25 +457,6 @@ export class ExtensionInstance<TConfiguration extends BaseConfigType = BaseConfi
     await this.specification.contributeToSharedTypeFile?.(this, typeDefinitionsByFile)
   }
 
-  private buildMode(options: ExtensionBuildOptions): BuildMode {
-    if (this.isThemeExtension) {
-      return 'theme'
-    } else if (this.isFunctionExtension) {
-      return 'function'
-    } else if (this.features.includes('esbuild')) {
-      return 'ui'
-    } else if (this.specification.identifier === 'flow_template' && options.environment === 'production') {
-      return 'flow'
-    }
-
-    // Workaround for tax_calculations because they remote spec NEEDS a valid js file to be included.
-    if (this.type === 'tax_calculation') {
-      return 'tax_calculation'
-    }
-
-    return 'none'
-  }
-
   private buildHandle() {
     switch (this.specification.uidStrategy) {
       case 'single':