@maka/maka-cli 5.1.23 → 5.1.25

package/bundle/typescript/src/commands/proxy.js

@@ -0,0 +1,163 @@
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { execSync } from 'child_process';
+import httpProxy from 'http-proxy';
+import { Command } from '../command.js';
+import { Log } from '../tools/log/log.class.js';
+import { UsageError } from '../error.js';
+import { SSL } from '../tools/ssl/ssl.class.js';
+import { Actions } from '../tools/actions/actions.class.js';
+import MakaGen from '../generators/maka.gen.js';
+Command.create({
+    name: 'proxy',
+    usage: 'maka proxy',
+    mustBeInMakaProject: true,
+    validOpts: ['help', 'targetPort', 'listenPort', 'targetHost'],
+    maxArgLength: 1,
+    shortDesc: 'Proxy HTTPS requests to another Server',
+    description: `
+  If you're running your Meteor service, and need to stand up an SSL
+  Proxy, this command will automatically create a key pair for use in an HTTPS
+  proxy.
+
+  For example, you're running http://localhost:3000 with "maka run" then open a new
+  terminal and run "maka proxy" to standup https://localhost:3443.
+  Then open your browser to that URL (you may need to trust the certificates
+  because they are self-signed) and you'll have an SSL connection to your
+  http://localhost:3000.
+
+  To avoid possibly overwriting PKI files in higher environments, "maka proxy"
+  will try to only generate / store PKI keys in the development environment.
+  `,
+    examples: [
+        'maka proxy',
+        'maka proxy --target-port 3000 --listen-port 4000',
+        'maka proxy --target-host http://192.168.1.20'
+    ]
+}, async function (args, opts) {
+    const config = this.cfg.getMakaProjectConfig();
+    const env = 'local';
+    const configPath = this.cfg.getAppConfigPath(env);
+    const keyDir = this.fsi.mkKeysDir({ configPath });
+    const targetPort = (opts.targetPort) ? Number(opts.targetPort) : 3000;
+    const listenPort = (opts.listenPort) ? Number(opts.listenPort) : 3443;
+    const targetHost = (opts.targetHost) ? opts.targetHost : '0.0.0.0';
+    const keyPath = path.join(keyDir, config.appName + '.key');
+    const certPath = path.join(keyDir, config.appName + '.crt');
+    if (!this.fsi.isFile(keyPath) || !this.fsi.isFile(certPath)) {
+        await MakaGen.processAndRunGenerator('service:sslconfig', [], { env });
+        SSL.genCSR({ keyName: config.appName + '.key', csrName: config.appName + '.csr', cwd: keyDir, useConfig: true });
+        // log out if the file was created correctly
+        if (this.fsi.isFile(path.join(keyDir, config.appName + '.csr'))) {
+            Log.info(`CSR file created: ${path.join(keyDir, config.appName + '.csr')}`);
+        }
+        SSL.genSSC({ keyName: config.appName + '.key', crtName: config.appName + '.crt', cwd: keyDir, useConfig: true });
+        // log out if the file was created correctly
+        if (this.fsi.isFile(path.join(keyDir, config.appName + '.crt'))) {
+            Log.info(`SSC file created: ${path.join(keyDir, config.appName + '.crt')}`);
+        }
+        Log.info(`Key file created: ${keyPath}`);
+        const shouldTrust = await Actions.confirm(`Would you like to add this certificate to your system trust store?`, false);
+        if (shouldTrust) {
+            const platform = os.platform();
+            try {
+                if (platform === 'darwin') {
+                    // macOS - use security command
+                    execSync(`sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain "${certPath}"`, { stdio: 'inherit' });
+                    Log.success('Certificate added to macOS system trust store.');
+                }
+                else if (platform === 'win32') {
+                    // Windows - use certutil (requires admin)
+                    execSync(`certutil -addstore -f "Root" "${certPath}"`, { stdio: 'inherit' });
+                    Log.success('Certificate added to Windows trusted root certification authorities.');
+                }
+                else {
+                    Log.warn(`Auto-trusting the certificate is not yet supported on ${platform}.`);
+                }
+            }
+            catch (err) {
+                Log.error(`Failed to add certificate to trust store: ${err.message}`);
+            }
+        }
+    }
+    if (targetPort === listenPort) {
+        Log.error(`Target and Listen ports cannot be the same.`);
+        throw new UsageError();
+    }
+    const options = {
+        ssl: {
+            key: fs.readFileSync(keyPath, 'utf8'),
+            cert: fs.readFileSync(certPath, 'utf8'),
+            // Uncomment the below line if you decide to use a custom CA
+            // ca: fs.readFileSync(path.join(configPath, '_keys', config.appName + '.crt'), 'utf8')
+        },
+        target: {
+            host: targetHost,
+            port: Number(targetPort)
+        },
+        ws: true,
+        xfwd: true
+    };
+    const proxy = httpProxy.createProxyServer(options);
+    proxy.on('error', (error, req, res) => {
+        if ('writeHead' in res) { // Type guard
+            Log.error(`Proxy error: ${error.message}`);
+            if (!res.headersSent) {
+                res.writeHead(500, { 'content-type': 'text/plain' });
+                res.end('Internal server error.');
+            }
+        }
+    });
+    proxy.on('proxyRes', (proxyRes, req) => {
+        const timestamp = new Date().toISOString();
+        const method = req.method;
+        const url = req.url;
+        const host = req.headers.host;
+        const statusCode = proxyRes.statusCode;
+        const statusMessage = proxyRes.statusMessage;
+        Log.warn(`[${timestamp}] => ${method} ${url} from ${host} responded with ${statusCode} ${statusMessage}`);
+    });
+    proxy.on('proxyReq', (proxyReq) => {
+        const timestamp = new Date().toISOString();
+        const method = proxyReq.method;
+        const url = proxyReq.path;
+        const host = proxyReq.getHeader('host');
+        Log.info(`[${timestamp}] <= Sending ${method} request to ${url} on ${host}`);
+    });
+    // Log when a WebSocket request is received
+    proxy.on('proxyReqWs', (proxyReq, req) => {
+        const timestamp = new Date().toISOString();
+        const method = req.method;
+        const url = req.url;
+        const host = req.headers.host;
+        Log.success(`[${timestamp}] WS ${method} ${url} from ${host} - Starting WebSocket handshake`);
+    });
+    // Log when the WebSocket tunnel is established
+    proxy.on('open', () => {
+        const timestamp = new Date().toISOString();
+        Log.success(`[${timestamp}] WebSocket connection established`);
+    });
+    // This is optional but useful: log when the WebSocket connection is closed
+    proxy.on('close', () => {
+        const timestamp = new Date().toISOString();
+        Log.error(`[${timestamp}] WebSocket connection closed`);
+    });
+    proxy.listen(Number(listenPort));
+    Log.bright(`=> SSL Proxy forwarding ${listenPort} to ${targetPort}`);
+    const SHUTDOWN_TIMEOUT = 2000; // 2 seconds
+    process.on('SIGINT', () => {
+        const handler = Log.withSpinner();
+        handler.start('Shutting down proxy server...');
+        const shutdownTimer = setTimeout(() => {
+            handler.success();
+            process.exit(1);
+        }, SHUTDOWN_TIMEOUT);
+        proxy.close(() => {
+            clearTimeout(shutdownTimer);
+            Log.info('Proxy server closed.');
+            process.exit(0);
+        });
+    });
+});
+//# sourceMappingURL=proxy.js.map

