fix: Remove output directory cli option

lowdefy · Jun 18, 2022 · ba281a6 · ba281a6
1 parent d091a6c
commit ba281a6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 48 deletions.
diff --git a/package.json b/package.json
@@ -39,23 +39,23 @@
     "start": "yarn start:server:app",
     "test:ci": "yarn test --ignore='@lowdefy/format' --ignore='@lowdefy/blocks-*' --ignore='@lowdefy/plugin-aws'",
     "test": "lerna run test",
-    "app:cli:build": "yarn build:turbo && yarn workspace lowdefy start build --config-directory ../../app --server-directory ../server --output-directory ../",
+    "app:cli:build": "yarn build:turbo && yarn workspace lowdefy start build --config-directory ../../app --server-directory ../server",
     "app:cli:dev": "yarn build:turbo && yarn workspace lowdefy start dev --config-directory ../../app --dev-directory ../server-dev",
-    "app:cli:start": "yarn build:turbo && yarn workspace lowdefy start start --config-directory ../../app --server-directory ../server --output-directory ../",
-    "app:server-dev:next-dev": "yarn workspace lowdefy start build --config-directory ../../app --server-directory ../server-dev --output-directory ../ && yarn workspace @lowdefy/server-dev next dev",
+    "app:cli:start": "yarn build:turbo && yarn workspace lowdefy start start --config-directory ../../app --server-directory ../server",
+    "app:server-dev:next-dev": "yarn workspace lowdefy start build --config-directory ../../app --server-directory ../server-dev && yarn workspace @lowdefy/server-dev next dev",
     "app:server-dev": "yarn workspace @lowdefy/server-dev start --package-manager yarn --config-directory ../../app",
     "app:server:next-dev": "yarn app:start:cli:build && yarn && yarn workspace @lowdefy/server dev",
     "app:server": "yarn workspace @lowdefy/server build:lowdefy --config-directory ../../app && yarn && yarn workspace @lowdefy/server build:next && yarn workspace @lowdefy/server start",
-    "docs:cli:build": "yarn build:turbo && yarn workspace lowdefy start build --config-directory ../docs --server-directory ../server --output-directory ../",
+    "docs:cli:build": "yarn build:turbo && yarn workspace lowdefy start build --config-directory ../docs --server-directory ../server",
     "docs:cli:dev": "yarn build:turbo && yarn workspace lowdefy start dev --config-directory ../docs --dev-directory ../server-dev",
-    "docs:cli:start": "yarn build:turbo && yarn workspace lowdefy start start --config-directory ../docs --server-directory ../server --output-directory ../",
+    "docs:cli:start": "yarn build:turbo && yarn workspace lowdefy start start --config-directory ../docs --server-directory ../server",
     "docs:server-dev": "yarn workspace @lowdefy/server-dev start --package-manager yarn --config-directory ../docs",
     "docs:server:next-dev": "yarn docs:start:cli:build && yarn && yarn workspace @lowdefy/server dev",
     "docs:server": "yarn workspace @lowdefy/server build:lowdefy --config-directory ../docs && yarn && yarn workspace @lowdefy/server build:next && yarn workspace @lowdefy/server start",
-    "env:cli:build": "yarn build:turbo && yarn workspace lowdefy start build --server-directory ../server --output-directory ../",
+    "env:cli:build": "yarn build:turbo && yarn workspace lowdefy start build --server-directory ../server",
     "env:cli:dev": "yarn build:turbo && yarn workspace lowdefy start dev --dev-directory ../server-dev",
-    "env:cli:start": "yarn build:turbo && yarn workspace lowdefy start start --server-directory ../server --output-directory ../",
-    "env:server-dev:next-dev": "yarn workspace lowdefy start build --server-directory ../server-dev --output-directory ../ && yarn workspace @lowdefy/server-dev next dev",
+    "env:cli:start": "yarn build:turbo && yarn workspace lowdefy start start --server-directory ../server",
+    "env:server-dev:next-dev": "yarn workspace lowdefy start build --server-directory ../server-dev && yarn workspace @lowdefy/server-dev next dev",
     "env:server-dev": "yarn workspace @lowdefy/server-dev start --package-manager yarn",
     "env:server:next-dev": "yarn outa:start:cli:build && yarn && yarn workspace @lowdefy/server dev",
     "env:server": "yarn workspace @lowdefy/server build:lowdefy && yarn && yarn workspace @lowdefy/server build:next && yarn workspace @lowdefy/server start"

diff --git a/packages/cli/src/commands/start/runStart.js b/packages/cli/src/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,
       },
     },

diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js
@@ -42,10 +42,6 @@ program
     '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".'
@@ -108,10 +104,6 @@ program
     '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".'

diff --git a/packages/cli/src/utils/getDirectories.js b/packages/cli/src/utils/getDirectories.js
@@ -17,16 +17,11 @@
 import path from 'path';
 
 function getDirectories({ configDirectory, options }) {
-  let dotLowdefy;
-  if (options.outputDirectory) {
-    dotLowdefy = path.resolve(options.outputDirectory);
-  } else {
-    dotLowdefy = path.resolve(configDirectory, '.lowdefy');
-  }
+  // TODO: Should the ".lowdefy" directory be configurable
+  const dotLowdefy = path.resolve(configDirectory, '.lowdefy');
+
   return {
     config: configDirectory,
-    build: path.join(dotLowdefy, 'server', 'build'),
-    dotLowdefy,
     server: options.serverDirectory
       ? path.resolve(options.serverDirectory)
       : path.join(dotLowdefy, 'server'),

diff --git a/packages/cli/src/utils/getDirectories.test.js b/packages/cli/src/utils/getDirectories.test.js
@@ -23,31 +23,12 @@ test('default directories', () => {
   });
 
   expect(directories).toEqual({
-    build: '/test/config/.lowdefy/server/build',
     config: '/test/config',
     dev: '/test/config/.lowdefy/dev',
-    dotLowdefy: '/test/config/.lowdefy',
     server: '/test/config/.lowdefy/server',
   });
 });
 
-test('specify outputDirectory in options', () => {
-  const directories = getDirectories({
-    configDirectory: '/test/config',
-    options: {
-      outputDirectory: '/test/out',
-    },
-  });
-
-  expect(directories).toEqual({
-    build: '/test/out/server/build',
-    config: '/test/config',
-    dev: '/test/out/dev',
-    dotLowdefy: '/test/out',
-    server: '/test/out/server',
-  });
-});
-
 test('specify serverDirectory in options', () => {
   const directories = getDirectories({
     configDirectory: '/test/config',
@@ -57,10 +38,8 @@ test('specify serverDirectory in options', () => {
   });
 
   expect(directories).toEqual({
-    build: '/test/config/.lowdefy/server/build',
     config: '/test/config',
     dev: '/test/config/.lowdefy/dev',
-    dotLowdefy: '/test/config/.lowdefy',
     server: '/test/server',
   });
 });
@@ -74,10 +53,8 @@ test('specify devDirectory in options', () => {
   });
 
   expect(directories).toEqual({
-    build: '/test/config/.lowdefy/server/build',
     config: '/test/config',
     dev: '/test/dev',
-    dotLowdefy: '/test/config/.lowdefy',
     server: '/test/config/.lowdefy/server',
   });
 });