Skip to content

U
uni-app

DCloud / uni-app
3 个月 前同步成功

通知 725
Star 38705
Fork 3642
U
uni-app

体验新版 GitCode，发现更多精彩内容 >>

提交 765912d4 编写于 作者: fxy060608's avatar fxy060608
浏览文件
操作

wip(app): uni-app-plus

上级 01931e93
展开全部 显示空白变更内容
内联 并排
Showing with 13486 addition and 15907 deletion
packages/uni-app-plus/dist/style.css
浏览文件 @ 765912d4
uni-button {
position: relative;
uni-view {
display: block;
margin-left: auto;
margin-right: auto;
padding-left: 14px;
padding-right: 14px;
box-sizing: border-box;
font-size: 18px;
text-align: center;
text-decoration: none;
line-height: 2.55555556;
border-radius: 5px;
-webkit-tap-highlight-color: transparent;
overflow: hidden;
color: #000000;
background-color: #f8f8f8;
cursor: pointer;
}
uni-button[hidden] {
display: none !important;
}
uni-button:after {
content: ' ';
width: 200%;
height: 200%;
position: absolute;
top: 0;
left: 0;
border: 1px solid rgba(0, 0, 0, 0.2);
transform: scale(0.5);
transform-origin: 0 0;
box-sizing: border-box;
border-radius: 10px;
}
uni-button[native] {
padding-left: 0;
padding-right: 0;
}
uni-button[native] .uni-button-cover-view-wrapper {
border: inherit;
border-color: inherit;
border-radius: inherit;
background-color: inherit;
}
uni-button[native] .uni-button-cover-view-inner {
padding-left: 14px;
padding-right: 14px;
}
uni-button uni-cover-view {
line-height: inherit;
white-space: inherit;
}
uni-button[type='default'] {
color: #000000;
background-color: #f8f8f8;
}
uni-button[type='primary'] {
color: #ffffff;
background-color: #007aff;
}
uni-button[type='warn'] {
color: #ffffff;
background-color: #e64340;
}
uni-button[disabled] {
color: rgba(255, 255, 255, 0.6);
cursor: not-allowed;
}
uni-button[disabled][type='default'],
uni-button[disabled]:not([type]) {
color: rgba(0, 0, 0, 0.3);
background-color: #f7f7f7;
}
uni-button[disabled][type='primary'] {
background-color: rgba(0, 122, 255, 0.6);
}
uni-button[disabled][type='warn'] {
background-color: #ec8b89;
}
uni-button[type='primary'][plain] {
color: #007aff;
border: 1px solid #007aff;
background-color: transparent;
}
uni-button[type='primary'][plain][disabled] {
color: rgba(0, 0, 0, 0.2);
border-color: rgba(0, 0, 0, 0.2);
}
uni-button[type='primary'][plain]:after {
border-width: 0;
}
uni-button[type='default'][plain] {
color: #353535;
border: 1px solid #353535;
background-color: transparent;
}
uni-button[type='default'][plain][disabled] {
color: rgba(0, 0, 0, 0.2);
border-color: rgba(0, 0, 0, 0.2);
}
uni-button[type='default'][plain]:after {
border-width: 0;
}
uni-button[plain] {
color: #353535;
border: 1px solid #353535;
background-color: transparent;
}
uni-button[plain][disabled] {
color: rgba(0, 0, 0, 0.2);
border-color: rgba(0, 0, 0, 0.2);
}
uni-button[plain]:after {
border-width: 0;
}
uni-button[plain][native] .uni-button-cover-view-inner {
padding: 0;
}
uni-button[type='warn'][plain] {
color: #e64340;
border: 1px solid #e64340;
background-color: transparent;
}
uni-button[type='warn'][plain][disabled] {
color: rgba(0, 0, 0, 0.2);
border-color: rgba(0, 0, 0, 0.2);
}
uni-button[type='warn'][plain]:after {
border-width: 0;
}
uni-button[size='mini'] {
display: inline-block;
line-height: 2.3;
font-size: 13px;
padding: 0 1.34em;
}
uni-button[size='mini'][native] {
padding: 0;
}
uni-button[size='mini'][native] .uni-button-cover-view-inner {
padding: 0 1.34em;
}
uni-button[loading]:not([disabled]) {
cursor: progress;
}
uni-button[loading]:before {
content: ' ';
display: inline-block;
width: 18px;
height: 18px;
vertical-align: middle;
animation: uni-loading 1s steps(12, end) infinite;
background-size: 100%;
}
uni-button[loading][type='primary'] {
color: rgba(255, 255, 255, 0.6);
background-color: #0062cc;
}
uni-button[loading][type='primary'][plain] {
color: #007aff;
background-color: transparent;
}
uni-button[loading][type='default'] {
color: rgba(0, 0, 0, 0.6);
background-color: #dedede;
}
uni-button[loading][type='default'][plain] {
color: #353535;
background-color: transparent;
}
uni-button[loading][type='warn'] {
color: rgba(255, 255, 255, 0.6);
background-color: #ce3c39;
}
uni-button[loading][type='warn'][plain] {
color: #e64340;
background-color: transparent;
}
uni-button[loading][native]:before {
content: none;
}
.button-hover {
color: rgba(0, 0, 0, 0.6);
background-color: #dedede;
}
.button-hover[plain] {
color: rgba(53, 53, 53, 0.6);
border-color: rgba(53, 53, 53, 0.6);
background-color: transparent;
}
.button-hover[type='primary'] {
color: rgba(255, 255, 255, 0.6);
background-color: #0062cc;
}
.button-hover[type='primary'][plain] {
color: rgba(26, 173, 25, 0.6);
border-color: rgba(26, 173, 25, 0.6);
background-color: transparent;
}
.button-hover[type='default'] {
color: rgba(0, 0, 0, 0.6);
background-color: #dedede;
}
.button-hover[type='default'][plain] {
color: rgba(53, 53, 53, 0.6);
border-color: rgba(53, 53, 53, 0.6);
background-color: transparent;
}
.button-hover[type='warn'] {
color: rgba(255, 255, 255, 0.6);
background-color: #ce3c39;
}
.button-hover[type='warn'][plain] {
color: rgba(230, 67, 64, 0.6);
border-color: rgba(230, 67, 64, 0.6);
background-color: transparent;
uni-view[hidden] {
display: none;
}
packages/uni-app-plus/dist/uni-app-service.es.js
浏览文件 @ 765912d4
......@@ -5614,6 +5614,7 @@ var serviceContext = (function (vue) {
});
}
const VD_SYNC = 'vdSync';
const ON_WEBVIEW_READY = 'onWebviewReady';
function initNVue(webviewStyle, routeMeta, path) {
......@@ -6490,7 +6491,6 @@ var serviceContext = (function (vue) {
}, delay);
}
const BRIDGE_NODE_SYNC = 'nodeSync';
const ACTION_TYPE_PAGE_CREATE = 1;
const ACTION_TYPE_PAGE_CREATED = 2;
const ACTION_TYPE_CREATE = 3;
......@@ -6499,6 +6499,7 @@ var serviceContext = (function (vue) {
const ACTION_TYPE_SET_ATTRIBUTE = 6;
const ACTION_TYPE_REMOVE_ATTRIBUTE = 7;
const ACTION_TYPE_SET_TEXT = 8;
class UniPageNode extends UniNode {
constructor(pageId, options, setup = false) {
super(NODE_TYPE_PAGE, '#page', null);
......@@ -6509,6 +6510,7 @@ var serviceContext = (function (vue) {
this.pageNode = this;
this.createAction = [ACTION_TYPE_PAGE_CREATE, options];
this.createdAction = [ACTION_TYPE_PAGE_CREATED];
this._update = this.update.bind(this);
setup && this.setup();
}
onCreate(thisNode, nodeName) {
......@@ -6548,6 +6550,10 @@ var serviceContext = (function (vue) {
}
push(action) {
this.updateActions.push(action);
if ((process.env.NODE_ENV !== 'production')) {
console.log(formatLog('PageNode', 'push', action));
}
vue.queuePostFlushCb(this._update);
}
restore() {
this.push(this.createAction);
......@@ -6557,20 +6563,23 @@ var serviceContext = (function (vue) {
setup() {
this.send([this.createAction]);
}
mounted() {
const { updateActions, createdAction } = this;
updateActions.unshift(createdAction);
this.update();
}
// mounted() {
// const { updateActions, createdAction } = this
// updateActions.unshift(createdAction)
// this.update()
// }
update() {
const { updateActions } = this;
if ((process.env.NODE_ENV !== 'production')) {
console.log(formatLog('PageNode', 'update', updateActions.length));
}
if (updateActions.length) {
this.send(updateActions);
updateActions.length = 0;
}
}
send(action) {
UniServiceJSBridge.publishHandler(BRIDGE_NODE_SYNC, action, this.pageId);
UniServiceJSBridge.publishHandler(VD_SYNC, action, this.pageId);
}
}
function pushCreateAction(pageNode, nodeId, nodeName) {
......@@ -6730,6 +6739,7 @@ var serviceContext = (function (vue) {
function initPageOptions({ meta }) {
const statusbarHeight = getStatusbarHeight();
return {
route: meta.route,
version: 1,
locale: '',
disableScroll: meta.disableScroll === true,
......
packages/uni-app-plus/src/PageAction.ts 0 → 100644
浏览文件 @ 765912d4
export const ACTION_TYPE_PAGE_CREATE = 1
export const ACTION_TYPE_PAGE_CREATED = 2
export const ACTION_TYPE_CREATE = 3
export const ACTION_TYPE_INSERT = 4
export const ACTION_TYPE_REMOVE = 5
export const ACTION_TYPE_SET_ATTRIBUTE = 6
export const ACTION_TYPE_REMOVE_ATTRIBUTE = 7
export const ACTION_TYPE_SET_TEXT = 8
export interface PageNodeOptions {
route: string
version: number
locale: string
disableScroll: boolean
onPageScroll: boolean
onPageReachBottom: boolean
onReachBottomDistance: number
statusbarHeight: number
windowTop: number
windowBottom: number
}
export interface PageCreateData extends PageNodeOptions {}
export type PageCreateAction = [typeof ACTION_TYPE_PAGE_CREATE, PageCreateData]
export type PageCreatedAction = [typeof ACTION_TYPE_PAGE_CREATED]
export type CreateAction = [
typeof ACTION_TYPE_CREATE,
number, // nodeId
string | number //nodeName
]
export type InsertAction = [
typeof ACTION_TYPE_INSERT,
number, // nodeId
number, // parentNodeId
number, // index
Record<string, any> // Element JSON
]
export type RemoveAction = [
typeof ACTION_TYPE_REMOVE,
number, // nodeId
number // parentNodeId
]
export type SetAttributeAction = [
typeof ACTION_TYPE_SET_ATTRIBUTE,
number, // nodeId
string, // attribute name
unknown // attribute value
]
export type RemoveAttributeAction = [
typeof ACTION_TYPE_REMOVE_ATTRIBUTE,
number, // nodeId
string // attribute name
]
export type SetTextAction = [
typeof ACTION_TYPE_SET_TEXT,
number, // nodeId
string // text content
]
export type PageUpdateAction =
| CreateAction
| InsertAction
| RemoveAction
| SetAttributeAction
| RemoveAttributeAction
| SetTextAction
export type PageAction = PageCreateAction | PageCreatedAction | PageUpdateAction
packages/uni-app-plus/src/constants.ts
浏览文件 @ 765912d4
export const VD_SYNC = 'vdSync'
export const ON_WEBVIEW_READY = 'onWebviewReady'
packages/uni-app-plus/src/service/framework/dom/Page.ts
浏览文件 @ 765912d4
import { queuePostFlushCb } from 'vue'
import {
UniNode,
NODE_TYPE_PAGE,
UniBaseNode,
IUniPageNode,
formatLog,
} from '@dcloudio/uni-shared'
const BRIDGE_NODE_SYNC = 'nodeSync'
const ACTION_TYPE_PAGE_CREATE = 1
const ACTION_TYPE_PAGE_CREATED = 2
export const ACTION_TYPE_CREATE = 3
export const ACTION_TYPE_INSERT = 4
export const ACTION_TYPE_REMOVE = 5
export const ACTION_TYPE_SET_ATTRIBUTE = 6
export const ACTION_TYPE_REMOVE_ATTRIBUTE = 7
export const ACTION_TYPE_SET_TEXT = 8
export interface PageNodeOptions {
version: number
locale: string
disableScroll: boolean
onPageScroll: boolean
onPageReachBottom: boolean
onReachBottomDistance: number
statusbarHeight: number
windowTop: number
windowBottom: number
}
interface PageCreateData extends PageNodeOptions {}
type PageCreateAction = [typeof ACTION_TYPE_PAGE_CREATE, PageCreateData]
type PageCreatedAction = [typeof ACTION_TYPE_PAGE_CREATED]
export type CreateAction = [
typeof ACTION_TYPE_CREATE,
number, // nodeId
string | number //nodeName
]
export type InsertAction = [
typeof ACTION_TYPE_INSERT,
number, // nodeId
number, // parentNodeId
number, // index
Record<string, any> // Element JSON
]
export type RemoveAction = [
typeof ACTION_TYPE_REMOVE,
number, // nodeId
number // parentNodeId
]
export type SetAttributeAction = [
typeof ACTION_TYPE_SET_ATTRIBUTE,
number, // nodeId
string, // attribute name
unknown // attribute value
]
export type RemoveAttributeAction = [
typeof ACTION_TYPE_REMOVE_ATTRIBUTE,
number, // nodeId
string // attribute name
]
export type SetTextAction = [
typeof ACTION_TYPE_SET_TEXT,
number, // nodeId
string // text content
]
type PageUpdateAction =
| CreateAction
| InsertAction
| RemoveAction
| SetAttributeAction
| RemoveAttributeAction
| SetTextAction
export type PageAction = PageCreateAction | PageCreatedAction | PageUpdateAction
import {
PageCreateAction,
PageCreatedAction,
PageAction,
PageNodeOptions,
ACTION_TYPE_CREATE,
ACTION_TYPE_INSERT,
ACTION_TYPE_REMOVE,
ACTION_TYPE_SET_ATTRIBUTE,
ACTION_TYPE_REMOVE_ATTRIBUTE,
ACTION_TYPE_SET_TEXT,
ACTION_TYPE_PAGE_CREATE,
ACTION_TYPE_PAGE_CREATED,
} from '../../../PageAction'
import { VD_SYNC } from '../../../constants'
export default class UniPageNode extends UniNode implements IUniPageNode {
pageId: number
......@@ -87,6 +28,9 @@ export default class UniPageNode extends UniNode implements IUniPageNode {
private createAction: PageCreateAction
private createdAction: PageCreatedAction
public updateActions: PageAction[] = []
private _update: () => void
constructor(
pageId: number,
options: PageNodeOptions,
......@@ -100,6 +44,8 @@ export default class UniPageNode extends UniNode implements IUniPageNode {
this.createAction = [ACTION_TYPE_PAGE_CREATE, options]
this.createdAction = [ACTION_TYPE_PAGE_CREATED]
this._update = this.update.bind(this)
setup && this.setup()
}
onCreate(thisNode: UniNode, nodeName: string | number) {
......@@ -139,6 +85,10 @@ export default class UniPageNode extends UniNode implements IUniPageNode {
}
push(action: PageAction) {
this.updateActions.push(action)
if (__DEV__) {
console.log(formatLog('PageNode', 'push', action))
}
queuePostFlushCb(this._update)
}
restore() {
this.push(this.createAction)
......@@ -148,20 +98,23 @@ export default class UniPageNode extends UniNode implements IUniPageNode {
setup() {
this.send([this.createAction])
}
mounted() {
const { updateActions, createdAction } = this
updateActions.unshift(createdAction)
this.update()
}
// mounted() {
// const { updateActions, createdAction } = this
// updateActions.unshift(createdAction)
// this.update()
// }
update() {
const { updateActions } = this
if (__DEV__) {
console.log(formatLog('PageNode', 'update', updateActions.length))
}
if (updateActions.length) {
this.send(updateActions)
updateActions.length = 0
}
}
send(action: PageAction[]) {
UniServiceJSBridge.publishHandler(BRIDGE_NODE_SYNC, action, this.pageId)
UniServiceJSBridge.publishHandler(VD_SYNC, action, this.pageId)
}
}
......
packages/uni-app-plus/src/service/framework/page/define.ts
浏览文件 @ 765912d4
import { once } from '@dcloudio/uni-shared'
import { createApp, defineComponent } from 'vue'
import { createPageNode, PageNodeOptions } from '../dom/Page'
import { createPageNode } from '../dom/Page'
import { setupPage } from './setup'
import __vuePlugin from '../plugin'
import { PageNodeOptions } from '../../../PageAction'
export type VueComponent = ReturnType<typeof defineComponent>
......
packages/uni-app-plus/src/service/framework/page/register.ts
浏览文件 @ 765912d4
import { ComponentPublicInstance } from 'vue'
import { hasOwn } from '@vue/shared'
import {
formatLog,
NAVBAR_HEIGHT,
ON_REACH_BOTTOM_DISTANCE,
} from '@dcloudio/uni-shared'
import { initPageInternalInstance } from '@dcloudio/uni-core'
import { initEntry } from '../app/initEntry'
import { initRouteOptions } from './routeOptions'
import { createWebview, initWebview } from '../webview'
import { createPage } from './define'
import { PageNodeOptions } from '../dom/Page'
import { PageNodeOptions } from '../../../PageAction'
import { getStatusbarHeight } from '../../../helpers/statusBar'
import tabBar from '../app/tabBar'
import { addCurrentPage } from './getCurrentPages'
import { initPageInternalInstance } from '@dcloudio/uni-core'
import { ComponentPublicInstance } from 'vue'
export type OpenType =
| 'navigateTo'
......@@ -92,6 +93,7 @@ export function registerPage({
function initPageOptions({ meta }: UniApp.UniRoute): PageNodeOptions {
const statusbarHeight = getStatusbarHeight()
return {
route: meta.route,
version: 1,
locale: '',
disableScroll: meta.disableScroll === true,
......
packages/uni-app-plus/src/service/framework/runtime.ts 已删除 100644 → 0
浏览文件 @ 01931e93
import { ComponentInternalInstance } from 'vue'
import { extend } from '@vue/shared'
interface JsRuntime {
injectHook: (
type: string,
hook: Function,
target: ComponentInternalInstance | null,
prepend: boolean
) => Function | undefined
createApp: typeof createApp
}
export function defineRuntime(runtime: JsRuntime) {
// @ts-expect-error
extend(jsRuntime, runtime)
}
packages/uni-app-plus/src/view/components/index.ts
浏览文件 @ 765912d4
import { createApp, h } from 'vue'
import wrapper from 'vue3-webcomponent-wrapper'
import '@dcloudio/uni-components/style/button.css'
import {
// Audio,
Button,
// Canvas,
// Checkbox,
// CheckboxGroup,
// Editor,
// Form,
Icon,
Image,
// Input,
// Label,
// MovableArea,
// MovableView,
// Navigator,
// PickerView,
// PickerViewColumn,
// Progress,
// Radio,
// RadioGroup,
// ResizeSensor,
// RichText,
// ScrollView,
// Slider,
// Swiper,
// SwiperItem,
// Switch,
Text,
// Textarea,
View,
} from '@dcloudio/uni-components'
const { customElements } = window
customElements.define('v-uni-button', wrapper(Button, createApp, h))
customElements.define('v-uni-icon', wrapper(Icon, createApp, h))
customElements.define('v-uni-image', wrapper(Image, createApp, h))
customElements.define('v-uni-text', wrapper(Text, createApp, h))
customElements.define('v-uni-view', wrapper(View, createApp, h))
export * from './view'
packages/uni-app-plus/src/view/components/view.ts 0 → 100644
浏览文件 @ 765912d4
import '@dcloudio/uni-components/style/view.css'
export function View() {
return document.createElement('uni-view')
}
packages/uni-app-plus/src/view/framework/index.ts 0 → 100644
浏览文件 @ 765912d4
import { initSubscribeHandlers } from './subscriber'
export function initView() {
initSubscribeHandlers()
}
packages/uni-app-plus/src/view/framework/subscriber/index.ts 0 → 100644
浏览文件 @ 765912d4
import { VD_SYNC } from '../../../constants'
import { onVdSync } from './vdom'
export function initSubscribeHandlers() {
const { subscribe } = UniViewJSBridge
subscribe(VD_SYNC, onVdSync)
}
packages/uni-app-plus/src/view/framework/subscriber/vdom/index.ts 0 → 100644
浏览文件 @ 765912d4
import {
ACTION_TYPE_PAGE_CREATE,
ACTION_TYPE_PAGE_CREATED,
PageAction,
} from '../../../../PageAction'
import { onPageCreate } from './onPageCreate'
import { onPageCreated } from './onPageCreated'
export function onVdSync(actions: PageAction[]) {
actions.forEach((action) => {
switch (action[0]) {
case ACTION_TYPE_PAGE_CREATE:
return onPageCreate(action[1])
case ACTION_TYPE_PAGE_CREATED:
return onPageCreated()
}
})
}
packages/uni-app-plus/src/view/framework/subscriber/vdom/onPageCreate.ts 0 → 100644
浏览文件 @ 765912d4
import {
createScrollListener,
CreateScrollListenerOptions,
disableScrollListener,
updateCssVar,
} from '@dcloudio/uni-core'
import { formatLog } from '@dcloudio/uni-shared'
import { PageCreateData } from '../../../../PageAction'
export function onPageCreate({
route,
disableScroll,
onPageScroll,
onPageReachBottom,
onReachBottomDistance,
statusbarHeight,
windowTop,
windowBottom,
}: PageCreateData) {
const pageId = plus.webview.currentWebview().id!
;(window as any).__id__ = pageId
document.title = `${route}[${pageId}]`
initCssVar(statusbarHeight, windowTop, windowBottom)
if (disableScroll) {
document.addEventListener('touchmove', disableScrollListener)
} else if (onPageScroll || onPageReachBottom) {
initPageScroll(onPageScroll, onPageReachBottom, onReachBottomDistance)
}
}
function initCssVar(
statusbarHeight: number,
windowTop: number,
windowBottom: number
) {
const cssVars = {
'--window-left': '0px',
'--window-right': '0px',
'--window-top': windowTop + 'px',
'--window-bottom': windowBottom + 'px',
'--status-bar-height': statusbarHeight + 'px',
}
if (__DEV__) {
console.log(formatLog('initCssVar', cssVars))
}
updateCssVar(cssVars)
}
function initPageScroll(
onPageScroll: boolean,
onPageReachBottom: boolean,
onReachBottomDistance: number
) {
const opts: CreateScrollListenerOptions = {}
if (onPageScroll) {
opts.onPageScroll = (scrollTop) => {
UniViewJSBridge.publishHandler('onPageScroll', { scrollTop })
}
}
if (onPageReachBottom) {
opts.onReachBottomDistance = onReachBottomDistance
opts.onReachBottom = () => UniViewJSBridge.publishHandler('onReachBottom')
}
// 避免监听太早，直接触发了 scroll
requestAnimationFrame(() =>
document.addEventListener('scroll', createScrollListener(opts))
)
}
packages/uni-app-plus/src/view/ready.ts
浏览文件 @ 765912d4
import { ON_WEBVIEW_READY } from '../constants'
import { UniViewJSBridge } from './bridge'
import { initView } from './framework'
;(window as any).UniViewJSBridge = UniViewJSBridge
function onWebviewReady() {
initView()
UniViewJSBridge.publishHandler(ON_WEBVIEW_READY)
}
if (typeof plus !== 'undefined') {
......
packages/uni-app-vue/build.json
浏览文件 @ 765912d4
......@@ -11,7 +11,8 @@
"__VUE_OPTIONS_API__": "true",
"__VUE_PROD_DEVTOOLS__": "false"
},
"external": false
"external": false,
"babel": true
},
{
"input": {
......
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @ 765912d4
......@@ -737,7 +737,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(() => {
......@@ -749,10 +749,10 @@ function getWindowOffset() {
const left = parseInt(style.getPropertyValue("--window-left"));
const right = parseInt(style.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
};
}
function updateCssVar(cssVars) {
......@@ -13071,7 +13071,7 @@ function normalizePageMeta(pageMeta) {
}, pageMeta.pullToRefresh));
const { type, style } = navigationBar;
if (style !== "custom" && type !== "transparent") {
pullToRefresh.offset += NAVBAR_HEIGHT + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top;
pullToRefresh.offset += NAVBAR_HEIGHT + out.top;
}
pageMeta.pullToRefresh = pullToRefresh;
}
......@@ -15246,7 +15246,7 @@ const getSystemInfoSync = /* @__PURE__ */ 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;
......@@ -15359,12 +15359,12 @@ const getSystemInfoSync = /* @__PURE__ */ 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;
......@@ -15384,10 +15384,10 @@ const getSystemInfoSync = /* @__PURE__ */ 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/utils/plugin.ts
浏览文件 @ 765912d4
......@@ -17,17 +17,9 @@ export function initExtraPlugins(cliRoot: string, platform: UniApp.PLATFORM) {
return initPlugins(resolvePlugins(cliRoot, platform))
}
function initPlugin(plugin: PluginConfig): Plugin | void {
const configFile = path.join(
plugin.id,
plugin.config.main || '/lib/uni.plugin.js'
)
try {
const plugin = require(configFile)
function initPlugin({ id, config: { main } }: PluginConfig): Plugin | void {
const plugin = require(path.join(id, main || '/lib/uni.plugin.js'))
return plugin.default || plugin
} catch (e) {
console.warn(`${configFile} not found`)
}
}
function initPlugins(plugins: PluginConfig[]): Plugin[] {
......
rollup.config.js
浏览文件 @ 765912d4
......@@ -6,6 +6,7 @@ import json from '@rollup/plugin-json'
import alias from '@rollup/plugin-alias'
import nodeResolve from '@rollup/plugin-node-resolve'
import commonjs from '@rollup/plugin-commonjs'
import { getBabelOutputPlugin } from '@rollup/plugin-babel'
if (!process.env.TARGET) {
throw new Error('TARGET package must be specified via --environment flag.')
......@@ -111,11 +112,7 @@ function createConfig(entryFile, output, buildOption) {
...Object.keys(pkg.peerDependencies || {}),
...(buildOption.external || []),
]
return {
input: resolve(entryFile),
external,
plugins: [
const plugins = [
createAliasPlugin(buildOption),
nodeResolve(),
commonjs(),
......@@ -124,7 +121,18 @@ function createConfig(entryFile, output, buildOption) {
}),
tsPlugin,
createReplacePlugin(buildOption, output.format),
],
]
if (buildOption.babel) {
plugins.push(
getBabelOutputPlugin({
presets: [['@babel/preset-env', { targets: ['iOS 9'] }]],
})
)
}
return {
input: resolve(entryFile),
external,
plugins,
output,
onwarn: (msg, warn) => {
// if (!/Circular/.test(msg)) {
......
yarn.lock
浏览文件 @ 765912d4
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或