@maka/maka-cli 5.140.0 → 5.142.0

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.140.0",
+  "version": "5.142.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 3.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 3.x applications using React.",

package/bundle/typescript/src/commands/env/env.command.js

@@ -9,9 +9,8 @@ const EnvCommand = Command.create({
     description: `
   Set or read secrets (KEY VALUE pairs) in a config/<env>/process.env file.
 
-  Values are encrypted in place with dotenvx (https://dotenvx.com) for every
-  environment except local, which stays plaintext for easy local development.
-  The encrypted process.env and its DOTENV_PUBLIC_KEY are safe to commit; the
+  Values are encrypted in place with dotenvx (https://dotenvx.com). The
+  encrypted process.env and its DOTENV_PUBLIC_KEY are safe to commit; the
   sibling .env.keys file holding the private key is gitignored and must never
   be committed.
   `,

package/bundle/typescript/src/commands/env/prompt-for-env.js

@@ -4,15 +4,10 @@ import { Log } from '../../tools/log/log.class.js';
  * Prompts for which environment to target when --env wasn't given.
  */
 export async function promptForEnv(cfg, opts = {}) {
-    const { message = 'Which environment?', excludeLocal = false } = opts;
-    let configs = cfg.getAppProjectConfigs();
-    if (excludeLocal) {
-        configs = configs.filter(config => config !== 'local');
-    }
+    const { message = 'Which environment?' } = opts;
+    const configs = cfg.getAppProjectConfigs();
     if (configs.length === 0) {
-        Log.error(excludeLocal
-            ? 'No configuration other than local found. Consider running "maka g:config production" first.'
-            : 'No configurations found. Consider running "maka g:config local" first.');
+        Log.error('No configurations found. Consider running "maka g:config local" first.');
         process.exit(1);
     }
     if (configs.length === 1) {

package/bundle/typescript/src/commands/env/set.sub.cmd.js

@@ -23,9 +23,8 @@ Command.create({
   a MongoDB connection string with a query string:
   maka env:set --env production MONGO_URL "mongodb+srv://user:pass@host/db?retryWrites=true&w=majority"
 
-  For every environment except local, the value is encrypted in place with
-  dotenvx -- the file's DOTENV_PUBLIC_KEY is generated on first use if it
-  doesn't already exist. local stays plaintext for easy local development.
+  The value is encrypted in place with dotenvx -- the file's DOTENV_PUBLIC_KEY
+  is generated on first use if it doesn't already exist.
   `,
     examples: [
         'maka env:set --env production MONGO_URL mongodb://localhost:27017/app',
@@ -34,7 +33,7 @@ Command.create({
     ]
 }, async function (args, opts) {
     try {
-        const env = opts.env ? this.cfg.getEnvFromShorthand(opts.env) : await promptForEnv(this.cfg, { excludeLocal: true });
+        const env = opts.env ? this.cfg.getEnvFromShorthand(opts.env) : await promptForEnv(this.cfg);
         if (!this.cfg.checkConfigExists(env)) {
             Log.error(`No configuration: ${env}, consider running "maka g:config ${env}"`);
             process.exit(1);
@@ -47,8 +46,8 @@ Command.create({
         for (let i = 0; i < args.length; i += 2) {
             const key = args[i];
             const value = args[i + 1];
-            await this.dotenvx.set(key, value, processEnvPath, { plain: env === 'local' });
-            Log.success(`Set ${key} in config/${env}/process.env${(env === 'local') ? '' : ' (encrypted)'}`);
+            await this.dotenvx.set(key, value, processEnvPath);
+            Log.success(`Set ${key} in config/${env}/process.env (encrypted)`);
         }
     }
     catch (e) {

package/bundle/typescript/src/generators/config.js

@@ -65,9 +65,7 @@ Generator.create({
             context,
             config
         });
-        if (destinationKey !== 'local') {
-            Log.notice(`config/${destinationKey}/process.env starts as plaintext; use "maka env:set --env ${destinationKey} KEY VALUE" to add secrets, which encrypts them with dotenvx on first use.`);
-        }
+        Log.notice(`config/${destinationKey}/process.env starts as plaintext; use "maka env:set --env ${destinationKey} KEY VALUE" to add secrets, which encrypts them with dotenvx on first use.`);
     }
     catch (error) {
         Log.error(error);

package/bundle/typescript/src/tools/dotenvx/dotenvx.class.js

@@ -1,5 +1,5 @@
 // Dotenvx wrapper: loads (and transparently decrypts) process.env-style files,
-// and sets/gets individual secrets, encrypting on first use for non-local envs.
+// and sets/gets individual secrets, encrypting on first use.
 import path from 'path';
 import dotenvxPkg from '@dotenvx/dotenvx';
 import { Log } from '../log/log.class.js';
@@ -36,13 +36,12 @@ export class DOTENVX {
     }
     /**
      * Sets a single KEY=value pair into a .env-style file, creating the file's
-     * keypair on first use if needed. Encrypted by default (matching encrypt());
-     * pass plain: true to write it unencrypted (used for the local environment).
+     * keypair on first use if needed. Always encrypted.
      */
-    async set(key, value, filePath, opts = {}) {
+    async set(key, value, filePath) {
         try {
             const envKeysFile = path.join(path.dirname(filePath), '.env.keys');
-            await setDotenvxValue(key, value, { path: filePath, envKeysFile, encrypt: !opts.plain });
+            await setDotenvxValue(key, value, { path: filePath, envKeysFile, encrypt: true });
         }
         catch (e) {
             errorHandler('set()', e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.140.0",
+  "version": "5.142.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 3.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 3.x applications using React.",