lowdefy 4.0.0-alpha.12 → 4.0.0-alpha.15

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

@@ -28,6 +28,7 @@ async function runDevServer({ context , directory  }) {
                 LOWDEFY_BUILD_REF_RESOLVER: context.options.refResolver,
                 LOWDEFY_DIRECTORY_CONFIG: context.directories.config,
                 LOWDEFY_PACKAGE_MANAGER: context.packageManager,
+                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

@@ -26,7 +26,6 @@ async function runStart({ context , directory  }) {
             cwd: directory,
             env: {
                 ...process.env,
-                LOWDEFY_DIRECTORY_CONFIG: context.directories.config,
                 PORT: context.options.port
             }
         },

package/dist/commands/start/start.js

@@ -13,12 +13,14 @@
   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
     });
+    readDotEnv(context);
     await runStart({
         context,
         directory: context.directories.server

package/dist/index.js

@@ -13,23 +13,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 { fileURLToPath } from 'url';
-import { readFile } from '@lowdefy/node-utils';
+*/ import { createRequire } from 'module';
 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(fileURLToPath(new URL('../package.json', import.meta.url))));
+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');
-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({
+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('--no-next-build', 'Do not build the Next.js server.').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({
+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('--no-open', 'Do not open a new tab in the default browser.').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
 }));
@@ -37,7 +37,7 @@ program.command('init').description('Initialize a Lowdefy project.').usage(`[opt
     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({
+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('--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
 }));

package/dist/utils/createPrint.js

@@ -24,24 +24,18 @@ function getTime() {
 function createOraPrint() {
     const spinner = ora({
         spinner: 'random',
-        prefixText: ()=>chalk.dim(getTime())
-        ,
+        prefixText: ()=>chalk.dim(getTime()),
         color: 'blue'
     });
     return {
         type: 'ora',
-        error: (text)=>spinner.fail(chalk.red(text))
-        ,
-        info: (text)=>spinner.info(chalk.blue(text))
-        ,
+        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))
-        ,
+            }),
+        spin: (text)=>spinner.start(text),
+        succeed: (text)=>spinner.succeed(chalk.green(text)),
         warn: (text)=>spinner.warn(chalk.yellow(text))
     };
 }
@@ -62,7 +56,7 @@ let print;
 function createPrint() {
     // TODO: Add debug
     if (print) return print;
-    if (process.env.CI === 'true') {
+    if (process.env.CI === 'true' || process.env.CI === '1') {
         print = createBasicPrint();
         return print;
     }

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/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

@@ -21,17 +21,15 @@ async function runLowdefyBuild({ context , directory  }) {
             command: context.packageManagerCmd,
             args: [
                 'run',
-                'build:lowdefy'
+                'build:lowdefy',
+                '--ref-resolver',
+                context.options.refResolver,
+                '--config-directory',
+                context.directories.config, 
             ],
             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
-                }
+                env: process.env
             },
             silent: false
         });

package/dist/utils/startUp.js

@@ -26,7 +26,7 @@ async function startUp({ context , options ={} , command  }) {
     context.command = command.name();
     context.commandLineOptions = options;
     context.print = createPrint();
-    context.configDirectory = path.resolve(options.configDirectory || process.cwd());
+    context.configDirectory = path.resolve(options.configDirectory || process.env.LOWDEFY_DIRECTORY_CONFIG || process.cwd());
     const { cliConfig , lowdefyVersion , plugins  } = await getLowdefyYaml(context);
     context.cliConfig = cliConfig;
     context.lowdefyVersion = lowdefyVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowdefy",
-  "version": "4.0.0-alpha.12",
+  "version": "4.0.0-alpha.15",
   "license": "Apache-2.0",
   "description": "Lowdefy CLI",
   "homepage": "https://lowdefy.com",
@@ -40,26 +40,27 @@
     "test": "FORCE_COLOR=3 yarn node --experimental-vm-modules $(yarn bin jest)"
   },
   "dependencies": {
-    "@lowdefy/helpers": "4.0.0-alpha.12",
-    "@lowdefy/node-utils": "4.0.0-alpha.12",
-    "axios": "0.25.0",
+    "@lowdefy/helpers": "4.0.0-alpha.15",
+    "@lowdefy/node-utils": "4.0.0-alpha.15",
+    "axios": "0.27.2",
     "chalk": "4.1.2",
     "commander": "9.0.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": "41b6138a81bee7da362dad06345bc9f87b2c2133"
+  "gitHead": "b4e4538475e997f95baa37f01f39689240e6f01c"
 }