@digigov/cli 1.0.0-rc.6 → 1.0.1

package/README.md

@@ -19,7 +19,7 @@ $ npm install -g @digigov/cli
 $ digigov COMMAND
 running command...
 $ digigov (-v|--version|version)
-@digigov/cli/1.0.0-rc.6 darwin-arm64 node-v16.20.2
+@digigov/cli/1.0.1 darwin-arm64 node-v18.19.0
 $ digigov --help [COMMAND]
 USAGE
   $ digigov COMMAND

package/lib.js

@@ -1,25 +1,27 @@
-const pkgUp = require('pkg-up');
-const fs = require('fs-extra');
-const path = require('path');
-const merge = require('deepmerge');
-const execa = require('execa');
-const glob = require('glob');
-const { Command } = require('@oclif/command');
-const rushLib = require('@microsoft/rush-lib');
+const pkgUp = require("pkg-up");
+const fs = require("fs-extra");
+const path = require("path");
+const merge = require("deepmerge");
+const execa = require("execa");
+const glob = require("glob");
+const { Command } = require("@oclif/command");
 
 function resolveProject(dir) {
   const pkg = pkgUp.sync({ cwd: dir || process.cwd() });
   const root = path.dirname(pkg);
   let externalLockFile = false;
-  if (fs.existsSync(path.join(root, 'yarn.lock')) || fs.existsSync(path.join(root, 'package-lock.json'))) {
+  if (
+    fs.existsSync(path.join(root, "yarn.lock")) ||
+    fs.existsSync(path.join(root, "package-lock.json"))
+  ) {
     externalLockFile = true;
   }
-  let distDir = 'dist';
-  let src = 'src';
-  let workspace = {}
+  let distDir = "dist";
+  let src = "src";
+  let workspace = {};
   if (!fs.existsSync(path.join(root, src))) {
-    src = '.';
-    distDir = '.';
+    src = ".";
+    distDir = ".";
   }
   // project type heuristics
   let isLib = false;
@@ -28,24 +30,24 @@ function resolveProject(dir) {
   let isDocs = false;
 
   if (
-    fs.existsSync(path.join(root, 'next.config.js')) ||
-    fs.existsSync(path.join(root, 'pages'))
+    fs.existsSync(path.join(root, "next.config.js")) ||
+    fs.existsSync(path.join(root, "pages"))
   ) {
     isApp = true;
   }
   if (
-    fs.existsSync(path.join(root, 'docusaurus.config.js')) &&
-    fs.existsSync(path.join(root, 'docs'))
+    fs.existsSync(path.join(root, "docusaurus.config.js")) &&
+    fs.existsSync(path.join(root, "docs"))
   ) {
     isDocs = true;
   }
-  if (fs.existsSync(path.join(root, 'src')) && !isApp) {
+  if (fs.existsSync(path.join(root, "src")) && !isApp) {
     isLib = true;
   }
 
   const rush = resolveWorkspace();
   if (rush) {
-    isWorkspace = true
+    isWorkspace = true;
     workspace = {
       config: rush,
       root: rush.rushJsonFolder,
@@ -54,9 +56,9 @@ function resolveProject(dir) {
 
   const isNodeLib = !isLib && !isApp && !isWorkspace && !isDocs;
 
-  let ignore = path.resolve(root, '.gitignore');
+  let ignore = path.resolve(root, ".gitignore");
   if (!fs.existsSync(ignore) && workspace.root) {
-    ignore = path.resolve(workspace.root, '.gitignore');
+    ignore = path.resolve(workspace.root, ".gitignore");
   }
 
   if (!fs.existsSync(ignore)) {
@@ -64,11 +66,11 @@ function resolveProject(dir) {
   }
 
   let digigov = {};
-  if (fs.existsSync(path.join(root, 'digigovrc.json'))) {
-    digigov = require(path.join(root, 'digigovrc.json'));
+  if (fs.existsSync(path.join(root, "digigovrc.json"))) {
+    digigov = require(path.join(root, "digigovrc.json"));
   }
-  if (fs.existsSync(path.join(root, 'digigovrc.js'))) {
-    digigov = require(path.join(root, 'digigovrc.js'));
+  if (fs.existsSync(path.join(root, "digigovrc.js"))) {
+    digigov = require(path.join(root, "digigovrc.js"));
   }
 
   const packageJS = require(pkg);
@@ -76,12 +78,12 @@ function resolveProject(dir) {
   const devDependencies = packageJS.devDependencies || {};
   const dependencies = packageJS.dependencies || {};
   const peerDependencies = packageJS.peerDependencies || {};
-  const isTs = Object.keys(devDependencies).includes('typescript');
+  const isTs = Object.keys(devDependencies).includes("typescript");
   const allDependencies = {
     ...dependencies,
     ...devDependencies,
     ...peerDependencies,
-  }
+  };
   // hook applies extra properties based on project type
   return {
     name: packageJS.name,
@@ -114,12 +116,12 @@ function localRequire(file, dflt) {
 
 function makeConfig(file, cfg) {
   let hook = {};
-  if (file && typeof file !== 'string') {
+  if (file && typeof file !== "string") {
     hook = file;
-  } else if (typeof file === 'string') {
+  } else if (typeof file === "string") {
     hook = localRequire(file, {});
   }
-  if (typeof hook === 'function') {
+  if (typeof hook === "function") {
     return hook(cfg);
   }
   if (hook) {
@@ -129,11 +131,13 @@ function makeConfig(file, cfg) {
 
 function resolveWorkspace(dir) {
   try {
-    const rushConfiguration = rushLib.RushConfiguration.loadFromDefaultLocation({
-      startingFolder: process.cwd()
-    });
-    return rushConfiguration
-
+    const rushLib = require("@microsoft/rush-lib");
+    const rushConfiguration = rushLib.RushConfiguration.loadFromDefaultLocation(
+      {
+        startingFolder: process.cwd(),
+      },
+    );
+    return rushConfiguration;
   } catch (err) {
     // console.log(err);
   }
@@ -144,18 +148,17 @@ Identify if project running the command from, is lerna-enabled. If so, return
 lerna registered projects metadata.
 */
 function resolveLocalPackages(dir, dependencies) {
-  const packages = {}
+  const packages = {};
   const rush = resolveWorkspace(dir);
   if (rush) {
-    rush.projects.forEach(p => {
+    rush.projects.forEach((p) => {
       if (dependencies.includes(p.packageName)) {
-        packages[p.packageName] = resolveProject(p.projectFolder)
+        packages[p.packageName] = resolveProject(p.projectFolder);
       }
-    })
-    return packages
+    });
+    return packages;
   }
   return {};
-
 }
 
 /**
@@ -166,7 +169,7 @@ function resolveLocalPackages(dir, dependencies) {
 function aliases(dir, absolute = false) {
   const aliases = {};
   const project = resolveProject(dir);
-  const depKeys = ['dependencies', 'peerDependencies', 'devDependencies'];
+  const depKeys = ["dependencies", "peerDependencies", "devDependencies"];
   const root = project.root;
   const deps = depKeys.reduce((deps, key) => {
     return deps.concat(Object.keys(project.package[key] || {}));
@@ -174,7 +177,12 @@ function aliases(dir, absolute = false) {
   const packages = resolveLocalPackages(project.root, deps);
   Object.keys(packages).forEach((key) => {
     const project = packages[key];
-    if (deps.includes(project.name) && project.package.devDependencies && project.package.devDependencies['@digigov/cli-build'] && project.isWorkspace) {
+    if (
+      deps.includes(project.name) &&
+      project.package.devDependencies &&
+      project.package.devDependencies["@digigov/cli-build"] &&
+      project.isWorkspace
+    ) {
       const projectSrc = path.join(project.root, project.src);
       if (absolute) {
         aliases[project.name] = path.resolve(root, projectSrc);
@@ -213,27 +221,27 @@ const extractCommandArgs = (config, commandArgs) => {
       }
     }
   });
-  return vars
-}
+  return vars;
+};
 
 class DigigovCommand extends Command {
   async exec(script, args, config) {
-    const { stdout: binFolder } = await execa('npm', ['bin'], {
-      cwd: this.dirname
-    })
-    let executable = path.join(binFolder, script)
-    if (!fs.existsSync(executable)) {
-      const { stdout: currentBinFolder } = await execa('npm', ['bin'])
-      executable = path.join(currentBinFolder, script)
-    }
-    if (!fs.existsSync(executable)) {
-      throw new Error(`Executable ${script} not installed`)
+    const binLocation = [process.cwd(), this.dirname, __dirname].find(
+      (location) => {
+        return fs.existsSync(
+          path.join(location, "node_modules", ".bin", script),
+        );
+      },
+    );
+    if (!binLocation || !fs.existsSync(binLocation)) {
+      throw new Error(`Executable ${script} not installed`);
     }
-    console.log('Running ', executable, ...args)
+    let executable = path.join(binLocation, "node_modules", ".bin", script);
+    console.log("Running ", executable, ...args);
     try {
-      return await execa(executable, args, { ...config, stdio: 'inherit' });
+      return await execa(executable, args, { ...config, stdio: "inherit" });
     } catch (err) {
-      process.exit(err.exitCode)
+      process.exit(err.exitCode);
     }
   }
 }
@@ -244,5 +252,5 @@ module.exports = {
   DigigovCommand,
   resolveProject,
   resolveWorkspace,
-  extractCommandArgs
+  extractCommandArgs,
 };

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"1.0.0-rc.6","commands":{"hello":{"id":"hello","description":"describe the command here","pluginName":"@digigov/cli","pluginType":"core","aliases":[],"examples":["$ digigov hello\nhello world from ./src/hello.ts!\n"],"flags":{},"args":[{"name":"file"}]}}}
+{"version":"1.0.1","commands":{"hello":{"id":"hello","description":"describe the command here","pluginName":"@digigov/cli","pluginType":"core","aliases":[],"examples":["$ digigov hello\nhello world from ./src/hello.ts!\n"],"flags":{},"args":[{"name":"file"}]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@digigov/cli",
   "description": "CLI for Digigov apps and libs with plugin support",
-  "version": "1.0.0-rc.6",
+  "version": "1.0.1",
   "author": "GRNET Devs <devs@lists.grnet.gr>",
   "bin": {
     "digigov": "./bin/run"
@@ -10,16 +10,15 @@
     "@oclif/command": "1.8.0",
     "@oclif/config": "1",
     "@oclif/plugin-help": "3",
-    "tslib": "2.4.1",
+    "tslib": "2.6.2",
     "cli-ux": "5.5.1",
     "@oclif/errors": "1.3.4",
     "pkg-up": "3.1.0",
-    "fs-extra": "10.0.0",
+    "fs-extra": "11.2.0",
     "deepmerge": "4.2.2",
     "execa": "5.0.0",
     "rimraf": "3.0.2",
     "glob": "7.1.6",
-    "@microsoft/rush-lib": "5.83.3",
     "publint": "0.1.8"
   },
   "devDependencies": {
@@ -27,14 +26,15 @@
     "@oclif/test": "1",
     "@types/chai": "4",
     "@types/mocha": "5",
-    "@types/node": "16.6.2",
+    "@types/node": "18.19.0",
     "chai": "4",
     "globby": "11.0.0",
     "mocha": "5",
     "nyc": "14",
-    "ts-node": "8",
+    "ts-node": "10.9.2",
     "typescript": "4.9.5",
-    "publint": "0.1.8"
+    "publint": "0.1.8",
+    "@microsoft/rush-lib": "5.112.2"
   },
   "engines": {
     "node": ">=12.13.0"
@@ -61,15 +61,13 @@
       "init": "./lib/hooks/init/addcommand"
     }
   },
+  "types": "lib/index.d.ts",
   "scripts": {
     "publint": "publint",
     "lint": "echo 'no lint needed (yet)'",
-    "postpack": "rm -f oclif.manifest.json",
-    "prepack": "oclif-dev manifest && oclif-dev readme",
     "prepublish": "tsc",
     "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
     "version": "oclif-dev readme && git add README.md",
     "build": "tsc"
-  },
-  "types": "lib/index.d.ts"
-}
+  }
+}