feat: 提升aiottoolkit依赖版本,优化marquee等组件打包提示

Signed-off-by: lilei946 <[email protected]>

Author: lilei946

packages/hap-compiler/src/template/validator.js

@@ -1118,15 +1118,27 @@ function checkTagName(node, output, options = {}) {
   ) {
     const locationAddr =
       location.line && location.column ? '@' + location.line + ':' + location.column : ''
-    colorconsole.throw(
-      'ERROR: ' +
-        locationAddr +
-        ' 使用 `' +
-        tagName +
-        '` 组件，要求卡片配置 minCardPlatformVersion 或 minPlatformVersion 不低于 ' +
-        tagNatives[tagName].minRequiredRuntimeVersion +
-        ', 请修改'
-    )
+    if (options.isTargetVivo) {
+      colorconsole.throw(
+        'ERROR: ' +
+          locationAddr +
+          ' 使用 `' +
+          tagName +
+          '` 组件，要求卡片配置 minCardPlatformVersion 或 minPlatformVersion 不低于 ' +
+          tagNatives[tagName].minRequiredRuntimeVersion +
+          ', 请修改'
+      )
+    } else {
+      colorconsole.warn(
+        'ERROR: ' +
+          locationAddr +
+          ' 使用 `' +
+          tagName +
+          '` 组件，要求卡片配置 minCardPlatformVersion 或 minPlatformVersion 不低于 ' +
+          tagNatives[tagName].minRequiredRuntimeVersion +
+          ', 请修改'
+      )
+    }
   }
 
   // 检测根组件合法性

packages/hap-dsl-xvm/src/loaders/ux-fragment-utils.js

