From e063fc5cb5bd529fe1bc79f96146e6d1192deda9 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Fri, 6 Aug 2021 18:12:31 +0800 Subject: [PATCH] fix: tests --- packages/uni-app-vite/dist/plugin/uni.js | 18 ++++++++++-------- packages/uni-app-vite/src/plugin/uni.ts | 22 ++++++++++++---------- packages/uni-cli-shared/src/vite/index.ts | 20 +++++++++++--------- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/packages/uni-app-vite/dist/plugin/uni.js b/packages/uni-app-vite/dist/plugin/uni.js index cee00b543..8d59b929e 100644 --- a/packages/uni-app-vite/dist/plugin/uni.js +++ b/packages/uni-app-vite/dist/plugin/uni.js @@ -9,14 +9,16 @@ const uni_shared_1 = require("@dcloudio/uni-shared"); const uni_cli_shared_1 = require("@dcloudio/uni-cli-shared"); function uniOptions() { return { - copyOptions: { - assets: ['hybrid/html'], - targets: [ - { - src: uni_cli_shared_1.normalizePath(path_1.default.resolve(process.env.UNI_INPUT_DIR, 'androidPrivacy.json')), - dest: process.env.UNI_OUTPUT_DIR, - }, - ], + copyOptions() { + return { + assets: ['hybrid/html'], + targets: [ + { + src: uni_cli_shared_1.normalizePath(path_1.default.resolve(process.env.UNI_INPUT_DIR, 'androidPrivacy.json')), + dest: process.env.UNI_OUTPUT_DIR, + }, + ], + }; }, compilerOptions: { isNativeTag: uni_shared_1.isServiceNativeTag, diff --git a/packages/uni-app-vite/src/plugin/uni.ts b/packages/uni-app-vite/src/plugin/uni.ts index f3b1e5d34..959219a83 100644 --- a/packages/uni-app-vite/src/plugin/uni.ts +++ b/packages/uni-app-vite/src/plugin/uni.ts @@ -7,16 +7,18 @@ import { normalizePath, UniVitePlugin } from '@dcloudio/uni-cli-shared' export function uniOptions(): UniVitePlugin['uni'] { return { - copyOptions: { - assets: ['hybrid/html'], - targets: [ - { - src: normalizePath( - path.resolve(process.env.UNI_INPUT_DIR, 'androidPrivacy.json') - ), - dest: process.env.UNI_OUTPUT_DIR, - }, - ], + copyOptions() { + return { + assets: ['hybrid/html'], + targets: [ + { + src: normalizePath( + path.resolve(process.env.UNI_INPUT_DIR, 'androidPrivacy.json') + ), + dest: process.env.UNI_OUTPUT_DIR, + }, + ], + } }, compilerOptions: { isNativeTag: isServiceNativeTag, diff --git a/packages/uni-cli-shared/src/vite/index.ts b/packages/uni-cli-shared/src/vite/index.ts index f94afd60d..24d5a6218 100644 --- a/packages/uni-cli-shared/src/vite/index.ts +++ b/packages/uni-cli-shared/src/vite/index.ts @@ -9,16 +9,18 @@ export interface CopyOptions { assets?: string[] targets?: readonly Target[] } -export interface UniVitePlugin extends Plugin { - uni?: { - compilerOptions?: { - isNativeTag: ParserOptions['isNativeTag'] - isCustomElement: ParserOptions['isCustomElement'] - directiveTransforms?: CompilerOptions['directiveTransforms'] - } - transformEvent?: Record - copyOptions?: CopyOptions | (() => CopyOptions) + +interface UniVitePluginUniOptions { + compilerOptions?: { + isNativeTag: ParserOptions['isNativeTag'] + isCustomElement: ParserOptions['isCustomElement'] + directiveTransforms?: CompilerOptions['directiveTransforms'] } + transformEvent?: Record + copyOptions?: CopyOptions | (() => CopyOptions) +} +export interface UniVitePlugin extends Plugin { + uni?: UniVitePluginUniOptions } export * from './utils' -- GitLab