@dcloudio/uni-cli-shared 2.0.1-33320211224001 → 2.0.1-33420211228004

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/package.js

@@ -1,14 +1,11 @@
 const uniI18n = require('@dcloudio/uni-cli-i18n')
 
-const PLATFORMS = [
-  'h5',
-  'app-plus',
-  'mp-weixin',
-  'mp-qq',
-  'mp-baidu',
-  'mp-alipay',
-  'mp-toutiao'
-]
+function isPlainObject (a) {
+  if (a === null) {
+    return false
+  }
+  return typeof a === 'object'
+}
 
 module.exports = {
   initCustomScript (name, pkgPath) {
@@ -27,13 +24,22 @@ module.exports = {
     }
 
     if (!scriptOptions.env || !scriptOptions.env.UNI_PLATFORM) {
-      console.error(uniI18n.__('cliShared.requireConfigUniPlatform', { 0: `package.json->uni-app->scripts->${name}->env ` }))
+      console.error(uniI18n.__('cliShared.requireConfigUniPlatform', {
+        0: `package.json->uni-app->scripts->${name}->env `
+      }))
       process.exit(0)
     }
 
-    if (PLATFORMS.indexOf(scriptOptions.env.UNI_PLATFORM) === -1) {
-      console.error(uniI18n.__('cliShared.supportPlatform', { 0: 'UNI_PLATFORM', 1: JSON.stringify(PLATFORMS) }))
-      process.exit(0)
+    if (isPlainObject(scriptOptions.define)) {
+      Object.keys(uniAppOptions.scripts).forEach(scriptName => {
+        if (scriptName !== name) {
+          const define = uniAppOptions.scripts[scriptName].define
+          Object.keys(define).forEach(name => {
+            define[name] = false
+          })
+          Object.assign(scriptOptions.define, define)
+        }
+      })
     }
 
     process.env.UNI_PLATFORM = scriptOptions.env.UNI_PLATFORM
@@ -44,4 +50,4 @@ module.exports = {
 
     return scriptOptions
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.1-33320211224001",
+  "version": "2.0.1-33420211228004",
   "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": "30f3c9d6642904e10fa2ea878ad02a348ecb137d"
+  "gitHead": "46925c288cdb3a955c9eb78de2972d94b2f8d249"
 }