Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add information about network transaction #951

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
c8126d4
Convert template to typescript
paulomarg Sep 22, 2023
4d39e83
Add CI step definition
paulomarg Sep 29, 2023
ff36375
Convert template to Javascript
web-flow Oct 2, 2023
0f24694
Convert template to typescript
paulomarg Sep 22, 2023
059a790
Add CI step definition
paulomarg Sep 29, 2023
e3306af
Convert template to Javascript
web-flow Oct 20, 2023
8500ab9
Merge pull request #395 from Shopify/fix_js_workflow
paulomarg Oct 23, 2023
305afcc
Convert template to Javascript
web-flow Oct 23, 2023
35c47ae
Merge pull request #393 from Shopify/javascript_updates
paulomarg Oct 23, 2023
82dc9e0
Merge pull request #397 from Shopify/update_rest_resource_version
paulomarg Oct 24, 2023
bb5b985
Convert template to Javascript
web-flow Oct 24, 2023
6deedc6
Merge pull request #398 from Shopify/javascript_updates
paulomarg Oct 24, 2023
8f2d265
Merge pull request #387 from Shopify/bun
gonzaloriestra Oct 25, 2023
31db2a7
Convert template to Javascript
web-flow Oct 25, 2023
8492499
Add extensions folder
gonzaloriestra Oct 19, 2023
ce89e43
Enable postinstall scripts for cloudflare
gonzaloriestra Oct 20, 2023
9597bdd
Merge pull request #401 from Shopify/bun
gonzaloriestra Oct 25, 2023
5e9ada3
Merge pull request #400 from Shopify/javascript_updates
byrichardpowell Oct 25, 2023
79b4f14
Merge pull request #409 from Zwyx/patch-1
paulomarg Nov 3, 2023
98c113f
Convert template to Javascript
web-flow Nov 3, 2023
90fb2ac
Merge pull request #410 from Shopify/javascript_updates
paulomarg Nov 3, 2023
a342865
Merge pull request #411 from Shopify/enable-future-flag
byrichardpowell Nov 3, 2023
f20f43a
Convert template to Javascript
web-flow Nov 3, 2023
9e98a46
Merge pull request #412 from Shopify/javascript_updates
paulomarg Nov 3, 2023
e264b28
Merge pull request #413 from Shopify/fix_shopify_api_dependency
paulomarg Nov 3, 2023
ef59b4a
Convert template to Javascript
web-flow Nov 3, 2023
778fb33
Merge pull request #414 from Shopify/javascript_updates
paulomarg Nov 3, 2023
9614907
Merge pull request #423 from Shopify/add_webhook_registration_gotcha
paulomarg Nov 13, 2023
3e7100a
Convert template to Javascript
web-flow Nov 13, 2023
241ccd2
Merge pull request #424 from Shopify/javascript_updates
paulomarg Nov 13, 2023
10e4bad
Merge pull request #418 from Shopify/reduce_docker_container_size
paulomarg Nov 15, 2023
8fb8cd1
Convert template to Javascript
web-flow Nov 15, 2023
acef278
Merge pull request #426 from Shopify/javascript_updates
paulomarg Nov 15, 2023
c352ca9
Merge pull request #433 from Shopify/close_issues_waiting_for_response
paulomarg Nov 24, 2023
bbcb370
Convert template to Javascript
web-flow Nov 24, 2023
72f5a18
Merge pull request #434 from Shopify/javascript_updates
paulomarg Nov 24, 2023
26e51f3
Merge pull request #437 from Shopify/liz/admin-webhook-gotcha
lizkenyon Nov 28, 2023
2329d5e
Convert template to Javascript
web-flow Nov 28, 2023
2a5b235
Merge pull request #439 from Shopify/javascript_updates
paulomarg Nov 28, 2023
a5c723d
Merge pull request #451 from Shopify/fix_js_build_workflow
paulomarg Dec 11, 2023
f025482
Convert template to Javascript
web-flow Dec 11, 2023
bb682f3
Merge pull request #450 from Shopify/javascript_updates
paulomarg Dec 11, 2023
8a76dce
Merge pull request #453 from Shopify/revert-452-dependabot/npm_and_ya…
thomfoolery Jan 3, 2024
f7ca5b5
Convert template to Javascript
web-flow Jan 3, 2024
6129a76
Merge pull request #482 from Shopify/javascript_updates
lizkenyon Jan 3, 2024
ca1be82
Initial commit
bargenson Aug 18, 2023
912524a
Add tags
jaruserickson Dec 14, 2023
f50a809
Merge pull request #1 from Shopify/add-cc-payments-app-template
nadiakostiv98 Jan 3, 2024
4d7d700
Merge pull request #492 from Shopify/liz/update-shopify-app-remix
lizkenyon Jan 10, 2024
532ca26
Convert template to Javascript
web-flow Jan 10, 2024
fa47234
Merge pull request #493 from Shopify/javascript_updates
lizkenyon Jan 10, 2024
013f72f
Update readme for clarity
jaruserickson Jan 11, 2024
13d22ee
Remove documentation comments
jaruserickson Jan 11, 2024
33b0e94
Merge pull request #495 from Shopify/liz/update-rest-resources-2024-01
lizkenyon Jan 11, 2024
4aa0081
Convert template to Javascript
web-flow Jan 11, 2024
8e439ce
Merge pull request #496 from Shopify/javascript_updates
lizkenyon Jan 11, 2024
cd57279
Remove JS workflow, add sync flows
jaruserickson Jan 12, 2024
61a324b
Merge branch 'main-js' into javascript
jaruserickson Jan 12, 2024
7dbb324
Merge pull request #9 from Shopify/javascript
jaruserickson Jan 12, 2024
88fb28f
Remove duplicate migration
jaruserickson Jan 15, 2024
9ea2828
Update remix config
jaruserickson Jan 15, 2024
49bed0e
Add clarity to Readme
jaruserickson Jan 15, 2024
d43c006
Use new BlockStack, remove extra route
jaruserickson Jan 15, 2024
411011c
Merge pull request #12 from Shopify/more-fixes
jaruserickson Jan 15, 2024
10d6328
Update CODEOWNERS
jaruserickson Jan 15, 2024
54629c6
Update sync-upstream.yml
jaruserickson Jan 22, 2024
74da8f3
Use new icons
jaruserickson Mar 4, 2024
bd53bd9
Update codeowners
jaruserickson Mar 4, 2024
7543f31
Remove broken dependency
jaruserickson Mar 4, 2024
5d48667
Merge pull request #29 from Shopify/new-polaris-icons
jaruserickson Mar 4, 2024
57f2b81
Update CODEOWNERS
bazay Nov 11, 2024
6cae851
Merge pull request #104 from Shopify/update-codeowners
bazay Nov 11, 2024
77ae228
Add networkTransactionId to the paymentSessionResolve
marcin-drozd Jan 31, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @shopify/client-libraries-app-templates
* @shopify/pp-partners
20 changes: 20 additions & 0 deletions .github/workflows/close-waiting-for-response-issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Close Waiting for Response Issues
on:
schedule:
- cron: "30 1 * * *"
workflow_dispatch:
jobs:
check-need-info:
runs-on: ubuntu-latest
steps:
- name: close-issues
uses: actions-cool/issues-helper@v3
with:
actions: "close-issues"
token: ${{ secrets.GITHUB_TOKEN }}
labels: "Waiting for Response"
inactive-day: 14
body: |
We are closing this issue because we did not hear back regarding additional details we needed to resolve this issue. If the issue persists and you are able to provide the missing clarification we need, you can respond here or create a new issue.