package/bundle/typescript/src/commands/proxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/commands/proxy.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/reconfig.d.ts

@@ -0,0 +1 @@
+export {};

package/bundle/typescript/src/commands/reconfig.js

@@ -0,0 +1,69 @@
+import fs from 'fs';
+import path from 'path';
+import { Command } from '../command.js';
+import { Log } from '../tools/log/log.class.js';
+import { SSH } from '../tools/ssh/ssh.class.js';
+Command.create({
+    name: 'reconfigure',
+    aliases: ['reconfig'],
+    validOpts: [''],
+    requiredOpts: ['env'],
+    mustBeInMakaProject: true,
+    usage: 'maka reconfig',
+    shortDesc: 'Reconfigure your deployed applications w/o rebuild or redploy',
+    description: `
+  If using a remote server (Ubuntu), send up the settings.json
+  and pm2.config.js files and reloads the PM2 service.
+
+  This does not restart the nginx server and is much faster than deploying
+  a new build.
+  `,
+    examples: [
+        'maka reconfig --env prod',
+    ]
+}, async function (args, opts) {
+    try {
+        const env = this.cfg.getEnvFromShorthand(opts.env);
+        const envConfigPath = this.cfg.getAppConfigPath(env);
+        const sshConfigPath = path.join(envConfigPath, 'ssh.json');
+        const sshConfigFile = fs.readFileSync(sshConfigPath).toString();
+        const sshConfig = JSON.parse(sshConfigFile);
+        Object.assign(sshConfig, { env: envConfigPath });
+        Log.notice(`Checking remote host availability`);
+        const resp = SSH.ping('uname -a', sshConfig);
+        if (!resp)
+            throw 'Could not connect to remote host. Please check your ssh.json config file.';
+        if (resp)
+            Log.success('Remote host connection successful');
+        const sesConfig = path.join(envConfigPath, '_keys', 'ses.json');
+        if (fs.existsSync(sesConfig)) {
+            const sesConfigSCP = { source: sesConfig, dest: '~/ses.json', verbose: true };
+            SSH.scp(sesConfigSCP, { ...sshConfig });
+        }
+        const pm2ConfPath = path.join(envConfigPath, 'pm2.config.js');
+        SSH.scp({
+            source: pm2ConfPath,
+            dest: '~/pm2.config.js',
+            verbose: true
+        }, {
+            ...sshConfig
+        });
+        const settingsPath = path.join(envConfigPath, 'settings.json');
+        SSH.scp({
+            source: settingsPath,
+            dest: '~/settings.json',
+            verbose: true
+        }, {
+            ...sshConfig
+        });
+        SSH.sshSync('pm2 delete all', sshConfig);
+        await SSH.ssh('echo "" && pm2 start pm2.config.js && echo "" || echo "Cound not find PM2, have you deployed the app yet?"', {
+            ...sshConfig
+        }, { verbose: true });
+    }
+    catch (e) {
+        console.error(e);
+        process.exit(0);
+    }
+});
+//# sourceMappingURL=reconfig.js.map

