Skip to content

Commit 8c6b655

Browse files
committed
fix: update current dir
1 parent 7893da2 commit 8c6b655

6 files changed

Lines changed: 14 additions & 12 deletions

File tree

src/app/routes/route.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import express, { Request, Response } from 'express'
22
import { asyncHandler } from '~/lib/async-handler'
33
import HttpResponse from '~/lib/http/response'
4-
import { __dirname, require } from '~/lib/string'
4+
import { currentDir, require } from '~/lib/string'
55
import { v1Route } from './v1'
66

77
const route = express.Router()
88

99
function versioning() {
10-
const node_modules = `${__dirname}/node_modules`
10+
const node_modules = `${currentDir}/node_modules`
1111
const express = require(`${node_modules}/express/package.json`).version
12-
const app = require(`${__dirname}/package.json`).version
12+
const app = require(`${currentDir}/package.json`).version
1313

1414
return { express: `v${express}`, app: `v${app}` }
1515
}

src/config/app.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import expressWithState from '~/app/middleware/with-state'
1616
import { Route } from '~/app/routes/route'
1717
import { allowedCors } from '~/lib/constant/allowed-cors'
1818
import ErrorResponse from '~/lib/http/errors'
19-
import { __dirname } from '~/lib/string'
19+
import { currentDir } from '~/lib/string'
2020
import { httpLogger } from './logger'
2121

2222
export class App {
@@ -32,7 +32,7 @@ export class App {
3232
this._app.use(httpLogger)
3333
this._app.use(express.json({ limit: '20mb', type: 'application/json' }))
3434
this._app.use(express.urlencoded({ extended: true }))
35-
this._app.use(express.static(path.resolve(`${__dirname}/public`)))
35+
this._app.use(express.static(path.resolve(`${currentDir}/public`)))
3636
this._app.use(compression())
3737
this._app.use(cookieParser())
3838
this._app.use(helmet())

src/config/logger.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { randomUUID } from 'crypto'
33
import path from 'path'
44
import pino from 'pino'
55
import { pinoHttp } from 'pino-http'
6-
import { __dirname } from '~/lib/string'
6+
import { currentDir } from '~/lib/string'
77

8-
const logDir = path.resolve(`${__dirname}/logs`)
8+
const logDir = path.resolve(`${currentDir}/logs`)
99

1010
const fileTransport = pino.transport({
1111
target: 'pino/file',

src/lib/storage/gcs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { addDays } from 'date-fns'
44
import fs from 'fs'
55
import path from 'path'
66
import { logger } from '~/config/logger'
7-
import { __dirname } from '~/lib/string'
7+
import { currentDir } from '~/lib/string'
88
import { ms } from '../date'
99
import { GoogleCloudStorageParams, UploadFileParams } from './types'
1010

@@ -20,7 +20,7 @@ export default class GoogleCloudStorage {
2020
this._access_key = params.access_key
2121
this._bucket = params.bucket
2222
this._expires = params.expires
23-
this._filepath = path.resolve(`${__dirname}/${params.filepath}`)
23+
this._filepath = path.resolve(`${currentDir}/${params.filepath}`)
2424

2525
const msgType = `${green('storage - google cloud storage')}`
2626

src/lib/string.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { createRequire } from 'module'
22
import path from 'path'
33
import { fileURLToPath } from 'url'
4+
import { cwd } from 'node:process'
45

56
const __filename = fileURLToPath(import.meta.url)
67
export const require = createRequire(import.meta.url)
78
export const __dirname = path.join(path.dirname(__filename), '../../')
9+
export const currentDir = cwd()

src/lib/swagger/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import _ from 'lodash'
33
import path from 'path'
44
import swaggerJSDoc from 'swagger-jsdoc'
55
import { env } from '~/config/env'
6-
import { __dirname, require } from '../string'
6+
import { currentDir, require } from '../string'
77

8-
const _pathRouteDocs = path.resolve(`${__dirname}/public/swagger/routes`)
9-
const _pathSchemaDocs = path.resolve(`${__dirname}/public/swagger/schema`)
8+
const _pathRouteDocs = path.resolve(`${currentDir}/public/swagger/routes`)
9+
const _pathSchemaDocs = path.resolve(`${currentDir}/public/swagger/schema`)
1010

1111
function _getDocsSwaggers(_path: string | Buffer): Record<string, unknown> {
1212
return fs.readdirSync(_path).reduce((acc, file) => {

0 commit comments

Comments
 (0)