@@ -269,7 +269,7 @@ function makeLoaderString(type, config, newJSCard, uxType) {
  * @returns {string}
  */
 function processImportFrag($loader, imports, importNames, queryOptions = {}) {
-  const { newJSCard, lite, cardEntry, minCardRuntimeVersion } = queryOptions
+  const { newJSCard, lite, cardEntry, minCardRuntimeVersion, isTargetVivo } = queryOptions
   let retStr = ''
   if (imports.length) {
     const newJSCardParam = newJSCard ? `&newJSCard=${newJSCard}` : ''
@@ -278,6 +278,7 @@ function processImportFrag($loader, imports, importNames, queryOptions = {}) {
     const minCardRuntimeVersionParam = minCardRuntimeVersion
       ? `&minCardRuntimeVersion=${minCardRuntimeVersion}`
       : ''
+    const isTargetVivoParam = isTargetVivo ? `&isTargetVivo=${isTargetVivo}` : ''
     for (let i = 0; i < imports.length; i++) {
       const imp = imports[i]
       let importSrc = imp.attrs.src
@@ -314,7 +315,7 @@ function processImportFrag($loader, imports, importNames, queryOptions = {}) {
       let reqStr = makeRequireString(
         $loader,
         makeLoaderString(FRAG_TYPE.IMPORT, null, newJSCard),
-        `${importSrc}?uxType=${ENTRY_TYPE.COMP}&name=${importName}${newJSCardParam}${liteParam}${cardEntryParam}${minCardRuntimeVersionParam}`
+        `${importSrc}?uxType=${ENTRY_TYPE.COMP}&name=${importName}${newJSCardParam}${liteParam}${cardEntryParam}${minCardRuntimeVersionParam}${isTargetVivoParam}`
       )
 
       if (compileOptionsObject.stats) {
@@ -338,7 +339,7 @@ function processImportFrag($loader, imports, importNames, queryOptions = {}) {
  * @param {number} lite 轻卡
  */
 function processTemplateFrag($loader, templates, importNames, queryOptions = {}) {
-  const { uxType, newJSCard, lite, cardEntry, minCardRuntimeVersion } = queryOptions
+  const { uxType, newJSCard, lite, cardEntry, minCardRuntimeVersion, isTargetVivo } = queryOptions
   let retStr = '{}'
   if (!templates.length) {
     $loader.emitError(new Error('需要模板 <template> 片段'))
@@ -360,6 +361,7 @@ function processTemplateFrag($loader, templates, importNames, queryOptions = {})
     const minCardRuntimeVersionParam = minCardRuntimeVersion
       ? `&minCardRuntimeVersion=${minCardRuntimeVersion}`
       : ''
+    const isTargetVivoParam = isTargetVivo ? `&isTargetVivo=${isTargetVivo}` : ''
     // 解析成类似url中key[]=xxx 的形式，便于loader-utils解析
     importNames = importNames.map((item) => 'importNames[]=' + item)
     retStr = makeRequireString(
@@ -373,7 +375,7 @@ function processTemplateFrag($loader, templates, importNames, queryOptions = {})
       ),
       `${src}?uxType=${uxType}&${importNames.join(
         ','
-      )}${newJSCardParam}${liteParam}${pathParam}${cardEntryParam}${minCardRuntimeVersionParam}`
+      )}${newJSCardParam}${liteParam}${pathParam}${cardEntryParam}${minCardRuntimeVersionParam}${isTargetVivoParam}`
     )
   }
   return retStr

packages/hap-dsl-xvm/src/loaders/ux-loader.js

@@ -139,7 +139,8 @@ export default function uxLoader(source) {
     newJSCard: resourceQuery.newJSCard, // 新打包格式的 JS卡
     lite: resourceQuery.lite, // 轻卡
     cardEntry: resourceQuery.cardEntry, // 卡片入口
-    minCardRuntimeVersion: resourceQuery.minCardRuntimeVersion // 卡片配置的最小平台版本
+    minCardRuntimeVersion: resourceQuery.minCardRuntimeVersion, // 卡片配置的最小平台版本
+    isTargetVivo: resourceQuery.isTargetVivo // 厂商是否包含vivo
   }
   // 使用原有文件名（不包含扩展名）
   const name = resourceQuery.name || getNameByPath(resourcePath)

packages/hap-packager/package.json

@@ -35,7 +35,7 @@
     "babel.tree.config.js"
   ],
   "dependencies": {
-    "@aiot-toolkit/card-expression": "^1.0.13",
+    "@aiot-toolkit/card-expression": "^1.0.15",
     "@babel/core": "^7.9.6",
     "@babel/generator": "^7.9.6",
     "@babel/parser": "^7.9.6",

packages/hap-toolkit/__tests__/__snapshots__/compile.test.js.snap

@@ -355,7 +355,7 @@ Array [
 
 exports[`测试compile generate webpack config 1`] = `
 Object {
-  "CardDemo/index": "./src/CardDemo/index.ux?uxType=card&minCardRuntimeVersion=2000&cardEntry=CardDemo",
+  "CardDemo/index": "./src/CardDemo/index.ux?uxType=card&minCardRuntimeVersion=2000&cardEntry=CardDemo&isTargetVivo=false",
   "Demo/index": "./src/Demo/index.ux?uxType=page",
   "app": "./src/app.ux?uxType=app",
   "workers/request/index": "./src/workers/request/index.js",

packages/hap-toolkit/src/utils.js

@@ -104,6 +104,7 @@ export function resolveEntries(manifest, basedir, cwd) {
           `编译失败：请确认manifest.json中router.pages配置的 '${routePath}' 为目录名`
         )
       }
+      const isTargetVivo = (conf.targetManufacturers || []).includes('vivo')
       let sourceFile = path.relative(cwd, filepath)
       sourceFile = './' + sourceFile + `?uxType=${type}`
       sourceFile = sourceFile.replace(/\\/g, '/')
@@ -117,6 +118,7 @@ export function resolveEntries(manifest, basedir, cwd) {
           conf.minCardPlatformVersion || conf.minPlatformVersion || 0
         }` // 卡片配置的最小运行时版本
         sourceFile += `&cardEntry=${routePath}` // card 入口，lite 和 js 卡（新旧打包格式）都带该参数
+        sourceFile += `&isTargetVivo=${isTargetVivo}` // 厂商是否包含vivo
       }
       entries[entryKey] = sourceFile
     })

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@aiot-toolkit/card-expression@^1.0.13":
-  version "1.0.13"
-  resolved "https://registry.npmmirror.com/@aiot-toolkit/card-expression/-/card-expression-1.0.13.tgz#6649204e181fc46d21e8a7afef8ab82fff1bf2ab"
-  integrity sha512-5FhFSgh598fHRFMcF4g20V0PnGh0GhEzbGeK89DOSbe/2f4PPs75N4l1TmiwIBbT2zEDXe/1oFBIgIruoFqFUQ==
+"@aiot-toolkit/card-expression@^1.0.15":
+  version "1.0.15"
+  resolved "https://registry.npmmirror.com/@aiot-toolkit/card-expression/-/card-expression-1.0.15.tgz#5e4e7bd10b2b9044751b82c9861c82abaf2cc1fb"
+  integrity sha512-+8ZQQXiPB9OUL76BlqIDVhvtB46mXpMMYSxapMAOYw/C5M0RUnrRWOpF7XwRP/eVZqaY3/6SeZjZkT9r1HU5Iw==
   dependencies:
     "@babel/generator" "^7.25.6"
     "@babel/parser" "^7.25.6"