@digigov/css 1.0.0-266e80f3 → 1.0.0-3bfc7d37

package/src/utilities/postcss.config.js

@@ -1,20 +1,19 @@
-module.exports = {
+/** @type {import('postcss-load-config').Config} */
+const config = {
   plugins: [
-    require('postcss-import'),
-    require('tailwindcss')('./src/utilities/tailwind.config.js'),
-    require('postcss-nested')({
-      "bubble": [
-        "screen"
-      ]
-    }),
-    require('autoprefixer'),
-    require('cssnano')({
-      "preset": [
+    require("postcss-import"),
+    require("tailwindcss/nesting"),
+    require("tailwindcss")("./src/utilities/tailwind.config.js"),
+    require("autoprefixer"),
+    require("cssnano")({
+      preset: [
         "default",
         {
-          "mergeRules": false
-        }
-      ]
+          mergeRules: false,
+        },
+      ],
     }),
-  ]
-}
+  ],
+};
+
+module.exports = config;

package/src/utilities/tailwind.config.js

@@ -1 +1,10 @@
-module.exports = require('../../tailwind.config.js');
+const tailwindConfig = require("../../tailwind.config");
+
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  ...tailwindConfig,
+  content: {
+    files: ["./*.css"],
+    relative: true,
+  },
+};

package/src/utilities/utilities.css

@@ -2,7 +2,7 @@
 @layer utilities {
   .govgr-m-0 {
     @apply m-0 !important;
-  }  
+  }
   .govgr-m-1 {
     @apply m-1 !important;
   }
@@ -41,7 +41,7 @@
   }
   .govgr-mt-0 {
     @apply mt-0 !important;
-  }  
+  }
   .govgr-mt-1 {
     @apply mt-1 !important;
   }
@@ -80,7 +80,7 @@
   }
   .govgr-mb-0 {
     @apply mb-0 !important;
-  }  
+  }
   .govgr-mb-1 {
     @apply mb-1 !important;
   }
@@ -119,7 +119,7 @@
   }
   .govgr-ml-0 {
     @apply ml-0 !important;
-  }  
+  }
   .govgr-ml-1 {
     @apply ml-1 !important;
   }
@@ -158,7 +158,7 @@
   }
   .govgr-mr-0 {
     @apply mr-0 !important;
-  }  
+  }
   .govgr-mr-1 {
     @apply mr-1 !important;
   }
@@ -197,7 +197,7 @@
   }
   .govgr-p-0 {
     @apply p-0 !important;
-  }  
+  }
   .govgr-p-1 {
     @apply p-1 !important;
   }
@@ -236,7 +236,7 @@
   }
   .govgr-pt-0 {
     @apply pt-0 !important;
-  }  
+  }
   .govgr-pt-1 {
     @apply pt-1 !important;
   }
@@ -275,7 +275,7 @@
   }
   .govgr-pb-0 {
     @apply pb-0 !important;
-  }  
+  }
   .govgr-pb-1 {
     @apply pb-1 !important;
   }
@@ -314,7 +314,7 @@
   }
   .govgr-pl-0 {
     @apply pl-0 !important;
-  }  
+  }
   .govgr-pl-1 {
     @apply pl-1 !important;
   }
@@ -353,7 +353,7 @@
   }
   .govgr-pr-0 {
     @apply pr-0 !important;
-  }  
+  }
   .govgr-pr-1 {
     @apply pr-1 !important;
   }

package/tailwind.config.js

@@ -64,14 +64,8 @@ const allColors = [
   "shadow600",
 ];
 
