From 1ccfd468ef46157ee2c2525021587ab1dd4bb384 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Mon, 29 Nov 2021 11:42:32 +0800 Subject: [PATCH] fix(mp): remove crypto inject --- .../uni-app-plus/dist/uni-app-service.es.js | 146 +++++++++--------- packages/uni-app-vite/src/index.ts | 4 +- .../src/webpack/config/plugins/provide.ts | 4 +- packages/uni-cli-shared/src/env/index.ts | 2 +- packages/uni-cli-shared/src/env/provide.ts | 2 +- packages/uni-mp-vite/src/index.ts | 4 +- 6 files changed, 81 insertions(+), 81 deletions(-) diff --git a/packages/uni-app-plus/dist/uni-app-service.es.js b/packages/uni-app-plus/dist/uni-app-service.es.js index 9b1e1cd12..3d3ee55e0 100644 --- a/packages/uni-app-plus/dist/uni-app-service.es.js +++ b/packages/uni-app-plus/dist/uni-app-service.es.js @@ -10,79 +10,79 @@ const __uniRoutes = instanceContext.__uniRoutes; var serviceContext = (function (vue) { 'use strict'; - /* - * base64-arraybuffer - * https://github.com/niklasvh/base64-arraybuffer - * - * Copyright (c) 2012 Niklas von Hertzen - * Licensed under the MIT license. - */ - - var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'; - - // Use a lookup table to find the index. - var lookup = /*#__PURE__*/ (function () { - const lookup = new Uint8Array(256); - for (var i = 0; i < chars.length; i++) { - lookup[chars.charCodeAt(i)] = i; - } - return lookup - })(); - - function encode$3(arraybuffer) { - var bytes = new Uint8Array(arraybuffer), - i, - len = bytes.length, - base64 = ''; - - for (i = 0; i < len; i += 3) { - base64 += chars[bytes[i] >> 2]; - base64 += chars[((bytes[i] & 3) << 4) | (bytes[i + 1] >> 4)]; - base64 += chars[((bytes[i + 1] & 15) << 2) | (bytes[i + 2] >> 6)]; - base64 += chars[bytes[i + 2] & 63]; - } - - if (len % 3 === 2) { - base64 = base64.substring(0, base64.length - 1) + '='; - } else if (len % 3 === 1) { - base64 = base64.substring(0, base64.length - 2) + '=='; - } - - return base64 - } - - function decode$1(base64) { - var bufferLength = base64.length * 0.75, - len = base64.length, - i, - p = 0, - encoded1, - encoded2, - encoded3, - encoded4; - - if (base64[base64.length - 1] === '=') { - bufferLength--; - if (base64[base64.length - 2] === '=') { - bufferLength--; - } - } - - var arraybuffer = new ArrayBuffer(bufferLength), - bytes = new Uint8Array(arraybuffer); - - for (i = 0; i < len; i += 4) { - encoded1 = lookup[base64.charCodeAt(i)]; - encoded2 = lookup[base64.charCodeAt(i + 1)]; - encoded3 = lookup[base64.charCodeAt(i + 2)]; - encoded4 = lookup[base64.charCodeAt(i + 3)]; - - bytes[p++] = (encoded1 << 2) | (encoded2 >> 4); - bytes[p++] = ((encoded2 & 15) << 4) | (encoded3 >> 2); - bytes[p++] = ((encoded3 & 3) << 6) | (encoded4 & 63); - } - - return arraybuffer + /* + * base64-arraybuffer + * https://github.com/niklasvh/base64-arraybuffer + * + * Copyright (c) 2012 Niklas von Hertzen + * Licensed under the MIT license. + */ + + var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'; + + // Use a lookup table to find the index. + var lookup = /*#__PURE__*/ (function () { + const lookup = new Uint8Array(256); + for (var i = 0; i < chars.length; i++) { + lookup[chars.charCodeAt(i)] = i; + } + return lookup + })(); + + function encode$3(arraybuffer) { + var bytes = new Uint8Array(arraybuffer), + i, + len = bytes.length, + base64 = ''; + + for (i = 0; i < len; i += 3) { + base64 += chars[bytes[i] >> 2]; + base64 += chars[((bytes[i] & 3) << 4) | (bytes[i + 1] >> 4)]; + base64 += chars[((bytes[i + 1] & 15) << 2) | (bytes[i + 2] >> 6)]; + base64 += chars[bytes[i + 2] & 63]; + } + + if (len % 3 === 2) { + base64 = base64.substring(0, base64.length - 1) + '='; + } else if (len % 3 === 1) { + base64 = base64.substring(0, base64.length - 2) + '=='; + } + + return base64 + } + + function decode$1(base64) { + var bufferLength = base64.length * 0.75, + len = base64.length, + i, + p = 0, + encoded1, + encoded2, + encoded3, + encoded4; + + if (base64[base64.length - 1] === '=') { + bufferLength--; + if (base64[base64.length - 2] === '=') { + bufferLength--; + } + } + + var arraybuffer = new ArrayBuffer(bufferLength), + bytes = new Uint8Array(arraybuffer); + + for (i = 0; i < len; i += 4) { + encoded1 = lookup[base64.charCodeAt(i)]; + encoded2 = lookup[base64.charCodeAt(i + 1)]; + encoded3 = lookup[base64.charCodeAt(i + 2)]; + encoded4 = lookup[base64.charCodeAt(i + 3)]; + + bytes[p++] = (encoded1 << 2) | (encoded2 >> 4); + bytes[p++] = ((encoded2 & 15) << 4) | (encoded3 >> 2); + bytes[p++] = ((encoded3 & 3) << 6) | (encoded4 & 63); + } + + return arraybuffer } /** diff --git a/packages/uni-app-vite/src/index.ts b/packages/uni-app-vite/src/index.ts index fa9f41371..f8813a188 100644 --- a/packages/uni-app-vite/src/index.ts +++ b/packages/uni-app-vite/src/index.ts @@ -1,6 +1,6 @@ import path from 'path' import { - initProvide, + initAppProvide, uniViteInjectPlugin, uniCssScopedPlugin, getAppStyleIsolation, @@ -50,7 +50,7 @@ const plugins = [ uniMainJsPlugin(), uniManifestJsonPlugin(), uniPagesJsonPlugin(), - uniViteInjectPlugin(initProvide()), + uniViteInjectPlugin(initAppProvide()), uniRenderjsPlugin(), uniTemplatePlugin(), uniStatsPlugin(), diff --git a/packages/uni-cli-nvue/src/webpack/config/plugins/provide.ts b/packages/uni-cli-nvue/src/webpack/config/plugins/provide.ts index 04cb36c9a..f36a6b25d 100644 --- a/packages/uni-cli-nvue/src/webpack/config/plugins/provide.ts +++ b/packages/uni-cli-nvue/src/webpack/config/plugins/provide.ts @@ -1,5 +1,5 @@ import { ProvidePlugin } from 'webpack' -import { initProvide, resolveBuiltIn } from '@dcloudio/uni-cli-shared' +import { initAppProvide, resolveBuiltIn } from '@dcloudio/uni-cli-shared' import { resolveLib } from '../../../utils' export function createProvidePlugin() { @@ -13,6 +13,6 @@ export function createProvidePlugin() { resolveLib('require-native-plugin.js'), 'default', ], - ...initProvide(), + ...initAppProvide(), }) } diff --git a/packages/uni-cli-shared/src/env/index.ts b/packages/uni-cli-shared/src/env/index.ts index 591a80c7d..f0bd61cab 100644 --- a/packages/uni-cli-shared/src/env/index.ts +++ b/packages/uni-cli-shared/src/env/index.ts @@ -1,2 +1,2 @@ export { initDefine } from './define' -export { initProvide } from './provide' +export { initAppProvide } from './provide' diff --git a/packages/uni-cli-shared/src/env/provide.ts b/packages/uni-cli-shared/src/env/provide.ts index 6d96b4fb3..d622cba3e 100644 --- a/packages/uni-cli-shared/src/env/provide.ts +++ b/packages/uni-cli-shared/src/env/provide.ts @@ -1,6 +1,6 @@ import path from 'path' const libDir = path.resolve(__dirname, '../../lib') -export function initProvide() { +export function initAppProvide() { const cryptoDefine = [path.join(libDir, 'crypto.js'), 'default'] return { __f__: ['@dcloudio/uni-shared', 'formatAppLog'], diff --git a/packages/uni-mp-vite/src/index.ts b/packages/uni-mp-vite/src/index.ts index cbad800c3..7f51627a7 100644 --- a/packages/uni-mp-vite/src/index.ts +++ b/packages/uni-mp-vite/src/index.ts @@ -1,6 +1,6 @@ import { extend } from '@vue/shared' import type { SFCScriptCompileOptions } from '@vue/compiler-sfc' -import { initProvide, uniViteInjectPlugin } from '@dcloudio/uni-cli-shared' +import { uniViteInjectPlugin } from '@dcloudio/uni-cli-shared' import { uniMiniProgramPlugin, UniMiniProgramPluginOptions } from './plugin' import { uniUsingComponentsPlugin } from './plugins/usingComponents' @@ -27,7 +27,7 @@ export default (options: UniMiniProgramPluginOptions) => { uniManifestJsonPlugin(options), uniPagesJsonPlugin(options), uniEntryPlugin(options), - uniViteInjectPlugin(extend({}, options.vite.inject, initProvide())), + uniViteInjectPlugin(extend({}, options.vite.inject)), uniRenderjsPlugin({ lang: options.template.filter?.lang }), uniMiniProgramPlugin(options), (options: { -- GitLab