Merge pull request #192 from AthennaIO/develop

fix(build): copy files to pwd
AthennaIO · Oct 15, 2023 · 8d931a3 · 8d931a3
2 parents 84338bb + c3c4476
commit 8d931a3
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 54 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@athenna/core",
-  "version": "4.10.0",
+  "version": "4.10.1",
   "description": "The plug and play Node.js framework.",
   "license": "MIT",
   "author": "João Lenon <[email protected]>",

diff --git a/src/commands/BuildCommand.ts b/src/commands/BuildCommand.ts
@@ -11,8 +11,8 @@ import { rimraf } from 'rimraf'
 import { tsc } from '@athenna/tsconfig/tsc'
 import { Path, Color } from '@athenna/common'
 import { BaseCommand } from '@athenna/artisan'
+import { isAbsolute, join, parse } from 'node:path'
 import { copyfiles } from '@athenna/tsconfig/copyfiles'
-import { isAbsolute, join, parse, sep } from 'node:path'
 import { UndefinedOutDirException } from '#src/exceptions/UndefinedOutDirException'
 
 export class BuildCommand extends BaseCommand {
@@ -42,7 +42,7 @@ export class BuildCommand extends BaseCommand {
     const compiler = Color.yellow.bold('tsc')
     const includedFiles = Color.gray(include.join(', '))
 
-    const outDir = this.getOutDir(tsConfigPath)
+    const outDir = this.getOutDir()
     const outDirName = Color.yellow.bold(parse(outDir).name)
 
     const tasks = this.logger.task()
@@ -68,13 +68,11 @@ export class BuildCommand extends BaseCommand {
     this.logger.success('Application successfully compiled')
   }
 
-  private getOutDir(tsConfigPath: string): string {
+  private getOutDir(): string {
     if (!Config.exists('rc.commands.build.outDir')) {
       throw new UndefinedOutDirException()
     }
 
-    return (
-      parse(tsConfigPath).dir + sep + Config.get('rc.commands.build.outDir')
-    )
+    return Path.pwd(Config.get('rc.commands.build.outDir'))
   }
 }
diff --git a/tests/fixtures/tsconfig.build.json b/tests/fixtures/tsconfig.build.json
@@ -8,7 +8,7 @@
     "strict": false,
     "rootDir": ".",
     "baseUrl": ".",
-    "outDir": "./build-relative",
+    "outDir": "../../build-relative",
     "module": "NodeNext",
     "target": "ESNext",
     "moduleResolution": "NodeNext",

diff --git a/tests/fixtures/tsconfig.json b/tests/fixtures/tsconfig.json
@@ -8,7 +8,7 @@
     "strict": false,
     "rootDir": ".",
     "baseUrl": ".",
-    "outDir": "./build",
+    "outDir": "../../build",
     "module": "NodeNext",
     "target": "ESNext",
     "moduleResolution": "NodeNext",

diff --git a/tests/helpers/BaseCommandTest.ts b/tests/helpers/BaseCommandTest.ts
@@ -36,10 +36,6 @@ export class BaseCommandTest {
     await Folder.safeRemove(Path.pwd('build'))
     await Folder.safeRemove(Path.pwd('build-relative'))
     await Folder.safeRemove(Path.tests('e2e'))
-    await Folder.safeRemove(Path.fixtures('dist'))
-    await Folder.safeRemove(Path.fixtures('build'))
-    await Folder.safeRemove(Path.fixtures('storage'))
-    await Folder.safeRemove(Path.fixtures('build-relative'))
 
     await new File(Path.pwd('package.json')).setContent(this.originalPJson)
   }

diff --git a/tests/unit/commands/BuildCommandTest.ts b/tests/unit/commands/BuildCommandTest.ts
@@ -19,9 +19,9 @@ export default class BuildCommandTest extends BaseCommandTest {
     output.assertSucceeded()
     output.assertLogged('Application successfully compiled')
 
-    assert.isTrue(Folder.existsSync(Path.fixtures('build')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.js')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.d.ts')))
+    assert.isTrue(Folder.existsSync(Path.pwd('build')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.js')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.d.ts')))
   }
 
   @Test()
@@ -33,27 +33,27 @@ export default class BuildCommandTest extends BaseCommandTest {
     output.assertSucceeded()
     output.assertLogged('Application successfully compiled')
 
-    assert.isTrue(Folder.existsSync(Path.fixtures('build-relative')))
-    assert.isTrue(File.existsSync(Path.fixtures('build-relative/app/hello.js')))
-    assert.isTrue(File.existsSync(Path.fixtures('build-relative/app/hello.d.ts')))
+    assert.isTrue(Folder.existsSync(Path.pwd('build-relative')))
+    assert.isTrue(File.existsSync(Path.pwd('build-relative/app/hello.js')))
+    assert.isTrue(File.existsSync(Path.pwd('build-relative/app/hello.d.ts')))
   }
 
   @Test()
   public async shouldDeleteTheOldOutDirBeforeCompilingTheApplicationAgain({ assert, command }: Context) {
     await command.run('build')
 
-    assert.isTrue(Folder.existsSync(Path.fixtures('build')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.js')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.d.ts')))
+    assert.isTrue(Folder.existsSync(Path.pwd('build')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.js')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.d.ts')))
 
     const output = await command.run('build')
 
     output.assertSucceeded()
     output.assertLogged('Application successfully compiled')
 