-const buildOnly = !process.env["DIGIGOV_CSS_BUILD"]
-  ? {
-    mode: "jit",
-  }
-  : {};
-
 const colorVariables = allColors.reduce((colorVars, color) => {
-  if (['transparent', 'currentColor'].includes(color)) {
+  if (["transparent", "currentColor"].includes(color)) {
     colorVars[color] = color;
   } else {
     colorVars[color] = ({ opacityVariable, opacityValue }) => {
@@ -87,13 +81,17 @@ const colorVariables = allColors.reduce((colorVars, color) => {
   return colorVars;
 }, {});
 
+/** @type {import('tailwindcss').Config} */
 module.exports = {
-  ...buildOnly,
-  darkMode: 'class',
+  darkMode: "class",
+  content: {
+    files: ["./src/*.css"],
+    relative: true,
+  },
   themes: {
-    light: require.resolve('./defaultTheme'),
+    light: require.resolve("./defaultTheme"),
   },
-  defaultTheme: 'light',
+  defaultTheme: "light",
   theme: {
     colors: colorVariables,
     container: {
@@ -111,11 +109,11 @@ module.exports = {
       xl: "1280px",
       "2xl": "1280px",
       print: { raw: "print" },
-      xsOnly: { 'min': '0px', 'max': '639.98px' },
-      smOnly: { 'min': '640px', 'max': '767.98px' },
-      mdOnly: { 'min': '768px', 'max': '1023.98px' },
-      lgOnly: { 'min': '1024px', 'max': '1279.98px' },
-      xlOnly: { 'min': '1280px', 'max': '1535.98px' },
+      xsOnly: { min: "0px", max: "639.98px" },
+      smOnly: { min: "640px", max: "767.98px" },
+      mdOnly: { min: "768px", max: "1023.98px" },
+      lgOnly: { min: "1024px", max: "1279.98px" },
+      xlOnly: { min: "1280px", max: "1535.98px" },
     },
     fontFamily: {
       sans: ["Roboto", ...defaultTheme.fontFamily.sans],
@@ -126,8 +124,8 @@ module.exports = {
       },
       width: {
         fit: "fit-content",
-        '2xl': '42rem',
-        '4xl': '56rem',
+        "2xl": "42rem",
+        "4xl": "56rem",
       },
       maxWidth: {
         fit: "fit-content",
@@ -171,15 +169,8 @@ module.exports = {
       borderColor: {
         // TODO: fix this invalid value in the future
         // Read more: https://gitlab.grnet.gr/devs/digigov/digigov-sdk/-/merge_requests/818
-        DEFAULT: 'reset',
-      }
-    },
-  },
-  variants: {
-    extend: {
-      textDecoration: ["active"],
-      backgroundColor: ["active"],
-      borderColor: ["active"],
+        DEFAULT: "reset",
+      },
     },
   },
   plugins: [plugin(themesPlugin)],

package/themes.plugin.js

@@ -13,85 +13,13 @@ const mediaQueriesMapping = {
   print: "@media print",
 };
 
-function hexToRGB(hex) {
-  var r = parseInt(hex.slice(1, 3), 16),
-    g = parseInt(hex.slice(3, 5), 16),
-    b = parseInt(hex.slice(5, 7), 16);
-
-  return r + ", " + g + ", " + b;
-}
 let hasRun = false;
 
-function addThemes({ addBase, addComponents, theme, config }) {
+module.exports = function addThemes({ addBase, config }) {
   if (hasRun) {
     return;
   }
   hasRun = true;
-  function extractColorVars(colorObj, colorGroup = "") {
-    return Object.keys(colorObj).reduce((vars, colorKey) => {
-      const value = colorObj[colorKey];
-      const colorName =
-        colorKey == "default"
-          ? `--color${colorGroup}`
-          : `--color${colorGroup}-${colorKey}`;
-      const newVars =
-        typeof value === "string"
-          ? {
-            [colorName]: value,
-            [`${colorName}-rgb`]: hexToRGB(value),
-          }
-          : extractColorVars(value, `-${colorKey}`);
-      return { ...vars, ...newVars };
-    }, {});
-  }
-
-  function extractMediaQueriesFromComponentVars(componentObj, customTheme) {
-    let mediaObj = {};
-    Object.keys(componentObj).forEach((componentClass) => {
-      Object.keys(componentObj[componentClass]).forEach((componentAttr) => {
-        Object.keys(componentObj[componentClass][componentAttr]).forEach(
-          (componentMedia) => {
-            const newAttrKey = `--${componentClass}-${componentAttr}`;
-            const newAttrValue =
-              componentObj[componentClass][componentAttr][componentMedia];
-            const newAttr = { [newAttrKey]: newAttrValue };
-            const newClass = `.${prefix}-${componentClass}`;
-            const newMedia = mediaQueriesMapping[componentMedia];
-            const newTheme =
-              customTheme === defaultTheme ? "" : `.${customTheme}`;
-
-            if (mediaObj[newMedia]) {
-              if (mediaObj[newMedia][newTheme][newClass]) {
-                mediaObj[newMedia][newTheme][newClass][newAttrKey] =
-                  newAttrValue;
-              } else {
-                mediaObj[newMedia][newTheme][newClass] = newAttr;
-              }
-            } else {
-              mediaObj[newMedia] = { [newTheme]: { [newClass]: newAttr } };
-            }
-          }
-        );
-      });
-    });
-    return mediaObj;
-  }
-
-  function extractGlobalVars(globalVarsObj) {
-    return Object.keys(globalVarsObj).reduce((vars, varKey) => {
-      const value = globalVarsObj[varKey];
-      vars[`--${varKey}`] = value;
-      return vars;
-    }, {});
-  }
-  function extractVars(themeObj) {
-    const colorVars = extractColorVars(themeObj.colors);
-    const globalVars =
-      themeObj.variables && themeObj.variables.globals
-        ? extractGlobalVars(themeObj.variables.globals)
-        : {};
-    return { ...colorVars, ...globalVars };
-  }
 
   let base = {};
   const themes = config("themes");
@@ -99,44 +27,35 @@ function addThemes({ addBase, addComponents, theme, config }) {
   for (const customTheme in themes) {
     const customThemeObject = require(themes[customTheme]);
     if (customThemeObject.overrides) {
-      if (config("mode") === "jit") {
-        console.log("Loading theme css from source...");
-        const css = fs
-          .readFileSync(
-            path.resolve(
-              path.dirname(themes[customTheme]),
-              "overrides/index.css"
-            )
-          )
-          .toString();
-        const ctx = {};
-        const { plugins, options } = postcssrc.sync(ctx);
-        const result = postcss(plugins).process(css, options).root;
-        const cssJs = postcssJs.objectify(result);
-        base[`.${customTheme}`] = cssJs;
-      } else {
-        customThemeObject.overrides.forEach((override) => {
-          const cssJs = require(path.resolve(
+      console.log("Loading theme css from source...");
+      const css = fs
+        .readFileSync(
+          path.resolve(
             path.dirname(themes[customTheme]),
-            override
-          ));
-          base[`.${customTheme}`] = cssJs;
-        });
-      }
+            "overrides/index.css",
+          ),
+        )
+        .toString();
+      const ctx = {};
+      const { plugins, options } = postcssrc.sync(ctx);
+      const result = postcss(plugins).process(css, options).result.root;
+      const cssJs = postcssJs.objectify(result);
+      base[`.${customTheme}`] = cssJs;
     }
     if (customTheme === defaultTheme) {
       base[`:root,:root.${customTheme},::before,::after`] =
         extractVars(customThemeObject);
     } else {
       base[
-        `:root.${customTheme},.${customTheme} *::before,.${customTheme} *::after`
+        `:root.${customTheme},.${customTheme},.${customTheme} *::before,.${customTheme} *::after`
       ] = extractVars(customThemeObject);
     }
 
     if (customThemeObject.variables && customThemeObject.variables.components) {
       const extractedVariables = extractMediaQueriesFromComponentVars(
         customThemeObject.variables.components,
-        customTheme
+        customTheme,
+        defaultTheme,
       );
       Object.keys(extractedVariables).forEach((key) => {
         if (base[key]) {
@@ -148,6 +67,82 @@ function addThemes({ addBase, addComponents, theme, config }) {
     }
   }
   addBase(base);
+};
+
+function extractVars(themeObj) {
+  const colorVars = extractColorVars(themeObj.colors);
+  const globalVars =
+    themeObj.variables && themeObj.variables.globals
+      ? extractGlobalVars(themeObj.variables.globals)
+      : {};
+  return { ...colorVars, ...globalVars };
+}
+
+function extractColorVars(colorObj, colorGroup = "") {
+  return Object.keys(colorObj).reduce((vars, colorKey) => {
+    const value = colorObj[colorKey];
+    const colorName =
+      colorKey == "default"
+        ? `--color${colorGroup}`
+        : `--color${colorGroup}-${colorKey}`;
+    const newVars =
+      typeof value === "string"
+        ? {
+            [colorName]: value,
+            [`${colorName}-rgb`]: hexToRGB(value),
+          }
+        : extractColorVars(value, `-${colorKey}`);
+    return { ...vars, ...newVars };
+  }, {});
+}
+
+function extractGlobalVars(globalVarsObj) {
+  return Object.keys(globalVarsObj).reduce((vars, varKey) => {
+    const value = globalVarsObj[varKey];
+    vars[`--${varKey}`] = value;
+    return vars;
+  }, {});
+}
+
+function hexToRGB(hex) {
+  const r = parseInt(hex.slice(1, 3), 16),
+    g = parseInt(hex.slice(3, 5), 16),
+    b = parseInt(hex.slice(5, 7), 16);
+
+  return r + ", " + g + ", " + b;
 }
 
-module.exports = addThemes;
+function extractMediaQueriesFromComponentVars(
+  componentObj,
+  customTheme,
+  defaultTheme,
+) {
+  let mediaObj = {};
+  Object.keys(componentObj).forEach((componentClass) => {
+    Object.keys(componentObj[componentClass]).forEach((componentAttr) => {
+      Object.keys(componentObj[componentClass][componentAttr]).forEach(
+        (componentMedia) => {
+          const newAttrKey = `--${componentClass}-${componentAttr}`;
+          const newAttrValue =
+            componentObj[componentClass][componentAttr][componentMedia];
+          const newAttr = { [newAttrKey]: newAttrValue };
+          const newClass = `.${prefix}-${componentClass}`;
+          const newMedia = mediaQueriesMapping[componentMedia];
+          const newTheme =
+            customTheme === defaultTheme ? "" : `.${customTheme}`;
+
+          if (mediaObj[newMedia]) {
+            if (mediaObj[newMedia][newTheme][newClass]) {
+              mediaObj[newMedia][newTheme][newClass][newAttrKey] = newAttrValue;
+            } else {
+              mediaObj[newMedia][newTheme][newClass] = newAttr;
+            }
+          } else {
+            mediaObj[newMedia] = { [newTheme]: { [newClass]: newAttr } };
+          }
+        },
+      );
+    });
+  });
+  return mediaObj;
+}