Skip to content

Commit

Permalink
Merge branch 'main' into fd-h2o-compat
Browse files Browse the repository at this point in the history
  • Loading branch information
wizardlyhel committed Oct 10, 2024
2 parents 9b96f30 + 54a8824 commit 5a1c8c0
Show file tree
Hide file tree
Showing 279 changed files with 20,081 additions and 30,907 deletions.
5 changes: 0 additions & 5 deletions .changeset/flat-melons-design.md

This file was deleted.

4 changes: 3 additions & 1 deletion .github/workflows/deploy-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
matrix:
examples:
[
{name: 'optimistic-cart-ui', token: '1000014888'},
{name: 'classic-remix', token: '1000014892'},
{name: 'metaobjects', token: '1000014928'},
{name: 'third-party-queries-caching', token: '1000014929'},
{name: 'custom-cart-method', token: '1000014930'},
{name: 'sitemap', token: '1000022490'},
]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -58,7 +58,9 @@ jobs:
run: |
npx shopify hydrogen deploy --no-lockfile-check --diff --token=$OXYGEN_DEPLOYMENT_TOKEN_${{ matrix.examples.token }}
env:
SHOPIFY_HYDROGEN_FLAG_METADATA_DESCRIPTION: ${{ github.event.head_commit.message }}
OXYGEN_DEPLOYMENT_TOKEN_1000014888: ${{ secrets.OXYGEN_DEPLOYMENT_TOKEN_1000014888 }}
OXYGEN_DEPLOYMENT_TOKEN_1000022490: ${{ secrets.OXYGEN_DEPLOYMENT_TOKEN_1000022490 }}
OXYGEN_DEPLOYMENT_TOKEN_1000014892: ${{ secrets.OXYGEN_DEPLOYMENT_TOKEN_1000014892 }}
OXYGEN_DEPLOYMENT_TOKEN_1000014928: ${{ secrets.OXYGEN_DEPLOYMENT_TOKEN_1000014928 }}
OXYGEN_DEPLOYMENT_TOKEN_1000014929: ${{ secrets.OXYGEN_DEPLOYMENT_TOKEN_1000014929 }}
Expand Down
30 changes: 10 additions & 20 deletions .github/workflows/snapit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,21 @@ jobs:
if: ${{ github.event.issue.pull_request && github.event.comment.body == '/snapit' }}
runs-on: ubuntu-latest
steps:
- name: Checkout default branch
# WARNING: DO NOT RUN ANY CUSTOM LOCAL SCRIPT BEFORE RUNNING THE SNAPIT ACTION
# This action can be executed by 3rd party users and it should not be able to run arbitrary code from a PR.
- name: Checkout current branch
uses: actions/checkout@v4

- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'npm'
cache-dependency-path: '**/package-lock.json'

- name: 📥 Install dependencies
run: npm ci

- name: 🏗 Build
run: npm run build

- name: 🔐 Setup npm auth
- name: Force snapshot changeset
run: |
echo "registry=https://registry.npmjs.org" >> ~/.npmrc
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
printf -- "---\n'@shopify/hydrogen': patch\n'@shopify/cli-hydrogen': patch\n'@shopify/create-hydrogen': patch\n---\n\nForce snapshot build.\n" > .changeset/force-snapshot-build.md
- name: Create snapshot version
uses: Shopify/snapit@f9e1c0990888000fb4b2e622319ee69e2dc84e67 # pin@main
uses: Shopify/snapit@0c0d2dd62c9b0c94b7d03e1f54e72f18548e7752 # pin to a specific commit
with:
github_comment_included_packages: '@shopify/hydrogen,@shopify/cli-hydrogen,@shopify/hydrogen-codegen,@shopify/mini-oxygen,@shopify/remix-oxygen'
custom_message_suffix: "\n> Create a new project with all the released packages running `npm create @shopify/hydrogen@<snapshot_version>`\n>To try a new CLI plugin version, add `@shopify/cli-hydrogen` as a dependency to your project using the snapshot version."
build_script: 'npm run build'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18
v20
Loading

0 comments on commit 5a1c8c0

Please sign in to comment.