diff --git a/packages/uni-app-vite/src/nvue/index.ts b/packages/uni-app-vite/src/nvue/index.ts index 2344ddeb5a92e902849633461ced8b8069758db4..02848134eade7bf91a36de6d5687c0453f10d336 100644 --- a/packages/uni-app-vite/src/nvue/index.ts +++ b/packages/uni-app-vite/src/nvue/index.ts @@ -18,16 +18,17 @@ export { initNVueNodeTransforms } from './plugin' export function initNVuePlugins() { const renderer = process.env.UNI_RENDERER + const app = process.env.UNI_COMPILER_NVUE === 'app' return [ uniAppCssPlugin(), uniEasycomPlugin({ exclude: UNI_EASYCOM_EXCLUDE }), uniHBuilderXConsolePlugin(), - uniMainJsPlugin({ renderer }), - ...(process.env.UNI_RENDERER === 'native' ? [uniManifestJsonPlugin()] : []), - uniPagesJsonPlugin({ renderer }), + uniMainJsPlugin({ app }), + ...(app ? [uniManifestJsonPlugin()] : []), + uniPagesJsonPlugin({ app }), uniViteInjectPlugin('uni:app-inject', initAppProvide()), uniStatsPlugin(), uniAppNVuePlugin(), - uniEsbuildPlugin({ renderer }), + uniEsbuildPlugin({ renderer, app }), ] } diff --git a/packages/uni-app-vite/src/nvue/plugins/esbuild.ts b/packages/uni-app-vite/src/nvue/plugins/esbuild.ts index 78ea61261ab9e85a132cd9fdff8d9e2380fb681c..b33bcf845f388374e2a0de3bb27db66abb15c3a7 100644 --- a/packages/uni-app-vite/src/nvue/plugins/esbuild.ts +++ b/packages/uni-app-vite/src/nvue/plugins/esbuild.ts @@ -18,8 +18,10 @@ const debugEsbuild = debug('uni:app-nvue-esbuild') export function uniEsbuildPlugin({ renderer, + app, }: { renderer?: 'native' + app: boolean }): Plugin { let buildOptions: BuildOptions const outputDir = process.env.UNI_OUTPUT_DIR @@ -50,7 +52,7 @@ export function uniEsbuildPlugin({ entryPoints.push(name) } }) - if (renderer === 'native') { + if (app) { debugEsbuild('start', APP_SERVICE_FILENAME) await buildNVueAppService(buildOptions).then((code) => { return fs.outputFile( diff --git a/packages/uni-app-vite/src/nvue/plugins/mainJs.ts b/packages/uni-app-vite/src/nvue/plugins/mainJs.ts index 62535dd5b23606aebcaf6f87e07a5dd9498feeb6..559d85dd3b7566ead5bb2e7a4ef915cab1ce0c97 100644 --- a/packages/uni-app-vite/src/nvue/plugins/mainJs.ts +++ b/packages/uni-app-vite/src/nvue/plugins/mainJs.ts @@ -1,21 +1,19 @@ import { defineUniMainJsPlugin, PAGES_JSON_JS } from '@dcloudio/uni-cli-shared' import { APP_CSS_JS } from './appCss' -export function uniMainJsPlugin({ renderer }: { renderer?: 'native' }) { +export function uniMainJsPlugin({ app }: { app: boolean }) { return defineUniMainJsPlugin((opts) => { return { name: 'uni:app-nvue-main-js', enforce: 'pre', transform(code, id) { if (opts.filter(id)) { - if (renderer === 'native') { + if (app) { code = code.includes('createSSRApp') ? createApp(code) : createLegacyApp(code) return { - code: - `import './${PAGES_JSON_JS}';import('${APP_CSS_JS}').then(()=>{});` + - code, + code, map: { mappings: '' }, } } diff --git a/packages/uni-app-vite/src/nvue/plugins/pagesJson.ts b/packages/uni-app-vite/src/nvue/plugins/pagesJson.ts index 8f4e20571ec580f351b3b4985fd315c5817f2015..54062f534935584a2f3ee6b5a209951698aec015 100644 --- a/packages/uni-app-vite/src/nvue/plugins/pagesJson.ts +++ b/packages/uni-app-vite/src/nvue/plugins/pagesJson.ts @@ -11,11 +11,7 @@ import { MANIFEST_JSON_JS, } from '@dcloudio/uni-cli-shared' -export function uniPagesJsonPlugin({ - renderer, -}: { - renderer?: 'native' -}): Plugin { +export function uniPagesJsonPlugin({ app }: { app: boolean }): Plugin { return defineUniPagesJsonPlugin((opts) => { return { name: 'uni:app-nvue-pages-json', @@ -38,7 +34,7 @@ export function uniPagesJsonPlugin({ ) } }) - if (renderer === 'native') { + if (app) { this.emitFile({ fileName: `app-config-service.js`, type: 'asset',