@tarojs/runtime 4.0.0-beta.133 → 4.0.0-beta.134

package/dist/index.d.ts

@@ -1,14 +1,14 @@
 import env from "./env.js";
 export { hooks } from '@tarojs/shared';
-export { document } from "./bom/document.js";
-export { getComputedStyle } from "./bom/getComputedStyle.js";
+export { taroDocumentProvider as document } from "./bom/document.js";
+export { taroGetComputedStyleProvider as getComputedStyle } from "./bom/getComputedStyle.js";
 export { History } from "./bom/history.js";
 export { Location } from "./bom/location.js";
 export { nav as navigator } from "./bom/navigator.js";
 export { caf as cancelAnimationFrame, now, raf as requestAnimationFrame } from "./bom/raf.js";
-export { parseUrl, URL } from "./bom/URL.js";
+export { parseUrl, TaroURLProvider as URL } from "./bom/URL.js";
 export { URLSearchParams } from "./bom/URLSearchParams.js";
-export { history, location, window } from "./bom/window.js";
+export { taroHistoryProvider as history, taroLocationProvider as location, taroWindowProvider as window } from "./bom/window.js";
 export { TaroElement } from "./dom/element.js";
 export { createEvent, eventHandler, TaroEvent } from "./dom/event.js";
 export { FormElement } from "./dom/form.js";

package/dist/index.js

@@ -1,15 +1,15 @@
 import './dom-external/index.js';
 export { default as env } from './env.js';
 export { Events, hooks } from '@tarojs/shared';
-export { document } from './bom/document.js';
-export { getComputedStyle } from './bom/getComputedStyle.js';
+export { taroDocumentProvider as document } from './bom/document.js';
+export { taroGetComputedStyleProvider as getComputedStyle } from './bom/getComputedStyle.js';
 export { History } from './bom/history.js';
 export { Location } from './bom/location.js';
 export { nav as navigator } from './bom/navigator.js';
 export { caf as cancelAnimationFrame, now, raf as requestAnimationFrame } from './bom/raf.js';
-export { URL, parseUrl } from './bom/URL.js';
+export { TaroURLProvider as URL, parseUrl } from './bom/URL.js';
 export { URLSearchParams } from './bom/URLSearchParams.js';
-export { history, location, window } from './bom/window.js';
+export { taroHistoryProvider as history, taroLocationProvider as location, taroWindowProvider as window } from './bom/window.js';
 export { TaroElement } from './dom/element.js';
 export { TaroEvent, createEvent, eventHandler } from './dom/event.js';
 export { FormElement } from './dom/form.js';

package/dist/runtime.esm.d.ts

@@ -330,9 +330,11 @@ interface Env {
     document: TaroDocument;
 }
 declare const env: Env;
-declare const document: TaroDocument;
+// Note: 小程序端 vite 打包成 commonjs，const document = xxx 会报错，所以把 document 改为 taroDocumentProvider
+declare const taroDocumentProvider: TaroDocument;
 type TGetComputedStyle = typeof window.getComputedStyle | ((el: TaroElement) => Style);
