@dcloudio/uni-quickapp-webview 3.0.0-alpha-3021320211109003 → 3.0.0-alpha-3021320211117002

package/dist/uni.compiler.js

@@ -3,7 +3,6 @@
 var uniCliShared = require('@dcloudio/uni-cli-shared');
 var initMiniProgramPlugin = require('@dcloudio/uni-mp-vite');
 var path = require('path');
-var uniShared = require('@dcloudio/uni-shared');
 var shared = require('@vue/shared');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -57,8 +56,6 @@ function formatAppJson(_appJson, manifestJson, _pagesJson) {
 }
 
 const compilerOptions = {
-    isNativeTag: uniShared.isNativeTag,
-    isCustomElement: uniShared.isCustomElement,
     nodeTransforms: [uniCliShared.transformRef, uniCliShared.transformComponentLink],
 };
 const miniProgram = {

package/dist/uni.mp.esm.js

@@ -1,6 +1,71 @@
 import { isPlainObject, isArray, hasOwn, isFunction, extend, camelize, isObject } from '@vue/shared';
 import { injectHook, ref } from 'vue';
 
+const ON_READY$1 = 'onReady';
+
+class EventChannel$1 {
+    constructor(id, events) {
+        this.id = id;
+        this.listener = {};
+        this.emitCache = {};
+        if (events) {
+            Object.keys(events).forEach((name) => {
+                this.on(name, events[name]);
+            });
+        }
+    }
+    emit(eventName, ...args) {
+        const fns = this.listener[eventName];
+        if (!fns) {
+            return (this.emitCache[eventName] || (this.emitCache[eventName] = [])).push(args);
+        }
+        fns.forEach((opt) => {
+            opt.fn.apply(opt.fn, args);
+        });
+        this.listener[eventName] = fns.filter((opt) => opt.type !== 'once');
+    }
+    on(eventName, fn) {
+        this._addListener(eventName, 'on', fn);
+        this._clearCache(eventName);
+    }
+    once(eventName, fn) {
+        this._addListener(eventName, 'once', fn);
+        this._clearCache(eventName);
+    }
+    off(eventName, fn) {
+        const fns = this.listener[eventName];
+        if (!fns) {
+            return;
+        }
+        if (fn) {
+            for (let i = 0; i < fns.length;) {
+                if (fns[i].fn === fn) {
+                    fns.splice(i, 1);
+                    i--;
+                }
+                i++;
+            }
+        }
+        else {
+            delete this.listener[eventName];
+        }
+    }
+    _clearCache(eventName) {
+        const cacheArgs = this.emitCache[eventName];
+        if (cacheArgs) {
+            for (; cacheArgs.length > 0;) {
+                this.emit.apply(this, [eventName, ...cacheArgs.shift()]);
+            }
+        }
+    }
+    _addListener(eventName, type, fn) {
+        (this.listener[eventName] || (this.listener[eventName] = [])).push({
+            fn,
+            type,
+        });
+    }
+}
+
 // quickapp-webview 不能使用 default 作为插槽名称
 const SLOT_DEFAULT_NAME = 'd';
 // lifecycle
@@ -298,7 +363,7 @@ function parseApp(instance, parseAppOptions) {
             });
             injectAppLaunchHooks(internalInstance);
             ctx.globalData = this.globalData;
-            instance.$callHook(ON_LAUNCH, extend({ app: this }, options));
+            instance.$callHook(ON_LAUNCH, extend({ app: { mixin: internalInstance.appContext.app.mixin } }, options));
         },
     };
     initLocale(instance);
@@ -319,6 +384,43 @@ function initCreateApp(parseAppOptions) {
         return App(parseApp(vm, parseAppOptions));
     };
 }
