@digigov/cli-build 1.1.1 → 2.0.0-rc.17

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

@@ -111,6 +111,30 @@
   "@babel/traverse@7.23.9": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==",
   "@babel/types@7.23.9": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==",
   "@babel/types@7.8.3": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==",
+  "@esbuild/aix-ppc64@0.23.0": "sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==",
+  "@esbuild/android-arm64@0.23.0": "sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==",
+  "@esbuild/android-arm@0.23.0": "sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==",
+  "@esbuild/android-x64@0.23.0": "sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==",
+  "@esbuild/darwin-arm64@0.23.0": "sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==",
+  "@esbuild/darwin-x64@0.23.0": "sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==",
+  "@esbuild/freebsd-arm64@0.23.0": "sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==",
+  "@esbuild/freebsd-x64@0.23.0": "sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==",
+  "@esbuild/linux-arm64@0.23.0": "sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==",
+  "@esbuild/linux-arm@0.23.0": "sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==",
+  "@esbuild/linux-ia32@0.23.0": "sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==",
+  "@esbuild/linux-loong64@0.23.0": "sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==",
+  "@esbuild/linux-mips64el@0.23.0": "sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==",
+  "@esbuild/linux-ppc64@0.23.0": "sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==",
+  "@esbuild/linux-riscv64@0.23.0": "sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==",
+  "@esbuild/linux-s390x@0.23.0": "sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==",
+  "@esbuild/linux-x64@0.23.0": "sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==",
+  "@esbuild/netbsd-x64@0.23.0": "sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==",
+  "@esbuild/openbsd-arm64@0.23.0": "sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==",
+  "@esbuild/openbsd-x64@0.23.0": "sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==",
+  "@esbuild/sunos-x64@0.23.0": "sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==",
+  "@esbuild/win32-arm64@0.23.0": "sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==",
+  "@esbuild/win32-ia32@0.23.0": "sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==",
+  "@esbuild/win32-x64@0.23.0": "sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==",
   "@hapi/accept@5.0.1": "sha512-fMr4d7zLzsAXo28PRRQPXR1o2Wmu+6z+VY1UzDp0iFo13Twj8WePakwXBiqn3E1aAlTpSNzCXdnnQXFhst8h8Q==",
   "@hapi/boom@9.1.4": "sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==",
   "@hapi/hoek@9.3.0": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
@@ -132,6 +156,7 @@
   "@types/eslint-scope@3.7.7": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
   "@types/eslint@8.56.2": "sha512-uQDwm1wFHmbBbCZCqAlq6Do9LYwByNZHWzXppSnay9SuwJ+VRbjkbLABer54kcPnMSlG6Fdiy2yaFXm/z9Z5gw==",
   "@types/estree@0.0.51": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+  "@types/estree@1.0.5": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
   "@types/json-schema@7.0.15": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
   "@types/node@18.19.0": "sha512-667KNhaD7U29mT5wf+TZUnrzPrlL2GNQ5N0BMjO2oNULhBxX0/FKCkm6JMu0Jh7Z+1LwUlR21ekd7KhIboNFNw==",
   "@webassemblyjs/ast@1.11.1": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
@@ -268,6 +293,7 @@
   "enhanced-resolve@5.15.0": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
   "es-module-lexer@0.9.3": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
   "esbuild@0.11.14": "sha512-ejheEPkqhq5y0LM9rG9e+3yDihPtqeeE4NZmG7VQiSGJ3CjO4HvPOHmhhttSksfSztjLAGo2+0/zSIvlqj4JOQ==",
+  "esbuild@0.23.0": "sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==",
   "escalade@3.1.1": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
   "escape-string-regexp@1.0.5": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
   "eslint-scope@5.1.1": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",

package/index.js

@@ -1,8 +1,10 @@
-const { Command, flags } = require("@oclif/command");
+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");
 
 module.exports = class Build extends DigigovCommand {
   static description = "build digigov libraries";
@@ -10,15 +12,12 @@ module.exports = class Build extends DigigovCommand {
   dirname = __dirname;
   static examples = [`$ digigov build`];
   static strict = false;
-  static flags = {
-    subpackages: flags.boolean({ char: "--subpackages" }),
-  };
   static load() {
     return Build;
   }
   script = "babel";
   async run() {
-    const { argv, flags } = this.parse(Build);
+    const { argv } = this.parse(Build);
     try {
       await this.exec("rimraf", ["dist"]);
       const project = resolveProject();
@@ -34,76 +33,75 @@ module.exports = class Build extends DigigovCommand {
       const distDir = path.resolve(project.root, project.distDir);
       const basename = path.basename(project.root);
 
-      if (flags.subpackages) {
-        if (argv.includes("--watch") || argv.includes("-w")) {
-          throw new Error("--watch cannot be combined with --subpackages");
+      if (project.isTs) {
+        const tsconfigProduction = path.join(
+          project.root,
+          "tsconfig.production.json",
+        );
+        const tsArgs = [];
+        if (fs.existsSync(tsconfigProduction)) {
+          tsArgs.push("--project", tsconfigProduction);
         }
-        const args = argv.filter((a) => a !== "--subpackages");
-        if (project.isTs) {
-          const tsconfigProduction = path.join(
-            project.root,
-            "tsconfig.production.json",
+        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),
           );
-          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),
             );
-            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 });
-            });
-          }
+          });
+          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",
-        });
       }
+
+      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`,
+        }),
+      ]);
+      await execa("node", [path.join(__dirname, "copy-files.js")], {
+        env: {},
+        stdio: "inherit",
+      });
     } catch (err) {
-      console.log(err);
+      console.error(err);
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digigov/cli-build",
-  "version": "1.1.1",
+  "version": "2.0.0-rc.17",
   "description": "Build plugin for Digigov CLI",
   "main": "./index.js",
   "author": "GRNET Devs <devs@lists.grnet.gr>",
@@ -31,13 +31,14 @@
     "@digigov/babel-ts-to-proptypes": "1.1.0",
     "@types/node": "18.19.0",
     "babel-plugin-istanbul": "6.0.0",
-    "publint": "0.1.8"
+    "publint": "0.1.8",
+    "esbuild": "0.23.0"
   },
   "devDependencies": {
     "publint": "0.1.8"
   },
   "peerDependencies": {
-    "@digigov/cli": "1.1.0",
+    "@digigov/cli": "1.1.1-rc.17",
     "rimraf": "3.0.2",
     "next": "10.0.9"
   },