Sync javascript with upstream

.github/ISSUE_TEMPLATE.md

@@ -1,46 +1,46 @@
 ---
-name: "🐛 Bug Report"
+name: '🐛 Bug Report'
 about: Something isn't working
-labels: "Type: Bug 🐛"
+labels: 'Type: Bug 🐛'
 ---
 
 # Issue summary
 
-<!--
-
-Write a short description of the issue here. Please provide any details or logs that
-can help us debug it.
+Before opening this issue, I have:
 
-To increase logging, change these settings when calling shopifyApp in app/shopify.server.js:
-  api: {
-    logger: {
-      level: LogSeverity.Debug,
-      httpRequests: true, // if the error seems to be related to requests
-    }
-  }
+- [ ] Upgraded to the latest version of the `@shopify` packages
+  - Affected `@shopify/shopify-*` package and version:
+  - Node version:
+  - Operating system:
+- [ ] Set `{ logger: { level: LogSeverity.Debug } }` in my configuration
+- [ ] Found a reliable way to reproduce the problem that indicates it's a problem with the package
+- [ ] Looked for similar issues in this repository
+- [ ] Checked that this isn't an issue with a Shopify API
+  - If it is, please create a post in the [Shopify community forums](https://community.shopify.com/c/partners-and-developers/ct-p/appdev) or report it to [Shopify Partner Support](https://help.shopify.com/en/support/partners/org-select)
 
-Learn more: https://github.com/Shopify/shopify-api-js/blob/main/docs/reference/shopifyApi.md#logger
+<!--
+Write a short description of the issue here.
 
+We can only fix issues for which there is a clear reproduction scenario.
+The more context you can provide, the easier it becomes for us to investigate and fix the issue.
 -->
 
-- `@shopify/shopify-app-remix` version:
-- Node version:
-- Operating system:
-
-```
-// Paste any relevant logs here
-```
-
 ## Expected behavior
 
-<!-- What do you think should happen? -->
+What do you think should happen?
 
 ## Actual behavior
 
-<!-- What actually happens? -->
+What actually happens?
 
 ## Steps to reproduce the problem
 
 1.
 1.
 1.
+
+## Debug logs
+
+```
+// Paste any relevant logs here
+```

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,9 +21,14 @@ Fixes #0000 <!-- link to issue if one exists -->
   Before / after screenshots appreciated for UI changes.
 -->
 
-### Checklist
+### Test this PR
+
+```bash
+shopify app init --template=https://github.com/Shopify/shopify-app-template-remix#<your-branch-name>
+```
 
-**Note**: once this PR is merged, it becomes a new release for this template.
+### Checklist
 
-- [ ] I have added/updated tests for this change
 - [ ] I have made changes to the `README.md` file and other related documentation, if applicable
+- [ ] I have added an entry to `CHANGELOG.md`
+- [ ] I'm aware I need to create a new release when this PR is merged

.github/dependabot.yml

@@ -1,9 +1,58 @@
 version: 2
 updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly
   # Enable version updates for npm
-  - package-ecosystem: "npm"
+  - package-ecosystem: 'npm'
     # Look for `package.json` and `lock` files in the `root` directory
-    directory: "/"
+    directory: '/'
     # Check the npm registry for updates every day (weekdays)
     schedule:
-      interval: "daily"
+      interval: 'weekly'
+    # Dependabot defaults to 5 open pull requests at a time
+    open-pull-requests-limit: 100
+
+    # Cooldown is the number of days after a release to wait until opening a PR
+    # This gives us more confidence changes can be merged because changes have been community tested.
+    # See: https://github.blog/changelog/2025-07-01-dependabot-supports-configuration-of-a-minimum-package-age/
+    cooldown:
+      default-days: 14
+      semver-major-days: 30
+      semver-minor-days: 14
+      semver-patch-days: 14
+
+    groups:
+
+      # Group together PRs of dependant packages
+      prisma:
+        patterns:
+          - 'prisma'
+          - '@prisma/client'
+      react:
+        patterns:
+          - 'react'
+          - 'react-dom'
+          - '@types/react'
+          - '@types/react-dom'
+      vite:
+        patterns:
+          - 'vite'
+          - 'vite-tsconfig-paths'
+      remix:
+        patterns:
+          - '@remix-run/dev'
+          - '@remix-run/fs-routes'
+          - '@remix-run/node'
+          - '@remix-run/react'
+          - '@remix-run/eslint-config'
+          - '@remix-run/route-config'
+
+      # Group all patch updates not accounted for in prior groups in a single PR.
+      # This reduces the number of PRs to review and rebase.
+      patch-updates:
+        patterns:
+          - "*"
+        update-types:
+          - "patch"

.gitignore

@@ -1,4 +1,5 @@
 node_modules
+.DS_Store
 
 /.cache
 /build
@@ -11,5 +12,14 @@ node_modules
 database.sqlite
 
 .env
+.env.*
+
 package-lock.json
 yarn.lock
+pnpm-lock.yaml
+
+/extensions/*/dist
+
+# Ignore shopify files created during app dev
+.shopify/*
+.shopify.lock

.graphqlrc.js

@@ -1,34 +1,26 @@
-const fs = require("node:fs");
-const apiVersion = require("@shopify/shopify-app-remix").LATEST_API_VERSION;
-
+import fs from "fs";
+import { ApiVersion } from "@shopify/shopify-api";
+import { shopifyApiProject, ApiType } from "@shopify/api-codegen-preset";
 function getConfig() {
   const config = {
     projects: {
-      // Storefront API
-      // Here is the config to tell graphql.vscode-graphql to use the storefront GraphQL Schema
-      // Steps:
-      // 1. Uncomment lines 14-17 (the shopifyStorefrontApi property)
-      // 2. Update the documents array to point to files that use the storefront API
-      // Do not mix and match storefront and admin API documents in the same file.
-      // If a route needs both APIs, create a separate file for each API.
-      // shopifyStorefrontApi: {
-      //   schema: `https://shopify.dev/storefront-graphql-direct-proxy/${apiVersion}`,
-      //   documents: ["./app/routes/app.storefront.jsx"],
-      // },
-      shopifyAdminApi: {
-        schema: `https://shopify.dev/admin-graphql-direct-proxy/${apiVersion}`,
-        documents: ["./app/**/*.{graphql,js,ts,jsx,tsx}"],
-      },
+      default: shopifyApiProject({
+        apiType: ApiType.Admin,
+        apiVersion: ApiVersion.July25,
+        documents: [
+          "./app/**/*.{js,ts,jsx,tsx}",
+          "./app/.server/**/*.{js,ts,jsx,tsx}",
+        ],
+        outputDir: "./app/types",
+      }),
     },
   };
-
   let extensions = [];
   try {
     extensions = fs.readdirSync("./extensions");
   } catch {
     // ignore if no extensions
   }
-
   for (const entry of extensions) {
     const extensionPath = `./extensions/${entry}`;
     const schema = `${extensionPath}/schema.graphql`;
@@ -40,8 +32,7 @@ function getConfig() {
       documents: [`${extensionPath}/**/*.graphql`],
     };
   }
-
   return config;
 }
-
-module.exports = getConfig();
+const config = getConfig();
+export default config;

.npmrc

@@ -1,4 +1,2 @@
 engine-strict=true
-auto-install-peers=true
-shamefully-hoist=true
-enable-pre-post-scripts=true
+@shopify:registry=https://registry.npmjs.org