package/bundle/typescript/src/commands/reconfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reconfig.js","sourceRoot":"","sources":["../../../../src/commands/reconfig.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/register.d.ts

@@ -0,0 +1 @@
+export {};

package/bundle/typescript/src/commands/register.js

@@ -0,0 +1,101 @@
+import { Command } from '../command.js';
+import { Log } from '../tools/log/log.class.js';
+import { Actions } from '../tools/actions/actions.class.js';
+import { HTTPS } from '../tools/https/https.class.js';
+import MakaCmd from './maka.cmd.js';
+function validateEmail(email) {
+    const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    return re.test(String(email).toLowerCase());
+}
+const hostname = process.env.MAKA_DEV === 'True' ? 'localhost' : 'www.maka-cli.com';
+Command.create({
+    name: 'register',
+    validOpts: ['help', 'cacert'],
+    usage: 'maka register',
+    maxArgLength: 3,
+    disableAuthCheck: true,
+    shortDesc: 'Registers a new user on www.maka-cli.com',
+    examples: [
+        'maka register',
+    ]
+}, async function (args, opts) {
+    const spinHandle = Log.withSpinner();
+    try {
+        let caCertPath = '';
+        if (opts.cacert) {
+            if (this.fsi.isFile(opts.cacert)) {
+                caCertPath = opts.cacert;
+                Log.notice(`Using CA Cert ${caCertPath}`);
+            }
+            else {
+                Log.error(`CA Cert file could not be found at ${caCertPath}`);
+            }
+        }
+        const globalConfig = await this.cfg.getGlobalConfig();
+        if (globalConfig.cert) {
+            if (this.fsi.isFile(globalConfig.cert)) {
+                caCertPath = globalConfig.cert;
+            }
+            else {
+                Log.error(`CA Cert is configured in ~/.maka/global-config.json, but cert file cannot be located ${caCertPath}`);
+                return;
+            }
+        }
+        // Preflight check
+        Log.header(`Securing connection to https://${hostname}`);
+        const preflightGet = { url: `https://${hostname}/api/v1/status` };
+        if (opts.cacert) {
+            Object.assign(preflightGet, { cert: caCertPath });
+        }
+        spinHandle.start('Preflight Check');
+        const { statusCode: preflightSC } = await HTTPS.get(preflightGet);
+        if (preflightSC === 408) {
+            spinHandle.failure();
+            throw 'Could not make a secure connection.\nPlease ensure you are able to access https://www.maka-cli.com';
+        }
+        if (preflightSC !== 200) {
+            spinHandle.failure();
+            throw `https://${hostname} seems to be having a problem.  Please report a bug at: https://github.com/maka-io/maka-cli`;
+        }
+        spinHandle.success();
+        const email = await Actions.ask('Email:');
+        if (!validateEmail(email)) {
+            Log.error('Invalid email address');
+            process.exit(1);
+        }
+        const password = await Actions.ask('Password: ', true);
+        const passwordConfirm = await Actions.ask('Confirm Password: ', true);
+        if (password !== passwordConfirm) {
+            Log.error('Passwords do not match');
+            process.exit(1);
+        }
+        const postRegisterBody = {
+            hostname,
+            path: '/api/v1/register',
+            data: {
+                email,
+                password,
+            }
+        };
+        if (opts.cacert) {
+            Object.assign(postRegisterBody, { cert: caCertPath });
+        }
+        spinHandle.start('Registering');
+        const { statusCode: registerSC, data: registerBody } = await HTTPS.post(postRegisterBody);
+        if (registerSC !== 200) {
+            spinHandle.failure();
+            throw JSON.parse(registerBody);
+        }
+        spinHandle.success();
+        Log.notice('Registration successful');
+        MakaCmd.processAndRunCommand('login', [], { email, password });
+    }
+    catch (err) {
+        if (err === 'Too many requests') {
+            Log.majestic('Bruv... Too many requests, register slower...');
+        }
+        Log.error(err.message);
+        process.exit(1);
+    }
+});
+//# sourceMappingURL=register.js.map

