From 749ddb6a17eb3d5a198a3c0561fa21580be118d2 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Mon, 6 Dec 2021 16:21:23 +0800
Subject: [PATCH] chore: cdn

---
 packages/uni-app-plus/dist/uni-app-service.es.js    | 13 +++++--------
 packages/uni-mp-alipay/dist/uni.compiler.js         |  1 +
 packages/uni-mp-alipay/src/compiler/options.ts      |  1 +
 packages/uni-mp-baidu/dist/uni.compiler.js          |  1 +
 packages/uni-mp-baidu/src/compiler/options.ts       |  1 +
 packages/uni-mp-kuaishou/dist/uni.compiler.js       |  1 +
 packages/uni-mp-kuaishou/src/compiler/options.ts    |  1 +
 packages/uni-mp-lark/dist/uni.compiler.js           |  2 ++
 packages/uni-mp-lark/src/compiler/index.ts          |  2 ++
 packages/uni-mp-qq/dist/uni.compiler.js             |  1 +
 packages/uni-mp-qq/src/compiler/options.ts          |  1 +
 packages/uni-mp-toutiao/dist/uni.compiler.js        |  1 +
 packages/uni-mp-toutiao/src/compiler/options.ts     |  1 +
 packages/uni-mp-vite/src/plugin/configResolved.ts   | 13 +++++++++++--
 packages/uni-mp-vite/src/plugin/index.ts            |  1 +
 packages/uni-mp-weixin/dist/uni.compiler.js         |  1 +
 packages/uni-mp-weixin/src/compiler/options.ts      |  1 +
 packages/uni-quickapp-webview/dist/uni.compiler.js  |  1 +
 .../uni-quickapp-webview/src/compiler/options.ts    |  1 +
 19 files changed, 35 insertions(+), 10 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 f2a6501f2..52f08dd52 100644
--- a/packages/uni-app-plus/dist/uni-app-service.es.js
+++ b/packages/uni-app-plus/dist/uni-app-service.es.js
@@ -16110,11 +16110,7 @@ var serviceContext = (function (vue) {
       type: 'loading',
       icon: 'loading',
   }), callbacks), ShowLoadingProtocol, ShowLoadingOptions);
