@digigov/cli-build 2.0.0-rc.21 → 2.0.0-rc.22

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

@@ -1,17 +1,16 @@
 {
-  "../../tooling/cli-build": "../../tooling/cli-build:pAQsXnAQMf4lndbj9ZmjcYLifQhoD25kjbbi+6xqg1c=:",
-  "/@babel/cli@7.12.1(@babel/core@7.12.13)": "Missing shrinkwrap entry!",
+  "../../tooling/cli-build": "../../tooling/cli-build:o90YTy4xQCi6KeWvf5LX25kGiIgP/Xhcx0CMi+Wmhog=:",
+  "/@babel/cli@7.12.1(@babel/core@7.26.0)": "Missing shrinkwrap entry!",
   "/@babel/compat-data@7.12.5": "Missing shrinkwrap entry!",
-  "/@babel/core@7.12.13": "Missing shrinkwrap entry!",
+  "/@babel/core@7.26.0": "Missing shrinkwrap entry!",
   "/@babel/helper-validator-identifier@7.9.5": "Missing shrinkwrap entry!",
-  "/@babel/plugin-proposal-class-properties@7.12.1(@babel/core@7.12.13)": "Missing shrinkwrap entry!",
-  "/@babel/plugin-proposal-object-rest-spread@7.12.1(@babel/core@7.12.13)": "Missing shrinkwrap entry!",
-  "/@babel/plugin-transform-object-assign@7.12.1(@babel/core@7.12.13)": "Missing shrinkwrap entry!",
-  "/@babel/plugin-transform-runtime@7.12.1(@babel/core@7.12.13)": "Missing shrinkwrap entry!",
-  "/@babel/preset-env@7.12.13(@babel/core@7.12.13)": "Missing shrinkwrap entry!",
-  "/@babel/preset-react@7.12.13(@babel/core@7.12.13)": "Missing shrinkwrap entry!",
-  "/@babel/preset-typescript@7.12.1(@babel/core@7.12.13)": "Missing shrinkwrap entry!",
-  "/@types/node@18.19.0": "Missing shrinkwrap entry!",
+  "/@babel/plugin-proposal-class-properties@7.12.1(@babel/core@7.26.0)": "Missing shrinkwrap entry!",
+  "/@babel/plugin-proposal-object-rest-spread@7.12.1(@babel/core@7.26.0)": "Missing shrinkwrap entry!",
+  "/@babel/plugin-transform-object-assign@7.12.1(@babel/core@7.26.0)": "Missing shrinkwrap entry!",
+  "/@babel/plugin-transform-runtime@7.12.1(@babel/core@7.26.0)": "Missing shrinkwrap entry!",
+  "/@babel/preset-env@7.12.13(@babel/core@7.26.0)": "Missing shrinkwrap entry!",
+  "/@babel/preset-react@7.12.13(@babel/core@7.26.0)": "Missing shrinkwrap entry!",
+  "/@babel/preset-typescript@7.12.1(@babel/core@7.26.0)": "Missing shrinkwrap entry!",
   "/babel-plugin-inline-import-data-uri@1.0.1": "Missing shrinkwrap entry!",
   "/babel-plugin-istanbul@7.0.0": "Missing shrinkwrap entry!",
   "/babel-plugin-module-resolver@4.0.0": "Missing shrinkwrap entry!",
@@ -22,9 +21,8 @@
   "/babel-plugin-transform-react-remove-prop-types@0.4.24": "Missing shrinkwrap entry!",
   "/esbuild@0.23.0": "Missing shrinkwrap entry!",
   "/fs-extra@11.2.0": "Missing shrinkwrap entry!",
-  "/glob@7.1.6": "Missing shrinkwrap entry!",
-  "/next@13.1.1(@babel/core@7.12.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": "Missing shrinkwrap entry!",
+  "/globby@11.0.0": "Missing shrinkwrap entry!",
+  "/next@13.1.1(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": "Missing shrinkwrap entry!",
   "/publint@0.1.8": "Missing shrinkwrap entry!",
-  "/rimraf@3.0.2": "Missing shrinkwrap entry!",
-  "/typescript@5.6.2": "Missing shrinkwrap entry!"
+  "/rimraf@3.0.2": "Missing shrinkwrap entry!"
 }

package/{babel.common.js → babel.common.cjs}

