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

Refactor: Move meter data to definition package #1782

Merged
merged 1 commit into from
Nov 15, 2024

Conversation

timothyfroehlich
Copy link
Member

@timothyfroehlich timothyfroehlich commented Nov 12, 2024

Based on PR #1774

Chain of upstream PRs as of 2024-11-14

Moves the meter data types from the legacy_definition package to the definition package.
This change simplifies the codebase by removing the redundant legacy_definition package.

Additionally, this change refactors the DesignCompose code to use the new meter data types.

Copy link

github-actions bot commented Nov 12, 2024

Snapshot diff report vs base branch: main
Last updated: Thu Nov 14 13:34:36 PST 2024, Sha: a435b8f
No differences detected

@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch from 9baddf8 to ab2a727 Compare November 12, 2024 19:01
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/1731-meter-data branch from 5733ea3 to df97316 Compare November 12, 2024 19:01
@timothyfroehlich timothyfroehlich marked this pull request as draft November 12, 2024 19:03
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch from ab2a727 to 2b00867 Compare November 13, 2024 20:33
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/1731-meter-data branch 2 times, most recently from 168cb48 to 9d77c6b Compare November 13, 2024 20:43
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch from 2b00867 to 46a1f74 Compare November 13, 2024 23:10
github-merge-queue bot pushed a commit that referenced this pull request Nov 14, 2024
<!-- start git-machete generated -->

## Tree of downstream PRs as of 2024-11-12

* **PR #1776 (THIS ONE)**:
  `main` ← `wb/froeht/new-fetch-test`

    * PR #1774:
`wb/froeht/new-fetch-test` ← `wb/froeht/protoconv-layout-positioning`

      * PR #1782:
`wb/froeht/protoconv-layout-positioning` ← `wb/froeht/1731-meter-data`

<!-- end git-machete generated -->

This adds a new Cargo fetch test to check that a doc can be fetched and
serialized. Because we don't want GitHub to be trying to fetch files,
it's locked behind a new feature, "test_fetches".

This also removes the figma_v1_mock file and feature. This was a pseudo
test that wasn't being executed by anything. It worked by using a
feature flag to mock the http fetch, which meant that if the feature
flag was included that no http queries would work, including the new
fetch test.
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch from 46a1f74 to 96b48bb Compare November 14, 2024 17:57
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/1731-meter-data branch from 9d77c6b to 409bb52 Compare November 14, 2024 17:57
github-merge-queue bot pushed a commit that referenced this pull request Nov 14, 2024
<!-- start git-machete generated -->

## Tree of downstream PRs as of 2024-11-14

* **PR #1774 (THIS ONE)**:
  `main` ← `wb/froeht/protoconv-layout-positioning`

    * PR #1782:
`wb/froeht/protoconv-layout-positioning` ← `wb/froeht/1731-meter-data`

<!-- end git-machete generated -->

Fixes #1725
Fixes #1723
Base automatically changed from wb/froeht/protoconv-layout-positioning to main November 14, 2024 18:28
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/1731-meter-data branch 2 times, most recently from 1414c39 to 4f8bcbd Compare November 14, 2024 21:05
@timothyfroehlich timothyfroehlich marked this pull request as ready for review November 14, 2024 21:23
Moves the meter data types from the legacy_definition package to the definition package.
This change simplifies the codebase by removing the redundant legacy_definition package.

Additionally, this change refactors the DesignCompose code to use the new meter data types.

