@digigov/cli-build 2.0.0-18c66302 → 2.0.0-2271444d

package/copy-files.js

@@ -1,7 +1,6 @@
-import { logger, resolveProject } from "@digigov/cli/lib";
-import fs from "fs-extra";
-import path from "path";
-import glob from "globby";
+import { logger, resolveProject } from '@digigov/cli/lib';
+import fs from 'fs-extra';
+import path from 'path';
 
 const packagePath = process.cwd();
 const project = resolveProject();
@@ -19,69 +18,47 @@ function includeFileInBuild(file) {
   logger.debug(`Copied ${sourcePath} to build directory`);
 }
 
-function copyRegistryFilesToSrc() {
-  const registryPath = path.resolve(buildPath, "registry/index.js");
-  const lazyPath = path.resolve(buildPath, "lazy/index.js");
-  if (!fs.existsSync(registryPath) || !fs.existsSync(lazyPath)) return;
-
-  const srcPath = path.resolve(buildPath, "src");
-  logger.debug(`Copying registry and lazy files to ${srcPath}`);
-  fs.copySync(registryPath, path.resolve(srcPath, "registry.js"));
-  fs.copySync(lazyPath, path.resolve(srcPath, "lazy.js"));
-}
-
 /**
  * Create a package.json file in the build directory
  */
 function createRootPackageFile() {
   const packageData = fs.readFileSync(
-    path.resolve(packagePath, "./package.json"),
-    "utf8",
+    path.resolve(packagePath, './package.json'),
+    'utf8'
   );
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { nyc, scripts, devDependencies, workspaces, ...packageDataOther } =
     JSON.parse(packageData);
   const newPackageData = {
     ...packageDataOther,
+    main: undefined,
     private: false,
-    main: "./cjs/index.js",
-    module: "./index.js",
-    typings: "./index.d.ts",
+    type: 'module', // ESM only
+    exports: {
+      '.': {
+        types: './index.d.ts',
+        import: './index.js',
+      },
+      './src/*': './src/*',
+      './*': {
+        types: ['./*.d.ts', './*/index.d.ts'],
+        import: ['./*', './*/index.js'],
+      },
+      './*.js': {
+        types: './*.d.ts',
+        import: './*.js',
+      },
+    },
   };
-  const targetPath = path.resolve(buildPath, "./package.json");
+  const targetPath = path.resolve(buildPath, './package.json');
 
-  fs.writeFileSync(targetPath, JSON.stringify(newPackageData, null, 2), "utf8");
+  fs.writeFileSync(targetPath, JSON.stringify(newPackageData, null, 2), 'utf8');
   logger.debug(`Created package.json in build directory`);
 
   return newPackageData;
 }
 
-/**
- * Create nested package.json files in the build directory
- *
- */
-function createNestedPackageFiles() {
-  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;
-    const packageData = {
-      sideEffects: false,
-      module: "./index.js",
-      types: "./index.d.ts",
-      main: path.relative(
-        path.dirname(indexPath),
-        indexPath.replace(buildPath, path.join(buildPath, "/cjs")),
-      ),
-    };
-    fs.writeFileSync(
-      path.join(path.dirname(indexPath), "package.json"),
-      JSON.stringify(packageData, null, 2),
-    );
-  });
-}
-
 /**
  * Prepend a string to a file
  *
@@ -89,8 +66,8 @@ function createNestedPackageFiles() {
  * @param {string} string - The string to prepend
  */
 function prepend(file, string) {
-  const data = fs.readFileSync(file, "utf8");
-  fs.writeFileSync(file, string + data, "utf8");
+  const data = fs.readFileSync(file, 'utf8');
+  fs.writeFileSync(file, string + data, 'utf8');
   logger.debug(`Prepended license to ${file}`);
 }
 