package/bundle/typescript/src/commands/register.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../src/commands/register.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/run/_index.d.ts

@@ -0,0 +1,2 @@
+import './run.command.js';
+import './docker.sub.cmd.js';

package/bundle/typescript/src/commands/run/_index.js

@@ -0,0 +1,3 @@
+import './run.command.js';
+import './docker.sub.cmd.js';
+//# sourceMappingURL=_index.js.map

package/bundle/typescript/src/commands/run/_index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"_index.js","sourceRoot":"","sources":["../../../../../src/commands/run/_index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,qBAAqB,CAAC"}

package/bundle/typescript/src/commands/run/docker.sub.cmd.d.ts

@@ -0,0 +1 @@
+export {};

package/bundle/typescript/src/commands/run/docker.sub.cmd.js

@@ -0,0 +1,80 @@
+import Run from './run.command.js';
+import { execSync } from 'child_process';
+import path from 'path';
+import fs from 'fs';
+import { Log } from '../../tools/log/log.class.js';
+import { Command } from '../../command.js';
+import { kebabCase, } from "change-case";
+Command.create({
+    name: 'docker',
+    aliases: ['d'],
+    shortDesc: 'Run your application in a Docker container',
+    description: `
+  Run your application in a Docker container.  Docker Desktop, Rancher, or Colmia is required.
+
+  Colima is a great alternative to Docker Desktop, and it is free! (On a Mac)
+  Colima: https://github.com/abiosoft/colima
+
+  Rancher is a great alternative to Docker Desktop, and it is free! (On Windows or Mac)
+  Rancher: https://rancherdesktop.io/
+
+  A docker-compose.yml file (location defaulted to the "config/docker" folder)
+  is used to startup mongo and load the built image'
+  `,
+    usage: 'maka run:docker',
+    isPro: false,
+    mustBeInMakaProject: true,
+    validOpts: ['env'],
+    requiredOpts: [],
+}, async function (args, opts) {
+    try {
+        const { projectConfig, cfg, pkg, scaffold } = this;
+        const { appName } = projectConfig;
+        const env = cfg.getEnvFromShorthand(opts.env || 'docker');
+        if (env === 'local') {
+            Log.error('Maka should not run docker containers from a local config');
+            Log.error('Run at a higher level (e.g., docker)');
+            throw 'Not supported';
+        }
+        await pkg.ensureAllDependenciesInstalled();
+        const configPath = cfg.getAppConfigPath(env);
+        const dockerComposeFile = path.join(configPath, 'docker-compose.yaml');
+        const pm2ConfigFile = path.join(configPath, 'pm2.config.js');
+        Log.notice('PM2 Config File: ' + pm2ConfigFile);
+        Log.notice('Docker Compose Path: ' + dockerComposeFile);
+        if (!fs.existsSync(dockerComposeFile)) {
+            const DOCKERFILE_PATH = path.join(configPath, 'docker-compose.yaml');
+            await scaffold.template({
+                srcPath: 'config/docker-compose.yaml',
+                destPath: DOCKERFILE_PATH,
+                context: {
+                    app: appName,
+                    appFileCase: kebabCase(appName),
+                    env
+                },
+                config: projectConfig
+            });
+        }
+        const localImagesOutput = execSync(`docker images --format "{{.Repository}}:{{.Tag}}"`).toString();
+        const localImages = new Set(localImagesOutput.split('\n').filter(image => image.trim())); // Filter and trim whitespace
+        // Build the expected image name from appName
+        const expectedImageName = `${appName}:latest`;
+        Log.notice(`Checking local availability for image: ${expectedImageName}`);
+        if (localImages.has(expectedImageName)) {
+            Log.success(`Image already available locally: ${expectedImageName}`);
+        }
+        else {
+            Log.error(`Image not available locally: ${expectedImageName}`);
+            Log.error("Try building it with `maka build:docker`");
+            process.exit(1); // Stop execution if the required image is not available locally
+        }
+        // If the required image is available, you can proceed with the next steps
+        Log.notice("The required image is available locally. Proceeding with docker-compose up.");
+        execSync(`docker-compose --project-directory ${configPath} up --remove-orphans`, { stdio: 'inherit' });
+    }
+    catch (e) {
+        console.log(e);
+        process.exit(1);
+    }
+}, Run);
+//# sourceMappingURL=docker.sub.cmd.js.map

