From 80ff9fae0f403e7d86ff5fee324644af60a7ac47 Mon Sep 17 00:00:00 2001 From: jeasonnow Date: Sun, 25 Jun 2023 10:29:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E9=83=A8?= =?UTF-8?q?=E5=88=86=20utils=20=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/helpers/merge.ts | 2 +- bin/utils/combine.ts | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bin/helpers/merge.ts b/bin/helpers/merge.ts index f3794e7..409a099 100644 --- a/bin/helpers/merge.ts +++ b/bin/helpers/merge.ts @@ -186,7 +186,7 @@ export async function mergeConfig(url: string, options: PakeAppOptions, tauriCon } const files = inject.map(relativePath => path.join(process.cwd(), relativePath)); tauriConf.pake.inject = files; - combineFiles(files); + combineFiles(files, path.join(npmDirectory, `src-tauri/src/inject/_INJECT_.js`)); } // Save config file. diff --git a/bin/utils/combine.ts b/bin/utils/combine.ts index d2c030f..9599669 100644 --- a/bin/utils/combine.ts +++ b/bin/utils/combine.ts @@ -1,10 +1,6 @@ -import path from 'path'; import fs from 'fs'; -import { npmDirectory } from '@/utils/dir.js'; - -export default async function combineFiles(files: string[]) { - const output = path.join(npmDirectory, `src-tauri/src/inject/_INJECT_.js`); +export default async function combineFiles(files: string[], output: string) { const contents = files.map(file => { const fileContent = fs.readFileSync(file); if (file.endsWith('.css')) {