-declare const getComputedStyle: TGetComputedStyle;
+// Note: 小程序端 vite 打包成 commonjs，const getComputedStyle = xxx 会报错，所以把 GetComputedStyle 改为 taroGetComputedStyleProvider
+declare const taroGetComputedStyleProvider: TGetComputedStyle;
 declare const eventCenter: Events;
 type EventsType = typeof Events;
 /**
@@ -462,7 +464,8 @@ declare class TaroURL {
         href: string;
     };
 }
-declare const URL: typeof TaroURL;
+// Note: 小程序端 vite 打包成 commonjs，const URL = xxx 会报错，所以把 URL 改为 TaroURLProvider
+declare const TaroURLProvider: typeof TaroURL;
 declare function parseUrl(url?: string): {
     href: string;
     origin: string;
@@ -492,9 +495,10 @@ declare class TaroWindow extends Events {
     setTimeout(...args: Parameters<typeof setTimeout>): NodeJS.Timeout;
     clearTimeout(...args: Parameters<typeof clearTimeout>): void;
 }
-declare const window: TaroWindow;
-declare const location: TaroLocation;
-declare const history: TaroHistory;
+// Note: 小程序端 vite 打包成 commonjs，const window = xxx 会报错，所以把 window 改为 taroWindowProvider，location 和 history 同理
+declare const taroWindowProvider: TaroWindow;
+declare const taroLocationProvider: TaroLocation;
+declare const taroHistoryProvider: TaroHistory;
 // for Vue3
 declare class SVGElement extends TaroElement {
 }
@@ -803,4 +807,4 @@ declare const getHomePage: (path?: string, basename?: string, customRoutes?: Rec
 declare const getCurrentPage: (routerMode?: string, basename?: string) => string;
 declare function handlePolyfill(): void;
 export { hooks } from '@tarojs/shared';
-export { document, getComputedStyle, History, Location, nav as navigator, _caf as cancelAnimationFrame, now, _raf as requestAnimationFrame, parseUrl, URL, URLSearchParams, history, location, window, TaroElement, createEvent, eventHandler, TaroEvent, FormElement, TaroNode, TaroRootElement, Style, SVGElement, TaroText, MutationObserver, env, PROPERTY_THRESHOLD, TARO_RUNTIME, HOOKS_APP_ID, SET_DATA, PAGE_INIT, ROOT_STR, HTML, HEAD, BODY, APP, CONTAINER, DOCUMENT_ELEMENT_NAME, DOCUMENT_FRAGMENT, ID, UID, CLASS, STYLE, FOCUS, VIEW, STATIC_VIEW, PURE_VIEW, PROPS, DATASET, OBJECT, VALUE, INPUT, CHANGE, CUSTOM_WRAPPER, TARGET, CURRENT_TARGET, TYPE, CONFIRM, TIME_STAMP, KEY_CODE, TOUCHMOVE, DATE, SET_TIMEOUT, COMPILE_MODE, CATCHMOVE, CATCH_VIEW, COMMENT, ON_LOAD, ON_READY, ON_SHOW, ON_HIDE, OPTIONS, EXTERNAL_CLASSES, EVENT_CALLBACK_RESULT, BEHAVIORS, A, CONTEXT_ACTIONS, Current, getCurrentInstance, eventSource, createComponentConfig, createPageConfig, createRecursiveComponentConfig, getOnHideEventKey, getOnReadyEventKey, getOnShowEventKey, getPageInstance, getPath, injectPageInstance, removePageInstance, safeExecute, stringify, EventsType, eventCenter, Events, hydrate, nextTick, options, perf, incrementId, isElement, isText, isComment, isHasExtractProp, isParentBinded, shortcutAttr, customWrapperCache, extend, getComponentsAlias, convertNumber2PX, throttle, debounce, addLeadingSlash, hasBasename, stripBasename, stripTrailing, stripSuffix, getHomePage, getCurrentPage, Instance, PageProps, ReactPageComponent, ReactPageInstance, ReactAppInstance, PageLifeCycle, PageInstance, AppInstance, Attributes, EventOptions, MpEvent, EventListenerOptions, AddEventListenerOptions, EventHandler, MpInstance, MiniElementData, MiniTextData, MiniData, HydratedData, UpdatePayloadValue, DataTree, UpdatePayload, Options$1 as Options, TFunc, PageConfig, handlePolyfill };
+export { taroDocumentProvider as document, taroGetComputedStyleProvider as getComputedStyle, History, Location, nav as navigator, _caf as cancelAnimationFrame, now, _raf as requestAnimationFrame, parseUrl, TaroURLProvider as URL, URLSearchParams, taroHistoryProvider as history, taroLocationProvider as location, taroWindowProvider as window, TaroElement, createEvent, eventHandler, TaroEvent, FormElement, TaroNode, TaroRootElement, Style, SVGElement, TaroText, MutationObserver, env, PROPERTY_THRESHOLD, TARO_RUNTIME, HOOKS_APP_ID, SET_DATA, PAGE_INIT, ROOT_STR, HTML, HEAD, BODY, APP, CONTAINER, DOCUMENT_ELEMENT_NAME, DOCUMENT_FRAGMENT, ID, UID, CLASS, STYLE, FOCUS, VIEW, STATIC_VIEW, PURE_VIEW, PROPS, DATASET, OBJECT, VALUE, INPUT, CHANGE, CUSTOM_WRAPPER, TARGET, CURRENT_TARGET, TYPE, CONFIRM, TIME_STAMP, KEY_CODE, TOUCHMOVE, DATE, SET_TIMEOUT, COMPILE_MODE, CATCHMOVE, CATCH_VIEW, COMMENT, ON_LOAD, ON_READY, ON_SHOW, ON_HIDE, OPTIONS, EXTERNAL_CLASSES, EVENT_CALLBACK_RESULT, BEHAVIORS, A, CONTEXT_ACTIONS, Current, getCurrentInstance, eventSource, createComponentConfig, createPageConfig, createRecursiveComponentConfig, getOnHideEventKey, getOnReadyEventKey, getOnShowEventKey, getPageInstance, getPath, injectPageInstance, removePageInstance, safeExecute, stringify, EventsType, eventCenter, Events, hydrate, nextTick, options, perf, incrementId, isElement, isText, isComment, isHasExtractProp, isParentBinded, shortcutAttr, customWrapperCache, extend, getComponentsAlias, convertNumber2PX, throttle, debounce, addLeadingSlash, hasBasename, stripBasename, stripTrailing, stripSuffix, getHomePage, getCurrentPage, Instance, PageProps, ReactPageComponent, ReactPageInstance, ReactAppInstance, PageLifeCycle, PageInstance, AppInstance, Attributes, EventOptions, MpEvent, EventListenerOptions, AddEventListenerOptions, EventHandler, MpInstance, MiniElementData, MiniTextData, MiniData, HydratedData, UpdatePayloadValue, DataTree, UpdatePayload, Options$1 as Options, TFunc, PageConfig, handlePolyfill };

package/dist/runtime.esm.js

@@ -236,7 +236,8 @@ const env = {
     document: process.env.TARO_PLATFORM === 'web' ? document : EMPTY_OBJ
 };
 
-const getComputedStyle = process.env.TARO_PLATFORM === 'web' ? env.window.getComputedStyle : function (element) {
+// Note: 小程序端 vite 打包成 commonjs，const getComputedStyle = xxx 会报错，所以把 GetComputedStyle 改为 taroGetComputedStyleProvider
+const taroGetComputedStyleProvider = process.env.TARO_PLATFORM === 'web' ? env.window.getComputedStyle : function (element) {
     return element.style;
 };
 
@@ -427,11 +428,19 @@ const URLSearchParams = process.env.TARO_PLATFORM === 'web' ? env.window.URLSear
                 for (let pairs = query.split('&'), i = 0, length = pairs.length; i < length; i++) {
                     const value = pairs[i];
                     const index = value.indexOf('=');
-                    if (index > -1) {
-                        appendTo(dict, decode(value.slice(0, index)), decode(value.slice(index + 1)));
+                    // 针对不规范的 url 参数做容错处理，如：word=你%好
+                    try {
+                        if (index > -1) {
+                            appendTo(dict, decode(value.slice(0, index)), decode(value.slice(index + 1)));
+                        }
+                        else if (value.length) {
+                            appendTo(dict, decode(value), '');
+                        }
                     }
-                    else if (value.length) {
-                        appendTo(dict, decode(value), '');
+                    catch (err) {
+                        if (process.env.NODE_ENV !== 'production') {
+                            console.warn(`[Taro warn] URL 参数 ${value} decode 异常`);
+                        }
                     }
                 }
             }
@@ -650,7 +659,8 @@ class TaroURL {
     }
 }
 _TaroURL_hash = new WeakMap(), _TaroURL_hostname = new WeakMap(), _TaroURL_pathname = new WeakMap(), _TaroURL_port = new WeakMap(), _TaroURL_protocol = new WeakMap(), _TaroURL_search = new WeakMap();
-const URL = process.env.TARO_PLATFORM === 'web' ? env.window.URL : TaroURL;
+// Note: 小程序端 vite 打包成 commonjs，const URL = xxx 会报错，所以把 URL 改为 TaroURLProvider
+const TaroURLProvider = process.env.TARO_PLATFORM === 'web' ? env.window.URL : TaroURL;
 function parseUrl(url = '') {
     const result = {
         href: '',
@@ -723,7 +733,7 @@ class TaroLocation extends Events {
         super();
         _TaroLocation_instances.add(this);
         /* private property */