We appreciate your understanding as we try to manage our number of open issues.
80 changes: 0 additions & 80 deletions .github/workflows/convert-to-js.yml

This file was deleted.

39 changes: 39 additions & 0 deletions .github/workflows/js-to-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Create Docs PR

on:
push:
branches:
- main-js

workflow_dispatch:

jobs:
create-docs-pr:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
name: Sync latest commits from upstream repo

steps:
- name: Checkout target repo
uses: actions/checkout@v4
with:
repository: shopify/example-app--credit-card-payments-app-template--remix
fetch-depth: 0
ref: main-js

- name: Setup git config
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

- name: Setup updates branch
run: |
git push origin --delete docs_updates &>/dev/null || true
git switch -c docs_updates
git reset --hard origin/main-js
git push origin docs_updates --force

- name: Create PR
run: |
gh pr create --repo Shopify/example-app--credit-card-payments-app-template--remix --head docs_updates --base docs --title 'Sync docs' --body 'This is an automated PR. Please use this to make any updates to doc tags before merging.'
60 changes: 60 additions & 0 deletions .github/workflows/sync-upstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Sync with upstream

on:
schedule:
- cron: '0 7 * * 1,4'
# scheduled at 07:00 every Monday and Thursday
workflow_dispatch:

jobs:
sync_latest_from_upstream:
runs-on: ubuntu-latest
permissions: write-all
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
name: Sync latest commits from upstream repo

