From 7b91be1878b35c3c9af7c81782cfb2ed4fbc4e5a Mon Sep 17 00:00:00 2001
From: Thomas JUND <tjund@entrouvert.com>
Date: Wed, 20 Mar 2024 16:26:53 +0100
Subject: [PATCH] update package.json after make to setuptool migration

---
 npm_serve.js |  5 +++--
 package.json | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/npm_serve.js b/npm_serve.js
index 5a161a8..02dd1e5 100644
--- a/npm_serve.js
+++ b/npm_serve.js
@@ -5,14 +5,15 @@ const apps = [ 'combo', 'wcs', 'authentic'];
 
 const param = process.argv.pop();
 const themeFolder = process.env.npm_package_config_themefolder;
+const theme = process.env.npm_package_config_theme;
 const app =  apps.includes(param) ? param : process.env.npm_package_config_app;
 const appurl = pkgJson.config.url[app];
 
 browserSync.init({
     proxy: appurl,
     files: [
-      `${themeFolder}/static/**/*.css`,
-      `${themeFolder}/templates/**/*`
+      `${themeFolder}/static/${theme}/*.css`,
+      `${themeFolder}/templates/{theme}/*`
     ],
     logLevel: "debug"
 })
diff --git a/package.json b/package.json
index 16f6acb..a518ce6 100644
--- a/package.json
+++ b/package.json
@@ -7,22 +7,22 @@
     "url": {
       "combo": "https://combo.dev.publik.love/",
       "authentic": "https://authentic.dev.publik.love/accounts/register/",
-      "wcs": "https://wcs.dev.publik.love/form-test",
+      "wcs": "https://wcs.dev.publik.love/tests/form-test",
       "agent-combo": "https://agent-combo.dev.publik.love/"
     },
     "themefolder": "publik-base-theme",
-    "theme": "thomas",
+    "theme": "naoned",
     "app": "combo"
   },
   "scripts": {
     "explore:css": "cd $npm_package_config_themefolder && postcss static/**/style.css --config postcss.config.js  --dir /tmp/ > /tmp/explorecss.txt",
     "stop:memcache": "sudo systemctl stop memcached",
     "change:theme": "bash misc-tjund/change-theme.sh $npm_package_config_theme",
-    "build:css": "cd $npm_package_config_themefolder && make static/$npm_package_config_theme/style.css",
+    "build:css": "cd $npm_package_config_themefolder && sassc --sourcemap static/$npm_package_config_theme/style.scss static/$npm_package_config_theme/style.css",
     "build:css-gadjo": "cd gadjo && python3 setup.py compile_scss",
     "build:css-chrono": "cd chrono && python3 setup.py compile_scss",
-    "build:themes": "cd $npm_package_config_themefolder && make themes.json",
-    "watch:scss": "cd $npm_package_config_themefolder && chokidar 'static/**/*.scss' -c 'npm run build:css'",
+    "build:themes": "cd $npm_package_config_themefolder && python3 setup.py build_themes_json",
+    "watch:scss": "cd $npm_package_config_themefolder && chokidar 'static/**/*.scss' -i 'static/**/_data_uris.scss' -c 'npm run build:css'",
     "watch:scss-gadjo": "chokidar 'gadjo/gadjo/static/css/*.scss' -c 'npm run build:css-gadjo'",
     "watch:scss-chrono": "chokidar 'chrono/chrono/manager/static/css/*.scss' -c 'npm run build:css-chrono'",
     "watch:config": "cd $npm_package_config_themefolder && chokidar 'static/**/config.json' -c 'npm run build:themes'",