-        _TaroLocation_url.set(this, new URL(INIT_URL));
+        _TaroLocation_url.set(this, new TaroURLProvider(INIT_URL));
         _TaroLocation_noCheckUrl.set(this, false);
         _TaroLocation_window.set(this, void 0);
         __classPrivateFieldSet(this, _TaroLocation_window, options.window, "f");
@@ -900,7 +910,7 @@ _TaroLocation_url = new WeakMap(), _TaroLocation_noCheckUrl = new WeakMap(), _Ta
         });
         const searchStr = searchArr.length > 0 ? '?' + searchArr.join('&') : '';
         const url = `${INIT_URL}${path.startsWith('/') ? path : '/' + path}${searchStr}`;
-        __classPrivateFieldSet(this, _TaroLocation_url, new URL(url), "f");
+        __classPrivateFieldSet(this, _TaroLocation_url, new TaroURLProvider(url), "f");
         this.trigger('__reset_history__', this.href);
     }
 }, _TaroLocation_getPreValue = function _TaroLocation_getPreValue() {
@@ -983,12 +993,12 @@ let now;
 let lastTime = 0;
 // https://gist.github.com/paulirish/1579671
 // https://gist.github.com/jalbam/5fe05443270fa6d8136238ec72accbc0
-const _raf = typeof requestAnimationFrame !== 'undefined' && requestAnimationFrame !== null ? requestAnimationFrame : function (callback) {
+const _raf = process.env.TARO_PLATFORM === 'web' ? requestAnimationFrame : function (callback) {
     const _now = now();
     const nextTime = Math.max(lastTime + 16, _now); // First time will execute it immediately but barely noticeable and performance is gained.
     return setTimeout(function () { callback(lastTime = nextTime); }, nextTime - _now);
 };
-const _caf = typeof cancelAnimationFrame !== 'undefined' && cancelAnimationFrame !== null
+const _caf = process.env.TARO_PLATFORM === 'web'
     ? cancelAnimationFrame
     : function (seed) {
         // fix https://github.com/NervJS/taro/issues/7749
@@ -1001,7 +1011,7 @@ class TaroWindow extends Events {
         this.navigator = nav;
         this.requestAnimationFrame = _raf;
         this.cancelAnimationFrame = _caf;
-        this.getComputedStyle = getComputedStyle;
+        this.getComputedStyle = taroGetComputedStyleProvider;
         const globalProperties = [
             ...Object.getOwnPropertyNames(global || {}),
             ...Object.getOwnPropertySymbols(global || {})
@@ -1071,9 +1081,10 @@ class TaroWindow extends Events {
         return clearTimeout(...args);
     }
 }
-const window$1 = process.env.TARO_PLATFORM === 'web' ? env.window : (env.window = new TaroWindow());
-const location = window$1.location;
-const history = window$1.history;
+// Note: 小程序端 vite 打包成 commonjs，const window = xxx 会报错，所以把 window 改为 taroWindowProvider，location 和 history 同理
+const taroWindowProvider = process.env.TARO_PLATFORM === 'web' ? env.window : (env.window = new TaroWindow());
+const taroLocationProvider = taroWindowProvider.location;
+const taroHistoryProvider = taroWindowProvider.history;
 
 // export const removeLeadingSlash = (str = '') => str.replace(/^\.?\//, '')
 // export const removeTrailingSearch = (str = '') => str.replace(/\?[\s\S]*$/, '')
@@ -1090,8 +1101,8 @@ const getHomePage = (path = '', basename = '', customRoutes = {}, entryPagePath
 };
 const getCurrentPage = (routerMode = 'hash', basename = '/') => {
     const pagePath = routerMode === 'hash'
-        ? location.hash.slice(1).split('?')[0]
-        : location.pathname;
+        ? taroLocationProvider.hash.slice(1).split('?')[0]
+        : taroLocationProvider.pathname;
     return addLeadingSlash(stripBasename(pagePath, basename));
 };
 
@@ -3367,14 +3378,15 @@ class TaroEvent {
         this.defaultPrevented = true;
     }
     get target() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const cacheTarget = this.cacheTarget;
         if (!cacheTarget) {
             const target = Object.create(((_a = this.mpEvent) === null || _a === void 0 ? void 0 : _a.target) || null);
+            const currentEle = env.document.getElementById(((_b = target.dataset) === null || _b === void 0 ? void 0 : _b.sid) || target.id || null);
             // Note：优先判断冒泡场景alipay的targetDataset的sid, 不然冒泡场景target属性吐出不对，其余拿取当前绑定id
-            const element = env.document.getElementById(((_b = target.targetDataset) === null || _b === void 0 ? void 0 : _b.sid) || ((_c = target.dataset) === null || _c === void 0 ? void 0 : _c.sid) || target.id || null);
-            target.dataset = element !== null ? element.dataset : EMPTY_OBJ;
-            for (const key in (_d = this.mpEvent) === null || _d === void 0 ? void 0 : _d.detail) {
+            const element = env.document.getElementById(((_c = target.targetDataset) === null || _c === void 0 ? void 0 : _c.sid) || ((_d = target.dataset) === null || _d === void 0 ? void 0 : _d.sid) || target.id || null);
+            target.dataset = Object.assign(Object.assign({}, (currentEle !== null ? currentEle.dataset : EMPTY_OBJ)), (element !== null ? element.dataset : EMPTY_OBJ));
+            for (const key in (_e = this.mpEvent) === null || _e === void 0 ? void 0 : _e.detail) {
                 target[key] = this.mpEvent.detail[key];
             }
             this.cacheTarget = target;
@@ -3911,7 +3923,8 @@ function createDocument() {
     doc.body = body;
     return doc;
 }
-const document$1 = process.env.TARO_PLATFORM === 'web' ? env.document : (env.document = createDocument());
+// Note: 小程序端 vite 打包成 commonjs，const document = xxx 会报错，所以把 document 改为 taroDocumentProvider
+const taroDocumentProvider = process.env.TARO_PLATFORM === 'web' ? env.document : (env.document = createDocument());
 
 // for Vue3
 class SVGElement extends TaroElement {
@@ -4014,7 +4027,7 @@ function createPageConfig(component, pageName, data, pageConfig) {
             setCurrentRouter(this);
             // 初始化当前页面的上下文信息
             if (process.env.TARO_PLATFORM !== 'web') {
-                window$1.trigger(CONTEXT_ACTIONS.INIT, $taroPath);
+                taroWindowProvider.trigger(CONTEXT_ACTIONS.INIT, $taroPath);
             }
             const mount = () => {
                 Current.app.mount(component, $taroPath, () => {
@@ -4042,7 +4055,7 @@ function createPageConfig(component, pageName, data, pageConfig) {
             const $taroPath = this.$taroPath;
             // 销毁当前页面的上下文信息
             if (process.env.TARO_PLATFORM !== 'web') {
-                window$1.trigger(CONTEXT_ACTIONS.DESTORY, $taroPath);
+                taroWindowProvider.trigger(CONTEXT_ACTIONS.DESTORY, $taroPath);
             }
             // 触发onUnload生命周期
             safeExecute($taroPath, ONUNLOAD);
@@ -4076,7 +4089,7 @@ function createPageConfig(component, pageName, data, pageConfig) {
                 setCurrentRouter(this);
                 // 恢复上下文信息
                 if (process.env.TARO_PLATFORM !== 'web') {
-                    window$1.trigger(CONTEXT_ACTIONS.RECOVER, this.$taroPath);
+                    taroWindowProvider.trigger(CONTEXT_ACTIONS.RECOVER, this.$taroPath);
                 }
                 // 触发生命周期
                 safeExecute(this.$taroPath, ON_SHOW, options);
@@ -4087,7 +4100,7 @@ function createPageConfig(component, pageName, data, pageConfig) {
         [ONHIDE]() {
             // 缓存当前页面上下文信息
             if (process.env.TARO_PLATFORM !== 'web') {
-                window$1.trigger(CONTEXT_ACTIONS.RESTORE, this.$taroPath);
+                taroWindowProvider.trigger(CONTEXT_ACTIONS.RESTORE, this.$taroPath);
             }
             // 设置 Current 的 page 和 router
             if (Current.page === this) {
@@ -5052,5 +5065,5 @@ if (process.env.SUPPORT_TARO_POLYFILL !== 'disabled' && process.env.TARO_PLATFOR
     handlePolyfill();
 }
 
-export { A, APP, BEHAVIORS, BODY, CATCHMOVE, CATCH_VIEW, CHANGE, CLASS, COMMENT, COMPILE_MODE, CONFIRM, CONTAINER, CONTEXT_ACTIONS, CURRENT_TARGET, CUSTOM_WRAPPER, Current, DATASET, DATE, DOCUMENT_ELEMENT_NAME, DOCUMENT_FRAGMENT, EVENT_CALLBACK_RESULT, EXTERNAL_CLASSES, FOCUS, FormElement, HEAD, HOOKS_APP_ID, HTML, History, ID, INPUT, KEY_CODE, Location, MutationObserver$1 as MutationObserver, OBJECT, ON_HIDE, ON_LOAD, ON_READY, ON_SHOW, OPTIONS, PAGE_INIT, PROPERTY_THRESHOLD, PROPS, PURE_VIEW, ROOT_STR, SET_DATA, SET_TIMEOUT, STATIC_VIEW, STYLE, SVGElement, Style, TARGET, TARO_RUNTIME, TIME_STAMP, TOUCHMOVE, TYPE, TaroElement, TaroEvent, TaroNode, TaroRootElement, TaroText, UID, URL, URLSearchParams, VALUE, VIEW, addLeadingSlash, _caf as cancelAnimationFrame, convertNumber2PX, createComponentConfig, createEvent, createPageConfig, createRecursiveComponentConfig, customWrapperCache, debounce, document$1 as document, env, eventCenter, eventHandler, eventSource, extend, getComponentsAlias, getComputedStyle, getCurrentInstance, getCurrentPage, getHomePage, getOnHideEventKey, getOnReadyEventKey, getOnShowEventKey, getPageInstance, getPath, handlePolyfill, hasBasename, history, hydrate, incrementId, injectPageInstance, isComment, isElement, isHasExtractProp, isParentBinded, isText, location, nav as navigator, nextTick, now, options, parseUrl, perf, removePageInstance, _raf as requestAnimationFrame, safeExecute, shortcutAttr, stringify, stripBasename, stripSuffix, stripTrailing, throttle, window$1 as window };
+export { A, APP, BEHAVIORS, BODY, CATCHMOVE, CATCH_VIEW, CHANGE, CLASS, COMMENT, COMPILE_MODE, CONFIRM, CONTAINER, CONTEXT_ACTIONS, CURRENT_TARGET, CUSTOM_WRAPPER, Current, DATASET, DATE, DOCUMENT_ELEMENT_NAME, DOCUMENT_FRAGMENT, EVENT_CALLBACK_RESULT, EXTERNAL_CLASSES, FOCUS, FormElement, HEAD, HOOKS_APP_ID, HTML, History, ID, INPUT, KEY_CODE, Location, MutationObserver$1 as MutationObserver, OBJECT, ON_HIDE, ON_LOAD, ON_READY, ON_SHOW, OPTIONS, PAGE_INIT, PROPERTY_THRESHOLD, PROPS, PURE_VIEW, ROOT_STR, SET_DATA, SET_TIMEOUT, STATIC_VIEW, STYLE, SVGElement, Style, TARGET, TARO_RUNTIME, TIME_STAMP, TOUCHMOVE, TYPE, TaroElement, TaroEvent, TaroNode, TaroRootElement, TaroText, UID, TaroURLProvider as URL, URLSearchParams, VALUE, VIEW, addLeadingSlash, _caf as cancelAnimationFrame, convertNumber2PX, createComponentConfig, createEvent, createPageConfig, createRecursiveComponentConfig, customWrapperCache, debounce, taroDocumentProvider as document, env, eventCenter, eventHandler, eventSource, extend, getComponentsAlias, taroGetComputedStyleProvider as getComputedStyle, getCurrentInstance, getCurrentPage, getHomePage, getOnHideEventKey, getOnReadyEventKey, getOnShowEventKey, getPageInstance, getPath, handlePolyfill, hasBasename, taroHistoryProvider as history, hydrate, incrementId, injectPageInstance, isComment, isElement, isHasExtractProp, isParentBinded, isText, taroLocationProvider as location, nav as navigator, nextTick, now, options, parseUrl, perf, removePageInstance, _raf as requestAnimationFrame, safeExecute, shortcutAttr, stringify, stripBasename, stripSuffix, stripTrailing, throttle, taroWindowProvider as window };
 //# sourceMappingURL=runtime.esm.js.map