Project update. [p][robotic]

clevercanyon · Feb 1, 2023 · 2c5c692 · 2c5c692
1 parent c6e338a
commit 2c5c692
Show file tree

Hide file tree

Showing 20 changed files with 702 additions and 643 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -9,13 +9,13 @@
  */
 /* eslint-env es2021, node */
 
-const mc = require('merge-change');
+const $obj = require('@clevercanyon/utilities/obj');
 const baseConfig = require('./dev/.files/eslint/config.cjs');
 
 /*
  * Customizations.
  * <custom:start> */
 
-module.exports = mc.merge({}, baseConfig, {});
+module.exports = $obj.mc.merge({}, baseConfig, {});
 
 /* </custom:end> */
diff --git a/.madrun.mjs b/.madrun.mjs
@@ -9,13 +9,13 @@
  */
 /* eslint-env es2021, node */
 
-import mc from 'merge-change';
+import { $obj } from '@clevercanyon/utilities';
 import baseConfig from './dev/.files/madrun/config.mjs';
 
 /*
  * Customizations.
  * <custom:start> */
 
-export default mc.merge({}, baseConfig, {});
+export default $obj.mc.merge({}, baseConfig, {});
 
 /* </custom:end> */
diff --git a/.postcssrc.cjs b/.postcssrc.cjs
@@ -9,13 +9,13 @@
  */
 /* eslint-env es2021, node */
 
-const mc = require('merge-change');
+const $obj = require('@clevercanyon/utilities/obj');
 const baseConfig = require('./dev/.files/postcss/config.cjs');
 
 /*
  * Customizations.
  * <custom:start> */
 
-module.exports = mc.merge({}, baseConfig, {});
+module.exports = $obj.mc.merge({}, baseConfig, {});
 
 /* </custom:end> */
diff --git a/.prettierrc.cjs b/.prettierrc.cjs
@@ -9,13 +9,13 @@
  */
 /* eslint-env es2021, node */
 
-const mc = require('merge-change');
+const $obj = require('@clevercanyon/utilities/obj');
 const baseConfig = require('./dev/.files/prettier/config.cjs');
 
 /*
  * Customizations.
  * <custom:start> */
 
-module.exports = mc.merge({}, baseConfig, {});
+module.exports = $obj.mc.merge({}, baseConfig, {});
 
 /* </custom:end> */
diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs
@@ -9,13 +9,13 @@
  */
 /* eslint-env es2021, node */
 
-const mc = require('merge-change');
+const $obj = require('@clevercanyon/utilities/obj');
 const baseConfig = require('./dev/.files/stylelint/config.cjs');
 
 /*
  * Customizations.
  * <custom:start> */
 
-module.exports = mc.merge({}, baseConfig, {});
+module.exports = $obj.mc.merge({}, baseConfig, {});
 
 /* </custom:end> */
diff --git a/.tailwindrc.cjs b/.tailwindrc.cjs
@@ -9,13 +9,13 @@
  */
 /* eslint-env es2021, node */
 
-const mc = require('merge-change');
+const $obj = require('@clevercanyon/utilities/obj');
 const baseConfig = require('./dev/.files/tailwind/config.cjs');
 
 /*
  * Customizations.
  * <custom:start> */
 
-module.exports = mc.merge({}, baseConfig, {});
+module.exports = $obj.mc.merge({}, baseConfig, {});
 
 /* </custom:end> */
diff --git a/dev/.files/bin/envs.mjs b/dev/.files/bin/envs.mjs
@@ -15,15 +15,11 @@ import fsp from 'node:fs/promises';
 
 import chalk from 'chalk';
 import u from './includes/utilities.mjs';
+import { $yargs } from '@clevercanyon/utilities.node';
 
 const __dirname = dirname(import.meta.url);
 const projDir = path.resolve(__dirname, '../../..');
 
-/**
- * NOTE: Most of these commands _must_ be performed interactively. Please review the Yargs configuration below for
- * further details. At this time, only the `decrypt` command is allowed noninteractively, and _only_ noninteractively.
- */
-
 /**
  * Install command.
  */
@@ -479,9 +475,13 @@ class Decrypt {
  * Yargs ⛵🏴‍☠.
  */
 void (async () => {
-	await u.propagateUserEnvVars(); // i.e., `USER_` env vars.
-	const yargs = await u.yargs({ scriptName: 'madrun envs' });
-	await yargs
+	await u.propagateUserEnvVars();
+	await (
+		await $yargs.cli({
+			scriptName: 'madrun envs',
+			version: (await u.pkg()).version,
+		})
+	)
 		.command({
 			command: 'install',
 			describe: 'Installs all envs for Dotenv Vault.',