Merge remote-tracking branch 'shopify-app-template-remix/main'

lukeclifton · Sep 17, 2024 · 61323d2 · 61323d2
2 parents 3eaad8e + 93b9952
commit 61323d2
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 30 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.gitignore b/.gitignore
@@ -11,8 +11,12 @@ database.sqlite
 .env
 .env.*
 .dev.vars
-
 package-lock.json
 yarn.lock
-
+pnpm-lock.yaml
 /extensions/*/dist
+
+# Ignore shopify files created during app dev
+.shopify/*
+.shopify.lock
+
diff --git a/.graphqlrc.ts b/.graphqlrc.ts
@@ -9,7 +9,7 @@ function getConfig() {
       default: shopifyApiProject({
         apiType: ApiType.Admin,
         apiVersion: LATEST_API_VERSION,
-        documents: ["./app/**/*.{js,ts,jsx,tsx}"],
+        documents: ["./app/**/*.{js,ts,jsx,tsx}", "./app/.server/**/*.{js,ts,jsx,tsx}"],
         outputDir: "./app/types",
       }),
     },

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # @shopify/shopify-app-template-remix
 
+## 2024.08.19
+
+Replaced deprecated `productVariantUpdate` with `productVariantsBulkUpdate`
+
 ## v2024.08.06
+
 Allow `SHOP_REDACT` webhook to process without admin context
 
 ## v2024.07.16

diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
-# Shopify App Template - Remix (Cloudflare Pages)
+# Shopify App Template - Remix - Cloudflare Pages Deployment Ready
+
 
 This is a template for building a [Shopify app](https://shopify.dev/docs/apps/getting-started) using the [Remix](https://remix.run) framework.
 

diff --git a/app/db.server.ts b/app/db.server.ts
@@ -0,0 +1,15 @@
+import { PrismaClient } from "@prisma/client";
+
+declare global {
+  var prisma: PrismaClient;
+}
+
+const prisma: PrismaClient = global.prisma || new PrismaClient();
+
+if (process.env.NODE_ENV !== "production") {
+  if (!global.prisma) {
+    global.prisma = new PrismaClient();
+  }
+}
+
+export default prisma;
diff --git a/app/entry.server.tsx b/app/entry.server.tsx
@@ -20,7 +20,7 @@ export default async function handleRequest(
   loadContext: AppLoadContext
 ) {
   loadContext.shopify.addDocumentResponseHeaders(request, responseHeaders);
-  
+
   const body = await renderToReadableStream(
     <RemixServer context={remixContext} url={request.url} />,
     {

diff --git a/app/shopify.server.ts b/app/shopify.server.ts
@@ -25,4 +25,4 @@ export function createShopifyAppContext(env: Env) {
       ? { customShopDomains: [env.SHOP_CUSTOM_DOMAIN] }
       : {}),
   });
-}
+}
diff --git a/package.json b/package.json
@@ -62,10 +62,6 @@
   "trustedDependencies": [
     "@shopify/plugin-cloudflare"
   ],
-  "resolutions": {
-    "undici": "6.13.0"
-  },
-  "overrides": {
-    "undici": "6.13.0"
-  }
+  "resolutions": {},
+  "overrides": {}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,4 +25,4 @@ export function createShopifyAppContext(env: Env) { @@
           ? { customShopDomains: [env.SHOP_CUSTOM_DOMAIN] }
           : {}),
       });
-    }
+    }