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

Update reject_duplicated_checksums to only apply to asset files #3140

Merged
merged 2 commits into from
Nov 27, 2023

Conversation

lucyxiang
Copy link
Contributor

@lucyxiang lucyxiang commented Nov 24, 2023

WHY are these changes introduced?

Fixes #3138

WHAT is this pull request doing?

We only want to reject duplicate *.json and *.json.liquid for files under assets/* and not files under other directories.

How to test your changes?

  1. Add product.json and product.json.liquid to your theme
  2. shopify theme pull
  3. See that both files are pulled locally

Measuring impact

How do we know this change was effective? Please choose one:

  • n/a - this doesn't need measurement, e.g. a linting rule or a bug-fix
  • Existing analytics will cater for this addition
  • PR includes analytics changes to measure impact

Checklist

  • I've considered possible cross-platform impacts (Mac, Linux, Windows)
  • I've considered possible documentation changes
  • I've made sure that any changes to dev or deploy have been reflected in the internal flowchart.

Copy link
Contributor

Thanks for your contribution!

Depending on what you are working on, you may want to request a review from a Shopify team:

  • Themes: @shopify/advanced-edits
  • UI extensions: @shopify/ui-extensions-cli
    • Checkout UI extensions: @shopify/checkout-ui-extensions-api-stewardship
  • Hydrogen: @shopify/hydrogen
  • Other: @shopify/cli-foundations

Copy link
Contributor

github-actions bot commented Nov 24, 2023

Coverage report

St.
Category Percentage Covered / Total
🟡 Statements
73.11% (-0.01% 🔻)
6256/8557
🟡 Branches
70.71% (-0.02% 🔻)
3044/4305
🟡 Functions 71.82% 1585/2207
🟡 Lines
74.25% (-0.01% 🔻)
5941/8001
Show files with reduced coverage 🔻
St.
File Statements Branches Functions Lines
🟢
... / ConcurrentOutput.tsx
97.62% (-2.38% 🔻)
75% (-8.33% 🔻)
100%
97.44% (-2.56% 🔻)

Test suite run success

1495 tests passing in 670 suites.

Report generated by 🧪jest coverage report action from 2e1d555

@karreiro karreiro marked this pull request as ready for review November 27, 2023 05:51
Copy link
Contributor

@karreiro karreiro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, @lucyxiang!

@karreiro karreiro added this pull request to the merge queue Nov 27, 2023
Merged via the queue into main with commit 1f83867 Nov 27, 2023
@karreiro karreiro deleted the fix-3138 branch November 27, 2023 06:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] shopify theme pull drops json template under certain conditions
2 participants