# Conflicts:
#	crates/figma_import/tests/layout-unit-tests.dcf
#	designcompose/src/main/assets/figma/DesignSwitcherDoc_Ljph4e3sC0lHcynfXpoh9f.dcf
#	integration-tests/validation/src/main/assets/figma/AlignmentTestDoc_JIjE9oKQbq8ipi66ab5UaK.dcf
#	integration-tests/validation/src/main/assets/figma/BattleshipDoc_RfGl9SWnBEvdg8T1Ex6ZAR.dcf
#	integration-tests/validation/src/main/assets/figma/ComponentReplaceDoc_bQVVy2GSZJ8veYaJUrG6Ni.dcf
#	integration-tests/validation/src/main/assets/figma/ComponentReplaceRelayoutDoc_qIh0IOQTCtgeAWZFF5gYSk.dcf
#	integration-tests/validation/src/main/assets/figma/ComponentTapCallbackDoc_1jeKYynjk1nqYblZ66QDDK.dcf
#	integration-tests/validation/src/main/assets/figma/DialsGaugesTestDoc_lZj6E9GtIQQE4HNLpzgETw.dcf
#	integration-tests/validation/src/main/assets/figma/FancyFillTestDoc_xQ9cunHt8VUm6xqJJ2Pjb2.dcf
#	integration-tests/validation/src/main/assets/figma/GridLayoutDoc_MBNjjSbzzKeN7nBjVoewsl.dcf
#	integration-tests/validation/src/main/assets/figma/GridLayoutTestDoc_JOSOEvsrjvMqanyQa5OpNR.dcf
#	integration-tests/validation/src/main/assets/figma/GridWidgetTestDoc_OBhNItd9i9J2LwVYuLxEIx.dcf
#	integration-tests/validation/src/main/assets/figma/HelloVersionDoc_v62Vwlxa4Bb6nopJiAxQAQ_5668177823.dcf
#	integration-tests/validation/src/main/assets/figma/ImageUpdateTestDoc_oQw7kiy94fvdVouCYBC9T0.dcf
#	integration-tests/validation/src/main/assets/figma/InteractionTestDoc_8Zg9viyjYTnyN29pbkR1CE.dcf
#	integration-tests/validation/src/main/assets/figma/ItemSpacingTestDoc_YXrHBp6C6OaW5ShcCYeGJc.dcf
#	integration-tests/validation/src/main/assets/figma/LayoutReplacementTestDoc_dwk2GF7RiNvlbbAKPjqldx.dcf
#	integration-tests/validation/src/main/assets/figma/LayoutTestsDoc_Gv63fYTzpeH2ZtxP4go31E.dcf
#	integration-tests/validation/src/main/assets/figma/ListWidgetTestDoc_9ev0MBNHFrgTqJOrAGcEpV.dcf
#	integration-tests/validation/src/main/assets/figma/MaskTestDoc_mEmdUVEIjvBBbV0kELPy37.dcf
#	integration-tests/validation/src/main/assets/figma/ModuleExampleDoc_hPEGkrF0LUqNYEZObXqjXZ.dcf
#	integration-tests/validation/src/main/assets/figma/OpenLinkTestDoc_r7m4tqyKv6y9DWcg7QBEDf.dcf
#	integration-tests/validation/src/main/assets/figma/RecursiveCustomizationsDoc_o0GWzcqdOWEgzj4kIeIlAu.dcf
#	integration-tests/validation/src/main/assets/figma/ShadowsTestDoc_OqK58Y46IqP4wIgKCWys48.dcf
#	integration-tests/validation/src/main/assets/figma/SmartAnimateTestDoc_RW3lFurXCoVDeqY2Y7bf4v.dcf
#	integration-tests/validation/src/main/assets/figma/TelltaleTestDoc_TZgHrKWx8wvQM7UPTyEpmz.dcf
#	integration-tests/validation/src/main/assets/figma/TextElideTestDoc_oQ7nK49Ya5PJ3GpjI5iy8d.dcf
#	integration-tests/validation/src/main/assets/figma/VariableBorderTestDoc_MWnVAfW3FupV4VMLNR1m67.dcf
#	integration-tests/validation/src/main/assets/figma/VariablesTestDoc_HhGxvL4aHhP8ALsLNz56TP.dcf
#	integration-tests/validation/src/main/assets/figma/VariantAnimationTestDoc_pghyUUhlzJNoxxSK86ngiw.dcf
#	integration-tests/validation/src/main/assets/figma/VariantAnimationTimelineTestDoc_vJRf4zxY4QX4zzSSUd1nJ5.dcf
#	integration-tests/validation/src/main/assets/figma/VariantAsteriskTestDoc_gQeYHGCSaBE4zYSFpBrhre.dcf
#	integration-tests/validation/src/main/assets/figma/VariantInteractionsTestDoc_WcsgoLR4aDRSkZHY29Qdhq.dcf
#	integration-tests/validation/src/main/assets/figma/VariantPropertiesTestDoc_4P7zDdrQxj7FZsKJoIQcx1.dcf
#	reference-apps/tutorial/app/src/main/assets/figma/TutorialDoc_3z4xExq0INrL9vxPhj9tl7.dcf
@timothyfroehlich timothyfroehlich added this pull request to the merge queue Nov 15, 2024
Merged via the queue into main with commit 3709859 Nov 15, 2024
22 checks passed
@timothyfroehlich timothyfroehlich deleted the wb/froeht/1731-meter-data branch November 15, 2024 20:27
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.

2 participants