fix: Configure server lowdefy build with commandline args instead of …

…env from CLI
lowdefy · Jun 19, 2022 · 648f050 · 648f050
1 parent 9b565f4
commit 648f050
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/packages/cli/src/utils/getDirectories.js b/packages/cli/src/utils/getDirectories.js
@@ -21,6 +21,8 @@ function getDirectories({ configDirectory, options }) {
   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(server, 'build'),

diff --git a/packages/cli/src/utils/runLowdefyBuild.js b/packages/cli/src/utils/runLowdefyBuild.js
@@ -22,16 +22,17 @@ async function runLowdefyBuild({ context, directory }) {
     await spawnProcess({
       logger: context.print,
       command: context.packageManagerCmd,
-      args: ['run', 'build:lowdefy'],
+      args: [
+        'run',
+        '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,
     });

diff --git a/packages/server/lowdefy/build.mjs b/packages/server/lowdefy/build.mjs
@@ -25,18 +25,15 @@ import createCustomPluginTypesMap from './createCustomPluginTypesMap.mjs';
 const argv = yargs(hideBin(process.argv)).argv;
 
 async function run() {
+  const serverDirectory = path.resolve(
+    argv.serverDirectory || process.env.LOWDEFY_DIRECTORY_SERVER || process.cwd()
+  );
   const directories = {
-    build: path.resolve(
-      argv.buildDirectory ||
-        process.env.LOWDEFY_DIRECTORY_BUILD ||
-        path.join(process.cwd(), 'build')
-    ),
+    build: path.join(serverDirectory, 'build'),
     config: path.resolve(
       argv.configDirectory || process.env.LOWDEFY_DIRECTORY_CONFIG || process.cwd()
     ),
-    server: path.resolve(
-      argv.serverDirectory || process.env.LOWDEFY_DIRECTORY_SERVER || process.cwd()
-    ),
+    server: serverDirectory,
   };
 
   const customTypesMap = await createCustomPluginTypesMap({ directories });