Fixed TAR packaging errors

nomo-app · Dec 19, 2023 · 5f4f372 · 5f4f372
1 parent 8e2a09b
commit 5f4f372
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 11 deletions.
diff --git a/cache/.gitkeep b/cache/.gitkeep
diff --git a/src/build-webon/build-webon.ts b/src/build-webon/build-webon.ts
@@ -31,6 +31,7 @@ export async function deleteExistingTarFile(
   tarFilePath: string
 ): Promise<void> {
   if (existsSync(tarFilePath)) {
+    console.log("Deleting existing tar file: " + getDebugPath(tarFilePath));
     unlinkSync(tarFilePath);
   }
 }
@@ -63,8 +64,7 @@ export async function buildWebOn(assetDir: string): Promise<void> {
     return;
   }
 
-  const tarFileName = "nomo.tar.gz";
-  const tarFilePath = path.join(outDirPath, tarFileName);
+  const tarFilePath = "./nomo.tar.gz";
 
   await deleteExistingTarFile(tarFilePath);
 
@@ -80,11 +80,14 @@ export async function buildWebOn(assetDir: string): Promise<void> {
   }
 }
 
-async function createTarFile(
+export async function createTarFile(
   outDirPath: string,
   tarFilePath: string
 ): Promise<void> {
-  console.log(`Creating WebOn: ${tarFilePath}`);
+  if (!existsSync(outDirPath)) {
+    logFatal("Output directory does not exist: " + outDirPath);
+  }
+
   try {
     await tar.create(
       {

diff --git a/src/util/util.ts b/src/util/util.ts
@@ -22,7 +22,7 @@ function isDirectory(path: string): boolean {
   }
 }
 export function readCliConfig(): NomoCliConfigs {
-  const cliPath = resolve("nomo_cli.config.cjs");
+  const cliPath = resolve("nomo_cli.config.js");
   try {
     // @ts-ignore
     const nomoCliConfig = require(cliPath);

diff --git a/test/e2e/build-webon-test/packaging-completed.test.ts b/test/e2e/build-webon-test/packaging-completed.test.ts
@@ -7,18 +7,15 @@ import {
 test("nextjs_sample tar.gz build", async () => {
   const output = await runE2ETest("build test_assets/nextjs_sample/out/");
   expect(output).toContain("WebOn build completed: ");
-  const existsFile = fs.existsSync("test_assets/nextjs_sample/out/nomo.tar.gz");
+  const existsFile = fs.existsSync("nomo.tar.gz");
   expect(existsFile).toBe(true);
-  await new Promise((resolve) => setTimeout(resolve, 5000));
-  fs.unlinkSync("test_assets/nextjs_sample/out/nomo.tar.gz");
 });
 
 test("cra_sample tar.gz build", async () => {
   const output = await runE2ETest("build test_assets/cra_sample/out/");
   expect(output).toContain("WebOn build completed: ");
-  const existsFile = fs.existsSync("test_assets/cra_sample/out/nomo.tar.gz");
+  const existsFile = fs.existsSync("nomo.tar.gz");
   expect(existsFile).toBe(true);
-  fs.unlinkSync("test_assets/cra_sample/out/nomo.tar.gz");
 });
 
 test("missing required file", async () => {

diff --git a/test/unitTest/build-tar-gz/build-tar.test.ts b/test/unitTest/build-tar-gz/build-tar.test.ts
@@ -1,4 +1,11 @@
-import { runUnitTestExpectFailure } from "../../test-util/test-util";
+import {
+  runUnitTestExpectFailure,
+  runE2ETest,
+} from "../../test-util/test-util";
+import { createTarFile } from "../../../src/build-webon/build-webon";
+import * as fs from "fs";
+import * as path from "path";
+import * as tar from "tar";
 
 test("missing required file", async () => {
   const output = await runUnitTestExpectFailure(
@@ -8,3 +15,36 @@ test("missing required file", async () => {
     /Error: The 'out' directory is missing the following required files: .* Use nomo-webon-cli init if you do not have a nomo_manifest.json yet.\n/
   );
 });
+
+jest.mock("fs");
+jest.mock("tar");
+
+describe("createTarFile", () => {
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it("should create a tar file with the correct options", async () => {
+    const outDirPath = "/test_assets/my_sample/out";
+    const tarFilePath = "/test_assets/my_sample/out/nomo.tar.gz";
+
+    const existsSyncMock = jest.spyOn(fs, "existsSync");
+    existsSyncMock.mockReturnValue(true);
+
+    const createMock = tar.create as jest.Mock;
+    createMock.mockResolvedValue(undefined);
+
+    await createTarFile(outDirPath, tarFilePath);
+
+    expect(existsSyncMock).toHaveBeenCalledWith(outDirPath);
+    expect(createMock).toHaveBeenCalledWith(
+      {
+        file: tarFilePath,
+        gzip: true,
+        cwd: path.dirname(outDirPath),
+      },
+      [path.basename(outDirPath)]
+    );
+    expect(fs.existsSync(tarFilePath)).toBe(true);
+  });
+});