chore: merge

packages/uni-cli-shared/src/vite/utils/utils.ts

@@ -7,6 +7,10 @@ export function withSourcemap(config: ResolvedConfig) {
   return !!config.build.sourcemap
 }
 
+export function isInHybridNVue(config: UserConfig | ResolvedConfig): boolean {
+  return (config as any).nvue && process.env.UNI_RENDERER !== 'native'
+}
+
 export function isSsr(
   command: ConfigEnv['command'],
   config: UserConfig | ResolvedConfig

packages/uni-push/lib/uni.plugin.js

@@ -12,7 +12,7 @@ var path__default = /*#__PURE__*/ _interopDefaultLegacy(path)
 var debug__default = /*#__PURE__*/ _interopDefaultLegacy(debug)
 
 const debugPush = debug__default['default']('uni:push')
-var index = [
+var index = () => [
   uniCliShared.defineUniMainJsPlugin((opts) => {
     let isEnable = false
     let isOffline = false

packages/uni-push/src/plugin/index.ts

@@ -9,7 +9,7 @@ import {
 } from '@dcloudio/uni-cli-shared'
 
 const debugPush = debug('uni:push')
-export default [
+export default () => [
   defineUniMainJsPlugin((opts) => {
     let isEnable = false
     let isOffline = false