Skip to content

Commit

Permalink
build: xmodule/js -> xmodule/static/js
Browse files Browse the repository at this point in the history
TODO:
* commit details
* understand PIPELINE['javascript']
* look for any other code that expects modules at
  xmodule/js instead of xmodule/static/js

Part of: #31624
  • Loading branch information
kdmccormick committed May 22, 2023
1 parent dd25c77 commit ea3160d
Show file tree
Hide file tree
Showing 178 changed files with 85 additions and 85 deletions.
2 changes: 1 addition & 1 deletion cms/envs/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1385,7 +1385,7 @@
},
'module-js': {
'source_filenames': (
rooted_glob(COMMON_ROOT / 'static/', 'xmodule/js/*.js') +
rooted_glob(COMMON_ROOT / 'static/', 'xmodule/static/js/*.js') +
rooted_glob(COMMON_ROOT / 'static/', 'common/js/discussion/*.js')
),
'output_filename': 'js/cms-modules.js',
Expand Down
4 changes: 2 additions & 2 deletions lms/envs/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -2568,11 +2568,11 @@ def _make_locale_paths(settings): # pylint: disable=missing-function-docstring
'output_filename': 'js/lms-main_vendor.js',
},
'module-descriptor-js': {
'source_filenames': rooted_glob(COMMON_ROOT / 'static/', 'xmodule/js/*.js'),
'source_filenames': rooted_glob(COMMON_ROOT / 'static/', 'xmodule/static/js/*.js'),
'output_filename': 'js/lms-module-descriptors.js',
},
'module-js': {
'source_filenames': rooted_glob(COMMON_ROOT / 'static', 'xmodule/js/*.js'),
'source_filenames': rooted_glob(COMMON_ROOT / 'static', 'xmodule/static/js/*.js'),
'output_filename': 'js/lms-modules.js',
},
'discussion': {
Expand Down
2 changes: 1 addition & 1 deletion webpack-config/file-lists.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = {
path.resolve(__dirname, '../common/static/common/js/components/views/paging_footer.js'),
path.resolve(__dirname, '../cms/static/js/views/paging.js'),
path.resolve(__dirname, '../common/static/common/js/components/utils/view_utils.js'),
/xmodule\/js\/src\//,
/xmodule\/static\/js\/src\//,
path.resolve(__dirname, '../openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmark_button.js')
],

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
162 changes: 81 additions & 81 deletions xmodule/static/webpack.xmodule.config.js
Original file line number Diff line number Diff line change
@@ -1,136 +1,136 @@
module.exports = {
"entry": {
"AboutBlockPreview": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/html/display.js",
"xmodule/js/src/javascript_loader.js",
"xmodule/js/src/collapsible.js",
"xmodule/js/src/html/imageModal.js",
"xmodule/js/common_static/js/vendor/draggabilly.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/html/display.js",
"xmodule/static/js/src/javascript_loader.js",
"xmodule/static/js/src/collapsible.js",
"xmodule/static/js/src/html/imageModal.js",
"xmodule/static/js/common_static/js/vendor/draggabilly.js"
],
"AboutBlockStudio": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/html/edit.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/html/edit.js"
],
"AnnotatableBlockPreview": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/html/display.js",
"xmodule/js/src/annotatable/display.js",
"xmodule/js/src/javascript_loader.js",
"xmodule/js/src/collapsible.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/html/display.js",
"xmodule/static/js/src/annotatable/display.js",
"xmodule/static/js/src/javascript_loader.js",
"xmodule/static/js/src/collapsible.js"
],
"AnnotatableBlockStudio": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/raw/edit/xml.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/raw/edit/xml.js"
],
"ConditionalBlockPreview": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/conditional/display.js",
"xmodule/js/src/javascript_loader.js",
"xmodule/js/src/collapsible.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/conditional/display.js",
"xmodule/static/js/src/javascript_loader.js",
"xmodule/static/js/src/collapsible.js"
],
"ConditionalBlockStudio": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/sequence/edit.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/sequence/edit.js"
],
"CourseInfoBlockPreview": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/html/display.js",
"xmodule/js/src/javascript_loader.js",
"xmodule/js/src/collapsible.js",
"xmodule/js/src/html/imageModal.js",
"xmodule/js/common_static/js/vendor/draggabilly.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/html/display.js",
"xmodule/static/js/src/javascript_loader.js",
"xmodule/static/js/src/collapsible.js",
"xmodule/static/js/src/html/imageModal.js",
"xmodule/static/js/common_static/js/vendor/draggabilly.js"
],
"CourseInfoBlockStudio": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/html/edit.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/html/edit.js"
],
"CustomTagBlockPreview": "xmodule/js/src/xmodule.js",
"CustomTagBlockPreview": "xmodule/static/js/src/xmodule.js",
"CustomTagBlockStudio": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/raw/edit/xml.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/raw/edit/xml.js"
],
"HtmlBlockPreview": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/html/display.js",
"xmodule/js/src/javascript_loader.js",
"xmodule/js/src/collapsible.js",
"xmodule/js/src/html/imageModal.js",
"xmodule/js/common_static/js/vendor/draggabilly.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/html/display.js",
"xmodule/static/js/src/javascript_loader.js",
"xmodule/static/js/src/collapsible.js",
"xmodule/static/js/src/html/imageModal.js",
"xmodule/static/js/common_static/js/vendor/draggabilly.js"
],
"HtmlBlockStudio": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/html/edit.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/html/edit.js"
],
"LTIBlockPreview": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/lti/lti.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/lti/lti.js"
],
"LTIBlockStudio": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/raw/edit/metadata-only.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/raw/edit/metadata-only.js"
],
"LibraryContentBlockPreview": "xmodule/js/src/xmodule.js",
"LibraryContentBlockPreview": "xmodule/static/js/src/xmodule.js",
"LibraryContentBlockStudio": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/vertical/edit.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/vertical/edit.js"
],
"PollBlockPreview": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/javascript_loader.js",
"xmodule/js/src/poll/poll.js",
"xmodule/js/src/poll/poll_main.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/javascript_loader.js",
"xmodule/static/js/src/poll/poll.js",
"xmodule/static/js/src/poll/poll_main.js"
],
"PollBlockStudio": "xmodule/js/src/xmodule.js",
"PollBlockStudio": "xmodule/static/js/src/xmodule.js",
"ProblemBlockPreview": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/javascript_loader.js",
"xmodule/js/src/capa/display.js",
"xmodule/js/src/collapsible.js",
"xmodule/js/src/capa/imageinput.js",
"xmodule/js/src/capa/schematic.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/javascript_loader.js",
"xmodule/static/js/src/capa/display.js",
"xmodule/static/js/src/collapsible.js",
"xmodule/static/js/src/capa/imageinput.js",
"xmodule/static/js/src/capa/schematic.js"
],
"ProblemBlockStudio": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/problem/edit.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/problem/edit.js"
],
"SequenceBlockPreview": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/sequence/display.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/sequence/display.js"
],
"SequenceBlockStudio": "xmodule/js/src/xmodule.js",
"SplitTestBlockPreview": "xmodule/js/src/xmodule.js",
"SequenceBlockStudio": "xmodule/static/js/src/xmodule.js",
"SplitTestBlockPreview": "xmodule/static/js/src/xmodule.js",
"SplitTestBlockStudio": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/sequence/edit.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/sequence/edit.js"
],
"StaticTabBlockPreview": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/html/display.js",
"xmodule/js/src/javascript_loader.js",
"xmodule/js/src/collapsible.js",
"xmodule/js/src/html/imageModal.js",
"xmodule/js/common_static/js/vendor/draggabilly.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/html/display.js",
"xmodule/static/js/src/javascript_loader.js",
"xmodule/static/js/src/collapsible.js",
"xmodule/static/js/src/html/imageModal.js",
"xmodule/static/js/common_static/js/vendor/draggabilly.js"
],
"StaticTabBlockStudio": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/html/edit.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/html/edit.js"
],
"VideoBlockPreview": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/video/10_main.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/video/10_main.js"
],
"VideoBlockStudio": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/tabs/tabs-aggregator.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/tabs/tabs-aggregator.js"
],
"WordCloudBlockPreview": [
"xmodule/js/src/xmodule.js",
"xmodule/static/js/src/xmodule.js",
"xmodule/assets/word_cloud/src/js/word_cloud.js"
],
"WordCloudBlockStudio": [
"xmodule/js/src/xmodule.js",
"xmodule/js/src/raw/edit/metadata-only.js"
"xmodule/static/js/src/xmodule.js",
"xmodule/static/js/src/raw/edit/metadata-only.js"
]
}
};

0 comments on commit ea3160d

Please sign in to comment.