Merge branch 'main' into notifications

.changeset/calm-gifts-type.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': minor
+---
+
+Removes Ruby implementation of the `theme push` command

.changeset/four-bikes-remain.md

@@ -0,0 +1,6 @@
+---
+'@shopify/theme': patch
+'@shopify/app': patch
+---
+
+Bump Shopify/theme-tools packages

.changeset/fresh-crabs-kick.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli': patch
+---
+
+Fix files ignored when using negate patterns

.changeset/fresh-ears-search.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': patch
+---
+
+Fix the theme ID mismatch error, where the live theme ID is returned instead of the development theme ID

.changeset/giant-icons-exercise.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': patch
+---
+
+Fixes an issue in the `theme push` command where a confirmation prompt is rendered to users who provide the `--allow-live` flag

.changeset/great-timers-explode.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli': patch
+---
+
+Remove ruby version from theme info command

.changeset/heavy-lions-brush.md

@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+adding optional preloads to ui extension targets

.changeset/moody-beds-sneeze.md

@@ -0,0 +1,6 @@
+---
+'@shopify/cli-kit': patch
+'@shopify/app': patch
+---
+
+Show a warning when there are multiple CLI installations

.changeset/red-jars-kick.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli': patch
+---
+
+Bump cli-hydrogen to 9.0.2

.changeset/serious-radios-travel.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli': patch
+---
+
+Fix issue where you could not use multipass passwords with theme dev

.changeset/small-goats-cough.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': patch
+---
+
+Show an error when the `config/settings_schema.json` file cannot be parsed.

.changeset/soft-melons-retire.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': major
+---
+
+Removes the Ruby implementation of the `theme push` command

.changeset/strong-guests-worry.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli': patch
+---
+
+Fix theme dev command deleting remote files even if using --nodelete flag

.changeset/wicked-years-smash.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli': patch
+---
+
+Improve language around --nodelete flags for push and pull commands

.cursorrules

@@ -0,0 +1,30 @@
+As a Principal Developer, the highest ranking engineer at our company, you are tasked with creating clear, readable code in Typescript. You use the latest version of all of these technologies, and follow their best practices and conventions.
+
+When responding to questions, follow the Chain of Thought method. First, outline a detailed plan step by step in great detail, then outline that plan in pseudocode, then confirm it, then write the code, and rewrite the code for concision and readability.
+
+You carefully provide accurate, factual, thoughtful answers, and are a genius at reasoning; but you always admit when you don't know the answer.
+
+Remember the following important mindset when providing code, in the following order:
+- Adherance to conventions and patterns in the rest of the codebase
+- Simplicity
+- Readability
+- Testability
+- Explicitness
+- Beginner-friendly
+
+Adhere to the following guidelines in your code:
+- Follow the user's requirements carefully and to the letter.
+- Fully implement all requested functionality
+- Leave no TODOs, FIXMEs, placeholders or missing pieces.
+- Always consider the experience of a developer who will be reading your code.
+- Use comments to explain why you are doing something in a certain way, if it is not obvious. If unsure, leave a comment.
+- Employ descriptive, human-readable variable and function/const names.
+- Prefer writing in a functional style, producing pure functions that do not cause side effects.
+- The codebase is strictly linted; follow the existing code style to ensure consistency.
+- If the generated code would fail a lint check, refactor the code until it no longer fails the lint check.
+- Search hard to find an existing function where possible. These are often in the @shopify/cli-kit library.
+- Be sure to reference file names
+- Be concise. Minimize any prose other than code.
+- If you think there might not be a correct answer, say so. If you do not know the answer, say so instead of guessing.
+- In tests, always avoid mocking the filesystem. Use real files and directories, in temporary directories if needed.
+- In tests, prefer to have as little shared state between tests as possible. Avoid beforeAll and afterAll.

.github/CODEOWNERS

