@digigov/cli-build 1.1.1 → 2.0.0-07ee8440

package/index.js

@@ -1,109 +1,106 @@
-const { Command, flags } = require("@oclif/command");
-const execa = require("execa");
-const { resolveProject, DigigovCommand } = require("@digigov/cli/lib");
-const path = require("path");
-const fs = require("fs");
+import { DigigovCommand, resolveProject, logger } from "@digigov/cli/lib";
+import { buildFormat, generateTypeDeclarationFiles } from "./build.js";
+import { generateRegistryFiles } from "./generate-registry.js";
+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 flags = {
-    subpackages: flags.boolean({ char: "--subpackages" }),
-  };
-  static load() {
-    return Build;
+import { Option } from "commander";
+import path from "path";
+import glob from "globby";
+import assert from "assert";
+import { getProjectTsconfig } from "./common.js";
+
+const command = new DigigovCommand("build", import.meta.url)
+  .option(
+    "--generate-registry",
+    "Generate a registry file for the build output",
+  )
+  .addOption(
+    new Option("--include-stories", "Include stories in the output").implies({
+      generateRegistry: true,
+    }),
+  )
+  .action(main);
+export default command;
+
+const SRC_GLOB = "src/**/*.{tsx,ts,js,jsx}";
+const TEST_GLOBS = [
+  "**/*.test.{js,jsx,ts,tsx}",
+  "**/*.spec.{js,jsx,ts,tsx}",
+  "**/__tests__/**/*.{js,jsx,ts,tsx}",
+];
+const STORIES_GLOBS = [
+  "**/*.stories.{js,jsx,ts,tsx}",
+  "**/__stories__/**/*.{js,jsxts,tsx}",
+];
+
+/**
+ * @param {object} options - The command options
+ * @param {boolean} options.generateRegistry - Generate a registry file for the build output
+ * @param {boolean} options.includeStories - Include stories in the generated registry file
+ * @param {DigigovCommand} ctx
+ */
+async function main(options, ctx) {
+  const project = resolveProject();
+
+  await ctx.exec("rimraf", [project.distDir]);
+
+  /**
+   * The project tsconfig, or undefined if the project is not using TypeScript
+   * @type {string | undefined}
+   */
+  let tsconfig;
+  if (project.isTs) {
+    tsconfig = getProjectTsconfig(project.root);
+    assert(tsconfig, "Expected tsconfig to be in project");
+    await generateTypeDeclarationFiles(project, tsconfig, ctx);
+  }
+
+  const ignore = [...TEST_GLOBS];
+  if (options.includeStories) {
+    logger.debug("Including stories in the build");
+  } else {
+    ignore.push(...STORIES_GLOBS);
   }
-  script = "babel";
-  async run() {
-    const { argv, flags } = 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);
+  const filesToBuild = await glob(path.join(project.root, SRC_GLOB), {
+    ignore,
+  });
+  logger.debug("Bundling ESM and CJS...");
+  await Promise.all([
+    buildFormat({
+      files: filesToBuild,
+      tsconfig: tsconfig,
+      format: "cjs",
+      outdir: project.distDir + "/cjs",
+    }),
+    buildFormat({
+      files: filesToBuild,
+      tsconfig,
+      format: "esm",
+      outdir: project.distDir,
+    }),
+  ]);
+  logger.debug("Bundling done.");
 
-      if (flags.subpackages) {
-        if (argv.includes("--watch") || argv.includes("-w")) {
-          throw new Error("--watch cannot be combined with --subpackages");
-        }
-        const args = argv.filter((a) => a !== "--subpackages");
-        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 });
-            });
-          }
-        }
-        await this.exec(this.script, [...babelArgs, "dist", ...args], {
-          env: {
-            BABEL_ENV: "esm",
-            BABEL_PUBLISH: "true",
-          },
-          stdio: "inherit",
-        });
-        const proc = await this.exec(
-          this.script,
-          [...babelArgs, "dist/cjs", ...argv],
-          {
-            env: {
-              BABEL_ENV: "cjs",
-              BABEL_PUBLISH: "true",
-            },
-            stdio: "inherit",
-          },
-        );
-        await execa("node", [path.join(__dirname, "copy-files.js")], {
-          env: {},
-          stdio: "inherit",
-        });
-        return proc;
-      } else {
-        return this.exec(this.script, [...babelArgs, "", ...argv], {
-          env: {
-            BABEL_ENV: "cjs",
-            BABEL_PUBLISH: "true",
-          },
-          stdio: "inherit",
-        });
-      }
-    } catch (err) {
-      console.log(err);
-    }
+  if (options.generateRegistry) {
+    const registryFiles = filesToBuild.filter(
+      (file) => !(file.includes("native") || file.endsWith(".d.ts")),
+    );
+    logger.debug("Generating registry files...");
+    const registryFilePaths = await generateRegistryFiles(
+      project,
+      registryFiles,
+      options.includeStories,
+    );
+    await buildFormat({
+      files: registryFilePaths,
+      tsconfig: tsconfig,
+      format: "cjs",
+      outdir: project.distDir + "/cjs",
+    });
+    logger.log("Generated registry files");
   }
