-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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/6] build: commit XModule SCSS entrypoints instead of generating them #32290
Merged
kdmccormick
merged 1 commit into
openedx:master
from
kdmccormick:kdmccormick/xmodule-scss-commit
Jun 16, 2023
Merged
[5/6] build: commit XModule SCSS entrypoints instead of generating them #32290
kdmccormick
merged 1 commit into
openedx:master
from
kdmccormick:kdmccormick/xmodule-scss-commit
Jun 16, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced May 23, 2023
kdmccormick
force-pushed
the
kdmccormick/xmodule-scss-commit
branch
from
June 6, 2023 13:45
eb1088a
to
7220a30
Compare
kdmccormick
force-pushed
the
kdmccormick/xmodule-scss-commit
branch
2 times, most recently
from
June 14, 2023 16:46
aecaef9
to
8c0009c
Compare
kdmccormick
changed the title
[5/6] build: commit XModule SCSS entrypoints of generating them
[5/6] build: commit XModule SCSS entrypoints instead of generating them
Jun 14, 2023
feanil
approved these changes
Jun 14, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested in tutor, and looks good to me.
kdmccormick
force-pushed
the
kdmccormick/xmodule-scss-commit
branch
from
June 14, 2023 19:11
8c0009c
to
9e3bb3a
Compare
`xmodule_assets` generated a series of SCSS "entrypoint" files, where each entrypoint file imported from the SCSS "sources" in xmodule/css. This process was more complicated up until very recently; for context, make sure you've seen: * openedx#32288 * openedx#32289 Now that the process is simpler, though, there is no reason to generate the SCSS entrypoints; we can just commit them to the repository instead! So, we go from this: # GENERATED: SCSS entrypoints files for CMS common/static/xmodule/descriptors: AboutBlockStudio.scss AnnotatableBlockStudio.scss ... # GENERATED: SCSS entrypoints files for LMS common/static/xmodule/modules: AboutBlockPreview.scss AnnotatableBlockPreview.scss ... # VERSION CONTROLLED: SCSS source files xmodule/css: annotatable/... capa/... ... to this: # VERSION CONTROLLED: All XModule SCSS xmodule/static/sass: # Source files include: annotatable/... capa/... ... # CMS entrypoint files cms: AboutBlockStudio.scss AnnotatableBlockStudio.scss ... # LMS source files lms: AboutBlockPreview.scss AnnotatableBlockPreview.scss ... Also, we are able to remove all SCSS-related logic from the `xmodule_assets` script and from the `HTMLSnippet` class. XModule JS assets still need processing, but we will address those in a separate series of PRs. Part of: openedx#32292
kdmccormick
force-pushed
the
kdmccormick/xmodule-scss-commit
branch
from
June 16, 2023 03:51
9e3bb3a
to
b93e41d
Compare
2U Release Notice: This PR has been deployed to the edX staging environment in preparation for a release to production. |
2U Release Notice: This PR has been deployed to the edX production environment. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Supporting information
This is a part of a series of PRs:
The previous PR is:
The next PR is:
Description
xmodule_assets
generated a series of SCSS "entrypoint"files, where each entrypoint file imported from the
SCSS "sources" in xmodule/css.
This process was more complicated up until very
recently; for context, make sure you've seen:
Now that the process is simpler, though, there
is no reason to generated the SCSS entrypoints;
we can just commit them to the repository instead!
So, we go from this:
to this:
Also, we are able to remove all SCSS-related logic from the
xmodule_assets
script and from theHTMLSnippet
class.XModule JS assets still need processing, but we will address
those in a separate series of PRs.
Part of: #31624
Testing Instructions
Deadline
Medium-high urgency, as this is in the critical path to a long line of DevX improvement PRs.