fix: remove unnecessary inject options

packages/uni-h5/dist/uni-h5.esm.js

@@ -447,7 +447,7 @@ var safeAreaInsets = {
   onChange,
   offChange
 };
-var D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out = safeAreaInsets;
+var out = safeAreaInsets;
 const onEventPrevent = /* @__PURE__ */ withModifiers(() => {
 }, ["prevent"]);
 const onEventStop = /* @__PURE__ */ withModifiers(() => {
@@ -459,10 +459,10 @@ function getWindowOffset() {
   const left = parseInt(style2.getPropertyValue("--window-left"));
   const right = parseInt(style2.getPropertyValue("--window-right"));
   return {
-    top: top ? top + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top : 0,
-    bottom: bottom ? bottom + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.bottom : 0,
-    left: left ? left + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.left : 0,
-    right: right ? right + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.right : 0
+    top: top ? top + out.top : 0,
+    bottom: bottom ? bottom + out.bottom : 0,
+    left: left ? left + out.left : 0,
+    right: right ? right + out.right : 0
   };
 }
 const style = document.documentElement.style;
@@ -1113,7 +1113,7 @@ function normalizePageMeta(pageMeta) {
       let offset = rpx2px(refreshOptions.offset);
       const {type} = navigationBar;
       if (type !== "transparent" && type !== "none") {
-        offset += NAVBAR_HEIGHT + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top;
+        offset += NAVBAR_HEIGHT + out.top;
       }
       refreshOptions.offset = offset;
       refreshOptions.height = rpx2px(refreshOptions.height);
@@ -11380,7 +11380,7 @@ const getSystemInfoSync = defineSyncApi("getSystemInfoSync", () => {
   const windowWidth = getWindowWidth(screenWidth);
   let windowHeight = window.innerHeight;
   const language = navigator.language;
-  const statusBarHeight = D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top;
+  const statusBarHeight = out.top;
   let osname;
   let osversion;
   let model;
@@ -11493,12 +11493,12 @@ const getSystemInfoSync = defineSyncApi("getSystemInfoSync", () => {
   const system = `${osname} ${osversion}`;
   const platform = osname.toLocaleLowerCase();
   const safeArea = {
-    left: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.left,
-    right: windowWidth - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.right,
-    top: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top,
-    bottom: windowHeight - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.bottom,
-    width: windowWidth - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.left - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.right,
-    height: windowHeight - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.bottom
+    left: out.left,
+    right: windowWidth - out.right,
+    top: out.top,
+    bottom: windowHeight - out.bottom,
+    width: windowWidth - out.left - out.right,
+    height: windowHeight - out.top - out.bottom
   };
   const {top: windowTop, bottom: windowBottom} = getWindowOffset();
   windowHeight -= windowTop;
@@ -11518,10 +11518,10 @@ const getSystemInfoSync = defineSyncApi("getSystemInfoSync", () => {
     model,
     safeArea,
     safeAreaInsets: {
-      top: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top,
-      right: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.right,
-      bottom: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.bottom,
-      left: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.left
+      top: out.top,
+      right: out.right,
+      bottom: out.bottom,
+      left: out.left
     }
   };
 });

packages/vite-plugin-uni/src/configResolved/plugins/index.ts

@@ -94,14 +94,14 @@ export function initPlugins(
     // h5平台需要为非App.vue组件自动增加scoped
     addPlugin(
       plugins,
-      uniCssScopedPlugin(Object.assign(uniCssScopedPluginOptions, options)),
+      uniCssScopedPlugin(extend(uniCssScopedPluginOptions, options)),
       0,
       'pre'
     )
   }
   addPlugin(
     plugins,
-    uniPrePlugin(Object.assign(uniPrePluginOptions, options)),
+    uniPrePlugin(extend(uniPrePluginOptions, options)),
     0,
     'pre'
   )
@@ -111,7 +111,7 @@ export function initPlugins(
 
   addPlugin(
     plugins,
-    uniPreCssPlugin(Object.assign(uniPreCssPluginOptions, options)),
+    uniPreCssPlugin(extend(uniPreCssPluginOptions, options)),
     'vite:css'
   )
   addPlugin(plugins, uniPreVuePlugin(), 'vite:vue', 'pre')
@@ -122,9 +122,7 @@ export function initPlugins(
   if (command === 'build') {
     addPlugin(
       plugins,
-      uniInjectPlugin(
-        Object.assign(uniInjectPluginOptions, options, injectOptions)
-      ),
+      uniInjectPlugin(extend(uniInjectPluginOptions, injectOptions)),
       'vite:vue'
     )
   } else {
@@ -132,7 +130,7 @@ export function initPlugins(
       addPlugin(
         plugins,
         uniInjectPlugin(
-          extend({ exclude: [...COMMON_EXCLUDE] }, options, injectOptions)
+          extend({ exclude: [...COMMON_EXCLUDE] }, injectOptions)
         ),
         'vite:vue'
       )
@@ -141,7 +139,7 @@ export function initPlugins(
 
   addPlugin(
     plugins,
-    uniEasycomPlugin(Object.assign(uniEasycomPluginOptions, options)),
+    uniEasycomPlugin(extend(uniEasycomPluginOptions, options)),
     'vite:vue'
   )
   addPlugin(plugins, uniPageVuePlugin(options), 'vite:vue')

packages/vite-plugin-uni/src/configResolved/plugins/inject.ts

 import path, { sep } from 'path'
 import debug from 'debug'
-import { Plugin, ViteDevServer } from 'vite'
+import { Plugin } from 'vite'
 
 import {
   BaseNode,
@@ -15,6 +15,7 @@ import {
 import {
   attachScopes,
   createFilter,
+  FilterPattern,
   makeLegalIdentifier,
 } from '@rollup/pluginutils'
 import { AcornNode } from 'rollup'
@@ -38,15 +39,16 @@ interface Scope {
 
 type Injectment = string | [string, string]
 
-export interface InjectOptions extends UniPluginFilterOptions {
+export interface InjectOptions {
   sourceMap?: boolean
   callback?: (imports: Map<any, any>, mod: [string, string]) => void
+  include?: FilterPattern
+  exclude?: FilterPattern
   [str: string]:
     | Injectment
-    | InjectOptions['include']
+    | UniPluginFilterOptions['include']
     | Boolean
-    | ViteDevServer
-    | any
+    | Function
 }
 
 const debugInject = debug('uni:inject')
@@ -60,7 +62,6 @@ export function uniInjectPlugin(options: InjectOptions): Plugin {
   delete modules.include
   delete modules.exclude
   delete modules.sourceMap
-  delete modules.devServer
   delete modules.callback
 
   const modulesMap = new Map<string, string | [string, string]>()