-};
+
+  logger.debug("Copying files to build directory...");
+  copyFiles();
+  logger.debug("Files copied.");
+}

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@digigov/cli-build",
-  "version": "1.1.1",
+  "version": "2.0.0-07ee8440",
   "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,20 +27,30 @@
     "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.3.2",
-    "@digigov/babel-ts-to-proptypes": "1.1.0",
-    "@types/node": "18.19.0",
-    "babel-plugin-istanbul": "6.0.0",
-    "publint": "0.1.8"
+    "globby": "11.0.0",
+    "babel-plugin-istanbul": "7.0.0",
+    "publint": "0.1.8",
+    "rimraf": "3.0.2",
+    "esbuild": "0.23.0",
+    "commander": "12.1.0",
+    "ts-morph": "25.0.0"
   },
   "devDependencies": {
-    "publint": "0.1.8"
+    "publint": "0.1.8",
+    "vitest": "2.1.3",
+    "@digigov/cli-test": "2.0.0-07ee8440",
+    "@types/fs-extra": "11.0.4",
+    "@types/node": "18.19.0",
+    "typescript": "5.6.2"
   },
   "peerDependencies": {
-    "@digigov/cli": "1.1.0",
-    "rimraf": "3.0.2",
-    "next": "10.0.9"
+    "@digigov/cli": "2.0.0-07ee8440",
+    "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"],
@@ -36,14 +33,15 @@
       "@digigov/react-experimental/*": ["../libs-ui/react-experimental/src/*"],
       "@digigov/react-experimental/": ["../libs-ui/react-experimental/src"],
       "@digigov/react-experimental": ["../libs-ui/react-experimental/src"],
-      "@digigov/storybook/*": ["../examples/storybook/stories/*"]
+      "@digigov/storybook/*": ["../examples/storybook/stories/*"],
+      "@uides/stepwise/*": ["./stepwise/src/*"],
+      "@uides/stepwise/": ["./stepwise/src"],
+      "@uides/stepwise": ["./stepwise/src"]
     }
   },
   "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/tsconfig.json

@@ -1,45 +1,12 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "@digigov/cli/tsconfig.cli",
   "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": "./"
+      "vitest/globals"
+    ]
   },
   "include": [
-    "index.js"
-  ],
-  "exclude": [
-    "node_modules"
+    "./*.js",
+    "__tests__"
   ]
 }

package/.rush/temp/package-deps_publint.json

@@ -1,16 +0,0 @@
-{
-  "files": {
-    "tooling/cli-build/CHANGELOG.json": "2ef133cf1382408c12a9a50394458ce636db41da",
-    "tooling/cli-build/CHANGELOG.md": "e33f581bbe6df47d0a268214b2b36b466982382e",
-    "tooling/cli-build/babel.common.js": "90eb10de028180d36629ed9eb6ae766533fa2fb7",
-    "tooling/cli-build/babel.config.js": "429fbd41ed59647228513cb014d79ef7f1bc43b3",
-    "tooling/cli-build/copy-files.js": "4cc6276d2978b40bc3afd591b1a92272b01b77dc",
-    "tooling/cli-build/index.js": "8fbe904275720b2f09b60a78b4dcc0a2cab4b5da",
-    "tooling/cli-build/package.json": "bdcb47af72bfd9eeebb53bdc776bae9b9366eae0",
-    "tooling/cli-build/tsconfig.base.json": "bc11bf86f0eeec9612369323883285bb019233f6",
-    "tooling/cli-build/tsconfig.common.json": "17a9be8e2967aa47ab21e98cfa075505f9d1823f",
-    "tooling/cli-build/tsconfig.json": "dd8ed0b326b53d74d31dbc49a8628065f02691de",
-    "tooling/cli-build/.rush/temp/shrinkwrap-deps.json": "7ab9dd99f20c9f4f35a3b1d3f1666e0854600af6"
-  },
-  "arguments": "publint "
-}

package/babel.config.js

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

package/cli-build.publint.log

@@ -1,3 +0,0 @@
-Invoking: publint 
-@digigov/cli-build lint results:
-All good!