fix(cli): Fix netlify build.

Use fs-extra to copy files.
npm install to project root dir.

.pnp.js

@@ -4367,6 +4367,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["decompress-targz", "npm:4.1.1"],
             ["dotenv", "npm:8.2.0"],
             ["express", "npm:4.17.1"],
+            ["fs-extra", "npm:9.1.0"],
             ["graphql", "npm:15.5.0"],
             ["html-webpack-plugin", "virtual:1e43113c7dc84a5d03308bf7ffaf00574d351ca16282af6c6c0b9576804fb03914bdf2200961292f439926b2e537dce172d7529f79013ce51b9f2d56e9cd836b#npm:4.5.1"],
             ["inquirer", "npm:7.3.3"],
@@ -8368,6 +8369,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD",
         }]
       ]],
+      ["at-least-node", [
+        ["npm:1.0.0", {
+          "packageLocation": "./.yarn/cache/at-least-node-npm-1.0.0-2b36e661fa-8f33efc162.zip/node_modules/at-least-node/",
+          "packageDependencies": [
+            ["at-least-node", "npm:1.0.0"]
+          ],
+          "linkType": "HARD",
+        }]
+      ]],
       ["atob", [
         ["npm:2.1.2", {
           "packageLocation": "./.yarn/cache/atob-npm-2.1.2-bcb583261e-597c0d1a74.zip/node_modules/atob/",
@@ -13942,6 +13952,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["universalify", "npm:0.1.2"]
           ],
           "linkType": "HARD",
+        }],
+        ["npm:9.1.0", {
+          "packageLocation": "./.yarn/cache/fs-extra-npm-9.1.0-983c2ddb4c-e667d8df54.zip/node_modules/fs-extra/",
+          "packageDependencies": [
+            ["fs-extra", "npm:9.1.0"],
+            ["at-least-node", "npm:1.0.0"],
+            ["graceful-fs", "npm:4.2.4"],
+            ["jsonfile", "npm:6.1.0"],
+            ["universalify", "npm:2.0.0"]
+          ],
+          "linkType": "HARD",
         }]
       ]],
       ["fs-minipass", [
@@ -17416,6 +17437,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["graceful-fs", "npm:4.2.4"]
           ],
           "linkType": "HARD",
+        }],
+        ["npm:6.1.0", {
+          "packageLocation": "./.yarn/cache/jsonfile-npm-6.1.0-20a4796cee-9419c886ab.zip/node_modules/jsonfile/",
+          "packageDependencies": [
+            ["jsonfile", "npm:6.1.0"],
+            ["graceful-fs", "npm:4.2.4"],
+            ["universalify", "npm:2.0.0"]
+          ],
+          "linkType": "HARD",
         }]
       ]],
       ["jsonparse", [
@@ -26411,6 +26441,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["universalify", "npm:0.1.2"]
           ],
           "linkType": "HARD",
+        }],
+        ["npm:2.0.0", {
+          "packageLocation": "./.yarn/cache/universalify-npm-2.0.0-03b8b418a8-36bfbdc97b.zip/node_modules/universalify/",
+          "packageDependencies": [
+            ["universalify", "npm:2.0.0"]
+          ],
+          "linkType": "HARD",
         }]
       ]],
       ["unpipe", [

packages/cli/package.json

@@ -54,6 +54,7 @@
     "decompress-targz": "4.1.1",
     "dotenv": "8.2.0",
     "express": "4.17.1",
+    "fs-extra": "9.1.0",
     "graphql": "15.5.0",
     "inquirer": "7.3.3",
     "js-yaml": "4.0.0",

packages/cli/src/commands/build/build.js

@@ -15,7 +15,7 @@
 */
 
 import path from 'path';
-import { cleanDirectory } from '@lowdefy/node-utils';
+import fse from 'fs-extra';
 import startUp from '../../utils/startUp';
 import getFederatedModule from '../../utils/getFederatedModule';
 
@@ -30,7 +30,7 @@ async function build(options) {
   context.print.log(
     `Cleaning block meta cache at "${path.resolve(context.cacheDirectory, './meta')}".`
   );
-  await cleanDirectory(path.resolve(context.cacheDirectory, './meta'));
+  await fse.emptyDir(path.resolve(context.cacheDirectory, './meta'));
   context.print.info('Starting build.');
   await buildScript({
     logger: context.print,

packages/cli/src/commands/buildNetlify/buildNetlify.js

@@ -16,22 +16,14 @@
 
 import path from 'path';
 import { spawnSync } from 'child_process';
-import { cleanDirectory } from '@lowdefy/node-utils';
+import fse from 'fs-extra';
 
 import checkChildProcessError from '../../utils/checkChildProcessError';
 import startUp from '../../utils/startUp';
 import getFederatedModule from '../../utils/getFederatedModule';
 import fetchNpmTarball from '../../utils/fetchNpmTarball';
 
-async function buildNetlify(options) {
-  if (process.env.NETLIFY === 'true') {
-    options.basicPrint = true;
-  }
-
-  const context = await startUp(options);
-  const netlifyDir = path.resolve(context.baseDirectory, './.lowdefy/netlify');
-  context.print.info('Starting Netlify build.');
-
+async function fetchNetlifyServer({ context, netlifyDir }) {
   context.print.spin('Fetching Lowdefy Netlify server.');
   await fetchNpmTarball({
     packageName: '@lowdefy/server-netlify',
@@ -39,20 +31,26 @@ async function buildNetlify(options) {
     directory: netlifyDir,
   });
   context.print.log('Fetched Lowdefy Netlify server.');
+}
+
+async function npmInstall({ context, netlifyDir }) {
+  await fse.copy(path.resolve(netlifyDir, 'package/package.json'), path.resolve('./package.json'));
+  await fse.remove(path.resolve('./package-lock.json'));
+  await fse.remove(path.resolve('./package-lock.json'));
+  await fse.emptyDir(path.resolve('./node_modules'));
 
   context.print.spin('npm install production.');
-  let proccessOutput = spawnSync('npm', ['install', '--production', '--legacy-peer-deps'], {
-    cwd: path.resolve(netlifyDir, 'package'),
-  });
+  let processOutput = spawnSync('npm', ['install', '--production', '--legacy-peer-deps']);
   checkChildProcessError({
     context,
-    proccessOutput,
+    processOutput: processOutput,
     message: 'Failed to npm install Netlify server.',
   });
-
   context.print.log('npm install successful.');
-  context.print.log(proccessOutput.stdout.toString('utf8'));
+  context.print.log(processOutput.stdout.toString('utf8'));
+}
 
+async function fetchBuildScript({ context }) {
   context.print.spin('Fetching Lowdefy build script.');
   const { default: buildScript } = await getFederatedModule({
     module: 'build',
@@ -61,7 +59,10 @@ async function buildNetlify(options) {
     context,
   });
   context.print.log('Fetched Lowdefy build script.');
+  return buildScript;
+}
 
+async function build({ context, buildScript, netlifyDir }) {
   context.print.spin('Starting Lowdefy build.');
   const outputDirectory = path.resolve(netlifyDir, './package/dist/functions/graphql/build');
   await buildScript({
@@ -71,67 +72,51 @@ async function buildNetlify(options) {
     outputDirectory,
   });
   context.print.log(`Build artifacts saved at ${outputDirectory}.`);
+}
 
-  // TODO: Move files using node fs api instead of child process
-  context.print.log(`Moving output artifacts.`);
-  proccessOutput = spawnSync('cp', [
-    '-r',
+async function moveBuildArtifacts({ context, netlifyDir }) {
+  await fse.copy(
     path.resolve(netlifyDir, 'package/dist/shell'),
-    path.resolve('./.lowdefy/publish'),
-  ]);
-  checkChildProcessError({
-    context,
-    proccessOutput,
-    message: 'Failed to move publish artifacts.',
-  });
+    path.resolve('./.lowdefy/publish')
+  );
   context.print.log(`Netlify publish artifacts moved to "./lowdefy/publish".`);
+}
 
-  proccessOutput = spawnSync('cp', [
-    '-r',
+async function moveFunctions({ context, netlifyDir }) {
+  await fse.copy(
     path.resolve(netlifyDir, 'package/dist/functions'),
-    path.resolve('./.lowdefy/functions'),
-  ]);
-  checkChildProcessError({
-    context,
-    proccessOutput,
-    message: 'Failed to move functions artifacts.',
-  });
+    path.resolve('./.lowdefy/functions')
+  );
   context.print.log(`Netlify functions artifacts moved to "./lowdefy/functions".`);
+}
 
-  context.print.log(`Cleaning "./node_modules".`);
-  cleanDirectory('./node_modules');
-
-  context.print.log(`Moving Lowdefy server node_modules.`);
-  proccessOutput = spawnSync('cp', [
-    '-r',
-    path.resolve(netlifyDir, 'package/node_modules'),
-    path.resolve('./node_modules'),
-  ]);
-  checkChildProcessError({
-    context,
-    proccessOutput,
-    message: 'Failed to move node_modules.',
-  });
-
+async function movePublicAssets({ context }) {
   context.print.log(`Moving public assets.`);
-  // Make dir if it does not exist since cp will error
-  proccessOutput = spawnSync('mkdir', ['-p', path.resolve('./public')]);
-  checkChildProcessError({
-    context,
-    proccessOutput,
-    message: 'Failed to move public assets.',
-  });
-  proccessOutput = spawnSync('cp', [
-    '-r',
-    path.resolve('./public'),
-    path.resolve('./.lowdefy/publish/public'),
-  ]);
-  checkChildProcessError({
-    context,
-    proccessOutput,
-    message: 'Failed to move public assets.',
-  });
+  await fse.ensureDir(path.resolve('./public'));
+  await fse.copy(path.resolve('./public'), path.resolve('./.lowdefy/publish/public'));
   context.print.log(`Public assets moved to "./lowdefy/publish/public".`);
+}
+
+async function buildNetlify(options) {
+  if (process.env.NETLIFY === 'true') {
+    options.basicPrint = true;
+  }
+  const context = await startUp(options);
+  const netlifyDir = path.resolve(context.baseDirectory, './.lowdefy/netlify');
+
+  context.print.info('Starting build.');
+  const buildScript = await fetchBuildScript({ context });
+  await build({ context, buildScript, netlifyDir });
+
+  context.print.info('Installing Lowdefy server.');
+  await fetchNetlifyServer({ context, netlifyDir });
+  await npmInstall({ context, netlifyDir });
+
+  context.print.log(`Moving artifacts.`);
+  await moveBuildArtifacts({ context, netlifyDir });
+  await moveFunctions({ context, netlifyDir });
+  await movePublicAssets({ context });
+
   await context.sendTelemetry({
     data: {
       command: 'build-netlify',

packages/cli/src/commands/cleanCache/cleanCache.js

@@ -14,13 +14,13 @@
   limitations under the License.
 */
 
-import { cleanDirectory } from '@lowdefy/node-utils';
+import fse from 'fs-extra';
 import startUp from '../../utils/startUp';
 
 async function cleanCache(options) {
   const context = await startUp(options);
   context.print.log(`Cleaning cache at "${context.cacheDirectory}".`);
-  await cleanDirectory(context.cacheDirectory);
+  await fse.emptyDir(context.cacheDirectory);
   await context.sendTelemetry({
     data: {
       command: 'clean-cache',

packages/cli/src/commands/cleanCache/cleanCache.test.js

@@ -14,30 +14,31 @@
   limitations under the License.
 */
 import path from 'path';
-import { cleanDirectory } from '@lowdefy/node-utils';
+import fse from 'fs-extra';
+
 import cleanCache from './cleanCache';
 // eslint-disable-next-line no-unused-vars
 import startUp from '../../utils/startUp';
 
-jest.mock('@lowdefy/node-utils', () => {
-  const cleanDirectory = jest.fn();
-  return { cleanDirectory };
+jest.mock('fs-extra', () => {
+  const emptyDir = jest.fn();
+  return { emptyDir };
 });
 
 jest.mock('../../utils/startUp');
 
 beforeEach(() => {
-  cleanDirectory.mockReset();
+  fse.emptyDir.mockReset();
 });
 
 test('cleanCache', async () => {
   await cleanCache({});
   const cachePath = path.resolve(process.cwd(), './.lowdefy/.cache');
-  expect(cleanDirectory.mock.calls).toEqual([[cachePath]]);
+  expect(fse.emptyDir.mock.calls).toEqual([[cachePath]]);
 });
 
 test('cleanCache baseDir', async () => {
   await cleanCache({ baseDirectory: 'baseDir' });
   const cachePath = path.resolve(process.cwd(), 'baseDir/.lowdefy/.cache');
-  expect(cleanDirectory.mock.calls).toEqual([[cachePath]]);
+  expect(fse.emptyDir.mock.calls).toEqual([[cachePath]]);
 });

packages/cli/src/commands/dev/prepare.js

@@ -15,7 +15,7 @@
 */
 import path from 'path';
 import dotenv from 'dotenv';
-import { cleanDirectory } from '@lowdefy/node-utils';
+import fse from 'fs-extra';
 
 import startUp from '../../utils/startUp';
 
@@ -27,7 +27,7 @@ async function prepare(options) {
   context.print.log(
     `Cleaning block meta cache at "${path.resolve(context.cacheDirectory, './meta')}".`
   );
-  await cleanDirectory(path.resolve(context.cacheDirectory, './meta'));
+  await fse.emptyDir(path.resolve(context.cacheDirectory, './meta'));
   return context;
 }
 

packages/cli/src/utils/checkChildProcessError.js

@@ -14,9 +14,9 @@
   limitations under the License.
 */
 
-function checkChildProcessError({ context, proccessOutput, message }) {
-  if (proccessOutput.status === 1) {
-    context.print.error(proccessOutput.stderr.toString('utf8'));
+function checkChildProcessError({ context, processOutput, message }) {
+  if (processOutput.status === 1) {
+    context.print.error(processOutput.stderr.toString('utf8'));
     throw new Error(message);
   }
 }

packages/cli/src/utils/checkChildProcessError.test.js

@@ -24,18 +24,18 @@ const context = {
 };
 
 test('output status 0', () => {
-  checkChildProcessError({ context, proccessOutput: { status: 0 }, message: 'Test Error Message' });
+  checkChildProcessError({ context, processOutput: { status: 0 }, message: 'Test Error Message' });
   // checkChildProcessError should not throw, expect is so that test passes
   expect(true).toBe(true);
 });
 
 test('output status 1', () => {
-  const proccessOutput = {
+  const processOutput = {
     status: 1,
     stderr: Buffer.from('Process error message'),
   };
   expect(() =>
-    checkChildProcessError({ context, proccessOutput, message: 'Test Error Message' })
+    checkChildProcessError({ context, processOutput, message: 'Test Error Message' })
   ).toThrow('Test Error Message');
   expect(mockError.mock.calls).toMatchInlineSnapshot(
     [['Process error message']],

packages/cli/webpack.config.js

@@ -43,7 +43,7 @@ module.exports = [
       ],
     },
     plugins: [
-      new CleanWebpackPlugin(),
+      // new CleanWebpackPlugin(),
       new webpack.BannerPlugin({ banner: '#!/usr/bin/env node', raw: true }),
       new ModuleFederationPlugin({
         name: 'cli',

yarn.lock

@@ -2951,6 +2951,7 @@ __metadata:
     decompress-targz: 4.1.1
     dotenv: 8.2.0
     express: 4.17.1
+    fs-extra: 9.1.0
     graphql: 15.5.0
     html-webpack-plugin: 4.5.1
     inquirer: 7.3.3
@@ -5741,6 +5742,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"at-least-node@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "at-least-node@npm:1.0.0"
+  checksum: 8f33efc16287ed39766065c718a2d36a469f702c66c6eb41fa460c0c62bca395301a6a02946e315ae4a84c9cc7f44c94ec73a556bc2a1049350da98d0b013afe
+  languageName: node
+  linkType: hard
+
 "atob-lite@npm:^2.0.0":
   version: 2.0.0
   resolution: "atob-lite@npm:2.0.0"
@@ -9803,6 +9811,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fs-extra@npm:9.1.0":
+  version: 9.1.0
+  resolution: "fs-extra@npm:9.1.0"
+  dependencies:
+    at-least-node: ^1.0.0
+    graceful-fs: ^4.2.0
+    jsonfile: ^6.0.1
+    universalify: ^2.0.0
+  checksum: e667d8df54113b527bf5830dd9db8f142618db488894b329fe07724c7020dfacf8a372b144a74e683ae44e66f56117adca9cac165950dda7d83537c46c10dc4b
+  languageName: node
+  linkType: hard
+
 "fs-extra@npm:^8.1.0":
   version: 8.1.0
   resolution: "fs-extra@npm:8.1.0"
@@ -12712,6 +12732,19 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"jsonfile@npm:^6.0.1":
+  version: 6.1.0
+  resolution: "jsonfile@npm:6.1.0"
+  dependencies:
+    graceful-fs: ^4.1.6
+    universalify: ^2.0.0
+  dependenciesMeta:
+    graceful-fs:
+      optional: true
+  checksum: 9419c886abc6f8a5088cbb222b7bc17c76e8ee9f6c0e5c38781a4e09488166084f25247bc0b58e025b08c43064c82ae860ad89a992e35fc8cfae639323b7edbc
+  languageName: node
+  linkType: hard
+
 "jsonparse@npm:^1.2.0":
   version: 1.3.1
   resolution: "jsonparse@npm:1.3.1"
@@ -19846,6 +19879,13 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"universalify@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "universalify@npm:2.0.0"
+  checksum: 36bfbdc97bd4b483596e66ea65e20663f5ab9ec3650157d99b075b7f97afcdefe46bbb23f89171dd75595d398cea3769a5b6d7130f5c66cae2a0f00904780f62
+  languageName: node
+  linkType: hard
+
 "unpipe@npm:1.0.0, unpipe@npm:~1.0.0":
   version: 1.0.0
   resolution: "unpipe@npm:1.0.0"