From a728cd2a2b3572fe548ae2f93105beb223191166 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Mon, 24 Feb 2020 20:19:56 +0800
Subject: [PATCH] fix(app-plus): compatible with crypto, window.crypto,
 global.crypto

---
 packages/vue-cli-plugin-uni/lib/app-plus/index.js | 6 +++++-
 packages/vue-cli-plugin-uni/lib/mp.js             | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/vue-cli-plugin-uni/lib/app-plus/index.js b/packages/vue-cli-plugin-uni/lib/app-plus/index.js
index f9681b0ad..2aff58b34 100644
--- a/packages/vue-cli-plugin-uni/lib/app-plus/index.js
+++ b/packages/vue-cli-plugin-uni/lib/app-plus/index.js
@@ -25,6 +25,7 @@ const {
 const runtimePath = '@dcloudio/uni-mp-weixin/dist/mp.js'
 const wxsPath = '@dcloudio/uni-mp-weixin/dist/wxs.js'
 const uniCloudPath = path.resolve(__dirname, '../../packages/uni-cloud/dist/index.js')
+const cryptoPath = path.resolve(__dirname, '../crypto.js')
 
 function getProvides (isAppService) {
   if (isAppService) {
@@ -37,7 +38,10 @@ function getProvides (isAppService) {
       'Behavior': [runtimePath, 'Behavior'],
       'getDate': [wxsPath, 'getDate'],
       'getRegExp': [wxsPath, 'getRegExp'],
-      'uniCloud': [uniCloudPath, 'default']
+      'uniCloud': [uniCloudPath, 'default'],
+      'crypto': [cryptoPath, 'default'],
+      'window.crypto': [cryptoPath, 'default'],
+      'global.crypto': [cryptoPath, 'default']
     }
   }
   return { // app-view
diff --git a/packages/vue-cli-plugin-uni/lib/mp.js b/packages/vue-cli-plugin-uni/lib/mp.js
index 1a714d965..f9812ac05 100644
--- a/packages/vue-cli-plugin-uni/lib/mp.js
+++ b/packages/vue-cli-plugin-uni/lib/mp.js
@@ -44,7 +44,11 @@ function getProvides () {
     process.env.UNI_USING_V8
   ) {
     provides['__f__'] = [path.resolve(__dirname, 'format-log.js'), 'default']
-    provides['crypto'] = [path.resolve(__dirname, 'crypto.js'), 'default']
+
+    const cryptoProvide = [path.resolve(__dirname, 'crypto.js'), 'default']
+    provides['crypto'] = cryptoProvide
+    provides['window.crypto'] = cryptoProvide
+    provides['global.crypto'] = cryptoProvide
   }
 
   // TODO 目前依赖库 megalo 通过判断 wx 对象是否存在来识别平台做不同处理
-- 
GitLab