@@ -0,0 +1,14 @@
+# By default, review should come from the app-inner-loop team
+* @shopify/app-inner-loop
+
+# Theme team and CLI owners should review theme changes
+packages/cli-kit/src/private/themes/* @shopify/advanced-edits @shopify/app-inner-loop
+packages/cli-kit/src/public/themes/* @shopify/advanced-edits @shopify/app-inner-loop
+packages/theme/** @shopify/advanced-edits @shopify/app-inner-loop
+
+# These are metafiles that can be reviewed by anyone
+.changeset/* @shopify/advanced-edits @shopify/app-inner-loop
+.github/CODEOWNERS @shopify/advanced-edits @shopify/app-inner-loop
+docs-shopify.dev/*  @shopify/advanced-edits @shopify/app-inner-loop
+packages/cli/oclif.manifest.json @shopify/advanced-edits @shopify/app-inner-loop
+

.github/workflows/changelog-reminder.yml

@@ -1,7 +1,7 @@
 on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
-    paths: ['packages/*/src/**', 'packages/cli-kit/assets/cli-ruby/**']
+    paths: ['packages/*/src/**']
 name: Changelog Reminder
 jobs:
   remind:
@@ -14,5 +14,5 @@ jobs:
         with:
           changelogRegex: \.changeset
           message: |
-            We detected some changes at either packages/*/src or packages/cli-kit/assets/cli-ruby/** and there are no updates in the .changeset.
+            We detected some changes at packages/*/src and there are no updates in the .changeset.
             If the changes are user-facing, run "pnpm changeset add" to track your changes and include them in the next release CHANGELOG.

.github/workflows/checks.yml

@@ -10,8 +10,6 @@ env:
   SHOPIFY_CLI_ENV: development
   SHOPIFY_CONFIG: debug
   PNPM_VERSION: '8.15.7'
-  RUBY_VERSION: '3.1.2'
-  BUNDLER_VERSION: '2.3.18'
 
 jobs:
   type-diff:

.github/workflows/shopify-cli.yml

@@ -113,7 +113,7 @@ jobs:
       matrix:
         os: ['ubuntu-latest']
         node: ['18.20.3']
-        target: ['build', 'type-check', 'lint']
+        target: ['build', 'type-check']
     steps:
       - uses: actions/checkout@v3
         with:
@@ -127,6 +127,34 @@ jobs:
       - name: ${{ matrix.target }}
         run: pnpm nx run-many --all --skip-nx-cache --target=${{ matrix.target }} --output-style=stream
 
+  pr-platform-agnostic-lint:
+    name: '[PR] Run lint with Node ${{ matrix.node }} in ${{ matrix.os }}'
+    runs-on: ${{ matrix.os }}
+    if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
+    timeout-minutes: 30
+    strategy:
+      matrix:
+        os: ['ubuntu-latest']
+        node: ['18.20.3']
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name || github.event.repository.full_name }}
+          ref: ${{ github.event.pull_request.head.ref || github.event.merge_group.head_ref }}
+          fetch-depth: 1
+      - name: Setup deps
+        uses: ./.github/actions/setup-cli-deps
+        with:
+          node-version: ${{ matrix.node }}
+      - name: Lint
+        run: pnpm nx run-many --all --skip-nx-cache --target=lint --output-style=stream --format=json -o eslint-report.json
+        continue-on-error: true
+      - name: Annotate Code Linting Results
+        uses: ataylorme/eslint-annotate-action@21a1ba0738d8b732639999029c4ff40b6e121bb4 # pin@v3
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          report-json: "packages/*/eslint-report.json"
+
   pr-platform-agnostic-bundle:
     name: '[PR] Run bundle with Node ${{ matrix.node }} in ${{ matrix.os }}'
     runs-on: ${{ matrix.os }}

.gitignore

@@ -166,3 +166,6 @@ testing.mjs
 
 # NX
 .nx
+
+# ESLint reports
+eslint-report.json

RELEASE_NOTES/3.69.md

@@ -0,0 +1,11 @@
+# Themes
+- Remove legacy flag and Ruby implementation from theme console, dev, push, pull
+- Assorted fixes for JS based theme commands, including hot-reloading and dealing with server errors
+
+# Apps
+- Remove legacy flag and Ruby implementation for Theme App Extensions
+
+# Misc
+- Remove support for access_code based authentication in the CLI
+
+And lots more besides!

bin/bundling/esbuild-plugin-graphiql-imports.js

@@ -10,7 +10,7 @@ const GraphiQLImportsPlugin = {
       return {
         contents: contents
           .replace('@shopify/app/assets/graphiql/favicon.ico', './assets/graphiql/favicon.ico')
-          .replace('@shopify/cli-kit/assets/style.css', './assets/style.css'),
+          .replace('@shopify/app/assets/graphiql/style.css', './assets/graphiql/style.css'),
       }
     })
   },