diff --git a/bin/builders/LinuxBuilder.ts b/bin/builders/LinuxBuilder.ts index ccae449..6f0dcc8 100644 --- a/bin/builders/LinuxBuilder.ts +++ b/bin/builders/LinuxBuilder.ts @@ -6,7 +6,7 @@ import logger from '@/options/logger'; import tauriConfig from '@/helpers/tauriConfig'; import { npmDirectory } from '@/utils/dir'; import { PakeAppOptions } from '@/types'; -import { mergeConfig } from "@/builders/common"; +import { mergeConfig } from "@/helpers/merge"; export default class LinuxBuilder extends BaseBuilder { async build(url: string, options: PakeAppOptions) { diff --git a/bin/builders/MacBuilder.ts b/bin/builders/MacBuilder.ts index 8f6e8ef..abfd18e 100644 --- a/bin/builders/MacBuilder.ts +++ b/bin/builders/MacBuilder.ts @@ -6,7 +6,7 @@ import tauriConfig from '@/helpers/tauriConfig'; import BaseBuilder from './BaseBuilder'; import { npmDirectory } from '@/utils/dir'; import { PakeAppOptions } from '@/types'; -import { mergeConfig } from "@/builders/common"; +import { mergeConfig } from "@/helpers/merge"; export default class MacBuilder extends BaseBuilder { async build(url: string, options: PakeAppOptions) { diff --git a/bin/builders/WinBuilder.ts b/bin/builders/WinBuilder.ts index f831786..a0557a4 100644 --- a/bin/builders/WinBuilder.ts +++ b/bin/builders/WinBuilder.ts @@ -6,7 +6,7 @@ import logger from '@/options/logger'; import tauriConfig from '@/helpers/tauriConfig'; import { npmDirectory } from '@/utils/dir'; import { PakeAppOptions } from '@/types'; -import { mergeConfig } from '@/builders/common'; +import { mergeConfig } from '@/helpers/merge'; export default class WinBuilder extends BaseBuilder { async build(url: string, options: PakeAppOptions) { diff --git a/bin/builders/common.ts b/bin/helpers/merge.ts similarity index 98% rename from bin/builders/common.ts rename to bin/helpers/merge.ts index 66f7a78..e4972cc 100644 --- a/bin/builders/common.ts +++ b/bin/helpers/merge.ts @@ -1,8 +1,8 @@ import path from 'path'; import fsExtra from 'fs-extra'; -import { npmDirectory } from '@/utils/dir.js'; -import logger from '@/options/logger.js'; -import { PakeAppOptions, PlatformMap } from '@/types.js'; +import { npmDirectory } from '@/utils/dir'; +import logger from '@/options/logger'; +import { PakeAppOptions, PlatformMap } from '@/types'; export async function mergeConfig( url: string,