lowdefy 4.0.0-alpha.5 → 4.0.0-alpha.8

package/dist/commands/build/build.js

@@ -12,26 +12,43 @@
   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 getServer from './getServer.js';
-import installServer from './installServer.js';
-import runLowdefyBuild from './runLowdefyBuild.js';
-import runNextBuild from './runNextBuild.js';
+*/ import addCustomPluginsAsDeps from '../../utils/addCustomPluginsAsDeps.js';
+import copyPluginsFolder from '../../utils/copyPluginsFolder.js';
+import getServer from '../../utils/getServer.js';
+import installServer from '../../utils/installServer.js';
+import runLowdefyBuild from '../../utils/runLowdefyBuild.js';
+import runNextBuild from '../../utils/runNextBuild.js';
 async function build({ context  }) {
     context.print.info('Starting build.');
+    const directory = context.directories.server;
     await getServer({
-        context
+        context,
+        packageName: '@lowdefy/server',
+        directory
+    });
+    await copyPluginsFolder({
+        context,
+        directory
+    });
+    await addCustomPluginsAsDeps({
+        context,
+        directory
     });
     await installServer({
-        context
+        context,
+        directory
     });
     await runLowdefyBuild({
-        context
+        context,
+        directory
     });
     await installServer({
-        context
+        context,
+        directory
     });
     await runNextBuild({
-        context
+        context,
+        directory
     });
     await context.sendTelemetry({
         sendTypes: true

package/dist/commands/dev/dev.js

@@ -12,69 +12,35 @@
   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 opener from 'opener';
-import buildWatcher from './buildWatcher.js';
-import envWatcher from './envWatcher.js';
-import getBuild from './getBuild.js';
-import getExpress from './getExpress.js';
-import getGraphQL from './getGraphQL.js';
-import prepare from './prepare.js';
-import versionWatcher from './versionWatcher.js';
-async function initialBuild({ context  }) {
-    const build = await getBuild({
-        context
-    });
-    try {
-        await build();
-    // eslint-disable-next-line no-empty
-    } catch (error) {
-    }
-    return build;
-}
-async function serverSetup({ context  }) {
-    const gqlServer = await getGraphQL({
-        context
-    });
-    return getExpress({
-        context,
-        gqlServer
-    });
-}
+*/ import addCustomPluginsAsDeps from '../../utils/addCustomPluginsAsDeps.js';
+import copyPluginsFolder from '../../utils/copyPluginsFolder.js';
+import installServer from '../../utils/installServer.js';
+import runDevServer from './runDevServer.js';
+import getServer from '../../utils/getServer.js';
 async function dev({ context  }) {
-    await prepare({
-        context
-    });
-    const initialBuildPromise = initialBuild({
-        context
-    });
-    const serverSetupPromise = serverSetup({
-        context
-    });
-    const [build, { expressApp , reloadFn  }] = await Promise.all([
-        initialBuildPromise,
-        serverSetupPromise, 
-    ]);
-    buildWatcher({
-        build,
+    const directory = context.directories.dev;
+    context.print.info('Starting development server.');
+    await getServer({
         context,
-        reloadFn
+        packageName: '@lowdefy/server-dev',
+        directory
     });
-    envWatcher({
-        context
+    await copyPluginsFolder({
+        context,
+        directory
     });
-    versionWatcher({
-        context
+    await addCustomPluginsAsDeps({
+        context,
+        directory
     });
-    context.print.log('Starting Lowdefy development server.');
-    const port = expressApp.get('port');
-    expressApp.listen(port, function() {
-        context.print.info(`Development server listening on port ${port}`);
+    await installServer({
+        context,
+        directory
     });
-    opener(`http://localhost:${port}`);
-    await context.sendTelemetry({
-        data: {
-            type: 'startup'
-        }
+    context.sendTelemetry();
+    await runDevServer({
+        context,
+        directory
     });
 }
 export default dev;

package/dist/commands/dev/runDevServer.js

@@ -0,0 +1,39 @@
+/*
+  Copyright 2020-2021 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 { spawnProcess } from '@lowdefy/node-utils';
+async function runDevServer({ context , directory  }) {
+    await spawnProcess({
+        logger: context.print,
+        args: [
+            'run',
+            'start'
+        ],
+        command: context.packageManager,
+        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_SERVER_DEV_WATCH: JSON.stringify(context.options.watch),
+                LOWDEFY_SERVER_DEV_WATCH_IGNORE: JSON.stringify(context.options.watchIgnore),
+                PORT: context.options.port
+            }
+        },
+        silent: false
+    });
+}
+export default runDevServer;

package/dist/commands/init/init.js

@@ -23,18 +23,12 @@ async function init({ context  }) {
         throw new Error('Cannot initialize a Lowdefy project, a "lowdefy.yaml" file already exists');
     }
     context.print.log(`Initializing Lowdefy project`);
-    await writeFile({
-        filePath: lowdefyFilePath,
-        content: lowdefyFile({
-            version: context.cliVersion
-        })
-    });
+    await writeFile(lowdefyFilePath, lowdefyFile({
+        version: context.cliVersion
+    }));
     context.print.log(`Created 'lowdefy.yaml'.`);
-    await writeFile({
-        filePath: path.resolve('./.gitignore'),
-        content: `.lowdefy/**
-.env`
-    });
+    await writeFile(path.resolve('./.gitignore'), `.lowdefy/**
+.env`);
     context.print.log(`Created '.gitignore'.`);
     await context.sendTelemetry();
     context.print.succeed(`Project initialized.`);

package/dist/commands/init/lowdefyFile.js

@@ -36,7 +36,7 @@ pages:
                   title: Welcome to your Lowdefy app
                   subTitle: We are excited to see what you are going to build
                   icon:
-                    name: HeartTwoTone
+                    name: AiTwoToneHeart
                     color: '#f00'
                 areas:
                   extra:

package/dist/commands/start/runStart.js

@@ -12,18 +12,23 @@
   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 spawnProcess from '../../utils/spawnProcess.js';
-async function runStart({ context  }) {
+*/ import { spawnProcess } from '@lowdefy/node-utils';
+async function runStart({ context , directory  }) {
     context.print.spin(`Running "${context.packageManager} run start".`);
     await spawnProcess({
-        context,
-        command: context.packageManager,
+        logger: context.print,
         args: [
             'run',
             'start'
         ],
+        command: context.packageManager,
         processOptions: {
-            cwd: context.directories.server
+            cwd: directory,
+            env: {
+                ...process.env,
+                LOWDEFY_DIRECTORY_CONFIG: context.directories.config,
+                PORT: context.options.port
+            }
         },
         silent: false
     });

package/dist/commands/start/start.js

@@ -13,13 +13,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import runStart from './runStart.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({
-        context
+        context,
+        directory: context.directories.server
     });
 }
 export default build;

package/dist/index.js

@@ -14,49 +14,30 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { readFile } from '@lowdefy/node-utils';
-import program from 'commander';
+import { Command } from 'commander';
 import build from './commands/build/build.js';
-// import dev from './commands/dev/dev.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  } = packageJson;
-program.name('lowdefy').description(description).version(version, '-v, --version');
-program.command('build').description('Build a Lowdefy production app.').usage(`[options]`).option('--base-directory <base-directory>', 'Change base 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 "<base-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.').action(runCommand({
-    cliVersion: version
-})(build));
-// program
-//   .command('dev')
-//   .description('Start a Lowdefy development server.')
-//   .usage(`[options]`)
-//   .option(
-//     '--base-directory <base-directory>',
-//     'Change base directory. Default is the current working directory.'
-//   )
-//   .option(
-//     '--blocks-server-url <blocks-server-url>',
-//     'The URL from where Lowdefy blocks will be served.'
-//   )
-//   .option('--disable-telemetry', 'Disable telemetry.')
-//   .option('--port <port>', 'Change the port the 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.'
-//   )
-//   .option(
-//     '--watch-ignore <paths...>',
-//     'A list of paths to files or directories that should be ignored by the file watcher. Globs are supported.'
-//   )
-//   .action(runCommand({ cliVersion: version })(dev));
+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: version
-})(init));
-program.command('start').description('Start a Lowdefy production app.').usage(`[options]`).option('--base-directory <base-directory>', 'Change base 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 "<base-directory>/.lowdefy".').option('--package-manager <package-manager>', 'The package manager to use. Options are "npm" or "yarn".').action(runCommand({
-    cliVersion: version
-})(start));
+    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);

package/dist/utils/BatchChanges.js

@@ -13,7 +13,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ let BatchChanges = class BatchChanges {
-    newChange() {
+    newChange(...args) {
+        this.args.push(args);
         this.delay = this.minDelay;
         this._startTimer();
     }
@@ -21,28 +22,40 @@
         if (this.timer) {
             clearTimeout(this.timer);
         }
-        this.timer = setTimeout(this._call, this.delay);
+        if (this.running) {
+            this.repeat = true;
+        } else {
+            this.timer = setTimeout(this._call, this.delay);
+        }
     }
     async _call() {
+        this.running = true;
         try {
-            await this.fn();
+            const args = this.args;
+            this.args = [];
+            await this.fn(args);
+            this.running = false;
+            if (this.repeat) {
+                this.repeat = false;
+                this._call();
+            }
         } catch (error) {
-            this.context.print.error(error.message, {
-                timestamp: true
-            });
+            this.running = false;
+            this.context.print.error(error.message);
             this.delay *= 2;
-            this.context.print.warn(`Retrying in ${this.delay / 1000}s.`, {
-                timestamp: true
-            });
+            this.context.print.warn(`Retrying in ${this.delay / 1000}s.`);
             this._startTimer();
         }
     }
     constructor({ fn , context , minDelay  }){
-        this.fn = fn;
+        this._call = this._call.bind(this);
+        this.args = [];
         this.context = context;
         this.delay = minDelay || 500;
+        this.fn = fn;
         this.minDelay = minDelay || 500;
-        this._call = this._call.bind(this);
+        this.repeat = false;
+        this.running = false;
     }
 };
 export default BatchChanges;

package/dist/utils/addCustomPluginsAsDeps.js

@@ -0,0 +1,32 @@
+/*
+  Copyright 2020-2021 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 { 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;
+    Object.values(context.plugins).forEach((plugin)=>{
+        devDependencies[plugin.name] = plugin.version;
+    });
+    // Sort dependencies
+    packageJson.devDependencies = {};
+    Object.keys(devDependencies).sort().forEach((name)=>{
+        packageJson.devDependencies[name] = devDependencies[name];
+    });
+    const newPackageJsonContent = JSON.stringify(packageJson, null, 2).concat('\n');
+    await writeFile(packageJsonPath, newPackageJsonContent);
+}
+export default addCustomPluginsAsDeps;

package/dist/{commands/dev/prepare.js → utils/copyPluginsFolder.js}

@@ -13,15 +13,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import path from 'path';
-import dotenv from 'dotenv';
-import { cleanDirectory } from '@lowdefy/node-utils';
-async function prepare({ context  }) {
-    dotenv.config({
-        silent: true
-    });
-    // Setup
-    if (!context.options.port) context.options.port = 3000;
-    context.print.log(`Cleaning block meta cache at "${path.resolve(context.cacheDirectory, './meta')}".`);
-    await cleanDirectory(path.resolve(context.cacheDirectory, './meta'));
+import fs from 'fs';
+import { 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'));
 }
-export default prepare;
+export default copyPluginsFolder;

package/dist/utils/errorHandler.js

@@ -13,9 +13,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import axios from 'axios';
-import createPrint from './print.js';
-async function logError({ error , context ={
-}  }) {
+import createPrint from './createPrint.js';
+async function logError({ error , context ={}  }) {
     try {
         await axios.request({
             method: 'post',

package/dist/utils/getCliJson.js

@@ -15,17 +15,14 @@
 */ import path from 'path';
 import { readFile, writeFile } from '@lowdefy/node-utils';
 import { v4 as uuid } from 'uuid';
-async function getCliJson({ baseDirectory  }) {
-    const filePath = path.resolve(baseDirectory, './.lowdefy/cli.json');
+async function getCliJson({ configDirectory  }) {
+    const filePath = path.resolve(configDirectory, './.lowdefy/cli.json');
     const cliJson = await readFile(filePath);
     if (!cliJson) {
         const appId = uuid();
-        await writeFile({
-            filePath,
-            content: JSON.stringify({
-                appId
-            }, null, 2)
-        });
+        await writeFile(filePath, JSON.stringify({
+            appId
+        }, null, 2));
         return {
             appId
         };

package/dist/utils/getDirectories.js

@@ -13,18 +13,19 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import path from 'path';
-function getDirectories({ baseDirectory , options  }) {
+function getDirectories({ configDirectory , options  }) {
     let dotLowdefy;
     if (options.outputDirectory) {
         dotLowdefy = path.resolve(options.outputDirectory);
     } else {
-        dotLowdefy = path.resolve(baseDirectory, '.lowdefy');
+        dotLowdefy = path.resolve(configDirectory, '.lowdefy');
     }
     return {
-        base: baseDirectory,
+        config: configDirectory,
         build: path.join(dotLowdefy, 'server', 'build'),
         dotLowdefy,
-        server: path.join(dotLowdefy, 'server')
+        server: options.serverDirectory ? path.resolve(options.serverDirectory) : path.join(dotLowdefy, 'server'),
+        dev: options.devDirectory ? path.resolve(options.devDirectory) : path.join(dotLowdefy, 'dev')
     };
 }
 export default getDirectories;

package/dist/utils/getLowdefyYaml.js

@@ -15,26 +15,25 @@
 */ import path from 'path';
 import { get, type } from '@lowdefy/helpers';
 import { readFile } from '@lowdefy/node-utils';
-import YAML from 'js-yaml';
-async function getLowdefyYaml({ baseDirectory , command  }) {
-    let lowdefyYaml = await readFile(path.resolve(baseDirectory, 'lowdefy.yaml'));
+import YAML from 'yaml';
+async function getLowdefyYaml({ configDirectory , command  }) {
+    let lowdefyYaml = await readFile(path.join(configDirectory, 'lowdefy.yaml'));
     if (!lowdefyYaml) {
-        lowdefyYaml = await readFile(path.resolve(baseDirectory, 'lowdefy.yml'));
+        lowdefyYaml = await readFile(path.join(configDirectory, 'lowdefy.yml'));
     }
     if (!lowdefyYaml) {
         if (![
             'init'
         ].includes(command)) {
-            throw new Error(`Could not find "lowdefy.yaml" file in specified base directory ${baseDirectory}.`);
+            throw new Error(`Could not find "lowdefy.yaml" file in specified config directory ${configDirectory}.`);
         }
         return {
-            cliConfig: {
-            }
+            cliConfig: {}
         };
     }
     let lowdefy;
     try {
-        lowdefy = YAML.load(lowdefyYaml);
+        lowdefy = YAML.parse(lowdefyYaml);
     } catch (error) {
         throw new Error(`Could not parse "lowdefy.yaml" file. Received error ${error.message}.`);
     }
@@ -44,11 +43,14 @@ async function getLowdefyYaml({ baseDirectory , command  }) {
     if (!type.isString(lowdefy.lowdefy)) {
         throw new Error(`Version number specified in "lowdefy.yaml" file should be a string. Received ${JSON.stringify(lowdefy.lowdefy)}.`);
     }
+    // TODO: Validate plugins
     return {
         lowdefyVersion: lowdefy.lowdefy,
         cliConfig: get(lowdefy, 'cli', {
-            default: {
-            }
+            default: {}
+        }),
+        plugins: get(lowdefy, 'plugins', {
+            default: []
         })
     };
 }

package/dist/utils/getSendTelemetry.js

@@ -20,12 +20,9 @@ async function getTypes({ directories  }) {
 }
 function getSendTelemetry({ appId , cliVersion , command , directories , lowdefyVersion , options  }) {
     if (options.disableTelemetry) {
-        return ()=>{
-        };
+        return ()=>{};
     }
-    async function sendTelemetry({ data ={
-    } , sendTypes =false  } = {
-    }) {
+    async function sendTelemetry({ data ={} , sendTypes =false  } = {}) {
         let types;
         if (sendTypes) {
             types = await getTypes({

package/dist/{commands/build → utils}/getServer.js

@@ -15,28 +15,31 @@
 */ import fs from 'fs';
 import path from 'path';
 import { cleanDirectory, readFile } from '@lowdefy/node-utils';
-import fetchNpmTarball from '../../utils/fetchNpmTarball.js';
-async function getServer({ context  }) {
+import fetchNpmTarball from './fetchNpmTarball.js';
+async function getServer({ context , packageName , directory  }) {
+    if (context.lowdefyVersion === 'local') {
+        context.print.warn(`Running local ${packageName}.`);
+        return;
+    }
     let fetchServer = false;
-    const serverExists = fs.existsSync(path.join(context.directories.server, 'package.json'));
+    const serverExists = fs.existsSync(path.join(directory, 'package.json'));
     if (!serverExists) fetchServer = true;
     if (serverExists) {
-        const serverPackageConfig = JSON.parse(await readFile(path.join(context.directories.server, 'package.json')));
+        const serverPackageConfig = JSON.parse(await readFile(path.join(directory, 'package.json')));
         if (serverPackageConfig.version !== context.lowdefyVersion) {
             fetchServer = true;
-            context.print.warn(`Removing @lowdefy/server with version ${serverPackageConfig.version}`);
-            await cleanDirectory(context.directories.server);
+            context.print.warn(`Removing ${packageName} with version ${serverPackageConfig.version}`);
+            await cleanDirectory(directory);
         }
     }
     if (fetchServer) {
-        context.print.spin('Fetching @lowdefy/server from npm.');
+        context.print.spin(`Fetching ${packageName} from npm.`);
         await fetchNpmTarball({
-            packageName: '@lowdefy/server',
+            packageName,
             version: context.lowdefyVersion,
-            directory: context.directories.server
+            directory: directory
         });
-        context.print.log('Fetched @lowdefy/server from npm.');
-        return;
+        context.print.log(`Fetched ${packageName} from npm.`);
     }
 }
 export default getServer;

package/dist/{commands/build → utils}/installServer.js

@@ -12,7 +12,7 @@
   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 spawnProcess from '../../utils/spawnProcess.js';
+*/ import { spawnProcess } from '@lowdefy/node-utils';
 const args = {
     npm: [
         'install',
@@ -22,15 +22,15 @@ const args = {
         'install'
     ]
 };
-async function installServer({ context  }) {
+async function installServer({ context , directory  }) {
     context.print.spin(`Running ${context.packageManager} install.`);
     try {
         await spawnProcess({
-            context,
+            logger: context.print,
             command: context.packageManager,
             args: args[context.packageManager],
             processOptions: {
-                cwd: context.directories.server
+                cwd: directory
             },
             silent: false
         });

package/dist/utils/runCommand.js

@@ -14,29 +14,28 @@
   limitations under the License.
 */ import errorHandler from './errorHandler.js';
 import startUp from './startUp.js';
-const runCommand = ({ cliVersion  })=>(fn)=>{
-        async function run(options, command) {
-            const context = {
-                cliVersion
-            };
-            try {
-                await startUp({
-                    context,
-                    options,
-                    command
-                });
-                const res = await fn({
-                    context
-                });
-                return res;
-            } catch (error) {
-                await errorHandler({
-                    context,
-                    error
-                });
-            }
+const runCommand = ({ cliVersion , handler  })=>{
+    async function run(options, command) {
+        const context = {
+            cliVersion
+        };
+        try {
+            await startUp({
+                context,
+                options,
+                command
+            });
+            const res = await handler({
+                context
+            });
+            return res;
+        } catch (error) {
+            await errorHandler({
+                context,
+                error
+            });
         }
-        return run;
     }
-;
+    return run;
+};
 export default runCommand;

package/dist/{commands/build → utils}/runLowdefyBuild.js

@@ -12,24 +12,25 @@
   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 spawnProcess from '../../utils/spawnProcess.js';
-async function runLowdefyBuild({ context  }) {
+*/ import { spawnProcess } from '@lowdefy/node-utils';
+async function runLowdefyBuild({ context , directory  }) {
     context.print.log('Running Lowdefy build.');
     try {
         await spawnProcess({
-            context,
+            logger: context.print,
             command: context.packageManager,
             args: [
                 'run',
                 'build:lowdefy'
             ],
             processOptions: {
-                cwd: context.directories.server,
+                cwd: directory,
                 env: {
                     ...process.env,
-                    LOWDEFY_BUILD_DIRECTORY: context.directories.build,
-                    LOWDEFY_CONFIG_DIRECTORY: context.directories.base,
-                    LOWDEFY_SERVER_DIRECTORY: context.directories.server
+                    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
                 }
             },
             silent: false

package/dist/{commands/build → utils}/runNextBuild.js

@@ -12,19 +12,19 @@
   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 spawnProcess from '../../utils/spawnProcess.js';
-async function runNextBuild({ context  }) {
+*/ import { spawnProcess } from '@lowdefy/node-utils';
+async function runNextBuild({ context , directory  }) {
     context.print.log('Running Next build.');
     try {
         await spawnProcess({
-            context,
+            logger: context.print,
             command: context.packageManager,
             args: [
                 'run',
                 'build:next'
             ],
             processOptions: {
-                cwd: context.directories.server
+                cwd: directory
             },
             silent: false
         });

package/dist/utils/startUp.js

@@ -21,16 +21,16 @@ import getLowdefyYaml from './getLowdefyYaml.js';
 import getOptions from './getOptions.js';
 import getPackageManager from './getPackageManager.js';
 import getSendTelemetry from './getSendTelemetry.js';
-import createPrint from './print.js';
-async function startUp({ context , options ={
-} , command  }) {
+import createPrint from './createPrint.js';
+async function startUp({ context , options ={} , command  }) {
     context.command = command.name();
     context.commandLineOptions = options;
     context.print = createPrint();
-    context.baseDirectory = path.resolve(options.baseDirectory || process.cwd());
-    const { cliConfig , lowdefyVersion  } = await getLowdefyYaml(context);
+    context.configDirectory = path.resolve(options.configDirectory || process.cwd());
+    const { cliConfig , lowdefyVersion , plugins  } = await getLowdefyYaml(context);
     context.cliConfig = cliConfig;
     context.lowdefyVersion = lowdefyVersion;
+    context.plugins = plugins;
     const { appId  } = await getCliJson(context);
     context.appId = appId;
     context.options = getOptions(context);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowdefy",
-  "version": "4.0.0-alpha.5",
+  "version": "4.0.0-alpha.8",
   "license": "Apache-2.0",
   "description": "Lowdefy CLI",
   "homepage": "https://lowdefy.com",
@@ -37,32 +37,29 @@
     "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 jest --coverage"
+    "test": "FORCE_COLOR=3 yarn node --experimental-vm-modules $(yarn bin jest)"
   },
   "dependencies": {
-    "@lowdefy/helpers": "4.0.0-alpha.5",
-    "@lowdefy/node-utils": "4.0.0-alpha.5",
-    "axios": "0.24.0",
+    "@lowdefy/helpers": "4.0.0-alpha.8",
+    "@lowdefy/node-utils": "4.0.0-alpha.8",
+    "axios": "0.25.0",
     "chalk": "4.1.2",
-    "chokidar": "3.5.2",
-    "commander": "8.3.0",
+    "commander": "9.0.0",
     "decompress": "4.2.1",
     "decompress-targz": "4.1.1",
-    "dotenv": "10.0.0",
-    "js-yaml": "4.1.0",
-    "opener": "1.5.2",
-    "ora": "6.0.1",
-    "reload": "3.2.0",
-    "uuid": "8.3.2"
+    "ora": "5.4.1",
+    "uuid": "8.3.2",
+    "yaml": "2.0.0-10"
   },
   "devDependencies": {
-    "@swc/cli": "0.1.52",
-    "@swc/core": "1.2.112",
-    "@swc/jest": "0.2.9",
-    "jest": "27.3.1"
+    "@jest/globals": "27.5.1",
+    "@swc/cli": "0.1.55",
+    "@swc/core": "1.2.135",
+    "@swc/jest": "0.2.17",
+    "jest": "27.5.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "995fcdb020927f3cdc626fc99c15a2e4137bd962"
+  "gitHead": "9d56b83cf45e868afe3a1eeba750fe826eb74c8c"
 }

package/dist/commands/dev/buildWatcher.js

@@ -1,48 +0,0 @@
-/*
-  Copyright 2020-2021 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 chokidar from 'chokidar';
-import BatchChanges from '../../utils/BatchChanges.js';
-function buildWatcher({ build , context , reloadFn  }) {
-    const { watch =[] , watchIgnore =[]  } = context.options;
-    const resolvedWatchPaths = watch.map((pathName)=>path.resolve(pathName)
-    );
-    const buildCallback = async ()=>{
-        await build();
-        reloadFn();
-    };
-    const buildBatchChanges = new BatchChanges({
-        fn: buildCallback,
-        context
-    });
-    const configWatcher = chokidar.watch([
-        '.',
-        ...resolvedWatchPaths
-    ], {
-        ignored: [
-            /(^|[/\\])\../,
-            ...watchIgnore, 
-        ],
-        persistent: true,
-        ignoreInitial: true
-    });
-    configWatcher.on('add', ()=>buildBatchChanges.newChange()
-    );
-    configWatcher.on('change', ()=>buildBatchChanges.newChange()
-    );
-    configWatcher.on('unlink', ()=>buildBatchChanges.newChange()
-    );
-}
-export default buildWatcher;

package/dist/commands/dev/envWatcher.js

@@ -1,32 +0,0 @@
-/*
-  Copyright 2020-2021 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 chokidar from 'chokidar';
-import BatchChanges from '../../utils/BatchChanges.js';
-function envWatcher({ context  }) {
-    const changeEnvCallback = async ()=>{
-        context.print.warn('.env file changed. You should restart your development server.');
-        process.exit();
-    };
-    const changeEnvBatchChanges = new BatchChanges({
-        fn: changeEnvCallback,
-        context
-    });
-    const envFileWatcher = chokidar.watch('./.env', {
-        persistent: true
-    });
-    envFileWatcher.on('change', ()=>changeEnvBatchChanges.newChange()
-    );
-}
-export default envWatcher;

package/dist/commands/dev/getBuild.js

@@ -1,37 +0,0 @@
-/*
-  Copyright 2020-2021 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 getFederatedModule from '../../utils/getFederatedModule';
-async function getBuild({ context  }) {
-    const { default: buildScript  } = await getFederatedModule({
-        module: 'build',
-        packageName: '@lowdefy/build',
-        version: context.lowdefyVersion,
-        context
-    });
-    async function build() {
-        context.print.log('Building configuration.');
-        await buildScript({
-            blocksServerUrl: context.options.blocksServerUrl,
-            buildDirectory: context.buildDirectory,
-            cacheDirectory: context.cacheDirectory,
-            configDirectory: context.baseDirectory,
-            logger: context.print,
-            refResolver: context.options.refResolver
-        });
-        context.print.succeed('Built successfully.');
-    }
-    return build;
-}
-export default getBuild;

package/dist/commands/dev/getExpress.js

@@ -1,71 +0,0 @@
-/*
-  Copyright 2020-2021 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 express from 'express';
-import reload from 'reload';
-import { get } from '@lowdefy/helpers';
-import { readFile } from '@lowdefy/node-utils';
-import findOpenPort from '../../utils/findOpenPort';
-async function getExpress({ context , gqlServer  }) {
-    const serveIndex = async (req, res)=>{
-        let indexHtml = await readFile(path.resolve(__dirname, 'shell/index.html'));
-        let appConfig = await readFile(path.resolve(context.buildDirectory, 'app.json'));
-        appConfig = JSON.parse(appConfig);
-        indexHtml = indexHtml.replace('<!-- __LOWDEFY_APP_HEAD_HTML__ -->', get(appConfig, 'html.appendHead', {
-            default: ''
-        }));
-        indexHtml = indexHtml.replace('<!-- __LOWDEFY_APP_BODY_HTML__ -->', get(appConfig, 'html.appendBody', {
-            default: ''
-        }));
-        res.send(indexHtml);
-    };
-    const app = express();
-    // port is initialized to 3000 in prepare function
-    app.set('port', parseInt(context.options.port));
-    gqlServer.applyMiddleware({
-        app,
-        path: '/api/graphql'
-    });
-    const reloadPort = await findOpenPort();
-    const reloadReturned = await reload(app, {
-        route: '/api/dev/reload.js',
-        port: reloadPort
-    });
-    // serve index.html with appended html
-    // else static server serves without appended html
-    app.get('/', serveIndex);
-    // serve public files
-    app.use('/public', express.static(path.resolve(process.cwd(), 'public')));
-    // serve webpack files
-    app.use(express.static(path.resolve(__dirname, 'shell')));
-    // Serve rendererRemoteEntryUrl for renderer module federation
-    app.use('/api/dev/rendererRemoteEntryUrl', (req, res)=>{
-        let rendererRemoteEntryUrl;
-        if (context.options.blocksServerUrl) {
-            rendererRemoteEntryUrl = `${context.options.blocksServerUrl}/renderer/remoteEntry.js`;
-        } else {
-            rendererRemoteEntryUrl = `https://blocks-cdn.lowdefy.com/v${context.lowdefyVersion}/renderer/remoteEntry.js`;
-        }
-        res.json(rendererRemoteEntryUrl);
-    });
-    // Redirect all 404 to index.html with status 200
-    // This should always be the last route
-    app.use(serveIndex);
-    return {
-        expressApp: app,
-        reloadFn: reloadReturned.reload
-    };
-}
-export default getExpress;

package/dist/commands/dev/getGraphQL.js

@@ -1,39 +0,0 @@
-/*
-  Copyright 2020-2021 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 { createGetSecretsFromEnv } from '@lowdefy/node-utils';
-import { ApolloServer } from 'apollo-server-express';
-import getFederatedModule from '../../utils/getFederatedModule';
-async function getGraphQl({ context  }) {
-    const { typeDefs , resolvers , createContext: createGqlContext ,  } = await getFederatedModule({
-        module: 'graphql',
-        packageName: '@lowdefy/graphql-federated',
-        version: context.lowdefyVersion,
-        context
-    });
-    const config = {
-        CONFIGURATION_BASE_PATH: context.buildDirectory,
-        development: true,
-        logger: console,
-        getSecrets: createGetSecretsFromEnv()
-    };
-    const gqlContext = createGqlContext(config);
-    const server = new ApolloServer({
-        typeDefs,
-        resolvers,
-        context: gqlContext
-    });
-    return server;
-}
-export default getGraphQl;

package/dist/commands/dev/versionWatcher.js

@@ -1,36 +0,0 @@
-/*
-  Copyright 2020-2021 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 chokidar from 'chokidar';
-import BatchChanges from '../../utils/BatchChanges';
-import getLowdefyYaml from '../../utils/getLowdefyYaml';
-function versionWatcher({ context  }) {
-    const changeLowdefyFileCallback = async ()=>{
-        const { lowdefyVersion  } = await getLowdefyYaml(context);
-        if (lowdefyVersion !== context.lowdefyVersion) {
-            context.print.warn('Lowdefy version changed. You should restart your development server.');
-            process.exit();
-        }
-    };
-    const changeLowdefyFileBatchChanges = new BatchChanges({
-        fn: changeLowdefyFileCallback,
-        context
-    });
-    const lowdefyFileWatcher = chokidar.watch('./lowdefy.yaml', {
-        persistent: true
-    });
-    lowdefyFileWatcher.on('change', ()=>changeLowdefyFileBatchChanges.newChange()
-    );
-}
-export default versionWatcher;

package/dist/utils/spawnProcess.js

@@ -1,48 +0,0 @@
-/*
-  Copyright 2020-2021 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 { spawn } from 'child_process';
-async function spawnProcess({ context , command , args , processOptions , silent  }) {
-    return new Promise((resolve, reject)=>{
-        const process = spawn(command, args, processOptions);
-        process.stdout.on('data', (data)=>{
-            if (!silent) {
-                data.toString('utf8').split('\n').forEach((line)=>{
-                    if (line) {
-                        context.print.log(line);
-                    }
-                });
-            }
-        });
-        process.stderr.on('data', (data)=>{
-            if (!silent) {
-                data.toString('utf8').split('\n').forEach((line)=>{
-                    if (line) {
-                        context.print.warn(line);
-                    }
-                });
-            }
-        });
-        process.on('error', (error)=>{
-            reject(error);
-        });
-        process.on('exit', (code)=>{
-            if (code !== 0) {
-                reject(new Error(`${command} exited with code ${code}`));
-            }
-            resolve();
-        });
-    });
-}
-export default spawnProcess;