@digigov/cli-build-tailwind 1.0.2-rc.21 → 2.0.0-834daea4

package/.rush/temp/shrinkwrap-deps.json

@@ -1,8 +1,9 @@
 {
-  "../../tooling/cli-build-tailwind": "../../tooling/cli-build-tailwind:TTBeE63Q5gXUhngfrrpRCMToNU01pJPhTvZdIOef2Uk=:",
+  "../../tooling/cli-build-tailwind": "../../tooling/cli-build-tailwind:5YK6s5xAPyA8Dxx+04KMWLmQvo8zMTQEV0qfBu6MJzU=:",
   "/fs-extra@11.2.0": "Missing shrinkwrap entry!",
-  "/glob@7.1.6": "Missing shrinkwrap entry!",
+  "/globby@11.0.0": "Missing shrinkwrap entry!",
   "/postcss-js@4.0.0(postcss@8.4.4)": "Missing shrinkwrap entry!",
-  "/postcss-load-config@3.1.4(postcss@8.4.4)(ts-node@10.9.2(@types/node@18.19.0)(typescript@5.6.2))": "Missing shrinkwrap entry!",
-  "/postcss@8.4.4": "Missing shrinkwrap entry!"
+  "/postcss-load-config@3.1.4(postcss@8.4.4)(ts-node@10.9.2(@types/node@22.7.5)(typescript@5.6.2))": "Missing shrinkwrap entry!",
+  "/postcss@8.4.4": "Missing shrinkwrap entry!",
+  "/publint@0.1.8": "Missing shrinkwrap entry!"
 }

package/build.js

@@ -1,92 +1,142 @@
-const postcss = require('postcss');
-const postcssrc = require('postcss-load-config');
-const postcssJs = require('postcss-js');
-const fs = require('fs-extra');
-const path = require('path');
-const glob = require('glob');
+import postcss from "postcss";
+import postcssrc from "postcss-load-config";
+import postcssJs from "postcss-js";
+import fs from "fs-extra";
+import path from "path";
+import glob from "globby";
+import { logger } from "@digigov/cli/lib";
 
+/**
+ * Build the CSS files of a project
+ *
+ * @param {object} options - The options
+ * @param {string} [options.cwd=process.cwd()] - The current working directory
+ * @param {string} [options.distFolder='dist'] - The distribution folder
+ * @param {string} [options.bundleFileName='index'] - The bundle file name
+ * @param {boolean} [options.allFiles=false] - Whether to build all files
+ * @param {object} options.replace - Object defining the replacements to be made
+ *
+ */
+export async function build({
+  cwd = process.cwd(),
+  distFolder = "dist",
+  allFiles = false,
+  bundleFileName = "index",
+  replace,
+}) {
+  if (allFiles) logger.log("All files:", allFiles);
+  logger.log(`Removing dist folder ${path.join(cwd, distFolder)}`);
+  fs.rmSync(path.join(cwd, distFolder), {
+    recursive: true,
+    force: true,
+  });
+  const subfolders = ["utilities", "components", "base"];
+  const cssParts = [];
+  for (const subfolder of subfolders) {
+    logger.time(`build ${subfolder}`);
+    let css = "";
+    if (allFiles) {
+      for (const subpart of glob.sync(
+        path.join(cwd, "src", subfolder, "*.css"),
+      )) {
+        const fileName = path.basename(subpart);
+        if (fileName !== "index.css") {
+          css +=
+            "\n" +
+            (await buildDir({
+              dir: subfolder,
+              file: fileName,
+              cwd,
+              distFolder,
+              replace,
+            }));
+        } else {
+          await buildDir({
+            dir: subfolder,
+            file: fileName,
+            cwd,
+            distFolder,
+            replace,
+          });
+        }
+      }
+    } else {
+      css = await buildDir({
+        dir: subfolder,
+        file: "index.css",
+        cwd,
+        distFolder,
+        replace,
+      });
+    }
+    cssParts.unshift(css);
+    logger.timeEnd(`build ${subfolder}`);
+  }
+  fs.outputFileSync(
+    path.join(cwd, `dist/${bundleFileName}.css`),
+    cssParts.join("\n"),
+  );
+}
 
