fix(demo): subdir now explicitely loads from self

Only components were used before, so its directory name was hardcoded. But "components" is also an unconfigurable name used by Fractal. So both core-styles and Fractal share the "components" directory. To resolve this, "_preview" now expects subdir parameter and gets it.
TACC · Aug 22, 2022 · 7f45eb0 · 7f45eb0
1 parent ed173fd
commit 7f45eb0
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 1 deletion.
diff --git a/src/lib/_imports/_preview.hbs b/src/lib/_imports/_preview.hbs
@@ -2,7 +2,7 @@
 {{#unless styles.shouldSkipBase}}
   <link
     rel='stylesheet'
-    href='{{path "/components/{{ _target.baseHandle }}.css"}}'
+    href='{{path "/{{ subdir }}/{{ _target.baseHandle }}.css"}}'
   />
 {{/unless}}
 

diff --git a/src/lib/_imports/components/_components.config.yml b/src/lib/_imports/components/_components.config.yml
@@ -0,0 +1 @@
+preview: "@components.preview"
diff --git a/src/lib/_imports/components/_components.preview.hbs b/src/lib/_imports/components/_components.preview.hbs
@@ -0,0 +1 @@
+{{> @preview subdir="components" }}
diff --git a/src/lib/_imports/elements/_elements.config.yml b/src/lib/_imports/elements/_elements.config.yml
@@ -0,0 +1 @@
+preview: "@elements.preview"
diff --git a/src/lib/_imports/elements/_elements.preview.hbs b/src/lib/_imports/elements/_elements.preview.hbs
@@ -0,0 +1 @@
+{{> @preview subdir="elements" }}
diff --git a/src/lib/_imports/generics/_generics.config.yml b/src/lib/_imports/generics/_generics.config.yml
@@ -0,0 +1 @@
+preview: "@generics.preview"
diff --git a/src/lib/_imports/generics/_generics.preview.hbs b/src/lib/_imports/generics/_generics.preview.hbs
@@ -0,0 +1 @@
+{{> @preview subdir="generics" }}
diff --git a/src/lib/_imports/objects/_objects.config.yml b/src/lib/_imports/objects/_objects.config.yml
@@ -0,0 +1 @@
+preview: "@objects.preview"
diff --git a/src/lib/_imports/objects/_objects.preview.hbs b/src/lib/_imports/objects/_objects.preview.hbs
@@ -0,0 +1 @@
+{{> @preview subdir="objects" }}
diff --git a/src/lib/_imports/trumps/_trumps.config.yml b/src/lib/_imports/trumps/_trumps.config.yml
@@ -0,0 +1 @@
+preview: "@trumps.preview"
diff --git a/src/lib/_imports/trumps/_trumps.preview.hbs b/src/lib/_imports/trumps/_trumps.preview.hbs
@@ -0,0 +1 @@
+{{> @preview subdir="trumps" }}