@qtoggle/qui 1.19.6 → 1.19.8

package/js/tables/common-cells/icon-label-table-cell.js

@@ -32,6 +32,7 @@ class IconLabelTableCell extends mix(TableCell).with(IconLabelViewMixin) {
     showValue(value) {
         this.setIcon(value.icon)
         this.setLabel(value.label)
+        this.setSubLabel(value.subLabel)
     }
 
     prepareIcon(icon) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qtoggle/qui",
   "description": "A JavaScript UI library with batteries included.",
-  "version": "1.19.6",
+  "version": "1.19.8",
   "author": {
     "name": "Calin Crisan",
     "email": "ccrisan@gmail.com"

package/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "qui-server"
-version = "1.19.6"
+version = "1.19.8"
 description = "A fully fledged qToggle implementation written in Python"
 authors = [
     {name = "Calin Crisan", email = "ccrisan@gmail.com"},

package/webpack/webpack-common.js

@@ -1,5 +1,6 @@
 
 const crypto = require('crypto')
+const fs = require('fs')
 const glob = require('glob')
 const path = require('path')
 const webpack = require('webpack')
@@ -34,6 +35,14 @@ const FONT_REGEX = new RegExp(`${FONT_DIR}/.*\\.(woff)$`)
 const TMPL_REGEX = new RegExp(`${TMPL_DIR}/.*\\.(html|json|js)$`)
 
 
+function readLessImports(lessPath) {
+    return fs.readFileSync(lessPath, 'utf8')
+        .split('\n')
+        .map(line => line.match(/^@import\s+"([^"]+)"/))
+        .filter(Boolean)
+        .map(m => m[1])
+}
+
 function escapeForLess(s) {
     return `~"${s}"`
 }
@@ -231,10 +240,21 @@ function makeConfig({theme, isProduction, appName, appFullPath, extraAliases, cs
     let distFullPath = isProduction ? path.resolve(appFullPath, DIST_DIR) : appFullPath
 
     let excludeLessRegex = new RegExp('theme-(' + THEMES.join('|') + ')\\.less', 'i')
-    let cssRequirements = [
-        quiLessPath + '/all.less',
-        appLessPath + '/all.less'
-    ]
+    let cssRequirements
+    if (isProduction) {
+        cssRequirements = [
+            quiLessPath + '/all.less',
+            appLessPath + '/all.less'
+        ]
+    }
+    else {
+        /* In dev mode, enumerate individual LESS files so that file-loader emits a separate CSS file
+         * per module, matching what the templates expect in debug mode */
+        cssRequirements = [
+            ...readLessImports(quiLessPath + '/all.less').map(rel => path.resolve(quiLessPath, rel)),
+            ...readLessImports(appLessPath + '/all.less').map(rel => path.resolve(appLessPath, rel))
+        ]
+    }
 
     /* This is needed because FixStyleOnlyEntriesPlugin() needs resources for theme entries to be different */
     cssRequirements.push(path.resolve(quiLessPath, `theme-${theme}.less`))