🎨 Rename common

This commit is contained in:
Tw93
2023-06-22 14:38:19 +08:00
parent 1f44c71948
commit bb2f83eed6
4 changed files with 6 additions and 6 deletions

View File

@@ -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) {

View File

@@ -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) {

View File

@@ -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) {

View File

@@ -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,