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

5.40.0 Fixes - Batch 2 (themes/src) #4124

Merged
merged 4 commits into from
May 15, 2024

Conversation

adrians5j
Copy link
Member

Changes

This PR moves all of the code in the extensions/theme folder to extensions/theme/src. This was made for consistency (the new scaffolds also follow this folder structure).

With that, one additional change we did here is the import of the global.scss file. Previously, the file was directly imported from Admin/Website React apps, but now, they are imported within the the theme package's code.

How Has This Been Tested?

Manually.

Documentation

Changelog.

@adrians5j adrians5j changed the title 5.40.0 Fixes - Batch 1 5.40.0 Fixes - Batch 2 (themes/src) May 13, 2024
@adrians5j
Copy link
Member Author

/cypress

Copy link

Cypress E2E tests have been initiated (for more information, click here). ✨

@adrians5j adrians5j marked this pull request as ready for review May 13, 2024 09:11
@adrians5j adrians5j added this to the 5.40.0 milestone May 13, 2024
@@ -50,7 +50,7 @@
"typescript": "4.7.4"
},
"workspaces": {
"packages": ["apps/admin", "apps/website", "apps/api/graphql", "extensions/theme", "packages/*"]
"packages": ["apps/admin", "apps/website", "apps/api/graphql", "packages/*", "extensions/theme"]
Copy link
Collaborator

Choose a reason for hiding this comment

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

It should be extensions/*, just like packages/*, and then you never need to modify these rules again.

Copy link
Member Author

Choose a reason for hiding this comment

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

The thing is, users can also create extensions in e.g. extensions/fm/api/xyz folder.

Copy link
Collaborator

Choose a reason for hiding this comment

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

If you think everyone will be using scaffolds, then probably this is ok.

Copy link
Member Author

@adrians5j adrians5j May 14, 2024

Choose a reason for hiding this comment

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

@adrians5j adrians5j merged commit fe38f80 into adrian/5.40-fixes-batch-1 May 15, 2024
89 checks passed
@adrians5j
Copy link
Member Author

Went through this changes with @Pavel910.

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.

None yet

2 participants