Skip to content

Commit 64663df

Browse files
authored
Merge pull request #584 from Shopify/sgh/remix-upgrade-0
Update Remix template version for Delivery Customizations sample app
2 parents 903bc37 + 6b07454 commit 64663df

39 files changed

+987
-878
lines changed

sample-apps/delivery-customizations/.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,21 @@ node_modules
44
/build
55
/app/build
66
/public/build/
7+
/public/_dev
78
/app/public/build
89
/prisma/dev.sqlite
910
/prisma/dev.sqlite-journal
1011
database.sqlite
1112

1213
.env
14+
.env.*
15+
1316
package-lock.json
1417
yarn.lock
18+
pnpm-lock.yaml
19+
20+
/extensions/*/dist
21+
22+
# Ignore shopify files created during app dev
23+
.shopify/*
24+
.shopify.lock

sample-apps/delivery-customizations/.graphqlrc.js

Lines changed: 0 additions & 36 deletions
This file was deleted.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import fs from "fs";
2+
import { LATEST_API_VERSION } from "@shopify/shopify-api";
3+
import { shopifyApiProject, ApiType } from "@shopify/api-codegen-preset";
4+
import type { IGraphQLConfig } from "graphql-config";
5+
6+
function getConfig() {
7+
const config: IGraphQLConfig = {
8+
projects: {
9+
default: shopifyApiProject({
10+
apiType: ApiType.Admin,
11+
apiVersion: LATEST_API_VERSION,
12+
documents: ["./app/**/*.{js,ts,jsx,tsx}", "./app/.server/**/*.{js,ts,jsx,tsx}"],
13+
outputDir: "./app/types",
14+
}),
15+
},
16+
};
17+
18+
let extensions: string[] = [];
19+
try {
20+
extensions = fs.readdirSync("./extensions");
21+
} catch {
22+
// ignore if no extensions
23+
}
24+
25+
for (const entry of extensions) {
26+
const extensionPath = `./extensions/${entry}`;
27+
const schema = `${extensionPath}/schema.graphql`;
28+
if (!fs.existsSync(schema)) {
29+
continue;
30+
}
31+
config.projects[entry] = {
32+
schema,
33+
documents: [`${extensionPath}/**/*.graphql`],
34+
};
35+
}
36+
37+
return config;
38+
}
39+
40+
module.exports = getConfig();
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
engine-strict=true
22
auto-install-peers=true
33
shamefully-hoist=true
4-
@shopify:registry=https://registry.npmjs.org
4+
enable-pre-post-scripts=true
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
package.json
2-
.cache
32
.shadowenv.d
43
.vscode
5-
build
64
node_modules
75
prisma
86
public
9-
shopify-app-remix
10-
.github
11-
tmp
12-
*.yml
137
.shopify

sample-apps/delivery-customizations/.vscode/extensions.json

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# @shopify/shopify-app-template-remix
2+
3+
## 2024.12.19
4+
5+
- [#904](https://github.com/Shopify/shopify-app-template-remix/pull/904) bump `@shopify/app-bridge-react` to latest
6+
-
7+
## 2024.12.18
8+
9+
- [875](https://github.com/Shopify/shopify-app-template-remix/pull/875) Add Scopes Update Webhook
10+
## 2024.12.05
11+
12+
- [#910](https://github.com/Shopify/shopify-app-template-remix/pull/910) Install `openssl` in Docker image to fix Prisma (see [#25817](https://github.com/prisma/prisma/issues/25817#issuecomment-2538544254))
13+
- [#907](https://github.com/Shopify/shopify-app-template-remix/pull/907) Move `@remix-run/fs-routes` to `dependencies` to fix Docker image build
14+
- [#899](https://github.com/Shopify/shopify-app-template-remix/pull/899) Disable v3_singleFetch flag
15+
- [#898](https://github.com/Shopify/shopify-app-template-remix/pull/898) Enable the `removeRest` future flag so new apps aren't tempted to use the REST Admin API.
16+
17+
## 2024.12.04
18+
19+
- [#891](https://github.com/Shopify/shopify-app-template-remix/pull/891) Enable remix future flags.
20+
21+
## 2024.11.26
22+
- [888](https://github.com/Shopify/shopify-app-template-remix/pull/888) Update restResources version to 2024-10
23+
24+
## 2024.11.06
25+
26+
- [881](https://github.com/Shopify/shopify-app-template-remix/pull/881) Update to the productCreate mutation to use the new ProductCreateInput type
27+
28+
## 2024.10.29
29+
30+
- [876](https://github.com/Shopify/shopify-app-template-remix/pull/876) Update shopify-app-remix to v3.4.0 and shopify-app-session-storage-prisma to v5.1.5
31+
32+
## 2024.10.02
33+
34+
- [863](https://github.com/Shopify/shopify-app-template-remix/pull/863) Update to Shopify App API v2024-10 and shopify-app-remix v3.3.2
35+
36+
## 2024.09.18
37+
38+
- [850](https://github.com/Shopify/shopify-app-template-remix/pull/850) Removed "~" import alias
39+
40+
## 2024.09.17
41+
42+
- [842](https://github.com/Shopify/shopify-app-template-remix/pull/842) Move webhook processing to individual routes
43+
44+
## 2024.08.19
45+
46+
Replaced deprecated `productVariantUpdate` with `productVariantsBulkUpdate`
47+
48+
## v2024.08.06
49+
50+
Allow `SHOP_REDACT` webhook to process without admin context
51+
52+
## v2024.07.16
53+
54+
Started tracking changes and releases using calver
Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
FROM node:18-alpine
2+
RUN apk add --no-cache openssl
23

34
EXPOSE 3000
5+
46
WORKDIR /app
7+
8+
ENV NODE_ENV=production
9+
10+
COPY package.json package-lock.json* ./
11+
12+
RUN npm ci --omit=dev && npm cache clean --force
13+
# Remove CLI packages since we don't need them in production by default.
14+
# Remove this line if you want to run CLI commands in your container.
15+
RUN npm remove @shopify/cli
16+
517
COPY . .
618

7-
RUN npm install
819
RUN npm run build
920

10-
# You'll probably want to remove this in production, it's here to make it easier to test things!
11-
RUN rm prisma/dev.sqlite
12-
RUN npx prisma migrate dev --name init
13-
14-
CMD ["npm", "run", "start"]
21+
CMD ["npm", "run", "docker-start"]

0 commit comments

Comments
 (0)