Merge branch 'Shopify:main' into main

.changeset/clean-rats-talk.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': patch
+---
+
+Fix session refresh for theme dev without password

.changeset/fair-rockets-flow.md

@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Skip .DS_Dtore files when the theme app extension bundle content is created

.changeset/heavy-glasses-lick.md

@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Allow theme app extensions to exclude files from deploying via `.shopifyignore` file

.changeset/silly-shoes-visit.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': patch
+---
+
+Fix clean login on theme dev

.changeset/thin-islands-matter.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli': minor
+---
+
+Updated app generate schema to output to either to schema.graphql (by default) or stdout with --stdout flag

.changeset/wicked-pants-pull.md

@@ -0,0 +1,6 @@
+---
+'@shopify/cli-kit': patch
+'@shopify/app': patch
+---
+
+Add React deduplication plugin for ESBuild & extensions

.eslintrc.cjs

@@ -5,11 +5,11 @@ module.exports = {
     project: './tsconfig.json',
     EXPERIMENTAL_useSourceOfProjectReferenceRedirect: true,
   },
-  plugins: ['@nrwl/nx'],
+  plugins: ['@nx'],
   // WARNING: If you want to add new rules/plugins, you need to add them to the eslint-plugin-cli package.
   extends: ['plugin:@shopify/cli/configs'],
   rules: {
-    '@nrwl/nx/enforce-module-boundaries': [
+    '@nx/enforce-module-boundaries': [
       'error',
       {
         allow: [],

docs/README.md

@@ -16,7 +16,7 @@ The list below contains valuable resources for people interested in contributing
 * [Performance](./cli/performance.md)
 * [Debugging](./cli/debugging.md)
 * [ESLint rules](./cli/eslint-rules.md)
-* [Release process](./cli/release.md)
+* [Release process](./release.md)
 * [Testing strategy](./cli/testing-strategy.md)
 * [Cross-OS compatibility](./cli/cross-os-compatibility.md)
 * [Troubleshooting](./cli/troubleshooting.md)

nx.json

@@ -1,22 +1,4 @@
 {
-  "extends": "@nrwl/workspace/presets/npm.json",
-  "npmScope": "@shopify",
-  "tasksRunnerOptions": {
-    "default": {
-      "runner": "@nrwl/workspace/tasks-runners/default",
-      "options": {
-        "cacheableOperations": [
-          "build"
-        ],
-        "runtimeCacheInputs": [
-          "node bin/cache-inputs.js || node ../../bin/cache-inputs.js || node ../bin/cache-inputs.js"
-        ]
-      }
-    }
-  },
-  "affected": {
-    "defaultBase": "main"
-  },
   "targetDefaults": {
     "clean": {
       "dependsOn": ["^clean"]
@@ -27,13 +9,28 @@
     "refresh-manifests": {
       "dependsOn": ["build"]
     },
-    "lint": {
-    },
+    "lint": {},
     "lint:fix": {
       "dependsOn": ["build"]
     },
     "type-check": {
       "dependsOn": ["^build"]
     }
+  },
+  "extends": "@nx/workspace/presets/npm.json",
+  "npmScope": "@shopify",
+  "tasksRunnerOptions": {
+    "default": {
+      "runner": "@nx/workspace/tasks-runners/default",
+      "options": {
+        "cacheableOperations": ["build"],
+        "runtimeCacheInputs": [
+          "node bin/cache-inputs.js || node ../../bin/cache-inputs.js || node ../bin/cache-inputs.js"
+        ]
+      }
+    }
+  },
+  "affected": {
+    "defaultBase": "main"
   }
 }

package.json

@@ -11,18 +11,18 @@
     "clean": "nx run-many --target=clean --all --skip-nx-cache && nx reset",
     "docs:generate": "nx run-many --target=docs:generate --all --skip-nx-cache",
     "lint": "nx run-many --target=lint --all --skip-nx-cache",
-    "lint:affected": "nx affected --target=lint --all",
+    "lint:affected": "nx affected --target=lint",
     "lint:fix": "nx run-many --target=lint:fix --all --skip-nx-cache",
-    "lint:fix:affected": "nx affected --target=lint:fix --all",
+    "lint:fix:affected": "nx affected --target=lint:fix",
     "test": "nx run-many --target=test --all --skip-nx-cache",
     "test:unit": "nx run-many --target=test --all --skip-nx-cache --exclude=features",
     "test:features": "pnpm nx run features:test",
-    "test:affected": "nx affected --target=test --all",
+    "test:affected": "nx affected --target=test",
     "test:regenerate-snapshots": "nx build cli && packages/features/snapshots/regenerate.sh",
     "type-check": "nx run-many --target=type-check --all --skip-nx-cache",
-    "type-check:affected": "nx affected --target=type-check --all",
+    "type-check:affected": "nx affected --target=type-check",
     "build": "nx run-many --target=build --all --skip-nx-cache",
-    "build:affected": "nx affected --target=build --all",
+    "build:affected": "nx affected --target=build",
     "refresh-templates": "nx run-many --target=refresh-templates --all --skip-nx-cache",
     "refresh-manifests": "nx run-many --target=refresh-manifests --all --skip-nx-cache && bin/prettify-manifests.js",
     "changeset-manifests": "changeset version && pnpm install --no-frozen-lockfile && pnpm refresh-manifests && bin/update-cli-kit-version.js && pnpm docs:generate",
@@ -33,10 +33,7 @@
     "@babel/core": "^7.22.1",
     "@bugsnag/source-maps": "^2.3.1",
     "@changesets/cli": "2.26.1",
-    "@nrwl/eslint-plugin-nx": "15.9.2",
-    "@nrwl/js": "15.9.2",
-    "@nrwl/tao": "15.9.2",
-    "@nrwl/workspace": "15.9.2",
+    "@nrwl/tao": "16.3.2",
     "@octokit/core": "^4.2.1",
     "@octokit/rest": "^19.0.11",
     "@shopify/eslint-plugin-cli": "file:packages/eslint-plugin-cli",
@@ -59,7 +56,7 @@
     "graphql-tag": "^2.12.6",
     "liquidjs": "^10.7.1",
     "node-fetch": "^3.3.1",
-    "nx": "15.9.2",
+    "nx": "16.3.2",
     "oclif": "3.9.0",
     "octokit-plugin-create-pull-request": "^3.12.2",
     "pathe": "1.1.0",
@@ -73,7 +70,10 @@
     "tmp": "^0.2.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.2",
-    "typescript": "4.9.5"
+    "typescript": "5.0.4",
+    "@nx/workspace": "16.3.2",
+    "@nx/js": "16.3.2",
+    "@nx/eslint-plugin": "16.3.2"
   },
   "workspaces": {
     "packages": [

packages/app/oclif.manifest.json

@@ -444,6 +444,132 @@
       },
       "args": {}
     },
+    "app:config:link": {
+      "id": "app:config:link",
+      "description": "Fetch your app's config from the Partner Dashboard.",
+      "strict": true,
+      "pluginName": "@shopify/app",
+      "pluginAlias": "@shopify/app",
+      "pluginType": "core",
+      "hidden": true,
+      "aliases": [],
+      "flags": {
+        "no-color": {
+          "name": "no-color",
+          "type": "boolean",
+          "description": "Disable color output.",
+          "hidden": false,
+          "allowNo": false
+        },
+        "verbose": {
+          "name": "verbose",
+          "type": "boolean",
+          "description": "Increase the verbosity of the logs.",
+          "hidden": false,
+          "allowNo": false
+        },
+        "path": {
+          "name": "path",
+          "type": "option",
+          "description": "The path to your app directory.",
+          "multiple": false,
+          "default": "."
+        },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "char": "e",
+          "description": "The environment to apply to the current command.",
+          "hidden": true,
+          "multiple": false
+        }
+      },
+      "args": {}
+    },
+    "app:config:push": {
+      "id": "app:config:push",
+      "description": "Push your app's config to the Partner Dashboard.",
+      "strict": true,
+      "pluginName": "@shopify/app",
+      "pluginAlias": "@shopify/app",
+      "pluginType": "core",
+      "hidden": true,
+      "aliases": [],
+      "flags": {
+        "no-color": {
+          "name": "no-color",
+          "type": "boolean",
+          "description": "Disable color output.",
+          "hidden": false,
+          "allowNo": false
+        },
+        "verbose": {
+          "name": "verbose",
+          "type": "boolean",
+          "description": "Increase the verbosity of the logs.",
+          "hidden": false,
+          "allowNo": false
+        },
+        "path": {
+          "name": "path",
+          "type": "option",
+          "description": "The path to your app directory.",
+          "multiple": false,
+          "default": "."
+        },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "char": "e",
+          "description": "The environment to apply to the current command.",
+          "hidden": true,
+          "multiple": false
+        }
+      },
+      "args": {}
+    },
+    "app:config:use": {
+      "id": "app:config:use",
+      "description": "Set a particular configuration to use.",
+      "strict": true,
+      "pluginName": "@shopify/app",
+      "pluginAlias": "@shopify/app",
+      "pluginType": "core",
+      "hidden": true,
+      "aliases": [],
+      "flags": {
+        "no-color": {
+          "name": "no-color",
+          "type": "boolean",
+          "description": "Disable color output.",
+          "hidden": false,
+          "allowNo": false
+        },
+        "verbose": {
+          "name": "verbose",
+          "type": "boolean",
+          "description": "Increase the verbosity of the logs.",
+          "hidden": false,
+          "allowNo": false
+        },
+        "path": {
+          "name": "path",
+          "type": "option",
+          "description": "The path to your app directory.",
+          "multiple": false,
+          "default": "."
+        },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "char": "e",
+          "description": "The environment to apply to the current command.",
+          "hidden": true,
+          "multiple": false
+        }
+      },
+      "args": {}
+    },
     "app:env:pull": {
       "id": "app:env:pull",
       "description": "Pull app and extensions environment variables.",
@@ -647,6 +773,13 @@
           "description": "The API key to fetch the schema with.",
           "required": false,
           "multiple": false
+        },
+        "stdout": {
+          "name": "stdout",
+          "type": "boolean",
+          "description": "Output the schema to stdout instead of writing to a file.",
+          "required": false,
+          "allowNo": false
         }
       },
       "args": {}