-  const _showToast = ({ title = '', icon = 'success', image = '', duration = 1500, mask = false, position, 
-  // @ts-ignore ToastType
-  type = 'toast', 
-  // @ts-ignore PlusNativeUIWaitingStyles
-  style, }, { resolve, reject }) => {
+  const _showToast = ({ title = '', icon = 'success', image = '', duration = 1500, mask = false, position, type = 'toast', style, }, { resolve, reject }) => {
       hide('');
       toastType = type;
       if (['top', 'center', 'bottom'].includes(String(position))) {
@@ -16171,9 +16167,10 @@ var serviceContext = (function (vue) {
               reject(`${error}`);
           }
       }
-      timeout = setTimeout(() => {
-          hide('');
-      }, duration);
+      if (toastType === 'toast')
+          timeout = setTimeout(() => {
+              hide('');
+          }, duration);
       return resolve();
   };
   const showToast = defineAsyncApi(API_SHOW_TOAST, _showToast, ShowToastProtocol, ShowToastOptions);
diff --git a/packages/uni-mp-alipay/dist/uni.compiler.js b/packages/uni-mp-alipay/dist/uni.compiler.js
index c02bddb69..67958f9f2 100644
--- a/packages/uni-mp-alipay/dist/uni.compiler.js
+++ b/packages/uni-mp-alipay/dist/uni.compiler.js
@@ -161,6 +161,7 @@ const customElements = [
     'mkt',
 ];
 const options = {
+    cdn: 2,
     vite: {
         inject: {
             uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-alipay/src/compiler/options.ts b/packages/uni-mp-alipay/src/compiler/options.ts
index 6db1c2d78..41fc3d443 100644
--- a/packages/uni-mp-alipay/src/compiler/options.ts
+++ b/packages/uni-mp-alipay/src/compiler/options.ts
@@ -53,6 +53,7 @@ export const customElements = [
 ]
 
 export const options: UniMiniProgramPluginOptions = {
+  cdn: 2,
   vite: {
     inject: {
       uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-baidu/dist/uni.compiler.js b/packages/uni-mp-baidu/dist/uni.compiler.js
index 3535ebbeb..96702ecac 100644
--- a/packages/uni-mp-baidu/dist/uni.compiler.js
+++ b/packages/uni-mp-baidu/dist/uni.compiler.js
@@ -87,6 +87,7 @@ const compilerOptions = {
 };
 const projectConfigFilename = 'project.swan.json';
 const options = {
+    cdn: 3,
     vite: {
         inject: {
             uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-baidu/src/compiler/options.ts b/packages/uni-mp-baidu/src/compiler/options.ts
index 2e342b70b..a579db6f7 100644
--- a/packages/uni-mp-baidu/src/compiler/options.ts
+++ b/packages/uni-mp-baidu/src/compiler/options.ts
@@ -38,6 +38,7 @@ export const compilerOptions: CompilerOptions = {
 const projectConfigFilename = 'project.swan.json'
 
 export const options: UniMiniProgramPluginOptions = {
+  cdn: 3,
   vite: {
     inject: {
       uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-kuaishou/dist/uni.compiler.js b/packages/uni-mp-kuaishou/dist/uni.compiler.js
index f15073b86..29c87a483 100644
--- a/packages/uni-mp-kuaishou/dist/uni.compiler.js
+++ b/packages/uni-mp-kuaishou/dist/uni.compiler.js
@@ -152,6 +152,7 @@ const miniProgram = {
 };
 const projectConfigFilename = 'project.config.json';
 const options = {
+    cdn: 9,
     vite: {
         inject: {
             uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-kuaishou/src/compiler/options.ts b/packages/uni-mp-kuaishou/src/compiler/options.ts
index ca9b3d8aa..9b115ad36 100644
--- a/packages/uni-mp-kuaishou/src/compiler/options.ts
+++ b/packages/uni-mp-kuaishou/src/compiler/options.ts
@@ -38,6 +38,7 @@ export const miniProgram: MiniProgramCompilerOptions = {
 const projectConfigFilename = 'project.config.json'
 
 export const options: UniMiniProgramPluginOptions = {
+  cdn: 9,
   vite: {
     inject: {
       uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-lark/dist/uni.compiler.js b/packages/uni-mp-lark/dist/uni.compiler.js
index fc17d2173..9f2ed4d61 100644
--- a/packages/uni-mp-lark/dist/uni.compiler.js
+++ b/packages/uni-mp-lark/dist/uni.compiler.js
@@ -86,6 +86,7 @@ const miniProgram = {
     },
 };
 const options = {
+    cdn: 4,
     vite: {
         inject: {
             uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
@@ -137,6 +138,7 @@ const uniMiniProgramToutiaoPlugin = {
         };
     },
 };
+options.cdn = 10;
 options.template.slot.fallbackContent = false;
 // 飞书不支持：
 // <view tt:for="{{items}}" tt:for-item="item" tt:key="id" slot="{{item.slot}}">{{item.text}}</view>
diff --git a/packages/uni-mp-lark/src/compiler/index.ts b/packages/uni-mp-lark/src/compiler/index.ts
index 49489386e..9c2c7314a 100644
--- a/packages/uni-mp-lark/src/compiler/index.ts
+++ b/packages/uni-mp-lark/src/compiler/index.ts
@@ -19,6 +19,8 @@ const uniMiniProgramToutiaoPlugin: Plugin = {
   },
 }
 
+options.cdn = 10
+
 options.template.slot.fallbackContent = false
 // 飞书不支持：
 // <view tt:for="{{items}}" tt:for-item="item" tt:key="id" slot="{{item.slot}}">{{item.text}}</view>
diff --git a/packages/uni-mp-qq/dist/uni.compiler.js b/packages/uni-mp-qq/dist/uni.compiler.js
index e11cbd81d..4f3528a1b 100644
--- a/packages/uni-mp-qq/dist/uni.compiler.js
+++ b/packages/uni-mp-qq/dist/uni.compiler.js
@@ -104,6 +104,7 @@ const miniProgram = {
     },
 };
 const options = {
+    cdn: 5,
     vite: {
         inject: {
             uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-qq/src/compiler/options.ts b/packages/uni-mp-qq/src/compiler/options.ts
index 26c049d0e..8d78074bf 100644
--- a/packages/uni-mp-qq/src/compiler/options.ts
+++ b/packages/uni-mp-qq/src/compiler/options.ts
@@ -36,6 +36,7 @@ export const miniProgram: MiniProgramCompilerOptions = {
 }
 
 export const options: UniMiniProgramPluginOptions = {
+  cdn: 5,
   vite: {
     inject: {
       uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-toutiao/dist/uni.compiler.js b/packages/uni-mp-toutiao/dist/uni.compiler.js
index a86e2b454..f2dca6d06 100644
--- a/packages/uni-mp-toutiao/dist/uni.compiler.js
+++ b/packages/uni-mp-toutiao/dist/uni.compiler.js
@@ -86,6 +86,7 @@ const miniProgram = {
     },
 };
 const options = {
+    cdn: 4,
     vite: {
         inject: {
             uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-toutiao/src/compiler/options.ts b/packages/uni-mp-toutiao/src/compiler/options.ts
index 425b1a884..674f5f831 100644
--- a/packages/uni-mp-toutiao/src/compiler/options.ts
+++ b/packages/uni-mp-toutiao/src/compiler/options.ts
@@ -39,6 +39,7 @@ export const miniProgram: MiniProgramCompilerOptions = {
 }
 
 export const options: UniMiniProgramPluginOptions = {
+  cdn: 4,
   vite: {
     inject: {
       uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-vite/src/plugin/configResolved.ts b/packages/uni-mp-vite/src/plugin/configResolved.ts
index f2e7c99be..abc5485d0 100644
--- a/packages/uni-mp-vite/src/plugin/configResolved.ts
+++ b/packages/uni-mp-vite/src/plugin/configResolved.ts
@@ -23,11 +23,15 @@ import {
 
 const debugNVueCss = debug('vite:uni:nvue-css')
 const cssVars = `page{--status-bar-height:25px;--top-window-height:0px;--window-top:0px;--window-bottom:0px;--window-left:0px;--window-right:0px;--window-magin:0px}`
-const shadowCss = `page::after{position:fixed;content:'';left:-1000px;top:-1000px;-webkit-animation:shadow-preload .1s;-webkit-animation-delay:3s;animation:shadow-preload .1s;animation-delay:3s}@-webkit-keyframes shadow-preload{0%{background-image:url(https://cdn.dcloud.net.cn/img/shadow-grey.png)}100%{background-image:url(https://cdn.dcloud.net.cn/img/shadow-grey.png)}}@keyframes shadow-preload{0%{background-image:url(https://cdn.dcloud.net.cn/img/shadow-grey.png)}100%{background-image:url(https://cdn.dcloud.net.cn/img/shadow-grey.png)}}`
+
+const genShadowCss = (cdn: string) => {
+  return `page::after{position:fixed;content:'';left:-1000px;top:-1000px;-webkit-animation:shadow-preload .1s;-webkit-animation-delay:3s;animation:shadow-preload .1s;animation-delay:3s}@-webkit-keyframes shadow-preload{0%{background-image:url(${cdn}/img/shadow-grey.png)}100%{background-image:url(${cdn}/img/shadow-grey.png)}}@keyframes shadow-preload{0%{background-image:url(${cdn}/img/shadow-grey.png)}100%{background-image:url(${cdn}/img/shadow-grey.png)}}`
+}
 const genComponentCustomHiddenCss = (name: string) =>
   `[${name.replace(':', '')}="true"]{display: none !important;}`
 
 export function createConfigResolved({
+  cdn,
   style: { extname },
   template: { component },
 }: UniMiniProgramPluginOptions): Plugin['configResolved'] {
@@ -63,7 +67,12 @@ export function createConfigResolved({
               genComponentCustomHiddenCss(component.vShow)) ||
             ''
           if (config.isProduction) {
-            return cssCode + shadowCss + cssVars + componentCustomHiddenCss
+            return (
+              cssCode +
+              genShadowCss(`https://cdn${cdn || ''}.dcloud.net.cn`) +
+              cssVars +
+              componentCustomHiddenCss
+            )
           } else {
             return cssCode + cssVars + componentCustomHiddenCss
           }
diff --git a/packages/uni-mp-vite/src/plugin/index.ts b/packages/uni-mp-vite/src/plugin/index.ts
index bdc723740..31258b2ac 100644
--- a/packages/uni-mp-vite/src/plugin/index.ts
+++ b/packages/uni-mp-vite/src/plugin/index.ts
@@ -24,6 +24,7 @@ import {
 } from '@vue/compiler-sfc'
 
 export interface UniMiniProgramPluginOptions {
+  cdn?: number
   vite: {
     alias: AliasOptions
     copyOptions: CopyOptions
diff --git a/packages/uni-mp-weixin/dist/uni.compiler.js b/packages/uni-mp-weixin/dist/uni.compiler.js
index 2945406c7..112fb7b3c 100644
--- a/packages/uni-mp-weixin/dist/uni.compiler.js
+++ b/packages/uni-mp-weixin/dist/uni.compiler.js
@@ -81,6 +81,7 @@ const miniProgram = {
 };
 const projectConfigFilename = 'project.config.json';
 const options = {
+    cdn: 1,
     vite: {
         inject: {
             uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-weixin/src/compiler/options.ts b/packages/uni-mp-weixin/src/compiler/options.ts
index af9ff5b6d..210d51ae5 100644
--- a/packages/uni-mp-weixin/src/compiler/options.ts
+++ b/packages/uni-mp-weixin/src/compiler/options.ts
@@ -37,6 +37,7 @@ export const miniProgram: MiniProgramCompilerOptions = {
 const projectConfigFilename = 'project.config.json'
 
 export const options: UniMiniProgramPluginOptions = {
+  cdn: 1,
   vite: {
     inject: {
       uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-quickapp-webview/dist/uni.compiler.js b/packages/uni-quickapp-webview/dist/uni.compiler.js
index 5349c8475..4e8cc3ad1 100644
--- a/packages/uni-quickapp-webview/dist/uni.compiler.js
+++ b/packages/uni-quickapp-webview/dist/uni.compiler.js
@@ -70,6 +70,7 @@ const miniProgram = {
 };
 const projectConfigFilename = 'jsconfig.json';
 const options = {
+    cdn: process.env.UNI_SUB_PLATFORM === 'quickapp-webview-huawei' ? 200 : 201,
     vite: {
         inject: {
             uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-quickapp-webview/src/compiler/options.ts b/packages/uni-quickapp-webview/src/compiler/options.ts
index 23e94207b..63c895996 100644
--- a/packages/uni-quickapp-webview/src/compiler/options.ts
+++ b/packages/uni-quickapp-webview/src/compiler/options.ts
@@ -28,6 +28,7 @@ export const miniProgram: MiniProgramCompilerOptions = {
 const projectConfigFilename = 'jsconfig.json'
 
 export const options: UniMiniProgramPluginOptions = {
+  cdn: process.env.UNI_SUB_PLATFORM === 'quickapp-webview-huawei' ? 200 : 201,
   vite: {
     inject: {
       uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],
-- 
GitLab