+function initCreateSubpackageApp(parseAppOptions) {
+    return function createApp(vm) {
+        const appOptions = parseApp(vm, parseAppOptions);
+        const app = getApp({
+            allowDefault: true,
+        });
+        vm.$.ctx.$scope = app;
+        const globalData = app.globalData;
+        if (globalData) {
+            Object.keys(appOptions.globalData).forEach((name) => {
+                if (!hasOwn(globalData, name)) {
+                    globalData[name] = appOptions.globalData[name];
+                }
+            });
+        }
+        Object.keys(appOptions).forEach((name) => {
+            if (!hasOwn(app, name)) {
+                app[name] = appOptions[name];
+            }
+        });
+        if (isFunction(appOptions.onShow) && qa.onAppShow) {
+            qa.onAppShow((args) => {
+                vm.$callHook('onShow', args);
+            });
+        }
+        if (isFunction(appOptions.onHide) && qa.onAppHide) {
+            qa.onAppHide((args) => {
+                vm.$callHook('onHide', args);
+            });
+        }
+        if (isFunction(appOptions.onLaunch)) {
+            const args = qa.getLaunchOptionsSync && qa.getLaunchOptionsSync();
+            vm.$callHook('onLaunch', args);
+        }
+        return App(appOptions);
+    };
+}
 function initLocale(appVm) {
     const locale = ref(qa.getSystemInfoSync().language || 'zh-Hans');
     Object.defineProperty(appVm, '$locale', {
@@ -838,7 +940,7 @@ function initLifetimes(lifetimesOptions) {
                 }
                 this.$vm.$callCreatedHook();
                 this.$vm.$callHook('mounted');
-                this.$vm.$callHook(ON_READY);
+                this.$vm.$callHook(ON_READY$1);
             }
             else {
                 this.is && console.warn(this.is + ' is not ready');
@@ -903,7 +1005,7 @@ function handleLink({ detail: { nodeId, webviewId }, }) {
             delete vm._$childVues;
         }
         vm.$callHook('mounted');
-        vm.$callHook(ON_READY);
+        vm.$callHook(ON_READY$1);
     };
     // 当 parentVm 已经 mounted 时，直接触发，否则延迟
     if (!parentVm || parentVm.$.isMounted) {
@@ -919,31 +1021,33 @@ function handleLink({ detail: { nodeId, webviewId }, }) {
 }
 
 var parseComponentOptions = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  initRelation: initRelation,
-  handleLink: handleLink,
-  mocks: mocks,
-  isPage: isPage,
-  parse: parse,
-  initLifetimes: initLifetimes$1
+    __proto__: null,
+    initRelation: initRelation,
+    handleLink: handleLink,
+    mocks: mocks,
+    isPage: isPage,
+    parse: parse,
+    initLifetimes: initLifetimes$1
 });
 
 var parsePageOptions = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  mocks: mocks,
-  isPage: isPage,
-  initRelation: initRelation,
-  handleLink: handleLink,
-  parse: parse,
-  initLifetimes: initLifetimes
+    __proto__: null,
+    mocks: mocks,
+    isPage: isPage,
+    initRelation: initRelation,
+    handleLink: handleLink,
+    parse: parse,
+    initLifetimes: initLifetimes
 });
 
 const createApp = initCreateApp();
 const createPage = initCreatePage(parsePageOptions);
 const createComponent = initCreateComponent(parseComponentOptions);
-qa.EventChannel = EventChannel;
+const createSubpackageApp = initCreateSubpackageApp();
+qa.EventChannel = EventChannel$1;
 qa.createApp = global.createApp = createApp;
 qa.createPage = createPage;
-qa.createComponent = createComponent;
+qa.createComponent = createComponent;
+qa.createSubpackageApp = createSubpackageApp;
 
-export { createApp, createComponent, createPage };
+export { createApp, createComponent, createPage, createSubpackageApp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-quickapp-webview",
-  "version": "3.0.0-alpha-3021320211109003",
+  "version": "3.0.0-alpha-3021320211117002",
   "description": "uni-app quickapp-webview",
   "main": "dist/index.js",
   "repository": {
@@ -22,11 +22,13 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@vue/compiler-core": "^3.2.21"
+    "@vue/compiler-core": "3.2.22"
   },
   "dependencies": {
-    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3021320211109003",
-    "@dcloudio/uni-mp-vite": "3.0.0-alpha-3021320211109003",
-    "@dcloudio/uni-mp-vue": "3.0.0-alpha-3021320211109003"
+    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3021320211117002",
+    "@dcloudio/uni-mp-vite": "3.0.0-alpha-3021320211117002",
+    "@dcloudio/uni-mp-vue": "3.0.0-alpha-3021320211117002",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3021320211117002",
+    "@vue/shared": "3.2.22"
   }
 }

package/src/compiler/options.ts

@@ -1,6 +1,5 @@
 import path from 'path'
 import type { CompilerOptions } from '@vue/compiler-core'
-import { isNativeTag, isCustomElement } from '@dcloudio/uni-shared'
 import {
   MiniProgramCompilerOptions,
   transformComponentLink,
@@ -12,8 +11,6 @@ import source from './jsconfig.json'
 import { formatAppJson } from './utils'
 
 export const compilerOptions: CompilerOptions = {
-  isNativeTag,
-  isCustomElement,
   nodeTransforms: [transformRef, transformComponentLink],
 }
 

package/src/runtime/index.ts

@@ -3,6 +3,7 @@ import {
   initCreateApp,
   initCreatePage,
   initCreateComponent,
+  initCreateSubpackageApp,
 } from '@dcloudio/uni-mp-core'
 
 import '@dcloudio/uni-mp-polyfill'
@@ -13,7 +14,9 @@ import * as parseComponentOptions from './parseComponentOptions'
 export const createApp = initCreateApp()
 export const createPage = initCreatePage(parsePageOptions)
 export const createComponent = initCreateComponent(parseComponentOptions)
+export const createSubpackageApp = initCreateSubpackageApp()
 ;(qa as any).EventChannel = EventChannel
 ;(qa as any).createApp = (global as any).createApp = createApp
 ;(qa as any).createPage = createPage
 ;(qa as any).createComponent = createComponent
+;(qa as any).createSubpackageApp = createSubpackageApp

package/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "resolveJsonModule": true,
     "paths": {
       "@dcloudio/*": ["packages/*/src"],
       "@dcloudio/uni-platform": [