@@ -823,6 +956,13 @@
           "description": "The API key to fetch the schema with.",
           "required": false,
           "multiple": false
+        },
+        "stdout": {
+          "name": "stdout",
+          "type": "boolean",
+          "description": "Output the schema to stdout instead of writing to a file.",
+          "required": false,
+          "allowNo": false
         }
       },
       "args": {}

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

@@ -0,0 +1,18 @@
+import {appFlags} from '../../../flags.js'
+import Command from '../../../utilities/app-command.js'
+import {globalFlags} from '@shopify/cli-kit/node/cli'
+
+export default class ConfigLink extends Command {
+  static hidden = true
+
+  static description = "Fetch your app's config from the Partner Dashboard."
+
+  static flags = {
+    ...globalFlags,
+    ...appFlags,
+  }
+
+  public async run(): Promise<void> {
+    const {flags} = await this.parse(ConfigLink)
+  }
+}

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

@@ -0,0 +1,18 @@
+import {appFlags} from '../../../flags.js'
+import Command from '../../../utilities/app-command.js'
+import {globalFlags} from '@shopify/cli-kit/node/cli'
+
+export default class ConfigPush extends Command {
+  static hidden = true
+
+  static description = "Push your app's config to the Partner Dashboard."
+
+  static flags = {
+    ...globalFlags,
+    ...appFlags,
+  }
+
+  public async run(): Promise<void> {
+    const {flags} = await this.parse(ConfigPush)
+  }
+}

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

@@ -0,0 +1,18 @@
+import {appFlags} from '../../../flags.js'
+import Command from '../../../utilities/app-command.js'
+import {globalFlags} from '@shopify/cli-kit/node/cli'
+
+export default class ConfigUse extends Command {
+  static hidden = true
+
+  static description = 'Set a particular configuration to use.'
+
+  static flags = {
+    ...globalFlags,
+    ...appFlags,
+  }
+
+  public async run(): Promise<void> {
+    const {flags} = await this.parse(ConfigUse)
+  }
+}