From 73446b01118d741e6927afa72d00d54f30e38604 Mon Sep 17 00:00:00 2001 From: ringeringeraja Date: Fri, 8 Mar 2024 11:54:25 -0300 Subject: [PATCH] fix: absolute path imports that could crash on Windows --- packages/aeria-build/src/iconsExtraction.ts | 4 ++-- packages/aeria-build/src/migrate.ts | 4 ++-- packages/aeria-sdk/src/utils.ts | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/aeria-build/src/iconsExtraction.ts b/packages/aeria-build/src/iconsExtraction.ts index 13ca9b77..0e31ab94 100644 --- a/packages/aeria-build/src/iconsExtraction.ts +++ b/packages/aeria-build/src/iconsExtraction.ts @@ -1,12 +1,12 @@ import * as fs from 'fs/promises' import path from 'path' import { extractIcons, iconsEsmContent, iconsCjsContent, iconsDtsContent } from './icons' -import { right } from '@aeriajs/common' +import { right, dynamicImport } from '@aeriajs/common' const DATA_PATH = '.aeria' export const iconsExtraction = async () => { - const collections = await import(path.join(process.cwd(), 'dist', 'collections')) + const collections = await dynamicImport(path.join(process.cwd(), 'dist', 'collections', 'index.js')) const base = path.join(process.cwd(), 'node_modules', DATA_PATH) const icons = [] diff --git a/packages/aeria-build/src/migrate.ts b/packages/aeria-build/src/migrate.ts index 74227140..15420e2f 100644 --- a/packages/aeria-build/src/migrate.ts +++ b/packages/aeria-build/src/migrate.ts @@ -1,5 +1,5 @@ import type { Collection } from '@aeriajs/types' -import { right } from '@aeriajs/common' +import { right, dynamicImport } from '@aeriajs/common' import { getDatabase, prepareCollectionName, getDatabaseCollection } from '@aeriajs/api' import { config as loadEnv } from 'dotenv' import { log } from './log.js' @@ -20,7 +20,7 @@ export const migrate = async () => { loadEnv() } - const collections = await import(path.join(process.cwd(), 'dist', 'collections')) as Record Collection) > diff --git a/packages/aeria-sdk/src/utils.ts b/packages/aeria-sdk/src/utils.ts index 78539e70..bd67913e 100644 --- a/packages/aeria-sdk/src/utils.ts +++ b/packages/aeria-sdk/src/utils.ts @@ -1,4 +1,5 @@ import type { InstanceConfig } from './types.js' +import { dynamicImport } from '@aeriajs/common' import path from 'path' export const apiUrl = (config: InstanceConfig) => { @@ -12,7 +13,7 @@ export const apiUrl = (config: InstanceConfig) => { } export const getConfig = async () => { - const { aeriaSdk } = await import(path.join(process.cwd(), 'package.json')) + const { aeriaSdk } = await dynamicImport(path.join(process.cwd(), 'package.json')) if( typeof aeriaSdk !== 'object' || !aeriaSdk ) { throw new Error('aeriaSdk is absent in package.json') }