From 28ddf51bfca0c8c4f5b66859a39e774d60382fcc Mon Sep 17 00:00:00 2001 From: "Kyle D. McCormick" Date: Wed, 19 Jul 2023 15:08:17 -0400 Subject: [PATCH] build: lms/static/css/vendor/* -> common/static/css/vendor The git-ignored target directory for LMS Sass compilation is: lms/static/css Unfortunately, that directory contains git-controlled directory of vendored-in static assets: lms/static/css/vendor This is a problem for a couple reasons: 1. In Tutor, we would like to make lms/static/css a symlink to an external location for the sake of build efficiency. This is impossible to do without clobbering lms/static/css/vendor and dirtying the git state. 2. More generally, when optimizing (or just understanding) a build system, it adds complexity when git-controlled source directories are mixed up inside git-ignored target directories. The solution is to simply merge these vendored-in assets to another existing git-controlled vendor directory: common/static/css/vendor LMS already reads assets from this folder, so no further changes need to be made. common/static/css is fully git-controlled, so we avoid the complexity described above. Backport of: 97a9f08a9fdd20f47055920cec9ec92ac359218c --- .../css/vendor/images/treeview-default-line.gif | Bin .../static/css/vendor/images/treeview-default.gif | Bin {lms => common}/static/css/vendor/indicator.gif | Bin .../static/css/vendor/jquery.autocomplete.css | 0 .../static/css/vendor/jquery.treeview.css | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename {lms => common}/static/css/vendor/images/treeview-default-line.gif (100%) rename {lms => common}/static/css/vendor/images/treeview-default.gif (100%) rename {lms => common}/static/css/vendor/indicator.gif (100%) rename {lms => common}/static/css/vendor/jquery.autocomplete.css (100%) rename {lms => common}/static/css/vendor/jquery.treeview.css (100%) diff --git a/lms/static/css/vendor/images/treeview-default-line.gif b/common/static/css/vendor/images/treeview-default-line.gif similarity index 100% rename from lms/static/css/vendor/images/treeview-default-line.gif rename to common/static/css/vendor/images/treeview-default-line.gif diff --git a/lms/static/css/vendor/images/treeview-default.gif b/common/static/css/vendor/images/treeview-default.gif similarity index 100% rename from lms/static/css/vendor/images/treeview-default.gif rename to common/static/css/vendor/images/treeview-default.gif diff --git a/lms/static/css/vendor/indicator.gif b/common/static/css/vendor/indicator.gif similarity index 100% rename from lms/static/css/vendor/indicator.gif rename to common/static/css/vendor/indicator.gif diff --git a/lms/static/css/vendor/jquery.autocomplete.css b/common/static/css/vendor/jquery.autocomplete.css similarity index 100% rename from lms/static/css/vendor/jquery.autocomplete.css rename to common/static/css/vendor/jquery.autocomplete.css diff --git a/lms/static/css/vendor/jquery.treeview.css b/common/static/css/vendor/jquery.treeview.css similarity index 100% rename from lms/static/css/vendor/jquery.treeview.css rename to common/static/css/vendor/jquery.treeview.css