lowdefy 4.0.0-alpha.9 → 4.0.0-rc.0

package/dist/commands/build/build.js

@@ -16,10 +16,12 @@
 import copyPluginsFolder from '../../utils/copyPluginsFolder.js';
 import getServer from '../../utils/getServer.js';
 import installServer from '../../utils/installServer.js';
+import readDotEnv from '../../utils/readDotEnv.js';
 import runLowdefyBuild from '../../utils/runLowdefyBuild.js';
 import runNextBuild from '../../utils/runNextBuild.js';
 async function build({ context  }) {
     context.print.info('Starting build.');
+    readDotEnv(context);
     const directory = context.directories.server;
     await getServer({
         context,
@@ -46,10 +48,12 @@ async function build({ context  }) {
         context,
         directory
     });
-    await runNextBuild({
-        context,
-        directory
-    });
+    if (context.options.nextBuild !== false) {
+        await runNextBuild({
+            context,
+            directory
+        });
+    }
     await context.sendTelemetry({
         sendTypes: true
     });

package/dist/commands/dev/runDevServer.js

@@ -13,21 +13,25 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { spawnProcess } from '@lowdefy/node-utils';
+import createStdOutLineHandler from '../../utils/createStdOutLineHandler.js';
 async function runDevServer({ context , directory  }) {
     await spawnProcess({
-        logger: context.print,
         args: [
             'run',
             'start'
         ],
-        command: context.packageManager,
+        command: context.pnpmCmd,
+        stdOutLineHandler: createStdOutLineHandler({
+            context
+        }),
         processOptions: {
             cwd: directory,
             env: {
                 ...process.env,
                 LOWDEFY_BUILD_REF_RESOLVER: context.options.refResolver,
                 LOWDEFY_DIRECTORY_CONFIG: context.directories.config,
-                LOWDEFY_PACKAGE_MANAGER: context.packageManager,
+                LOWDEFY_LOG_LEVEL: context.options.logLevel,
+                LOWDEFY_SERVER_DEV_OPEN_BROWSER: !!context.options.open,
                 LOWDEFY_SERVER_DEV_WATCH: JSON.stringify(context.options.watch),
                 LOWDEFY_SERVER_DEV_WATCH_IGNORE: JSON.stringify(context.options.watchIgnore),
                 PORT: context.options.port

package/dist/commands/init/lowdefyFile.js

@@ -63,5 +63,4 @@ pages:
               content: |
                 Made by a Lowdefy 🤖
 
-`
-);
+`);

package/dist/commands/start/runStart.js

@@ -13,24 +13,25 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { spawnProcess } from '@lowdefy/node-utils';
+import createStdOutLineHandler from '../../utils/createStdOutLineHandler.js';
 async function runStart({ context , directory  }) {
-    context.print.spin(`Running "${context.packageManager} run start".`);
     await spawnProcess({
-        logger: context.print,
         args: [
             'run',
             'start'
         ],
-        command: context.packageManager,
+        command: context.pnpmCmd,
+        stdOutLineHandler: createStdOutLineHandler({
+            context
+        }),
         processOptions: {
             cwd: directory,
             env: {
                 ...process.env,
-                LOWDEFY_DIRECTORY_CONFIG: context.directories.config,
+                LOWDEFY_LOG_LEVEL: context.options.logLevel,
                 PORT: context.options.port
             }
-        },
-        silent: false
+        }
     });
 }
 export default runStart;

package/dist/commands/start/start.js

@@ -13,15 +13,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import runStart from './runStart.js';
+import readDotEnv from '../../utils/readDotEnv.js';
 // TODO: Handle "spawn yarn ENOENT" error if no built server exists.
 async function build({ context  }) {
-    context.print.info('Starting server.');
     context.sendTelemetry({
         sendTypes: true
     });
-    await runStart({
+    readDotEnv(context);
+    const serverProcess = runStart({
         context,
         directory: context.directories.server
     });
+    context.print.succeed('Started server.');
+    await serverProcess;
 }
 export default build;

package/dist/index.js

@@ -13,31 +13,13 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-*/ import { readFile } from '@lowdefy/node-utils';
-import { Command } from 'commander';
-import build from './commands/build/build.js';
-import dev from './commands/dev/dev.js';
-import init from './commands/init/init.js';
-import start from './commands/start/start.js';
-import runCommand from './utils/runCommand.js';
-const packageJson = JSON.parse(await readFile(new URL('../package.json', import.meta.url).pathname));
-const { description , version: cliVersion  } = packageJson;
-const program = new Command();
-program.name('lowdefy').description(description).version(cliVersion, '-v, --version');
-program.command('build').description('Build a Lowdefy production app.').usage(`[options]`).option('--config-directory <config-directory>', 'Change config directory. Default is the current working directory.').option('--disable-telemetry', 'Disable telemetry.').option('--output-directory <output-directory>', 'Change the directory to which build artifacts are saved. Default is "<config-directory>/.lowdefy".').option('--package-manager <package-manager>', 'The package manager to use. Options are "npm" or "yarn".').option('--ref-resolver <ref-resolver-function-path>', 'Path to a JavaScript file containing a _ref resolver function to be used as the app default _ref resolver.').option('--server-directory <server-directory>', 'Change the server directory. Default is "<config-directory>/.lowdefy/server".').action(runCommand({
-    cliVersion,
-    handler: build
-}));
-program.command('dev').description('Start a Lowdefy development server.').usage(`[options]`).option('--config-directory <config-directory>', 'Change config directory. Default is the current working directory.').option('--disable-telemetry', 'Disable telemetry.').option('--package-manager <package-manager>', 'The package manager to use. Options are "npm" or "yarn".').option('--port <port>', 'Change the port the development server is hosted at. Default is 3000.').option('--ref-resolver <ref-resolver-function-path>', 'Path to a JavaScript file containing a _ref resolver function to be used as the app default _ref resolver.').option('--watch <paths...>', 'A list of paths to files or directories that should be watched for changes. Globs are supported. Specify each path to watch separated by spaces.').option('--watch-ignore <paths...>', 'A list of paths to files or directories that should be ignored by the file watcher. Globs are supported. Specify each path to watch separated by spaces.').option('--dev-directory <dev-directory>', 'Change the development server directory. Default is "<config-directory>/.lowdefy/dev".').action(runCommand({
-    cliVersion,
-    handler: dev
-}));
-program.command('init').description('Initialize a Lowdefy project.').usage(`[options]`).action(runCommand({
-    cliVersion,
-    handler: init
-}));
-program.command('start').description('Start a Lowdefy production app.').usage(`[options]`).option('--config-directory <config-directory>', 'Change config directory. Default is the current working directory.').option('--disable-telemetry', 'Disable telemetry.').option('--output-directory <output-directory>', 'Change the directory to which build artifacts are saved. Default is "<config-directory>/.lowdefy".').option('--package-manager <package-manager>', 'The package manager to use. Options are "npm" or "yarn".').option('--port <port>', 'Change the port the server is hosted at. Default is 3000.').option('--server-directory <server-directory>', 'Change the server directory. Default is "<config-directory>/.lowdefy/server".').action(runCommand({
-    cliVersion,
-    handler: start
-}));
-program.parse(process.argv);
+*/ const nodeMajorVersion = process.version.split(/^v(\d+)/)[1];
+if (Number(nodeMajorVersion) < 14) {
+    // TODO: This error handled with telemetry.
+    throw new Error(`Nodejs versions below v14 are not supported. You are using ${process.version}. Update Nodejs to the latest LTS version to use Lowdefy.`);
+}
+async function run() {
+    const { default: program  } = await import('./program.js');
+    program.parse(process.argv);
+}
+run().then(()=>{});

package/dist/program.js

@@ -0,0 +1,59 @@
+/*
+  Copyright 2020-2022 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/ import { createRequire } from 'module';
+import { Command, Option } from 'commander';
+import build from './commands/build/build.js';
+import dev from './commands/dev/dev.js';
+import init from './commands/init/init.js';
+import start from './commands/start/start.js';
+import runCommand from './utils/runCommand.js';
+const require = createRequire(import.meta.url);
+const packageJson = require('../package.json');
+const { description , version: cliVersion  } = packageJson;
+const program = new Command();
+program.name('lowdefy').description(description).version(cliVersion, '-v, --version');
+const options = {
+    configDirectory: new Option('--config-directory <config-directory>', 'Change config directory. Default is the current working directory.').env('LOWDEFY_DIRECTORY_CONFIG'),
+    devDirectory: new Option('--dev-directory <dev-directory>', 'Change the development server directory. Default is "<config-directory>/.lowdefy/dev".').env('LOWDEFY_DIRECTORY_DEV'),
+    disableTelemetry: new Option('--disable-telemetry', 'Disable telemetry.').env('LOWDEFY_DISABLE_TELEMETRY'),
+    logLevel: new Option('--log-level <level>', 'The minimum severity of logs to show in the CLI output.').choices([
+        'error',
+        'warn',
+        'info',
+        'debug'
+    ]).default('info').env('LOWDEFY_LOG_LEVEL'),
+    port: new Option('--port <port>', 'Change the port the development server is hosted at. Default is 3000.').env('PORT'),
+    refResolver: new Option('--ref-resolver <ref-resolver-function-path>', 'Path to a JavaScript file containing a _ref resolver function to be used as the app default _ref resolver.'),
+    serverDirectory: new Option('--server-directory <server-directory>', 'Change the server directory. Default is "<config-directory>/.lowdefy/server".').env('LOWDEFY_DIRECTORY_SERVER'),
+    watch: new Option('--watch <paths...>', 'A list of paths to files or directories that should be watched for changes. Globs are supported. Specify each path to watch separated by spaces.'),
+    watchIgnore: new Option('--watch-ignore <paths...>', 'A list of paths to files or directories that should be ignored by the file watcher. Globs are supported. Specify each path to watch separated by spaces.')
+};
+program.command('build').description('Build a Lowdefy production app.').usage(`[options]`).addOption(options.configDirectory).addOption(options.disableTelemetry).addOption(options.logLevel).option('--no-next-build', 'Do not build the Next.js server.').addOption(options.refResolver).addOption(options.serverDirectory).action(runCommand({
+    cliVersion,
+    handler: build
+}));
+program.command('dev').description('Start a Lowdefy development server.').usage(`[options]`).addOption(options.configDirectory).addOption(options.devDirectory).addOption(options.disableTelemetry).addOption(options.logLevel).option('--no-open', 'Do not open a new tab in the default browser.').addOption(options.port).addOption(options.refResolver).addOption(options.watch).addOption(options.watchIgnore).action(runCommand({
+    cliVersion,
+    handler: dev
+}));
+program.command('init').description('Initialize a Lowdefy project.').usage(`[options]`).addOption(options.disableTelemetry).addOption(options.logLevel).action(runCommand({
+    cliVersion,
+    handler: init
+}));
+program.command('start').description('Start a Lowdefy production app.').usage(`[options]`).addOption(options.configDirectory).addOption(options.disableTelemetry).addOption(options.logLevel).addOption(options.port).addOption(options.serverDirectory).action(runCommand({
+    cliVersion,
+    handler: start
+}));
+export default program;

package/dist/utils/addCustomPluginsAsDeps.js

@@ -17,14 +17,14 @@ import { readFile, writeFile } from '@lowdefy/node-utils';
 async function addCustomPluginsAsDeps({ context , directory  }) {
     const packageJsonPath = path.join(directory, 'package.json');
     const packageJson = JSON.parse(await readFile(packageJsonPath));
-    const devDependencies = packageJson.devDependencies;
+    const dependencies = packageJson.dependencies;
     Object.values(context.plugins).forEach((plugin)=>{
-        devDependencies[plugin.name] = plugin.version;
+        dependencies[plugin.name] = plugin.version;
     });
     // Sort dependencies
-    packageJson.devDependencies = {};
-    Object.keys(devDependencies).sort().forEach((name)=>{
-        packageJson.devDependencies[name] = devDependencies[name];
+    packageJson.dependencies = {};
+    Object.keys(dependencies).sort().forEach((name)=>{
+        packageJson.dependencies[name] = dependencies[name];
     });
     const newPackageJsonContent = JSON.stringify(packageJson, null, 2).concat('\n');
     await writeFile(packageJsonPath, newPackageJsonContent);

package/dist/utils/checkPnpmIsInstalled.js

@@ -0,0 +1,32 @@
+/*
+  Copyright 2020-2022 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/ import { execSync } from 'child_process';
+function checkPnpmIsInstalled({ print , pnpmCmd  }) {
+    try {
+        execSync(`${pnpmCmd} --version`, {
+            stdio: 'ignore'
+        });
+    } catch (e) {
+        print.error(`
+-------------------------------------------------------------
+  The package manager "pnpm" is required to run Lowdefy.
+  Install pnpm as describe here:
+  https://pnpm.io/installation
+  or run  'corepack enable'.
+-------------------------------------------------------------`);
+        throw new Error('The package manager "pnpm" is required to run Lowdefy.');
+    }
+}
+export default checkPnpmIsInstalled;

package/dist/utils/copyPluginsFolder.js

@@ -14,10 +14,13 @@
   limitations under the License.
 */ import path from 'path';
 import fs from 'fs';
-import { copyDirectory } from '@lowdefy/node-utils';
+import { cleanDirectory, copyDirectory } from '@lowdefy/node-utils';
 async function copyPluginsFolder({ context , directory  }) {
     if (context.directories.config === directory) return;
-    if (!fs.existsSync(path.resolve(context.directories.config, 'plugins'))) return;
-    await copyDirectory(path.resolve(context.directories.config, 'plugins'), path.resolve(directory, 'plugins'));
+    if (!fs.existsSync(path.join(context.directories.config, 'plugins'))) return;
+    await cleanDirectory(path.join(directory, 'plugins'));
+    await copyDirectory(path.join(context.directories.config, 'plugins'), path.join(directory, 'plugins'), {
+        filter: (path1)=>!path1.includes('node_modules')
+    });
 }
 export default copyPluginsFolder;

package/dist/utils/createPrint.js

@@ -13,7 +13,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import ora from 'ora';
-import chalk from 'chalk';
+const reset = '\x1b[0m';
+const red = (text)=>`\x1b[31m${text}${reset}`;
+const green = (text)=>`\x1b[32m${text}${reset}`;
+const yellow = (text)=>`\x1b[33m${text}${reset}`;
+const blue = (text)=>`\x1b[34m${text}${reset}`;
+const dim = (text)=>`\x1b[2m${text}${reset}`;
 function getTime() {
     const time = new Date(Date.now());
     const h = time.getHours();
@@ -21,52 +26,79 @@ function getTime() {
     const s = time.getSeconds();
     return `${h > 9 ? '' : '0'}${h}:${m > 9 ? '' : '0'}${m}:${s > 9 ? '' : '0'}${s}`;
 }
-function createOraPrint() {
+// Same levels as pino with added custom levels
+const logLevelValues = {
+    error: 50,
+    warn: 40,
+    succeed: 33,
+    spin: 32,
+    log: 31,
+    info: 30,
+    debug: 20
+};
+function filterLevels(logger, level) {
+    const levelValue = logLevelValues[level];
+    Object.keys(logger).forEach((key)=>{
+        if (logLevelValues[key] < levelValue) {
+            logger[key] = ()=>{};
+        }
+    });
+    return logger;
+}
+function createOraPrint({ logLevel  }) {
     const spinner = ora({
         spinner: 'random',
-        prefixText: ()=>chalk.dim(getTime())
-        ,
+        prefixText: ()=>dim(getTime()),
         color: 'blue'
     });
-    return {
-        type: 'ora',
-        error: (text)=>spinner.fail(chalk.red(text))
-        ,
-        info: (text)=>spinner.info(chalk.blue(text))
-        ,
-        log: (text)=>spinner.start(text).stopAndPersist({
-                symbol: '∙'
-            })
-        ,
-        spin: (text)=>spinner.start(text)
-        ,
-        succeed: (text)=>spinner.succeed(chalk.green(text))
-        ,
-        warn: (text)=>spinner.warn(chalk.yellow(text))
-    };
+    return filterLevels({
+        error: (text)=>spinner.fail(red(text)),
+        info: (text)=>spinner.info(blue(text)),
+        log: (text)=>spinner.stopAndPersist({
+                symbol: '∙',
+                text
+            }),
+        spin: (text)=>spinner.start(text),
+        succeed: (text)=>spinner.succeed(green(text)),
+        warn: (text)=>spinner.warn(yellow(text)),
+        debug: (text)=>{
+            if (spinner.isSpinning) {
+                spinner.stopAndPersist({
+                    symbol: '∙'
+                });
+            }
+            spinner.stopAndPersist({
+                symbol: dim('+'),
+                text: dim(text)
+            });
+        }
+    }, logLevel);
 }
-function createBasicPrint() {
-    const { error , info , log , warn  } = console;
-    return {
-        type: 'basic',
+function createBasicPrint({ logLevel ='info'  }) {
+    const { error , info , log , warn , debug  } = console;
+    return filterLevels({
         error,
         info,
         log,
         spin: log,
         succeed: log,
-        warn
-    };
+        warn,
+        debug
+    }, logLevel);
 }
 // Memoise print so that error handler can get the same spinner object
 let print;
-function createPrint() {
-    // TODO: Add debug
+function createPrint({ logLevel  }) {
     if (print) return print;
-    if (process.env.CI === 'true') {
-        print = createBasicPrint();
+    if (process.env.CI === 'true' || process.env.CI === '1') {
+        print = createBasicPrint({
+            logLevel
+        });
         return print;
     }
-    print = createOraPrint();
+    print = createOraPrint({
+        logLevel
+    });
     return print;
 }
 export { createOraPrint, createBasicPrint };

package/dist/utils/createStdOutLineHandler.js

@@ -0,0 +1,26 @@
+/*
+  Copyright 2020-2022 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/ function createStdOutLineHandler({ context  }) {
+    function stdOutLineHandler(line) {
+        try {
+            const { print , msg  } = JSON.parse(line);
+            context.print[print](msg);
+        } catch (error) {
+            context.print.log(line);
+        }
+    }
+    return stdOutLineHandler;
+}
+export default createStdOutLineHandler;

package/dist/utils/errorHandler.js

@@ -37,7 +37,9 @@ async function logError({ error , context ={}  }) {
     }
 }
 async function errorHandler({ context , error  }) {
-    const print = createPrint();
+    const print = createPrint({
+        logLevel: 'info'
+    });
     print.error(error.message);
     if (!context.disableTelemetry) {
         await logError({

package/dist/utils/getDirectories.js

@@ -14,17 +14,14 @@
   limitations under the License.
 */ import path from 'path';
 function getDirectories({ configDirectory , options  }) {
-    let dotLowdefy;
-    if (options.outputDirectory) {
-        dotLowdefy = path.resolve(options.outputDirectory);
-    } else {
-        dotLowdefy = path.resolve(configDirectory, '.lowdefy');
-    }
+    const dotLowdefy = path.resolve(configDirectory, '.lowdefy');
+    const server = options.serverDirectory ? path.resolve(options.serverDirectory) : path.join(dotLowdefy, 'server');
+    // TODO: Read server directory from env var
+    // Priority should be CLI arguments, env var, CLI options in Lowdefy config
     return {
         config: configDirectory,
-        build: path.join(dotLowdefy, 'server', 'build'),
-        dotLowdefy,
-        server: options.serverDirectory ? path.resolve(options.serverDirectory) : path.join(dotLowdefy, 'server'),
+        build: path.join(server, 'build'),
+        server,
         dev: options.devDirectory ? path.resolve(options.devDirectory) : path.join(dotLowdefy, 'dev')
     };
 }

package/dist/utils/installServer.js

@@ -13,31 +13,24 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { spawnProcess } from '@lowdefy/node-utils';
-const args = {
-    npm: [
-        'install',
-        '--legacy-peer-deps'
-    ],
-    yarn: [
-        'install'
-    ]
-};
 async function installServer({ context , directory  }) {
-    context.print.spin(`Running ${context.packageManager} install.`);
+    context.print.spin('Installing dependencies.');
     try {
         await spawnProcess({
-            logger: context.print,
-            command: context.packageManager,
-            args: args[context.packageManager],
+            command: context.pnpmCmd,
+            args: [
+                'install',
+                '--no-frozen-lockfile'
+            ],
+            stdOutLineHandler: (line)=>context.print.debug(line),
             processOptions: {
                 cwd: directory
-            },
-            silent: false
+            }
         });
     } catch (error) {
         console.log(error);
-        throw new Error(`${context.packageManager} install failed.`);
+        throw new Error('Dependency installation failed.');
     }
-    context.print.log(`${context.packageManager} install successful.`);
+    context.print.log('Dependencies install successfully.');
 }
 export default installServer;

package/dist/utils/readDotEnv.js

@@ -0,0 +1,23 @@
+/*
+  Copyright 2020-2022 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/ import path from 'path';
+import dotenv from 'dotenv';
+function readDotEnv(context) {
+    dotenv.config({
+        path: path.join(context.directories.config, '.env'),
+        silent: true
+    });
+}
+export default readDotEnv;

package/dist/utils/runLowdefyBuild.js

@@ -13,27 +13,28 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { spawnProcess } from '@lowdefy/node-utils';
+import createStdOutLineHandler from './createStdOutLineHandler.js';
 async function runLowdefyBuild({ context , directory  }) {
-    context.print.log('Running Lowdefy build.');
+    context.print.spin('Running Lowdefy build.');
     try {
         await spawnProcess({
-            logger: context.print,
-            command: context.packageManager,
             args: [
                 'run',
                 'build:lowdefy'
             ],
+            command: context.pnpmCmd,
+            stdOutLineHandler: createStdOutLineHandler({
+                context
+            }),
             processOptions: {
                 cwd: directory,
                 env: {
                     ...process.env,
                     LOWDEFY_BUILD_REF_RESOLVER: context.options.refResolver,
-                    LOWDEFY_DIRECTORY_BUILD: context.directories.build,
                     LOWDEFY_DIRECTORY_CONFIG: context.directories.config,
-                    LOWDEFY_DIRECTORY_SERVER: context.directories.server
+                    LOWDEFY_LOG_LEVEL: context.options.logLevel
                 }
-            },
-            silent: false
+            }
         });
     } catch (error) {
         throw new Error('Lowdefy build failed.');

package/dist/utils/runNextBuild.js

@@ -13,20 +13,32 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { spawnProcess } from '@lowdefy/node-utils';
+function createStdOutLineHandler({ context  }) {
+    function stdOutLineHandler(line) {
+        // Matches next build output of form: ┌ λ /           261 B        403 kB
+        const match = line.match(/┌ λ \/\s*\d* [a-zA-Z]*\s*(\d* [a-zA-Z]*)/);
+        if (match) {
+            context.print.info(`Home page first load JS size: ${match[1]}.`);
+        }
+        context.print.debug(line);
+    }
+    return stdOutLineHandler;
+}
 async function runNextBuild({ context , directory  }) {
-    context.print.log('Running Next build.');
+    context.print.spin('Running Next build.');
     try {
         await spawnProcess({
-            logger: context.print,
-            command: context.packageManager,
+            command: context.pnpmCmd,
             args: [
                 'run',
                 'build:next'
             ],
+            stdOutLineHandler: createStdOutLineHandler({
+                context
+            }),
             processOptions: {
                 cwd: directory
-            },
-            silent: false
+            }
         });
     } catch (error) {
         throw new Error('Next build failed.');

package/dist/utils/startUp.js

@@ -15,17 +15,16 @@
 */ import path from 'path';
 import { type } from '@lowdefy/helpers';
 import checkForUpdatedVersions from './checkForUpdatedVersions.js';
+import checkPnpmIsInstalled from './checkPnpmIsInstalled.js';
 import getCliJson from './getCliJson.js';
 import getDirectories from './getDirectories.js';
 import getLowdefyYaml from './getLowdefyYaml.js';
 import getOptions from './getOptions.js';
-import getPackageManager from './getPackageManager.js';
 import getSendTelemetry from './getSendTelemetry.js';
 import createPrint from './createPrint.js';
 async function startUp({ context , options ={} , command  }) {
     context.command = command.name();
     context.commandLineOptions = options;
-    context.print = createPrint();
     context.configDirectory = path.resolve(options.configDirectory || process.cwd());
     const { cliConfig , lowdefyVersion , plugins  } = await getLowdefyYaml(context);
     context.cliConfig = cliConfig;
@@ -34,8 +33,12 @@ async function startUp({ context , options ={} , command  }) {
     const { appId  } = await getCliJson(context);
     context.appId = appId;
     context.options = getOptions(context);
+    context.print = createPrint({
+        logLevel: context.options.logLevel
+    });
     context.directories = getDirectories(context);
-    context.packageManager = getPackageManager(context);
+    context.pnpmCmd = process.platform === 'win32' ? 'pnpm.cmd' : 'pnpm';
+    checkPnpmIsInstalled(context);
     await checkForUpdatedVersions(context);
     context.sendTelemetry = getSendTelemetry(context);
     if (type.isNone(lowdefyVersion)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowdefy",
-  "version": "4.0.0-alpha.9",
+  "version": "4.0.0-rc.0",
   "license": "Apache-2.0",
   "description": "Lowdefy CLI",
   "homepage": "https://lowdefy.com",
@@ -32,34 +32,33 @@
   ],
   "exports": "./dist/index.js",
   "scripts": {
-    "build": "yarn swc",
+    "build": "swc src --out-dir dist --config-file ../../.swcrc --delete-dir-on-start",
     "clean": "rm -rf dist && rm -rf .lowdefy",
-    "start": "yarn node ./dist/index.js",
-    "prepare": "yarn build",
-    "swc": "swc src --out-dir dist --config-file ../../.swcrc --delete-dir-on-start",
-    "test": "FORCE_COLOR=3 yarn node --experimental-vm-modules $(yarn bin jest)"
+    "start": "node ./dist/index.js",
+    "prepublishOnly": "pnpm build",
+    "test": "FORCE_COLOR=3 node --experimental-vm-modules node_modules/jest/bin/jest.js"
   },
   "dependencies": {
-    "@lowdefy/helpers": "4.0.0-alpha.9",
-    "@lowdefy/node-utils": "4.0.0-alpha.9",
-    "axios": "0.25.0",
-    "chalk": "4.1.2",
-    "commander": "9.0.0",
+    "@lowdefy/helpers": "4.0.0-rc.0",
+    "@lowdefy/node-utils": "4.0.0-rc.0",
+    "axios": "0.27.2",
+    "commander": "9.4.0",
     "decompress": "4.2.1",
     "decompress-targz": "4.1.1",
+    "dotenv": "16.0.1",
     "ora": "5.4.1",
     "uuid": "8.3.2",
-    "yaml": "2.0.0-10"
+    "yaml": "2.1.1"
   },
   "devDependencies": {
-    "@jest/globals": "27.5.1",
-    "@swc/cli": "0.1.55",
-    "@swc/core": "1.2.135",
-    "@swc/jest": "0.2.17",
-    "jest": "27.5.1"
+    "@jest/globals": "28.1.0",
+    "@swc/cli": "0.1.57",
+    "@swc/core": "1.2.194",
+    "@swc/jest": "0.2.21",
+    "jest": "28.1.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "98b544eca231bdcfca6c3a8601a891835d5ce571"
+  "gitHead": "f6872d7ff6da421710096536fce7b2016ef8f35c"
 }

package/dist/utils/BatchChanges.js

@@ -1,61 +0,0 @@
-/*
-  Copyright 2020-2022 Lowdefy, Inc
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/ let BatchChanges = class BatchChanges {
-    newChange(...args) {
-        this.args.push(args);
-        this.delay = this.minDelay;
-        this._startTimer();
-    }
-    _startTimer() {
-        if (this.timer) {
-            clearTimeout(this.timer);
-        }
-        if (this.running) {
-            this.repeat = true;
-        } else {
-            this.timer = setTimeout(this._call, this.delay);
-        }
-    }
-    async _call() {
-        this.running = true;
-        try {
-            const args = this.args;
-            this.args = [];
-            await this.fn(args);
-            this.running = false;
-            if (this.repeat) {
-                this.repeat = false;
-                this._call();
-            }
-        } catch (error) {
-            this.running = false;
-            this.context.print.error(error.message);
-            this.delay *= 2;
-            this.context.print.warn(`Retrying in ${this.delay / 1000}s.`);
-            this._startTimer();
-        }
-    }
-    constructor({ fn , context , minDelay  }){
-        this._call = this._call.bind(this);
-        this.args = [];
-        this.context = context;
-        this.delay = minDelay || 500;
-        this.fn = fn;
-        this.minDelay = minDelay || 500;
-        this.repeat = false;
-        this.running = false;
-    }
-};
-export default BatchChanges;

package/dist/utils/getPackageManager.js

@@ -1,54 +0,0 @@
-/*
-  Copyright 2020-2022 Lowdefy, Inc
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/ // Source https://github.com/vercel/next.js/blob/canary/packages/create-next-app/helpers/should-use-yarn.ts
-/*
-The MIT License (MIT)
-
-Copyright (c) 2021 Vercel, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/ import { execSync } from 'child_process';
-function getPackageManager({ options  }) {
-    if (options.packageManager) return options.packageManager;
-    try {
-        const userAgent = process.env.npm_config_user_agent;
-        if (userAgent && userAgent.startsWith('yarn')) {
-            return 'yarn';
-        }
-        execSync('yarnpkg --version', {
-            stdio: 'ignore'
-        });
-        return 'yarn';
-    } catch (e) {
-        return 'npm';
-    }
-}
-export default getPackageManager;