chore: merge

lerna.json

@@ -7,5 +7,5 @@
       "message": "chore(release): publish %s"
     }
   },
-  "version": "3.0.0-alpha-3000020210827002"
+  "version": "3.0.0-alpha-3000020210827003"
 }

packages/size-check/package.json

 {
   "private": true,
   "name": "@dcloudio/size-check",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "dependencies": {
     "vue-router": "^4.0.11"
   }

packages/uni-api/package.json

 {
   "private": true,
   "name": "@dcloudio/uni-api",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-api",
   "sideEffects": false,
   "repository": {

packages/uni-app-plus/__tests__/service/amd.spec.ts

+import {
+  def,
+  req,
+  Exports,
+  Require,
+} from '../../src/service/framework/amd/index'
+describe('amd', () => {
+  test('basic', () => {
+    def(
+      'app-service',
+      [],
+      function (require: Require, exports: Exports, vue: Exports) {
+        console.log(require, exports, vue)
+      }
+    )
+    req(['app-service'], (AppService: Exports) => {
+      console.log('app-service.init', AppService)
+    })
+  })
+})

packages/uni-app-plus/package.json

 {
   "name": "@dcloudio/uni-app-plus",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-app-plus",
   "files": [
     "dist",

packages/uni-app-plus/src/service/framework/amd/index.ts

-const registry = {
-  promises: {} as Record<string, Promise<unknown>>,
-  resolves: {} as Record<string, (v: unknown) => void>,
-  getDependencyPromise: function (name: string) {
-    if (!this.promises[name]) {
-      const resolves = this.resolves
-      this.promises[name] = new Promise(function (resolve) {
-        resolves[name] = resolve
-      })
-    }
-    return this.promises[name]
-  },
-  resolve: function (name: string, value: unknown) {
-    this.getDependencyPromise(name)
-    this.resolves[name](value)
-    delete this.resolves[name]
-  },
+const promises: Record<string, Promise<unknown>> = {
+  require: new Promise(function (resolve) {
+    resolves.require = req
+  }),
 }
+const resolves: Record<string, (...args: any[]) => void> = {}
 
-export function define(name: string, deps: string[], definition: Function) {
-  require(deps, (...args: unknown[]) => {
-    registry.resolve(name, definition.apply(null, args))
-  })
+function deps(name: string) {
+  if (!promises[name]) {
+    promises[name] = new Promise(function (resolve) {
+      resolves[name] = resolve
+    })
+  }
+  return promises[name]
 }
 
-export function require(deps: string[], definition: Function) {
-  Promise.all(deps.map(registry.getDependencyPromise, registry)).then(function (
-    result
-  ) {
+function resolve(name: string) {
+  deps(name)
+  resolves[name]()
+  delete resolves[name]
+}
+
+export type Define = typeof def
+export type Require = typeof req
+export type Exports = Record<string, any>
+
+export function def(name: string, deps: string[], definition: Function) {
+  req(deps, () => resolve(name, definition()))
+}
+
+export function req(modules: string[], definition: Function) {
+  Promise.all(modules.map(deps)).then((result) =>
     definition.apply(null, result)
-  })
+  )
 }

packages/uni-app-vite/package.json

 {
   "name": "@dcloudio/uni-app-vite",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "uni-app-vite",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/uni-app-vue/package.json

 {
   "name": "@dcloudio/uni-app-vue",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-app-vue",
   "main": "dist/service.runtime.esm.dev.js",
   "module": "dist/service.runtime.esm.dev.js",

packages/uni-app/package.json

 {
   "name": "@dcloudio/uni-app",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-app",
   "main": "./dist/uni-app.cjs.js",
   "module": "./dist/uni-app.es.js",

packages/uni-automator/package.json

 {
   "name": "@dcloudio/uni-automator",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-automator",
   "main": "dist/index.js",
   "files": [

packages/uni-cli-nvue/package.json

 {
   "name": "@dcloudio/uni-cli-nvue",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "uni-cli-nvue",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/uni-cli-shared/package.json

 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/uni-cloud/package.json

 {
   "name": "@dcloudio/uni-cloud",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-cloud",
   "main": "dist/uni-cloud.cjs.js",
   "module": "dist/uni-cloud.es.js",

packages/uni-components/package.json

 {
   "name": "@dcloudio/uni-components",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-components",
   "main": "index.js",
   "files": [

packages/uni-core/package.json

 {
   "private": true,
   "name": "@dcloudio/uni-core",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-core",
   "sideEffects": false,
   "repository": {

packages/uni-h5-vite/package.json

 {
   "name": "@dcloudio/uni-h5-vite",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "uni-h5-vite",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/uni-h5-vue/package.json

 {
   "name": "@dcloudio/uni-h5-vue",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-h5-vue",
   "main": "dist/vue.runtime.cjs.js",
   "module": "dist/vue.runtime.esm.js",

packages/uni-h5/package.json

 {
   "name": "@dcloudio/uni-h5",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-h5",
   "main": "./dist/uni-h5.cjs.js",
   "module": "./dist/uni-h5.es.js",

packages/uni-i18n/package.json

 {
   "name": "@dcloudio/uni-i18n",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-i18n",
   "main": "./dist/uni-i18n.cjs.js",
   "module": "./dist/uni-i18n.es.js",

packages/uni-mp-alipay/package.json

 {
   "name": "@dcloudio/uni-mp-alipay",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "uni-app mp-alipay",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-baidu/package.json

 {
   "name": "@dcloudio/uni-mp-baidu",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "uni-app mp-baidu",
   "main": "dist/index.js",
   "files": [

packages/uni-mp-core/package.json

 {
   "private": true,
   "name": "@dcloudio/uni-mp-core",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-mp-core",
   "sideEffects": false,
   "repository": {

packages/uni-mp-kuaishou/package.json

 {
   "name": "@dcloudio/uni-mp-kuaishou",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "uni-app mp-kuaishou",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-qq/package.json

 {
   "name": "@dcloudio/uni-mp-qq",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "uni-app mp-qq",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-toutiao/package.json

 {
   "name": "@dcloudio/uni-mp-toutiao",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "uni-app mp-toutiao",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-vue/package.json

 {
   "name": "@dcloudio/uni-mp-vue",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-mp-vue",
   "main": "dist/vue.runtime.esm.js",
   "module": "dist/vue.runtime.esm.js",

packages/uni-mp-weixin/package.json

 {
   "name": "@dcloudio/uni-mp-weixin",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "uni-app mp-weixin",
   "main": "dist/index.js",
   "files": [

packages/uni-quickapp-webview/package.json

 {
   "name": "@dcloudio/uni-quickapp-webview",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "uni-app quickapp-webview",
   "main": "dist/index.js",
   "repository": {

packages/uni-shared/package.json

 {
   "name": "@dcloudio/uni-shared",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-shared",
   "main": "./dist/uni-shared.cjs.js",
   "module": "./dist/uni-shared.es.js",

packages/uni-stat/package.json

 {
   "name": "@dcloudio/uni-stat",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-stat",
   "main": "dist/uni-stat.es.js",
   "module": "dist/uni-stat.es.js",

packages/uni-vue/package.json

 {
   "private": true,
   "name": "@dcloudio/uni-vue",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "@dcloudio/uni-vue",
   "files": [
     "dist"

packages/vite-plugin-uni/package.json

 {
   "name": "@dcloudio/vite-plugin-uni",
-  "version": "3.0.0-alpha-3000020210827002",
+  "version": "3.0.0-alpha-3000020210827003",
   "description": "uni-app vite plugin",
   "bin": {
     "uni": "bin/uni.js"