diff --git a/packages/uni-app-vite/src/utils.ts b/packages/uni-app-vite/src/utils.ts index c3c6a463835c915cc43b96f6f8c79ebe242414c6..bb1580478fcea1241f7ce0a6af3ee6743856c553 100644 --- a/packages/uni-app-vite/src/utils.ts +++ b/packages/uni-app-vite/src/utils.ts @@ -1,10 +1,5 @@ import path from 'path' export const templateDir = path.resolve(__dirname, '../lib/template/') export function nvueOutDir() { - return path.join( - process.env.UNI_OUTPUT_DIR, - '../.nvue', - 'app' + - (process.env.UNI_APP_PLATFORM ? '-' + process.env.UNI_APP_PLATFORM : '') - ) + return path.join(process.env.UNI_OUTPUT_DIR, '../.nvue') } diff --git a/packages/uni-cli-shared/src/platform.ts b/packages/uni-cli-shared/src/platform.ts index 9ed3107ed17f9dc1311b008392998c3c61a92d37..89c316e1526d762dc8d7b20839735c62f8f5600f 100644 --- a/packages/uni-cli-shared/src/platform.ts +++ b/packages/uni-cli-shared/src/platform.ts @@ -28,8 +28,5 @@ export function getPlatforms() { } export function getPlatformDir() { - if (process.env.UNI_PLATFORM === 'app' && process.env.UNI_APP_PLATFORM) { - return process.env.UNI_PLATFORM + '-' + process.env.UNI_APP_PLATFORM - } return process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM } diff --git a/packages/uni-cli-shared/src/preprocess/context.ts b/packages/uni-cli-shared/src/preprocess/context.ts index 571f6fd7821bbb066c34afaaa833d1fcfbac25b8..08d1bacb600dc90777acfc2683860b8475077b94 100644 --- a/packages/uni-cli-shared/src/preprocess/context.ts +++ b/packages/uni-cli-shared/src/preprocess/context.ts @@ -63,15 +63,6 @@ export function initPreContext( nvueContext.APP_NVUE = true nvueContext.APP_PLUS_NVUE = true - - if (process.env.UNI_APP_PLATFORM === 'android') { - defaultContext.APP_ANDROID = true - } else if (process.env.UNI_APP_PLATFORM === 'ios') { - defaultContext.APP_IOS = true - } else { - defaultContext.APP_ANDROID = true - defaultContext.APP_IOS = true - } } else if (platform.startsWith('mp-')) { defaultContext.MP = true } else if (platform.startsWith('quickapp-webview')) { diff --git a/packages/uni-uts-vite/src/plugins/v1.ts b/packages/uni-uts-vite/src/plugins/v1.ts index 89d4517edae028ca66b75536f676ab50c4fc8f2f..efc0dc0678496e5d9e7d7534ce173dae1f51b5e5 100644 --- a/packages/uni-uts-vite/src/plugins/v1.ts +++ b/packages/uni-uts-vite/src/plugins/v1.ts @@ -1,6 +1,6 @@ import type { Plugin } from 'vite' import path from 'path' -import { isInHBuilderX, parseVueRequest, preJs } from '@dcloudio/uni-cli-shared' +import { isInHBuilderX, parseVueRequest } from '@dcloudio/uni-cli-shared' import { BindingIdentifier, ClassDeclaration, @@ -52,7 +52,7 @@ export function uniUtsV1Plugin(): Plugin { // 懒加载 uts 编译器 // eslint-disable-next-line no-restricted-globals const { parse } = require('@dcloudio/uts') - const ast = await parse(preJs(code), { noColor: isInHBuilderX() }) + const ast = await parse(code, { noColor: isInHBuilderX() }) code = ` import { initUtsProxyClass, initUtsProxyFunction, initUtsPackageName, initUtsClassName } from '@dcloudio/uni-app' const name = '${pkg.name}' diff --git a/packages/vite-plugin-uni/src/plugins/copy.ts b/packages/vite-plugin-uni/src/plugins/copy.ts index 35062ed9e2a9f68599761c3501732af06537609f..760e4d66ff90d5b2aeb6d0fc2e3e39a902b820fa 100644 --- a/packages/vite-plugin-uni/src/plugins/copy.ts +++ b/packages/vite-plugin-uni/src/plugins/copy.ts @@ -44,15 +44,6 @@ export function uniCopyPlugin({ }) .map((p) => '/' + PUBLIC_DIR + '/' + p) - if (process.env.UNI_APP_PLATFORM === 'android') { - ignorePlatformStaticDirs.push(`/${PUBLIC_DIR}/app-ios`) - } else if (process.env.UNI_APP_PLATFORM === 'ios') { - ignorePlatformStaticDirs.push(`/${PUBLIC_DIR}/app-android`) - } else { - ignorePlatformStaticDirs.push(`/${PUBLIC_DIR}/app-android`) - ignorePlatformStaticDirs.push(`/${PUBLIC_DIR}/app-ios`) - } - const targets: UniViteCopyPluginTarget[] = [ { src: assets,