diff --git a/bin/builders/BaseBuilder.ts b/bin/builders/BaseBuilder.ts index a8b78b3..56b9e22 100644 --- a/bin/builders/BaseBuilder.ts +++ b/bin/builders/BaseBuilder.ts @@ -1,14 +1,14 @@ -import ora from "ora"; import path from 'path'; +import ora from "ora"; import fsExtra from "fs-extra"; import prompts from 'prompts'; +import logger from '@/options/logger'; import { shellExec } from '@/utils/shell'; import { isChinaDomain } from '@/utils/ip'; -import logger from '@/options/logger'; -import { checkRustInstalled, installRust } from '@/helpers/rust'; import { PakeAppOptions } from '@/types'; import { IS_MAC } from "@/utils/platform"; +import { checkRustInstalled, installRust } from '@/helpers/rust'; export default abstract class BaseBuilder { abstract build(url: string, options: PakeAppOptions): Promise; diff --git a/bin/builders/LinuxBuilder.ts b/bin/builders/LinuxBuilder.ts index 6f0dcc8..764109b 100644 --- a/bin/builders/LinuxBuilder.ts +++ b/bin/builders/LinuxBuilder.ts @@ -1,12 +1,12 @@ import path from 'path'; import fsExtra from "fs-extra"; -import BaseBuilder from './BaseBuilder'; +import BaseBuilder from './BaseBuilder'; import logger from '@/options/logger'; import tauriConfig from '@/helpers/tauriConfig'; import { npmDirectory } from '@/utils/dir'; -import { PakeAppOptions } from '@/types'; import { mergeConfig } from "@/helpers/merge"; +import { PakeAppOptions } from '@/types'; 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 abfd18e..e167075 100644 --- a/bin/builders/MacBuilder.ts +++ b/bin/builders/MacBuilder.ts @@ -1,12 +1,12 @@ import path from 'path'; import fsExtra from "fs-extra"; +import BaseBuilder from './BaseBuilder'; import logger from '@/options/logger'; import tauriConfig from '@/helpers/tauriConfig'; -import BaseBuilder from './BaseBuilder'; import { npmDirectory } from '@/utils/dir'; -import { PakeAppOptions } from '@/types'; import { mergeConfig } from "@/helpers/merge"; +import { PakeAppOptions } from '@/types'; 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 a0557a4..3eff8cc 100644 --- a/bin/builders/WinBuilder.ts +++ b/bin/builders/WinBuilder.ts @@ -1,12 +1,12 @@ import path from 'path'; import fsExtra from 'fs-extra'; -import BaseBuilder from './BaseBuilder'; +import BaseBuilder from './BaseBuilder'; import logger from '@/options/logger'; import tauriConfig from '@/helpers/tauriConfig'; import { npmDirectory } from '@/utils/dir'; -import { PakeAppOptions } from '@/types'; import { mergeConfig } from '@/helpers/merge'; +import { PakeAppOptions } from '@/types'; export default class WinBuilder extends BaseBuilder { async build(url: string, options: PakeAppOptions) { diff --git a/bin/helpers/merge.ts b/bin/helpers/merge.ts index 9f7a487..60e81d8 100644 --- a/bin/helpers/merge.ts +++ b/bin/helpers/merge.ts @@ -1,5 +1,6 @@ import path from 'path'; import fsExtra from 'fs-extra'; + import { npmDirectory } from '@/utils/dir'; import logger from '@/options/logger'; import { PakeAppOptions, PlatformMap } from '@/types'; diff --git a/bin/options/icon.ts b/bin/options/icon.ts index f18fb66..afe1464 100644 --- a/bin/options/icon.ts +++ b/bin/options/icon.ts @@ -5,9 +5,9 @@ import { dir } from 'tmp-promise'; import { fileTypeFromBuffer } from 'file-type'; import logger from './logger'; -import { PakeAppOptions } from '@/types'; import { npmDirectory } from '@/utils/dir'; import { IS_LINUX, IS_WIN } from '@/utils/platform'; +import { PakeAppOptions } from '@/types'; export async function handleIcon(options: PakeAppOptions) { if (options.icon) { diff --git a/bin/options/logger.ts b/bin/options/logger.ts index da6cafa..5d6b893 100644 --- a/bin/options/logger.ts +++ b/bin/options/logger.ts @@ -1,5 +1,5 @@ -import log from 'loglevel'; import chalk from 'chalk'; +import log from 'loglevel'; const logger = { info(...msg: any[]) { diff --git a/bin/utils/ip.ts b/bin/utils/ip.ts index 6648dc2..0a98c5f 100644 --- a/bin/utils/ip.ts +++ b/bin/utils/ip.ts @@ -1,6 +1,7 @@ import dns from 'dns'; import http from 'http'; import { promisify } from 'util'; + import logger from '@/options/logger'; const resolve = promisify(dns.resolve);