-    assert.isTrue(Folder.existsSync(Path.fixtures('build')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.js')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.d.ts')))
+    assert.isTrue(Folder.existsSync(Path.pwd('build')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.js')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.d.ts')))
   }
 
   @Test()
@@ -66,11 +66,11 @@ export default class BuildCommandTest extends BaseCommandTest {
     output.assertLogged('Copying included paths to build folder: README.md, LICENSE.md')
     output.assertLogged('Application successfully compiled')
 
-    assert.isTrue(Folder.existsSync(Path.fixtures('build')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/LICENSE.md')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/README.md')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.js')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.d.ts')))
+    assert.isTrue(Folder.existsSync(Path.pwd('build')))
+    assert.isTrue(File.existsSync(Path.pwd('build/LICENSE.md')))
+    assert.isTrue(File.existsSync(Path.pwd('build/README.md')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.js')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.d.ts')))
   }
 
   @Test()
@@ -83,11 +83,11 @@ export default class BuildCommandTest extends BaseCommandTest {
     output.assertLogged('Copying included paths to build folder: src/*, templates/*')
     output.assertLogged('Application successfully compiled')
 
-    assert.isTrue(Folder.existsSync(Path.fixtures('build')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/src/index.ts')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/templates/exception.edge')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.js')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.d.ts')))
+    assert.isTrue(Folder.existsSync(Path.pwd('build')))
+    assert.isTrue(File.existsSync(Path.pwd('build/src/index.ts')))
+    assert.isTrue(File.existsSync(Path.pwd('build/templates/exception.edge')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.js')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.d.ts')))
   }
 
   @Test()
@@ -103,11 +103,11 @@ export default class BuildCommandTest extends BaseCommandTest {
     output.assertLogged('Copying included paths to build folder: src/**/*Command.ts')
     output.assertLogged('Application successfully compiled')
 
-    assert.isTrue(Folder.existsSync(Path.fixtures('build')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.js')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.d.ts')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/src/commands/BuildCommand.ts')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/src/commands/MakeServiceCommand.ts')))
+    assert.isTrue(Folder.existsSync(Path.pwd('build')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.js')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.d.ts')))
+    assert.isTrue(File.existsSync(Path.pwd('build/src/commands/BuildCommand.ts')))
+    assert.isTrue(File.existsSync(Path.pwd('build/src/commands/MakeServiceCommand.ts')))
   }
 
   @Test()
@@ -123,11 +123,11 @@ export default class BuildCommandTest extends BaseCommandTest {
     output.assertLogged('Copying included paths to build folder: templates/**/*.edge')
     output.assertLogged('Application successfully compiled')
 
-    assert.isTrue(Folder.existsSync(Path.fixtures('build')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/templates/exception.edge')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/templates/provider.edge')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.js')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.d.ts')))
+    assert.isTrue(Folder.existsSync(Path.pwd('build')))
+    assert.isTrue(File.existsSync(Path.pwd('build/templates/exception.edge')))
+    assert.isTrue(File.existsSync(Path.pwd('build/templates/provider.edge')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.js')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.d.ts')))
   }
 
   @Test()
@@ -139,9 +139,9 @@ export default class BuildCommandTest extends BaseCommandTest {
     output.assertSucceeded()
     output.assertLogged('Application successfully compiled')
 
-    assert.isTrue(Folder.existsSync(Path.fixtures('build-relative')))
-    assert.isTrue(File.existsSync(Path.fixtures('build-relative/app/hello.js')))
-    assert.isTrue(File.existsSync(Path.fixtures('build-relative/app/hello.d.ts')))
+    assert.isTrue(Folder.existsSync(Path.pwd('build-relative')))
+    assert.isTrue(File.existsSync(Path.pwd('build-relative/app/hello.js')))
+    assert.isTrue(File.existsSync(Path.pwd('build-relative/app/hello.d.ts')))
   }
 
   @Test()
@@ -165,9 +165,9 @@ export default class BuildCommandTest extends BaseCommandTest {
     output.assertSucceeded()
     output.assertLogged('Application successfully compiled')
 
-    assert.isTrue(Folder.existsSync(Path.fixtures('build')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.js')))
-    assert.isFalse(File.existsSync(Path.fixtures('build/.env')))
-    assert.isTrue(File.existsSync(Path.fixtures('build/app/hello.d.ts')))
+    assert.isTrue(Folder.existsSync(Path.pwd('build')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.js')))
+    assert.isFalse(File.existsSync(Path.pwd('build/.env')))
+    assert.isTrue(File.existsSync(Path.pwd('build/app/hello.d.ts')))
   }
 }