@@ -100,21 +77,21 @@ function prepend(file, string) {
  * @param {object} packageData - The package data
  */
 function addLicense(packageData) {
-  const license = `/** @license Digigov v${packageData["version"]}
+  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.
  */
 `;
-  ["./index.js", "./index.mjs"].map(async (file) => {
+  ['./index.js', './index.mjs'].map(async (file) => {
     try {
       prepend(path.resolve(buildPath, file), license);
     } catch (err) {
       if (
-        typeof err === "object" &&
+        typeof err === 'object' &&
         err &&
-        "code" in err &&
-        err.code === "ENOENT"
+        'code' in err &&
+        err.code === 'ENOENT'
       ) {
         logger.debug(`Skipped license for ${file}`);
       } else {
@@ -124,36 +101,19 @@ function addLicense(packageData) {
   });
 }
 
-/**
- * Create separate index modules for each directory
- */
-function createSeparateIndexModules() {
-  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"));
-  });
-}
-
 /**
  * Run the copy files script
  */
 export default function run() {
   const packageData = createRootPackageFile();
-  createSeparateIndexModules();
-  createNestedPackageFiles();
-  copyRegistryFilesToSrc();
 
   [
     // 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);
+    './src',
+    './README.md',
+    './CHANGELOG.md',
+    '../../LICENSE',
+  ].map((file) => includeFileInBuild(file));
+  addLicense(packageData);
 }

package/eslint.config.js

@@ -0,0 +1,3 @@
+import config from '@digigov/cli-lint/eslint.config';
+
+export default [...config];

package/generate-registry.js

@@ -1,14 +1,15 @@
-import { logger } from "@digigov/cli/lib";
-import path from "path";
-import fs from "fs-extra";
-import { SyntaxKind, Project as TsMorphProject } from "ts-morph";
-import assert from "assert";
+import { logger } from '@digigov/cli/lib';
+import path from 'path';
+import fs from 'fs-extra';
+import { SyntaxKind, Project as TsMorphProject } from 'ts-morph';
+import assert from 'assert';
 
-import { getProjectTsconfig } from "./common.js";
+import { getProjectTsconfig } from './common.js';
 
 /** @typedef {Object} Project - Represents the project to be built
  * @property {string} root - The project root directory
  * @property {string} name - The project name as in package.json
+ * @property {string} src - The project src directory
  * @property {string} distDir - The project build directory
  */
 
@@ -23,17 +24,17 @@ import { getProjectTsconfig } from "./common.js";
 export async function generateRegistry(
   project,
   absoluteFilePaths,
-  registryFilename = "registry.js",
+  registryFilename = 'registry.js'
 ) {
   const registryPath = ensureRegistryPath(project, registryFilename);
 
   const relativePaths = absoluteFilePaths.map((path) => {
     assert(
       path.startsWith(project.root),
-      "Expected path to be in project root",
+      'Expected path to be in project root'
     );
     return toNodeResolvablePath(
-      path.replace(`${project.root}/src/`, `${project.name}/`),
+      path.replace(`${project.root}/src/`, `${project.name}/`)
     );
   });
   let registryPaths = relativePaths.map((path) => ({
@@ -43,22 +44,22 @@ export async function generateRegistry(
 
   if (registryPaths.length === 0)
     throw new Error(
-      "Could not generate registry. No exportable modules found.",
+      'Could not generate registry. No exportable modules found.'
     );
 
   const importStatements = registryPaths.map(
-    (file) => `import * as ${file.uid} from "${file.path}";`,
+    (file) => `import * as ${file.uid} from "${file.path}";`
   );
   const componentsToExport = registryPaths.map(
-    (file) => `  '${file.path}': lazyImport(${file.uid})`,
+    (file) => `  '${file.path}': lazyImport(${file.uid})`
   );
 
   logger.debug(
-    `Including ${componentsToExport.length} items in ${registryPath}`,
+    `Including ${componentsToExport.length} items in ${registryPath}`
   );
 
   let registryFileContent = `
-${importStatements.join("\n")}
+${importStatements.join('\n')}
 function lazyImport(pkgImport) {
   return new Proxy(
     {},
@@ -78,7 +79,7 @@ function lazyImport(pkgImport) {
   )
 }
 export default {
-${componentsToExport.join(",\n")}
+${componentsToExport.join(',\n')}
 };
 `;
   await fs.writeFile(registryPath, registryFileContent);
@@ -97,7 +98,7 @@ ${componentsToExport.join(",\n")}
 export async function generateLazyRegistry(
   project,
   filePaths,
-  lazyFilename = "lazy.js",
+  lazyFilename = 'lazy.js'
 ) {
   const lazyPath = ensureRegistryPath(project, lazyFilename);
 
@@ -117,15 +118,15 @@ export async function generateLazyRegistry(
 
     for (const exportedComponent of exports) {
       if (
-        exportedComponent !== "default" &&
-        exportedComponent.match(/^[A-Z]/)
+        exportedComponent !== 'default' &&
+        exportedComponent.match(/^[A-Z][a-z]+/)
       ) {
         if (
           !allComponents[exportedComponent] ||
           allComponents[exportedComponent].length < filePath.length // Make import path more specific
         ) {
           allComponents[exportedComponent] = toNodeResolvablePath(
-            filePath.replace(`${project.root}/src/`, `${project.name}/`),
+            filePath.replace(`${project.root}/src/`, `${project.name}/`)
           );
         }
       }
@@ -136,7 +137,7 @@ export async function generateLazyRegistry(
 
   if (componentCount === 0)
     throw new Error(
-      "Could not generate lazy registry. No exportable components found.",
+      'Could not generate lazy registry. No exportable components found.'
     );
 
   logger.debug(`Including ${componentCount} components in ${lazyPath}`);
@@ -144,9 +145,9 @@ export async function generateLazyRegistry(
   const componentsToExport = Object.entries(allComponents)
     .map(
       ([component, filePath]) =>
-        `  '${component}': lazy(() => import('${filePath}').then((module) => ({ default: module['${component}'] })))`,
+        `  '${component}': lazy(() => import('${filePath}').then((module) => ({ default: module['${component}'] })))`
     )
-    .join(",\n");
+    .join(',\n');
 
   const lazyFileContent = `import { lazy } from 'react';
 export default {
@@ -166,7 +167,7 @@ ${componentsToExport}
  * @param {string} fileName - The name of the registry file
  */
 function ensureRegistryPath(project, fileName) {
-  const registryPath = path.join(project.root, project.distDir, fileName);
+  const registryPath = path.join(project.root, project.src, fileName);
   if (fs.existsSync(registryPath))
     throw new Error(`A "${fileName}" file already exists at ${registryPath}.`);
   return registryPath;
@@ -182,7 +183,7 @@ function toNodeResolvablePath(inputPath) {
   const dir = path.dirname(inputPath);
   const base = path.basename(inputPath, path.extname(inputPath));
 
-  return base === "index" ? dir : path.join(dir, base);
+  return base === 'index' ? dir : path.join(dir, base);
 }
 
 /**
@@ -192,7 +193,7 @@ function toNodeResolvablePath(inputPath) {
  * @returns {string} - The UID
  */
 function createUid(inputPath) {
-  return inputPath.replace(/[\/@\-.]/g, "_");
+  return inputPath.replace(/[/@\-.]/g, '_');
 }
 
 /**

package/index.js

@@ -1,36 +1,38 @@
-import { DigigovCommand, resolveProject, logger } from "@digigov/cli/lib";
-import { buildFormat, generateTypeDeclarationFiles } from "./build.js";
-import { generateLazyRegistry, generateRegistry } from "./generate-registry.js";
-import copyFiles from "./copy-files.js";
-
-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)
+import { DigigovCommand, resolveProject, logger } from '@digigov/cli/lib';
+import { build } from '@rslib/core';
+import copyFiles from './copy-files.js';
+
+import { Option } from 'commander';
+import path from 'path';
+import glob from 'globby';
+import assert from 'assert';
+import { getProjectTsconfig } from './common.js';
+import { generateLazyRegistry, generateRegistry } from './generate-registry.js';
+import transformImportsPlugin from './transform-imports-plugin.js';
+
+const command = new DigigovCommand('build', import.meta.url)
   .option(
-    "--generate-registry",
-    "Generate a registry file for the build output",
+    '--generate-registry',
+    'Generate a registry file for the build output'
   )
   .addOption(
-    new Option("--include-stories", "Include stories in the output").implies({
+    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 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}",
+  '**/*.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}",
+  '**/*.stories.{js,jsx,ts,tsx}',
+  '**/__stories__/**/*.{js,jsx,ts,tsx}',
+  '**/__stories__/*.{js,jsx,ts,tsx}',
 ];
 
 /**
@@ -40,79 +42,135 @@ const STORIES_GLOBS = [
  * @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);
-  }
+  /** @type {string[]} */
+  let filesToDelete = [];
+  let isCleaningUp = false;
+  let signalHandlersRegistered = false;
+
+  const cleanup = async () => {
+    if (isCleaningUp) return;
+    isCleaningUp = true;
+
+    if (options.generateRegistry && filesToDelete.length > 0) {
+      logger.debug('Deleting temporary registry files...');
+      try {
+        await ctx.exec('rimraf', filesToDelete, {}, true);
+      } catch (error) {
+        logger.error('Error during cleanup:', error);
+      }
+    }
+
+    // Remove signal handlers after cleanup
+    if (signalHandlersRegistered) {
+      process.off('SIGINT', handleSignal);
+      process.off('SIGTERM', handleSignal);
+    }
+  };
+
+  /** @param {string} signal */
+  const handleSignal = async (signal) => {
+    logger.log(`\nReceived ${signal}, cleaning up...`);
+    await cleanup();
+    process.exit(signal === 'SIGINT' ? 130 : 143);
+  };
+
+  // Register signal handlers
+  process.on('SIGINT', handleSignal);
+  process.on('SIGTERM', handleSignal);
+  signalHandlersRegistered = true;
+
+  try {
+    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');
+    }
 
-  const ignore = [...TEST_GLOBS, ...STORIES_GLOBS];
-  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 (options.generateRegistry) {
-    logger.debug("Generating registry files...");
-
-    const filesToIncludeInRegistry = filesToBuild.filter(
-      (file) => !(file.includes("native") || file.endsWith(".d.ts")),
+    if (options.generateRegistry) {
+      logger.debug('Generating registry files...');
+
+      const initialFiles = await glob(path.join(project.root, SRC_GLOB), {
+        ignore: [...TEST_GLOBS, ...STORIES_GLOBS],
+      });
+
+      const filesToIncludeInRegistry = initialFiles.filter(
+        (file) => !(file.includes('native') || file.endsWith('.d.ts'))
+      );
+      let storiesFiles = null;
+      if (options.includeStories) {
+        logger.debug('Including stories in the registry...');
+
+        storiesFiles = await glob(
+          STORIES_GLOBS.map((glob) =>
+            path.join(project.root, project.src, glob)
+          ),
+          {
+            ignore: ['**/*.native.*, **/*.d.ts'],
+          }
+        );
+      }
+
+      filesToDelete = await Promise.all([
+        storiesFiles
+          ? generateRegistry(project, storiesFiles, 'stories-registry.ts')
+          : null,
+        generateRegistry(project, filesToIncludeInRegistry, 'registry.ts'),
+        generateLazyRegistry(project, filesToIncludeInRegistry, 'lazy.ts'),
+      ]).then((paths) => paths.filter((p) => p !== null));
+
+      logger.log('Generated registry files');
+    }
+
+    const IGNORE_BLOBS = [...TEST_GLOBS, ...STORIES_GLOBS].map(
+      (path) => `!${project.root}/${path}`
     );
-    let storiesFiles = null;
-    if (options.includeStories) {
-      logger.debug("Including stories in the registry...");
 
-      storiesFiles = await glob(
-        STORIES_GLOBS.map((glob) => path.join(project.root, project.src, glob)),
+    logger.debug('Building...');
+    await build({
+      source: {
+        tsconfigPath: tsconfig,
+        entry: {
+          index: [`${project.root}/${SRC_GLOB}`, ...IGNORE_BLOBS],
+        },
+      },
+      output: {
+        distPath: {
+          root: project.distDir,
+        },
+      },
+      lib: [
         {
-          ignore: ["**/*.native.*, **/*.d.ts"],
+          redirect: {
+            dts: {
+              extension: true,
+            },
+          },
+          bundle: false,
+          dts: {
+            bundle: false,
+            autoExtension: true,
+          },
+          format: 'esm',
+          plugins: [
+            transformImportsPlugin(project, ['@uides/react-qr-reader']),
+          ],
         },
-      );
-    }
+      ],
+    });
+    logger.debug('Building done.');
 
-    const [_, ...registryFilePaths] = await Promise.all([
-      storiesFiles
-        ? generateRegistry(project, storiesFiles, "stories-registry.js")
-        : null,
-      generateRegistry(project, filesToIncludeInRegistry),
-      generateLazyRegistry(project, filesToIncludeInRegistry),
-    ]);
-
-    buildFormat({
-      files: registryFilePaths,
-      tsconfig: tsconfig,
-      format: "cjs",
-      outdir: project.distDir + "/cjs",
-      noLogs: true,
-    }),
-      logger.log("Generated registry files");
+    logger.debug('Copying files to build directory...');
+    copyFiles();
+    logger.debug('Files copied.');
+  } finally {
+    await cleanup();
   }
-
-  logger.debug("Copying files to build directory...");
-  copyFiles();
-  logger.debug("Files copied.");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digigov/cli-build",
-  "version": "2.0.0-18c66302",
+  "version": "2.0.0-2271444d",
   "description": "Build plugin for Digigov CLI",
   "main": "./index.js",
   "type": "module",
@@ -8,43 +8,28 @@
   "license": "BSD-2-Clause",
   "private": false,
   "dependencies": {
-    "@babel/cli": "7.12.1",
-    "@babel/compat-data": "7.12.5",
-    "@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",
-    "@babel/plugin-transform-object-assign": "7.12.1",
-    "@babel/plugin-transform-runtime": "7.12.1",
-    "@babel/preset-env": "7.12.13",
-    "@babel/preset-react": "7.12.13",
-    "@babel/preset-typescript": "7.12.1",
-    "babel-plugin-inline-import-data-uri": "1.0.1",
-    "babel-plugin-module-resolver": "4.0.0",
-    "babel-plugin-optimize-clsx": "1.1.1",
-    "babel-plugin-react-remove-properties": "0.3.0",
-    "babel-plugin-transform-dev-warning": "0.1.1",
-    "babel-plugin-transform-react-constant-elements": "6.23.0",
-    "babel-plugin-transform-react-remove-prop-types": "0.4.24",
     "fs-extra": "11.2.0",
     "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"
+    "ts-morph": "25.0.0",
+    "@rslib/core": "0.15.1"
   },
   "devDependencies": {
+    "@digigov/cli": "2.0.0-2271444d",
+    "@digigov/cli-lint": "2.0.0-2271444d",
     "publint": "0.1.8",
     "vitest": "2.1.3",
-    "@digigov/cli-test": "2.0.0-18c66302",
+    "@digigov/cli-test": "2.0.0-2271444d",
     "@types/fs-extra": "11.0.4",
-    "@types/node": "18.19.0",
-    "typescript": "5.6.2"
+    "@types/node": "20.17.24",
+    "typescript": "5.6.2",
+    "eslint": "9.16.0",
+    "prettier": "3.4.2"
   },
   "peerDependencies": {
-    "@digigov/cli": "2.0.0-18c66302",
+    "@digigov/cli": "2.0.0-2271444d",
     "next": "13.1.1"
   },
   "peerDependenciesMeta": {
@@ -53,6 +38,8 @@
     }
   },
   "scripts": {
-    "publint": "publint"
+    "publint": "publint",
+    "lint": "digigov lint",
+    "typecheck": "tsc"
   }
 }