package/bundle/typescript/src/commands/run/docker.sub.cmd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"docker.sub.cmd.js","sourceRoot":"","sources":["../../../../../src/commands/run/docker.sub.cmd.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/run/run.command.d.ts

@@ -0,0 +1,3 @@
+import { Command } from '../../command.js';
+declare const Run: Command;
+export default Run;

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

@@ -0,0 +1,157 @@
+import path from 'path';
+import fs from 'fs';
+import dotenv from 'dotenv';
+import { rimraf } from 'rimraf';
+import { execSync } from 'child_process';
+import MakaGen from '../../generators/maka.gen.js';
+import { Command } from '../../command.js';
+import { Log } from '../../tools/log/log.class.js';
+const syncSource = function (filePath) {
+    fs.openSync(filePath, 'r');
+    dotenv.config({ path: filePath });
+};
+const Run = Command.create({
+    name: 'run',
+    mustBeInMakaProject: true,
+    aliases: ['r'],
+    shortDesc: 'Run your Meteor application',
+    description: `
+  maka run
+  -e | --env            The target environment.  Will automatically pull in the meteor settings
+                        file (settings.json) and any environment options that have been enabled.
+                        Defaults to the development (dev) environment.
+
+  -r | --raw-logs       Only output the meteor logs without the timestamp.
+
+  -p | --port           The port to run the meteor server on. Defaults to port 3000.
+
+  -i | --inspect        Tells the meteor server to run nodejs in debug mode. Starts a debug session
+                        which can be accessed by Chrome Dev Tools or another debug terminal.
+                        Default port is 9229.
+
+  -m | --mobile-server  Specify a different backend server to connect to.  Mainly used when running
+                        mobile app mode with Cordova.
+
+  -x | --exclude-archs  Don't create bundles for certain web architectures (comma separated, for example:
+                        --exclude-archs "web.browser.legacy, web.cordova")
+
+  --production          Runs the application in production mode; minifies and bundles all files and
+                        removes development packages.
+
+  -o | --open           Opens the application in your default browser.
+  `,
+    validOpts: [
+        'env',
+        'rawLogs',
+        'port',
+        'inspect',
+        'mobileServer',
+        'verbose',
+        'allowIncompatibleUpdate',
+        'extraPackages',
+        'x', 'excludeArchs',
+        'production',
+        'ci',
+        'open'
+    ],
+}, async function (args, opts) {
+    try {
+        if (this.mpi.isMeteorInstalled()) {
+            Log.notice('Meteor is installed.');
+        }
+        else {
+            Log.notice('Meteor is not installed or cannot be found in your path. Installing...');
+            execSync('maka install --force', { stdio: 'inherit' });
+        }
+        // Check for meteor package requirements
+        await this.pkg.checkMeteorPackage('autoupdate', { shouldInstall: true });
+        await this.pkg.ensureAllDependenciesInstalled();
+        // Invoke the specified generator
+        const command = args[0];
+        if (command === 'ios') {
+            // https://github.com/meteor/cordova-plugin-meteor-webapp/issues/50
+            const projectDirectory = this.fsi.findProjectDirectory();
+            const buildPath = path.join(projectDirectory, 'app', '.meteor', 'local', 'cordova-build');
+            if (this.fsi.isDirectory(buildPath)) {
+                await rimraf(buildPath);
+            }
+        }
+        // no one has legacy browsers anymore...
+        if (!opts['excludeArchs'] && !opts['x']) {
+            args = args.concat([
+                '--exclude-archs',
+                '"web.browser.legacy"'
+            ]);
+        }
+        if (opts['mobileServer'] && typeof opts['mobileServer'] === 'boolean') {
+            throw 'Please provide a URL where your mobile app should connect to your server (e.g., -m | --mobile-server=https://example-server.com)';
+        }
+        // always ensure local exists
+        const localExists = this.cfg.checkConfigExists('local');
+        if (!localExists) {
+            Log.warn(`Your local config has gone missing, remaking it...`);
+            const projectDirectory = this.fsi.findProjectDirectory();
+            await MakaGen.processAndRunGenerator('config', ['local'], { cwd: projectDirectory, root: true });
+        }
+        const env = (opts.env) ? this.cfg.getEnvFromShorthand(opts.env) : 'local';
+        const configPath = this.cfg.getAppConfigPath(env);
+        const processDotEnvPath = path.join(configPath, 'process.env');
+        let settingsPath = path.join(configPath, 'settings.json');
+        // allow settings override
+        if (opts.settings) {
+            settingsPath = opts.settings;
+        }
+        else {
+            settingsPath = path.join(configPath, 'settings.json');
+        }
+        // source the env file into the process environment
+        if (this.fsi.isFile(processDotEnvPath)) {
+            // Use path.relative to compute the relative path
+            const relativeDotEnvPath = path.relative(process.cwd(), processDotEnvPath);
+            Log.notice('Node Env Config: ' + relativeDotEnvPath);
+            syncSource(processDotEnvPath);
+        }
+        else {
+            const relativeDotEnvPath = path.relative(process.cwd(), processDotEnvPath);
+            Log.info('Cannot find Node Environment file, creating: ' + relativeDotEnvPath);
+            this.fsi.createFile({ filePath: processDotEnvPath, data: '' });
+        }
+        if (this.fsi.isFile(settingsPath)) {
+            // Use path.relative to compute the relative path
+            const relativeSettingsPath = path.relative(process.cwd(), settingsPath);
+            Log.notice('Meteor Settings: ' + relativeSettingsPath);
+            args = args.concat([
+                '--settings',
+                settingsPath
+            ]);
+        }
+        else {
+            const relativeSettingsPath = path.relative(process.cwd(), settingsPath);
+            Log.warn('Cannot find Meteor Settings File: ' + relativeSettingsPath);
+        }
+        const splitPath = configPath.split(path.sep);
+        const envKey = splitPath[splitPath.length - 1];
+        if (envKey === 'production') {
+            args.push('--production');
+        }
+        // remove run and any platforms
+        const processArgv = process.argv.slice(2)
+            .filter(value => value !== 'run')
+            .filter(value => value !== args[0]);
+        processArgv.forEach((arg, idx) => {
+            if (arg === '--env') {
+                processArgv.splice(idx, 2);
+            }
+            if (arg === '-e') {
+                processArgv.splice(idx, 2);
+            }
+        });
+        this.mpi.invokeMeteorCommand('run', args.concat(processArgv));
+    }
+    catch (e) {
+        Log.error(e);
+        process.exit(1);
+    }
+});
+export default Run;
+//# sourceMappingURL=run.command.js.map

package/bundle/typescript/src/commands/run/run.command.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.command.js","sourceRoot":"","sources":["../../../../../src/commands/run/run.command.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,OAAO,MAAM,8BAA8B,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AAEnD,MAAM,UAAU,GAAG,UAAU,QAAQ;IACnC,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC3B,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC;AAiBF,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IACzB,IAAI,EAAE,KAAK;IACX,mBAAmB,EAAE,IAAI;IACzB,OAAO,EAAE,CAAC,GAAG,CAAC;IACd,SAAS,EAAE,6BAA6B;IACxC,WAAW,EAAE;;;;;;;;;;;;;;;;;;;;;;;;GAwBZ;IACD,SAAS,EAAE;QACT,KAAK;QACL,SAAS;QACT,MAAM;QACN,SAAS;QACT,cAAc;QACd,SAAS;QACT,yBAAyB;QACzB,eAAe;QACf,GAAG,EAAE,cAAc;QACnB,YAAY;QACZ,IAAI;QACJ,MAAM;KACP;CACF,EAAE,KAAK,WAAW,IAAc,EAAE,IAAc;IAC/C,IAAI,CAAC;QACH,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,EAAE,CAAC;YACjC,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,MAAM,CAAC,wEAAwE,CAAC,CAAC;YACrF,QAAQ,CAAC,sBAAsB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,wCAAwC;QACxC,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QACzE,MAAM,IAAI,CAAC,GAAG,CAAC,8BAA8B,EAAE,CAAC;QAEhD,iCAAiC;QACjC,MAAM,OAAO,GAAW,IAAI,CAAC,CAAC,CAAC,CAAC;QAEhC,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;YACtB,mEAAmE;YACnE,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;YACzD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;YAC1F,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;gBACpC,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,wCAAwC;QACxC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACxC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;gBACjB,iBAAiB;gBACjB,sBAAsB;aACvB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,SAAS,EAAE,CAAC;YACtE,MAAM,kIAAkI,CAAC;QAC3I,CAAC;QAED,6BAA6B;QAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,GAAG,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;YAC/D,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;YACzD,MAAM,OAAO,CAAC,sBAAsB,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,EAAC,GAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC;QACjG,CAAC;QAED,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAC1E,MAAM,UAAU,GAAW,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC1D,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAC/D,IAAI,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QAE1D,0BAA0B;QAC1B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QACxD,CAAC;QAED,mDAAmD;QACnD,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACvC,iDAAiD;YACjD,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,CAAC;YAC3E,GAAG,CAAC,MAAM,CAAC,mBAAmB,GAAG,kBAAkB,CAAC,CAAC;YACrD,UAAU,CAAC,iBAAiB,CAAC,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,CAAC;YAC3E,GAAG,CAAC,IAAI,CAAC,+CAA+C,GAAG,kBAAkB,CAAC,CAAC;YAC/E,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACjE,CAAC;QAED,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;YAClC,iDAAiD;YACjD,MAAM,oBAAoB,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC;YACxE,GAAG,CAAC,MAAM,CAAC,mBAAmB,GAAG,oBAAoB,CAAC,CAAC;YACvD,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;gBACjB,YAAY;gBACZ,YAAY;aACb,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,oBAAoB,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC;YACxE,GAAG,CAAC,IAAI,CAAC,oCAAoC,GAAG,oBAAoB,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC/C,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC;QAED,+BAA+B;QAC/B,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;aACtC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,KAAK,CAAC;aAChC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAEtC,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC/B,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;gBACpB,WAAW,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAC7B,CAAC;YAED,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;gBACjB,WAAW,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;IAChE,CAAC;IAAC,OAAM,CAAC,EAAE,CAAC;QACV,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,eAAe,GAAG,CAAC"}

package/bundle/typescript/src/commands/set/_index.d.ts

@@ -0,0 +1,3 @@
+import './set.command.js';
+import './global.sub.cmd.js';
+import './local.sub.cmd.js';