@digigov/cli-build 1.0.0-a131264d → 1.0.0-b4257f67

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

@@ -413,7 +413,7 @@
   "nanomatch@1.2.13": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
   "native-url@0.3.4": "sha512-6iM8R99ze45ivyH8vybJ7X0yekIcPf5GgLV5K0ENCbmRcaRIDoj37BC8iLEmaaBfqqb8enuZ5p0uhY+lVAbAcA==",
   "neo-async@2.6.2": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-  "next@10.0.9_e6d732769ad00865cae03196ac811f35": "sha512-HyoVjYydcM6LaFAUOHSxVQCcKOsIimVO/IKXCuWUu1rr6DDgXbWNg/8ckH084qD46MOYlLzjViiZ3KCmNQL4Cw==",
+  "next@10.0.9_d1850117ef0f0d0d966203ed2c22e5a0": "sha512-HyoVjYydcM6LaFAUOHSxVQCcKOsIimVO/IKXCuWUu1rr6DDgXbWNg/8ckH084qD46MOYlLzjViiZ3KCmNQL4Cw==",
   "node-fetch@2.6.1": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
   "node-html-parser@1.4.9": "sha512-UVcirFD1Bn0O+TSmloHeHqZZCxHjvtIeGdVdGMhyZ8/PWlEiZaZ5iJzR189yKZr8p0FXN58BUeC7RHRkf/KYGw==",
   "node-libs-browser@2.2.1": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
@@ -456,7 +456,7 @@
   "pkg-dir@4.2.0": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
   "pkg-up@3.1.0": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
   "platform@1.3.6": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==",
-  "pnp-webpack-plugin@1.6.4_typescript@4.7.2": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
+  "pnp-webpack-plugin@1.6.4_typescript@4.2.3": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
   "posix-character-classes@0.1.1": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
   "postcss@7.0.39": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
   "postcss@8.1.7": "sha512-llCQW1Pz4MOPwbZLmOddGM9eIJ8Bh7SZ2Oj5sxZva77uVaotYDsYTch1WBTNu7fUY0fpWp0fdt7uW40D4sRiiQ==",
@@ -565,10 +565,10 @@
   "to-regex@3.0.2": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
   "toidentifier@1.0.0": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
   "tr46@1.0.1": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
-  "ts-pnp@1.2.0_typescript@4.7.2": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
+  "ts-pnp@1.2.0_typescript@4.2.3": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
   "tty-browserify@0.0.0": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
   "type-fest@0.7.1": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==",
-  "typescript@4.7.2": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==",
+  "typescript@4.2.3": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==",
   "unicode-canonical-property-names-ecmascript@2.0.0": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
   "unicode-match-property-ecmascript@2.0.0": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
   "unicode-match-property-value-ecmascript@2.0.0": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",

package/copy-files.js

@@ -1,5 +1,6 @@
 /* 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");
@@ -15,7 +16,7 @@ async function includeFileInBuild(file) {
   console.log(`Copied ${sourcePath} to ${targetPath}`);
 }
 
-async function createPackageFile() {
+async function createRootPackageFile() {
   const packageData = await fse.readFile(
     path.resolve(packagePath, "./package.json"),
     "utf8",
@@ -25,8 +26,8 @@ async function createPackageFile() {
   const newPackageData = {
     ...packageDataOther,
     private: false,
-    main: "./index.js",
-    module: "./index.mjs",
+    main: "./cjs/index.js",
+    module: "./index.js",
     typings: "./index.d.ts",
   };
   const targetPath = path.resolve(buildPath, "./package.json");
@@ -41,6 +42,27 @@ async function createPackageFile() {
   return newPackageData;
 }
 
+async function createNestedPackageFiles() {
+  const indexPaths = glob.sync(path.join(buildPath, "**/index.js"));
+
+  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),
+    );
+  });
+}
+
 async function prepend(file, string) {
   const data = await fse.readFile(file, "utf8");
   await fse.writeFile(file, string + data, "utf8");
@@ -70,7 +92,8 @@ async function addLicense(packageData) {
 
 async function run() {
   try {
-    const packageData = await createPackageFile();
+    const packageData = await createRootPackageFile();
+    await createNestedPackageFiles();
 
     await Promise.all(
       [

package/index.js

@@ -70,20 +70,9 @@ module.exports = class Build extends DigigovCommand {
             });
           }
         }
-        await this.exec(
-          this.script,
-          [...babelArgs, "dist", "--out-file-extension", ".mjs", ...args],
-          {
-            env: {
-              BABEL_ENV: "esm",
-              BABEL_PUBLISH: "true",
-            },
-            stdio: "inherit",
-          },
-        );
-        await this.exec(this.script, [...babelArgs, "dist/es", ...args], {
+        await this.exec(this.script, [...babelArgs, "dist", ...args], {
           env: {
-            BABEL_ENV: "es",
+            BABEL_ENV: "esm",
             BABEL_PUBLISH: "true",
           },
           stdio: "inherit",
@@ -93,13 +82,17 @@ module.exports = class Build extends DigigovCommand {
           stdio: "inherit",
         });
       }
-      const proc = this.exec(this.script, [...babelArgs, "dist", ...argv], {
-        env: {
-          BABEL_ENV: "cjs",
-          BABEL_PUBLISH: "true",
+      const proc = this.exec(
+        this.script,
+        [...babelArgs, `dist${flags.subpackages ? "/cjs" : ""}`, ...argv],
+        {
+          env: {
+            BABEL_ENV: "cjs",
+            BABEL_PUBLISH: "true",
+          },
+          stdio: "inherit",
         },
-        stdio: "inherit",
-      });
+      );
       return proc;
     } catch (err) {
       console.log(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digigov/cli-build",
-  "version": "1.0.0-a131264d",
+  "version": "1.0.0-b4257f67",
   "description": "Build plugin for Digigov CLI",
   "main": "./index.js",
   "author": "GRNET Devs <devs@lists.grnet.gr>",
@@ -27,9 +27,9 @@
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
     "fs-extra": "10.0.0",
     "glob": "7.1.6",
-    "typescript": "4.7.2",
+    "typescript": "4.2.3",
     "@types/node": "16.6.2",
-    "@digigov/babel-ts-to-proptypes": "1.0.0-a131264d",
+    "@digigov/babel-ts-to-proptypes": "1.0.0-b4257f67",
     "babel-plugin-istanbul": "6.0.0",
     "publint": "0.1.8"
   },
@@ -37,7 +37,7 @@
     "publint": "0.1.8"
   },
   "peerDependencies": {
-    "@digigov/cli": "1.0.0-a131264d",
+    "@digigov/cli": "1.0.0-b4257f67",
     "rimraf": "3.0.2",
     "next": "10.0.9"
   },