@@ -4,7 +4,7 @@ const lib = require("@digigov/cli/lib");
 
 function makeBabelConfig(dir, opts = { docs: false, proptypes: false }) {
   const project = lib.resolveProject(dir);
-  const aliases = !project.externalLockFile ? lib.aliases(null, true) : {};
+  const aliases = !project.externalLockFile ? lib.aliases(true) : {};
 
   const BABEL_ENV = process.env.BABEL_ENV || "esm";
   const BABEL_PUBLISH = process.env.BABEL_PUBLISH || false;

package/babel.config.cjs

@@ -0,0 +1 @@
+module.exports = require("./babel.common.cjs").config;

package/copy-files.js

@@ -1,23 +1,33 @@
-/* eslint-disable no-console */
-const path = require("path");
-const fs = require("fs");
-const fse = require("fs-extra");
-const glob = require("glob");
-const { resolveProject } = require("@digigov/cli/lib");
+import { logger, resolveProject } from "@digigov/cli/lib";
+import fs from "fs-extra";
+import path from "path";
+import glob from "globby";
 
-const project = resolveProject();
 const packagePath = process.cwd();
-const buildPath = path.join(project.root, project.distDir);
 
-async function includeFileInBuild(file) {
+function getBuildPath() {
+  const project = resolveProject();
+  return path.join(project.root, project.distDir);
+}
+
+/**
+ * Copy a file from the package to the build directory
+ *
+ * @param {string} file - The file to include in the build
+ */
+function includeFileInBuild(file) {
   const sourcePath = path.resolve(packagePath, file);
+  const buildPath = getBuildPath();
   const targetPath = path.resolve(buildPath, path.basename(file));
-  await fse.copy(sourcePath, targetPath);
-  console.log(`Copied ${sourcePath} to ${targetPath}`);
+  fs.copySync(sourcePath, targetPath);
+  logger.log(`Copied ${sourcePath} to ${targetPath}`);
 }
 
-async function createRootPackageFile() {
-  const packageData = await fse.readFile(
+/**
+ * Create a package.json file in the build directory
+ */
+function createRootPackageFile() {
+  const packageData = fs.readFileSync(
     path.resolve(packagePath, "./package.json"),
     "utf8",
   );
@@ -30,20 +40,24 @@ async function createRootPackageFile() {
     module: "./index.js",
     typings: "./index.d.ts",
   };
+  const buildPath = getBuildPath();
   const targetPath = path.resolve(buildPath, "./package.json");
 
-  await fse.writeFile(
-    targetPath,
-    JSON.stringify(newPackageData, null, 2),
-    "utf8",
-  );
-  console.log(`Created package.json in ${targetPath}`);
+  fs.writeFileSync(targetPath, JSON.stringify(newPackageData, null, 2), "utf8");
+  logger.log(`Created package.json in ${targetPath}`);
 
   return newPackageData;
 }
 
+/**
+ * Create nested package.json files in the build directory
+ *
+ */
 function createNestedPackageFiles() {
-  const indexPaths = glob.sync(path.join(buildPath, "!(cjs)/**/index.js"));
+  const buildPath = getBuildPath();
+  const indexPaths = glob.sync(path.join(buildPath, "**/index.js"), {
+    ignore: [path.join(buildPath, "cjs/**")],
+  });
 
   indexPaths.forEach((indexPath) => {
     if (indexPath === path.join(buildPath, "index.js")) return;
@@ -63,63 +77,78 @@ function createNestedPackageFiles() {
   });
 }
 
-async function prepend(file, string) {
-  const data = await fse.readFile(file, "utf8");
-  await fse.writeFile(file, string + data, "utf8");
+/**
+ * Prepend a string to a file
+ *
+ * @param {string} file - The file to prepend to
+ * @param {string} string - The string to prepend
+ */
+function prepend(file, string) {
+  const data = fs.readFileSync(file, "utf8");
+  fs.writeFileSync(file, string + data, "utf8");
 }
 
-async function addLicense(packageData) {
-  const license = `/** @license Digigov v${packageData.version}
+/**
+ * Add license to the top of the files
+ *
+ * @param {object} packageData - The package data
+ */
+function addLicense(packageData) {
+  const buildPath = getBuildPath();
+  const license = `/** @license Digigov v${packageData["version"]}
  *
  * This source code is licensed under the BSD-2-Clause license found in the
  * LICENSE file in the root directory of this source tree.
  */
 `;
-  await Promise.all(
-    ["./index.js", "./index.mjs"].map(async (file) => {
-      try {
-        await prepend(path.resolve(buildPath, file), license);
-      } catch (err) {
-        if (err.code === "ENOENT") {
-          console.log(`Skipped license for ${file}`);
-        } else {
-          throw err;
-        }
+  ["./index.js", "./index.mjs"].map(async (file) => {
+    try {
+      prepend(path.resolve(buildPath, file), license);
+    } catch (err) {
+      if (
+        typeof err === "object" &&
+        err &&
+        "code" in err &&
+        err.code === "ENOENT"
+      ) {
+        logger.log(`Skipped license for ${file}`);
+      } else {
+        throw err;
       }
-    }),
-  );
+    }
+  });
 }
 
+/**
+ * Create separate index modules for each directory
+ */
 function createSeparateIndexModules() {
-  const files = glob.sync(path.join(buildPath, "**/!(index).js"));
+  const buildPath = getBuildPath();
+  const files = glob.sync(path.join(buildPath, "**/*.js"), {
+    ignore: [path.join(buildPath, "**/index.js")],
+  });
 
   files.forEach((file) => {
-    fs.mkdirSync(file.replace(".js", ""));
-    fs.renameSync(file, file.replace(".js", "/index.js"));
+    fs.mkdirSync(file.replace(/\.js$/, ""));
+    fs.renameSync(file, file.replace(/\.js$/, "/index.js"));
   });
 }
 
-async function run() {
-  try {
-    const packageData = await createRootPackageFile();
-    createSeparateIndexModules();
-    createNestedPackageFiles();
-
-    await Promise.all(
-      [
-        // use enhanced readme from workspace root for `@digigov/ui`
-        // packageData.name === '@digigov/ui' ? '../../README.md' : './README.md',
-        "./src",
-        "./README.md",
-        "./CHANGELOG.md",
-        "../../LICENSE",
-      ].map((file) => includeFileInBuild(file)),
-    );
+/**
+ * Run the copy files script
+ */
+export default function run() {
+  const packageData = createRootPackageFile();
+  createSeparateIndexModules();
+  createNestedPackageFiles();
 
-    await addLicense(packageData);
-  } catch (err) {
-    console.error(err);
-  }
+  [
+    // use enhanced readme from workspace root for `@digigov/ui`
+    // packageData.name === '@digigov/ui' ? '../../README.md' : './README.md',
+    "./src",
+    "./README.md",
+    "./CHANGELOG.md",
+    "../../LICENSE",
+  ].map((file) => includeFileInBuild(file)),
+    addLicense(packageData);
 }
-
-run();

package/index.js

@@ -1,107 +1,85 @@
-const { Command } = require("@oclif/command");
-const execa = require("execa");
-const { resolveProject, DigigovCommand } = require("@digigov/cli/lib");
-const path = require("path");
-const fs = require("fs");
-const esbuild = require("esbuild");
-const glob = require("glob");
+import { DigigovCommand, resolveProject } from "@digigov/cli/lib";
+import copyFiles from "./copy-files.js";
 
-module.exports = class Build extends DigigovCommand {
-  static description = "build digigov libraries";
-  static id = "build";
-  dirname = __dirname;
-  static examples = [`$ digigov build`];
-  static strict = false;
-  static load() {
-    return Build;
-  }
-  script = "babel";
-  async run() {
-    const { argv } = this.parse(Build);
-    try {
-      await this.exec("rimraf", ["dist"]);
-      const project = resolveProject();
-      const babelArgs = [
-        "--config-file",
-        path.join(__dirname, "babel.config.js"),
-        project.src,
-        "--extensions",
-        ".tsx,.ts,.js,.jsx",
-        "--copy-files",
-        "--out-dir",
-      ];
-      const distDir = path.resolve(project.root, project.distDir);
-      const basename = path.basename(project.root);
+import fs from "fs-extra";
+import path from "path";
+import esbuild from "esbuild";
+import glob from "globby";
 
-      if (project.isTs) {
-        const tsconfigProduction = path.join(
-          project.root,
-          "tsconfig.production.json",
-        );
-        const tsArgs = [];
-        if (fs.existsSync(tsconfigProduction)) {
-          tsArgs.push("--project", tsconfigProduction);
-        }
-        await this.exec("tsc", [
-          "--emitDeclarationOnly",
-          "--outDir",
-          "dist",
-          ...tsArgs,
-        ]);
-        if (fs.existsSync(path.join(distDir, basename))) {
-          const typesIncluded = fs.readdirSync(path.join(distDir));
-          const paths = fs.readdirSync(
-            path.join(distDir, basename, project.src),
-          );
-          paths.forEach((p) => {
-            fs.renameSync(
-              path.join(distDir, basename, project.src, p),
-              path.join(distDir, p),
-            );
-          });
-          typesIncluded.forEach((typesDir) => {
-            fs.rmSync(path.join(distDir, typesDir), { recursive: true });
-          });
-        }
-      }
+const command = new DigigovCommand("build", import.meta.url).action(build);
+export default command;
+
+/**
+ * @param {DigigovCommand} ctx
+ */
+async function build(_, ctx) {
+  await ctx.exec("rimraf", ["dist"]);
+  const project = resolveProject();
 
-      const files = glob.sync(
-        path.join(project.root, "src", "**/*.{tsx,ts,js,jsx}"),
-        {
-          ignore: "**/*.{spec,test}.{ts,tsx,js,jsx}",
-        },
-      );
-      const commonBuildOptions = {
-        entryPoints: files,
-        platform: "node",
-        sourcemap: true,
-        target: ["esnext"],
-        logLevel: "error",
-      };
-      if (fs.existsSync(path.join(project.root, "tsconfig.production.json"))) {
-        commonBuildOptions["tsconfig"] = "tsconfig.production.json";
-      } else if (fs.existsSync(path.join(project.root, "tsconfig.json"))) {
-        commonBuildOptions["tsconfig"] = "tsconfig.json";
-      }
+  const distDir = path.resolve(project.root, project.distDir);
+  const basename = path.basename(project.root);
 
-      await Promise.all([
-        esbuild.build({
-          ...commonBuildOptions,
-          format: "esm",
-          outdir: `dist`,
-        }),
-        esbuild.build({
-          ...commonBuildOptions,
-          format: "cjs",
-          outdir: `dist/cjs`,
-        }),
-      ]);
-      await execa("node", [path.join(__dirname, "copy-files.js")], {
-        env: {},
-        stdio: "inherit",
+  if (project.isTs) {
+    const tsconfigProduction = path.join(
+      project.root,
+      "tsconfig.production.json",
+    );
+    /** @type {string[]} */
+    const tsArgs = [];
+    if (fs.existsSync(tsconfigProduction)) {
+      tsArgs.push("--project", tsconfigProduction);
+    }
+    await ctx.exec("tsc", [
+      "--emitDeclarationOnly",
+      "--outDir",
+      "dist",
+      ...tsArgs,
+    ]);
+    if (fs.existsSync(path.join(distDir, basename))) {
+      const typesIncluded = fs.readdirSync(path.join(distDir));
+      const paths = fs.readdirSync(path.join(distDir, basename, project.src));
+      paths.forEach((p) => {
+        fs.renameSync(
+          path.join(distDir, basename, project.src, p),
+          path.join(distDir, p),
+        );
+      });
+      typesIncluded.forEach((typesDir) => {
+        fs.rmSync(path.join(distDir, typesDir), { recursive: true });
       });
-    } catch (err) {
-      console.error(err);
     }
   }
-};
+
+  const files = glob.sync(
+    path.join(project.root, "src", "**/*.{tsx,ts,js,jsx}"),
+    {
+      ignore: ["**/*.{spec,test}.{ts,tsx,js,jsx}"],
+    },
+  );
+  const commonBuildOptions = {
+    entryPoints: files,
+    platform: "node",
+    sourcemap: true,
+    target: ["esnext"],
+    logLevel: "error",
+  };
+  if (fs.existsSync(path.join(project.root, "tsconfig.production.json"))) {
+    commonBuildOptions["tsconfig"] = "tsconfig.production.json";
+  } else if (fs.existsSync(path.join(project.root, "tsconfig.json"))) {
+    commonBuildOptions["tsconfig"] = "tsconfig.json";
+  }
+
+  await Promise.all([
+    esbuild.build({
+      ...commonBuildOptions,
+      format: "esm",
+      outdir: `dist`,
+    }),
+    esbuild.build({
+      ...commonBuildOptions,
+      format: "cjs",
+      outdir: `dist/cjs`,
+    }),
+  ]);
+  copyFiles();
+}

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@digigov/cli-build",
-  "version": "2.0.0-rc.21",
+  "version": "2.0.0-rc.22",
   "description": "Build plugin for Digigov CLI",
   "main": "./index.js",
+  "type": "module",
   "author": "GRNET Devs <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
   "private": false,
   "dependencies": {
     "@babel/cli": "7.12.1",
     "@babel/compat-data": "7.12.5",
-    "@babel/core": "7.12.13",
+    "@babel/core": "7.26.0",
     "@babel/helper-validator-identifier": "7.9.5",
     "@babel/plugin-proposal-class-properties": "7.12.1",
     "@babel/plugin-proposal-object-rest-spread": "7.12.1",
@@ -26,22 +27,25 @@
     "babel-plugin-transform-react-constant-elements": "6.23.0",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
     "fs-extra": "11.2.0",
-    "glob": "7.1.6",
-    "typescript": "5.6.2",
-    "@digigov/babel-ts-to-proptypes": "1.1.0-rc.19-rc.20-rc.21",
-    "@types/node": "18.19.0",
+    "globby": "11.0.0",
+    "@digigov/babel-ts-to-proptypes": "1.1.0-rc.22",
     "babel-plugin-istanbul": "7.0.0",
     "publint": "0.1.8",
+    "rimraf": "3.0.2",
     "esbuild": "0.23.0"
   },
   "devDependencies": {
     "publint": "0.1.8"
   },
   "peerDependencies": {
-    "@digigov/cli": "1.1.1-rc.21",
-    "rimraf": "3.0.2",
+    "@digigov/cli": "2.0.0-rc.22",
     "next": "13.1.1"
   },
+  "peerDependenciesMeta": {
+    "next": {
+      "optional": true
+    }
+  },
   "scripts": {
     "publint": "publint"
   }

package/tsconfig.base.json

@@ -12,9 +12,6 @@
       "@digigov/auth/*": ["./auth/src/*"],
       "@digigov/auth/": ["./auth/src"],
       "@digigov/auth": ["./auth/src"],
-      "@digigov/benchmark/*": ["./benchmark/src/*"],
-      "@digigov/benchmark/": ["./benchmark/src"],
-      "@digigov/benchmark": ["./benchmark/src"],
       "@digigov/text-search/*": ["./text-search/src/*"],
       "@digigov/text-search/": ["./text-search/src"],
       "@digigov/text-search": ["./text-search/src"],
@@ -42,8 +39,6 @@
   "include": [
     "../../libs/auth/src/**/*.tsx",
     "../../libs/auth/src/*.tsx",
-    "../../libs/benchmark/src/**/*.tsx",
-    "../../libs/benchmark/src/*.tsx",
     "../../libs/text-search/src/**/*.tsx",
     "../../libs/text-search/src/*.tsx",
     "../../libs/text-search/src/**/*.ts",

package/babel.config.js

@@ -1 +0,0 @@
-module.exports = require('./babel.common').config

package/tsconfig.json

@@ -1,45 +0,0 @@
-{
-  "extends": "./tsconfig.base.json",
-  "compilerOptions": {
-    "types": [
-      "node"
-    ],
-    "outDir": "dist",
-    "paths": {
-      "@digigov/babel-ts-to-proptypes": [
-        "node_modules/@digigov/babel-ts-to-proptypes/src"
-      ],
-      "@digigov/babel-ts-to-proptypes/": [
-        "node_modules/@digigov/babel-ts-to-proptypes/src/"
-      ],
-      "@digigov/babel-ts-to-proptypes/*": [
-        "node_modules/@digigov/babel-ts-to-proptypes/src/*"
-      ],
-      "@digigov/cli": [
-        "node_modules/@digigov/cli/src"
-      ],
-      "@digigov/cli/": [
-        "node_modules/@digigov/cli/src/"
-      ],
-      "@digigov/cli/*": [
-        "node_modules/@digigov/cli/src/*"
-      ],
-      "@digigov/cli-build": [
-        "./src"
-      ],
-      "@digigov/cli-build/": [
-        "./src/"
-      ],
-      "@digigov/cli-build/*": [
-        "./src/*"
-      ]
-    },
-    "baseUrl": "./"
-  },
-  "include": [
-    "index.js"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
-}