separate managed and unmanaged scss

ui/.build/src/clean.ts

@@ -2,15 +2,6 @@ import { promises as fs } from 'fs';
 import * as fg from 'fast-glob';
 import { env, colors as c } from './main';
 
-const globs = [
-  '**/node_modules',
-  'ui/*/dist',
-  'ui/*/tsconfig.tsbuildinfo',
-  'public/compiled',
-  'public/npm',
-  'public/css/*.css*',
-];
-
 const globOpts: fg.Options = {
   absolute: true,
   onlyFiles: false,
@@ -20,6 +11,17 @@ const globOpts: fg.Options = {
 
 export async function clean() {
   if (!env.clean) return;
+
+  const globs = [
+    '**/node_modules',
+    'ui/*/dist',
+    'ui/*/tsconfig.tsbuildinfo',
+    'public/compiled',
+    'public/npm',
+    'public/css/*.css*',
+  ];
+  if (env.cleanTheme) globs.push('**/css/build/gen'); // will blow away mod.inquiry.scss
+
   for (const glob of globs) {
     env.log(`Cleaning '${c.cyan(glob)}'...`);
     for await (const f of fg.stream(glob, { cwd: env.rootDir, ...globOpts })) {

ui/.build/src/main.ts

@@ -20,6 +20,7 @@ const longArgs = [
   '--split',
   '--debug',
   '--clean',
+  '--clean-theme',
   '--update',
   '--no-install',
 ];
@@ -48,7 +49,8 @@ export function main() {
   env.prod = args.includes('--prod') || oneDashArgs.includes('p');
   env.split = args.includes('--split') || oneDashArgs.includes('s');
   env.debug = args.includes('--debug') || oneDashArgs.includes('d');
-  env.clean = args.includes('--clean') || oneDashArgs.includes('c');
+  env.clean = args.some(x => x.startsWith('--clean')) || oneDashArgs.includes('c');
+  env.cleanTheme = args.includes('--clean-theme');
   env.install = !args.includes('--no-install') && !oneDashArgs.includes('n');
 
   if (env.rebuild && !env.install) {
@@ -58,7 +60,7 @@ export function main() {
 
   if (args.length === 1 && (args[0] === '--help' || args[0] === '-h')) {
     console.log(fs.readFileSync(path.resolve(__dirname, '../readme'), 'utf8'));
-  } else if (args.length === 1 && (args[0] === '--clean' || args[0] === '-c')) {
+  } else if (args.length === 1 && (args[0].startsWith('--clean') || args[0] === '-c')) {
     clean();
   } else {
     build(args.filter(x => !x.startsWith('-')));
@@ -117,6 +119,7 @@ class Env {
   watch = false;
   rebuild = false;
   clean = false;
+  cleanTheme = false;
   prod = false;
   split = false;
   debug = false;

ui/.build/src/sass.ts

@@ -89,16 +89,17 @@ async function buildThemedScss() {
     if (!match || match.length < 3) continue;
     const path = match[1];
     const partial = match[2];
+    fs.mkdirSync(`${path}/gen`, { recursive: true });
     for (const direction of ['ltr', 'rtl']) {
       for (const theme of ['light', 'dark', 'transp']) {
-        const themed = `${path}/${partial}.${direction}.${theme}.scss`;
+        const themed = `${path}/gen/${partial}.${direction}.${theme}.scss`;
         if (fs.existsSync(themed)) {
           continue;
         }
         const code =
-          `@import '../../../common/css/dir/${direction}';\n` +
-          `@import '../../../common/css/theme/${theme}';\n` +
-          `@import '${partial}';\n`;
+          `@import '../../../../common/css/dir/${direction}';\n` +
+          `@import '../../../../common/css/theme/${theme}';\n` +
+          `@import '../${partial}';\n`;
         try {
           await fs.promises.writeFile(themed, code);
         } catch (e) {

ui/analyse/css/build/gen/analyse.forecast.ltr.dark.scss

@@ -0,0 +1,3 @@
+@import '../../../../common/css/dir/ltr';
+@import '../../../../common/css/theme/dark';
+@import '../analyse.forecast';

ui/analyse/css/build/gen/analyse.forecast.ltr.light.scss

@@ -0,0 +1,3 @@
+@import '../../../../common/css/dir/ltr';
+@import '../../../../common/css/theme/light';
+@import '../analyse.forecast';

ui/analyse/css/build/gen/analyse.forecast.ltr.transp.scss

@@ -0,0 +1,3 @@
+@import '../../../../common/css/dir/ltr';
+@import '../../../../common/css/theme/transp';
+@import '../analyse.forecast';

ui/analyse/css/build/gen/analyse.forecast.rtl.dark.scss

@@ -0,0 +1,3 @@
+@import '../../../../common/css/dir/rtl';
+@import '../../../../common/css/theme/dark';
+@import '../analyse.forecast';

ui/analyse/css/build/gen/analyse.forecast.rtl.light.scss

@@ -0,0 +1,3 @@
+@import '../../../../common/css/dir/rtl';
+@import '../../../../common/css/theme/light';
+@import '../analyse.forecast';

ui/analyse/css/build/gen/analyse.forecast.rtl.transp.scss

@@ -0,0 +1,3 @@
+@import '../../../../common/css/dir/rtl';
+@import '../../../../common/css/theme/transp';
+@import '../analyse.forecast';

ui/analyse/css/build/gen/analyse.free.ltr.dark.scss

@@ -0,0 +1,3 @@
+@import '../../../../common/css/dir/ltr';
+@import '../../../../common/css/theme/dark';
+@import '../analyse.free';

ui/analyse/css/build/gen/analyse.free.ltr.light.scss

@@ -0,0 +1,3 @@
+@import '../../../../common/css/dir/ltr';
+@import '../../../../common/css/theme/light';
+@import '../analyse.free';

ui/analyse/css/build/gen/analyse.free.ltr.transp.scss

@@ -0,0 +1,3 @@
+@import '../../../../common/css/dir/ltr';
+@import '../../../../common/css/theme/transp';
+@import '../analyse.free';

ui/analyse/css/build/gen/analyse.free.rtl.dark.scss

@@ -0,0 +1,3 @@
+@import '../../../../common/css/dir/rtl';
+@import '../../../../common/css/theme/dark';
+@import '../analyse.free';

ui/analyse/css/build/gen/analyse.free.rtl.light.scss

@@ -0,0 +1,3 @@
+@import '../../../../common/css/dir/rtl';
+@import '../../../../common/css/theme/light';
+@import '../analyse.free';