fix: improve paths for windows os

This commit is contained in:
Jakub P.
2024-07-26 11:30:55 +02:00
committed by Ali BARIN
parent 09d3a06b27
commit a755ee8dc1
5 changed files with 9 additions and 9 deletions

View File

@@ -1,6 +1,6 @@
import { knexSnakeCaseMappers } from 'objection';
import appConfig from './src/config/app.js';
import path from 'path';
import path, { join } from 'path';
import { fileURLToPath } from 'url';
const fileExtension = 'js';
@@ -20,12 +20,12 @@ const knexConfig = {
searchPath: [appConfig.postgresSchema],
pool: { min: 0, max: 20 },
migrations: {
directory: __dirname + '/src/db/migrations',
directory: join(__dirname, '/src/db/migrations'),
extension: fileExtension,
loadExtensions: [`.${fileExtension}`],
},
seeds: {
directory: __dirname + '/src/db/seeds',
directory: join(__dirname, '/src/db/seeds'),
},
...(appConfig.isTest ? knexSnakeCaseMappers() : {}),
};

View File

@@ -7,7 +7,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
const appAssetsHandler = async (app) => {
app.use('/apps/:appKey/assets/favicon.svg', (req, res, next) => {
const { appKey } = req.params;
const svgPath = `${__dirname}/../apps/${appKey}/assets/favicon.svg`;
const svgPath = path.resolve(`${__dirname}/../apps/${appKey}/assets/favicon.svg`);
const staticFileHandlerOptions = {
/**
* Disabling fallthrough is important to respond with HTTP 404.

View File

@@ -1,10 +1,10 @@
import path from 'node:path';
import path, { join } from 'path';
import fs from 'node:fs';
import omit from 'lodash/omit.js';
import cloneDeep from 'lodash/cloneDeep.js';
import addAuthenticationSteps from './add-authentication-steps.js';
import addReconnectionSteps from './add-reconnection-steps.js';
import { fileURLToPath } from 'url';
import { fileURLToPath, pathToFileURL } from 'url';
const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -14,7 +14,7 @@ const apps = fs
if (!dirent.isDirectory()) return apps;
apps[dirent.name] = import(
path.resolve(__dirname, '../apps', dirent.name, 'index.js')
pathToFileURL(join(__dirname, '../apps', dirent.name, 'index.js'))
);
return apps;

View File

@@ -10,7 +10,7 @@ class App {
static folderPath = join(__dirname, '../apps');
static list = fs
.readdirSync(this.folderPath)
.filter((file) => fs.statSync(this.folderPath + '/' + file).isDirectory());
.filter((file) => fs.statSync(join(this.folderPath, file)).isDirectory());
static async findAll(name, stripFuncs = true) {
if (!name)

View File

@@ -17,7 +17,7 @@ const knexConfig = {
loadExtensions: [`.${fileExtension}`],
},
seeds: {
directory: '../../packages/backend/src/db/seeds',
directory: '../../packages/backend/src/db/seeds/',
},
...(process.env.APP_ENV === 'test' ? knexSnakeCaseMappers() : {}),
};