-const buildDir = async (dir, file = 'index.css', cwd = process.cwd(), distFolder, replace) => {
+/**
+ * Build the CSS files for a directory
+ *
+ * @param {object} options - The options
+ * @param {string} options.dir - The directory
+ * @param {string} [options.file='index.css'] - The file
+ * @param {string} [options.cwd=process.cwd()] - The current working directory
+ * @param {string} options.distFolder - The distribution folder
+ * @param {object} options.replace - Object defining the replacements to be made
+ * @returns {Promise<string>} - The processed CSS
+ */
+export async function buildDir({
+  dir,
+  file = "index.css",
+  cwd = process.cwd(),
+  distFolder,
+  replace,
+}) {
   process.env["DIGIGOV_CSS_BUILD"] = "TRUE";
   const options = {
     cwd,
     options: {
-      map: {inline: true},
+      map: { inline: true },
     },
     file: {
-      dirname: path.join(cwd, 'src', dir),
+      dirname: path.join(cwd, "src", dir),
       basename: file,
-      extname: '.css'
+      extname: ".css",
     },
-    from: path.join(cwd, 'src', dir, file),
+    from: path.join(cwd, "src", dir, file),
     to: path.join(cwd, distFolder, dir, file),
   };
-  const filePathPart = file === 'index.css' ? '' : `/${file.replace('.css', '')}`;
-  console.log(`Building ${dir} ${file}...`);
+  const filePathPart =
+    file === "index.css" ? "" : `/${file.replace(".css", "")}`;
+  logger.log(`Building ${dir} ${file}...`);
   let css = fs.readFileSync(options.from, "utf8");
-  const rc = await postcssrc(options, path.join(cwd, 'src', dir))
-    .catch((err) => {
-      if(!err.message.includes('No PostCSS Config found')) throw err;
-    });
-  const result = await postcss(rc.plugins)
-    .process(css, options);
+  const rc = await postcssrc(options, path.join(cwd, "src", dir)).catch(
+    (err) => {
+      if (!err.message.includes("No PostCSS Config found")) throw err;
+    },
+  );
+  const result = await postcss.default(rc?.plugins).process(css, options);
   let processedCss = result.css;
   let cssJs = JSON.stringify(postcssJs.objectify(result.root));
-  if(replace) {
-    for(const from in replace) {
+  if (replace) {
+    for (const from in replace) {
       const to = replace[from];
-      console.log(`Replace ${from} with ${to}`);
+      logger.log(`Replace ${from} with ${to}`);
+      if (!to) continue;
       processedCss = processedCss.replaceAll(from, to);
       cssJs = cssJs.replaceAll(from, to);
     }
   }
-  if(options.to) {
+  if (options.to) {
     fs.outputFileSync(options.to, processedCss);
-    fs.outputFileSync(path.join(cwd, distFolder, `${dir}${filePathPart}.js`), `module.exports = ${cssJs}`);
-
-  } else process.stdout.write(processedCss, 'utf8');
+    fs.outputFileSync(
+      path.join(cwd, distFolder, `${dir}${filePathPart}.js`),
+      `module.exports = ${cssJs}`,
+    );
+  } else process.stdout.write(processedCss, "utf8");
   return processedCss;
-};
-
-
-const build = async ({cwd = process.cwd(), distFolder = 'dist', allFiles = false, bundleFileName = 'index', replace}) => {
-  console.time('build');
-  console.log('All files:', allFiles,);
-  console.log(`Removing dist folder ${path.join(cwd, distFolder)}`);
-  fs.rmSync(path.join(cwd, distFolder), {
-    recursive: true, force: true
-  });
-  const subfolders = ['utilities', 'components', 'base'];
-  const cssParts = [];
-  for(const subfolder of subfolders) {
-    console.time(`build ${subfolder}`);
-    let css = '';
-    if(allFiles) {
-      for(const subpart of glob.sync(path.join(cwd, 'src', subfolder, "*.css"))) {
-        const fileName = path.basename(subpart);
-        if(fileName !== 'index.css') {
-          css += "\n" + await buildDir(subfolder, fileName, cwd, distFolder, replace);
-        } else {
-          await buildDir(subfolder, fileName, cwd, distFolder, replace);
-        }
-      }
-
-    } else {
-      css = await buildDir(subfolder, 'index.css', cwd, distFolder, replace);
-
-    }
-    cssParts.unshift(css);
-    console.timeEnd(`build ${subfolder}`);
-  }
-  fs.outputFileSync(path.join(cwd, `dist/${bundleFileName}.css`), cssParts.join('\n'));
-  console.timeEnd('build');
-};
-if(typeof require !== 'undefined' && require.main === module) {
-  build({});
 }
-
-
-module.exports = {
-  buildDir,
-  build
-};

package/index.js

@@ -1,32 +1,35 @@
-const {flags} = require('@oclif/command');
-const {DigigovCommand} = require('@digigov/cli/lib');
-const {build} = require('./build');
-module.exports = class BuildTailwind extends DigigovCommand {
-  static description = 'build digigov libraries';
-  static id = 'build-tailwind';
-  dirname = __dirname;
-  static examples = [
-    `$ digigov build-tailwind`,
-  ];
-  static strict = true;
-  static flags = {
-    allFiles: flags.boolean({char: '--all-files'}),
-    bundle: flags.string({})
-  };
-  static load() {return BuildTailwind;}
-  async run() {
-    const {args, flags} = this.parse(BuildTailwind);
-    try {
-      await build({
-        bundleFileName: flags.bundle,
-        allFiles: flags.allFiles,
-        replace: {
-          'border-color:reset': '',
-          '"borderColor":"reset"':''
-        }
-      });
-    } catch(err) {
-      console.log(err);
-    }
-  }
-};
+import { DigigovCommand } from "@digigov/cli/lib";
+import { build } from "./build.js";
+
+const command = new DigigovCommand("build-tailwind", import.meta.url);
+
+command
+  .option("--all-files", "Build all files", false)
+  .option("--cwd <directory>", "Current working directory", process.cwd())
+  .option("--dist <distFolder>", "Distribution folder", "dist")
+  .option("--bundle <fileName>", "Bundle file name", "index")
+  .action(buildTailwind);
+
+export default command;
+
+/**
+ * @param {object} options - The options
+ * @param {string} options.cwd - The current working directory
+ * @param {string} options.dist - The distribution folder
+ * @param {string} options.bundle - The bundle file name
+ * @param {boolean} options.allFiles - Whether to build all files
+ * @param {string} options.replace - Replace
+ * @param {DigigovCommand} ctx - The command context
+ */
+async function buildTailwind(options) {
+  await build({
+    cwd: options.cwd,
+    distFolder: options.dist,
+    bundleFileName: options.bundle,
+    allFiles: options.allFiles,
+    replace: {
+      "border-color:reset": "",
+      '"borderColor":"reset"': "",
+    },
+  });
+}

package/package.json

@@ -1,20 +1,27 @@
 {
   "name": "@digigov/cli-build-tailwind",
-  "version": "1.0.2-rc.21",
+  "version": "2.0.0-834daea4",
   "description": "Build tailwind plugin for Digigov CLI",
   "main": "./index.js",
+  "type": "module",
   "author": "GRNET Devs <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
   "private": false,
   "dependencies": {
     "fs-extra": "11.2.0",
-    "glob": "7.1.6",
+    "globby": "11.0.0",
     "postcss": "8.4.4",
     "postcss-js": "4.0.0",
     "postcss-load-config": "3.1.4"
   },
+  "devDependencies": {
+    "publint": "0.1.8"
+  },
   "peerDependencies": {
-    "@digigov/cli": "1.1.1-rc.21"
+    "@digigov/cli": "2.0.0-834daea4"
   },
-  "scripts": {}
+  "scripts": {
+    "publint": "publint",
+    "lint": "echo 'no lint needed (yet)'"
+  }
 }