steps:
- name: Checkout source repo
uses: actions/checkout@v4
with:
repository: shopify/shopify-app-template-remix
fetch-depth: 0
ref: javascript

- name: Checkout target repo
uses: actions/checkout@v4
with:
repository: shopify/example-app--credit-card-payments-app-template--remix
fetch-depth: 0
ref: main-js

- name: Setup git config
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

- name: Reset javascript
run: |
git push origin --delete javascript &>/dev/null || true
git switch -c javascript
git push origin javascript

- name: Pull upstream changes
run: |
git remote add upstream https://github.com/shopify/shopify-app-template-remix.git
git fetch upstream
git reset --hard upstream/javascript

- name: Clean any workflows
run: |
shopt -s extglob
cd .github/workflows
rm -- !(js-to-docs.yml|sync-upstream.yml)
git add .
git commit -m "[Actions] Revert any workflow changes due to lack of permissions."

- name: Push changes
run: |
git push origin javascript --force
gh pr create --repo Shopify/example-app--credit-card-payments-app-template--remix --head javascript --title 'Sync javascript with upstream' --body 'This is an automated PR that syncs the repo with its source upstream.' &>/dev/null || true
44 changes: 44 additions & 0 deletions .graphqlrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import fs from "fs";

import { LATEST_API_VERSION } from "@shopify/shopify-api";
import { shopifyApiProject, ApiType } from "@shopify/api-codegen-preset";

function getConfig() {
const config = {
// For syntax highlighting / auto-complete when writing operations
schema: `https://shopify.dev/admin-graphql-direct-proxy/${LATEST_API_VERSION}`,
documents: ["./app/**/*.{js,ts,jsx,tsx}"],
projects: {
// To produce variable / return types for Admin API operations
default: shopifyApiProject({
apiType: ApiType.Admin,
apiVersion: LATEST_API_VERSION,
documents: ["./app/**/*.{js,ts,jsx,tsx}"],
outputDir: "./app/types",
}),
},
};

let extensions: string[] = [];
try {
extensions = fs.readdirSync("./extensions");
} catch {
// ignore if no extensions
}

for (const entry of extensions) {
const extensionPath = `./extensions/${entry}`;
const schema = `${extensionPath}/schema.graphql`;
if (!fs.existsSync(schema)) {
continue;
}
config.projects[entry] = {
schema,
documents: [`${extensionPath}/**/*.graphql`],
};
}

return config;
}

module.exports = getConfig();
8 changes: 7 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
FROM node:18-alpine

EXPOSE 3000

WORKDIR /app
COPY . .

RUN npm install
ENV NODE_ENV=production

RUN npm install --omit=dev
# Remove CLI packages since we don't need them in production by default.
# Remove this line if you want to run CLI commands in your container.
RUN npm remove @shopify/app @shopify/cli
RUN npm run build

# You'll probably want to remove this in production, it's here to make it easier to test things!
Expand Down
Loading