@dcloudio/uni-cli-shared 2.0.1-32920211122003 → 2.0.1-33420211228002

package/components/page-meta.vue

@@ -147,7 +147,7 @@ export default {
     setBackgroundTextStyle () {
       // TODO h5 app-plus 暂不支持
       // #ifdef MP
-      uni.setBackgroundTextStyle({
+      uni.setBackgroundTextStyle && uni.setBackgroundTextStyle({
         textStyle: this.backgroundTextStyle
       })
       // #endif
@@ -155,7 +155,7 @@ export default {
     setBackgroundColor () {
       // TODO h5 app-plus 暂不支持
       // #ifdef MP
-      uni.setBackgroundColor({
+      uni.setBackgroundColor && uni.setBackgroundColor({
         backgroundColor: this.backgroundColor,
         backgroundColorTop: this.backgroundColorTop,
         backgroundColorBottom: this.backgroundColorBottom

package/lib/cache.js

@@ -82,11 +82,14 @@ function updateComponentJson (name, jsonObj, usingComponents = true, type = 'Com
 
   const oldJsonStr = getJsonFile(name)
   if (oldJsonStr) { // update
-    if (usingComponents) { // merge usingComponents
+    if (usingComponents) { // merge usingComponents
       // 其实直接拿新的 merge 到旧的应该就行
       const oldJsonObj = JSON.parse(oldJsonStr)
-      jsonObj.usingComponents = oldJsonObj.usingComponents || {}
+      jsonObj.usingComponents = oldJsonObj.usingComponents || {}
       jsonObj.usingAutoImportComponents = oldJsonObj.usingAutoImportComponents || {}
+      if (oldJsonObj.genericComponents) {
+        jsonObj.genericComponents = oldJsonObj.genericComponents
+      }
       if (oldJsonObj.usingGlobalComponents) { // 复制 global components(针对不支持全局 usingComponents 的平台)
         jsonObj.usingGlobalComponents = oldJsonObj.usingGlobalComponents
       }
@@ -351,4 +354,4 @@ module.exports = {
   updateGenericComponents,
   getChangedJsonFileMap,
   getSpecialMethods
-}
+}

package/lib/platform.js

@@ -17,7 +17,26 @@ function getShadowCss () {
   if (process.env.UNI_PLATFORM === 'h5') {
     tagName = 'body'
   }
-  return `${tagName}::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 cdn = getShadowCdn()
+  return `${tagName}::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 cdns = {
+  'mp-weixin': 1,
+  'mp-alipay': 2,
+  'mp-baidu': 3,
+  'mp-toutiao': 4,
+  'mp-qq': 5,
+  'mp-360': 7,
+  'mp-dingtalk': 8,
+  'mp-kuaishou': 9,
+  'mp-lark': 10,
+  'quickapp-webview-huawei': 200,
+  'quickapp-webview-union': 201
+}
+
+function getShadowCdn () {
+  const index = cdns[process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM] || ''
+  return `https://cdn${index}.dcloud.net.cn`
 }
 
 // 解决 vue-cli-service lint 时 UNI_PLATFORM 不存在
@@ -34,7 +53,8 @@ module.exports = {
   normalizeNodeModules,
   isInHBuilderX,
   isInHBuilderXAlpha,
-  runByHBuilderX: isInHBuilderX || fs.existsSync(path.resolve(process.env.UNI_HBUILDERX_PLUGINS || '', 'weapp-tools')),
+  runByHBuilderX: isInHBuilderX || fs.existsSync(path.resolve(process.env.UNI_HBUILDERX_PLUGINS || '',
+    'weapp-tools')),
   getFlexDirection (json) {
     let flexDir = 'column'
     if (json && json.nvue && json.nvue['flex-direction']) {
@@ -90,7 +110,11 @@ module.exports = {
   },
   getMPRuntimePath () {
     if (process.env.UNI_USING_VUE3) {
-      return require.resolve('@dcloudio/uni-' + process.env.UNI_PLATFORM + '/dist/uni.mp.esm.js')
+      try {
+        return require.resolve('@dcloudio/uni-' + process.env.UNI_PLATFORM + '/dist/uni.mp.esm.js')
+      } catch (error) {
+        throw new Error('Vue3 项目暂不支持当前小程序')
+      }
     }
     return require.resolve('@dcloudio/uni-' + process.env.UNI_PLATFORM)
   },
@@ -125,7 +149,7 @@ module.exports = {
     if (process.env.UNI_PLATFORM === 'mp-toutiao' || process.env.UNI_PLATFORM === 'mp-lark') {
       tagName = 'image'
     }
-    return `<${tagName} src="https://cdn.dcloud.net.cn/img/shadow-${colorType}.png" style="z-index:998;position:fixed;left:0;top:0;width:100%;height:3px;"/>`
+    return `<${tagName} src="${getShadowCdn()}/img/shadow-${colorType}.png" style="z-index:998;position:fixed;left:0;top:0;width:100%;height:3px;"/>`
   },
   getPlatformScss () {
     return SCSS
@@ -137,7 +161,9 @@ module.exports = {
     return {
       sourceType: 'module',
       plugins: [
-        ['pipelineOperator', { proposal: 'minimal' }],
+        ['pipelineOperator', {
+          proposal: 'minimal'
+        }],
         'doExpressions',
         'optionalChaining',
         'typescript',
@@ -148,4 +174,4 @@ module.exports = {
       ]
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.1-32920211122003",
+  "version": "2.0.1-33420211228002",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -23,5 +23,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "547072012788a28569b9b8d073b22715a9f6dbb1"
+  "gitHead": "638b12e8f1886590d8f16562c14240c354a66bb2"
 }