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

Scaffold examples #1608

Merged
merged 33 commits into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
0ed73d7
Refactor symlink in init.test
frandiox Dec 6, 2023
289c34b
Add diff feature to dev command
frandiox Dec 6, 2023
0dca064
Add example diff
frandiox Dec 6, 2023
63111ec
Fix watcher when deleting files
frandiox Dec 6, 2023
2d58173
Allow importing from current dir and skeleton template at the same ti…
frandiox Dec 7, 2023
5d3e1fa
Support --diff in build command
frandiox Dec 7, 2023
6615b47
Add build script to example
frandiox Dec 7, 2023
86e3ebd
Add turbo dependency
frandiox Dec 8, 2023
2f68810
Merge main
frandiox Dec 8, 2023
5d2bcfd
Merge branch 'main' into fd-diff-examples
frandiox Dec 8, 2023
6765806
Remove examples/diff
frandiox Dec 8, 2023
c0a337a
Use --diff in examples/third-party-queries-caching
frandiox Dec 8, 2023
85fcf02
Update package-lock
frandiox Dec 8, 2023
fb86781
Merge branch 'main' into fd-diff-examples
frandiox Jan 3, 2024
d8b2374
Remove unnecessary files
frandiox Jan 3, 2024
014ebbb
Refactor mergePackageJson
frandiox Jan 3, 2024
09520af
Refactor mergePackageJson, move to another file
frandiox Jan 3, 2024
fa996ec
Merge package.json with --diff flag
frandiox Jan 3, 2024
8b17eb0
Refactor
frandiox Jan 3, 2024
75da309
Rename file, refactor
frandiox Jan 4, 2024
94a25d1
Changesets
frandiox Jan 4, 2024
3452e55
Fix abort logic
frandiox Jan 4, 2024
41d641d
Support examples for scaffolding
frandiox Jan 4, 2024
733640a
Fix test for unknown templates
frandiox Jan 4, 2024
3dd52b9
Rename variables in test
frandiox Jan 4, 2024
a60f270
Add test for example scaffolding
frandiox Jan 4, 2024
736e99b
Minor refactor
frandiox Jan 4, 2024
8ba6b47
Changesets
frandiox Jan 4, 2024
87ad9e4
Update flag description
frandiox Jan 4, 2024
163368e
Fix transpilation detection
frandiox Jan 8, 2024
fb4fb63
Merge branch 'main' into fd-scaffold-examples
frandiox Jan 11, 2024
f604df3
Update utility location
frandiox Jan 11, 2024
be1eb1c
Fix name mismatch
frandiox Jan 11, 2024
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
5 changes: 5 additions & 0 deletions .changeset/silly-vans-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/cli-hydrogen': minor
---

Add `--diff` flag to dev and build commands to run examples in monorepo. Examples are now a diff applied on top of the starter template.
5 changes: 5 additions & 0 deletions .changeset/ten-singers-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/cli-hydrogen': minor
---

Support scaffolding projects based on examples in Hydrogen repo using the `--template` flag. Example: `npm create @shopify/hydrogen@latest -- --template multipass`.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,5 @@ yarn.lock

admin.schema.json
business-platform.schema.json

examples/**/*.generated.d.ts
5 changes: 0 additions & 5 deletions examples/third-party-queries-caching/.eslintignore

This file was deleted.

18 changes: 0 additions & 18 deletions examples/third-party-queries-caching/.eslintrc.js

This file was deleted.

8 changes: 0 additions & 8 deletions examples/third-party-queries-caching/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion examples/third-party-queries-caching/.graphqlrc.yml

This file was deleted.

4 changes: 1 addition & 3 deletions examples/third-party-queries-caching/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Hydrogen example: Third-party Queries and Caching

This folder contains shows how to leverage Oxygen's sub-request caching when querying
This folder shows how to leverage Oxygen's sub-request caching when querying
third-party GraphQL API in Hydrogen. This example uses the public [Rick & Morty API](https://rickandmortyapi.com/documentation/#graphql)

<img width="981" alt="Screenshot 2023-11-13 at 3 51 32 PM" src="https://github.com/juanpprieto/hydrogen-third-party-api/assets/12080141/fe648c70-a979-4862-a173-4c0244543dec">
Expand Down Expand Up @@ -146,5 +146,3 @@ export default function Homepage() {
);
}
```

[View the complete remix.d.ts file](/app/routes/_index.tsx) to see these updates in context.
12 changes: 0 additions & 12 deletions examples/third-party-queries-caching/app/entry.client.tsx

This file was deleted.

41 changes: 0 additions & 41 deletions examples/third-party-queries-caching/app/entry.server.tsx

This file was deleted.

49 changes: 0 additions & 49 deletions examples/third-party-queries-caching/app/root.tsx

This file was deleted.

Loading
Loading