@bams-app/ui-dev-server 0.1.0 → 0.1.2

package/bin/ui-dev-server.js

@@ -23,7 +23,7 @@ function assertEnvSpecified(envInput) {
   const aliases = listEnvAliases(rootDir);
   if (aliases.length === 0) {
     console.warn(colorize('[ui-dev-server] 未找到环境配置（.envs/.env.dev-*），将以无环境变量方式启动', 'yellow'));
-    console.warn(colorize('[ui-dev-server] 可先执行 bams-work env <标识> 创建环境配置', 'yellow'));
+    console.warn(colorize('[ui-dev-server] 可先执行 work env <标识> 创建环境配置', 'yellow'));
     return;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bams-app/ui-dev-server",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "scripts": {
     "serve": "node ./bin/ui-dev-server.js",
     "build": "vue-cli-service build",

package/utils.js

@@ -244,6 +244,40 @@ function resolveComponent(componentName, rootDir, packageJson) {
     return getComponentScope(componentName, rootDir, packageJson);
 }
 
+/**
+ * 解析 dev/build 时 @target-component 别名实际指向的组件目录
+ * - 完整包名（@scope/name）：在候选中按 packageName 精确匹配，避免同名组件始终落到第一个
+ * - 路径：直接使用该路径
+ * - 短名：沿用第一个候选；无候选时回退 resolveComponent 结果（如已发布包从 node_modules 解析）
+ * @param {string} componentName - 组件名、完整包名或路径
+ * @param {string} rootDir - 项目根目录
+ * @param {Object} packageJson - package.json 对象
+ * @returns {string} 组件目录绝对路径或可被 webpack 解析的包名
+ */
+function resolveTargetComponentPath(componentName, rootDir, packageJson) {
+    const resolvedComponent = resolveComponent(componentName, rootDir, packageJson);
+
+    // 路径形式已指向明确目录，无需再按名字查找候选
+    if (isFileSystemPath(componentName)) {
+        return resolvedComponent;
+    }
+
+    const candidates = findComponentCandidates(getComponentEntryName(componentName), rootDir, packageJson);
+    if (candidates.length === 0) {
+        return resolvedComponent;
+    }
+
+    // 完整包名：按 packageName 精确匹配同名组件所属 scope
+    if (componentName.startsWith('@')) {
+        const matched = candidates.find((candidate) => candidate.packageName === componentName);
+        if (matched) {
+            return matched.componentPath;
+        }
+    }
+
+    return candidates[0].componentPath;
+}
+
 /**
  * 从组件名或路径中提取组件入口名（用于前端渲染）
  * @param {string} componentName - 组件名或路径
@@ -553,6 +587,7 @@ module.exports = {
     findComponentCandidates,
     getComponentScope,
     resolveComponent,
+    resolveTargetComponentPath,
     getComponentEntryName,
     toCamelComponentName,
     colorize,

package/vue.config.build.js

@@ -1,7 +1,7 @@
 const { defineConfig } = require('@vue/cli-service')
 const path = require('path')
 const { getBaseConfig } = require('./vue.config.base')
-const { getRootDir, getProjectPackageJson, resolveComponent, findComponentCandidates, getComponentEntryName } = require('./utils')
+const { getRootDir, getProjectPackageJson, resolveTargetComponentPath } = require('./utils')
 
 const rootDir = getRootDir();
 const packageJson = getProjectPackageJson(rootDir);
@@ -9,12 +9,9 @@ const baseConfig = getBaseConfig({ rootDir, packageJson });
 
 const componentName = process.env.COMPONENT || 'ui-component-demo';
 
-const resolvedComponent = resolveComponent(componentName, rootDir, packageJson);
-// COMPONENT 环境变量可能是 @scope/name 完整包名，查找候选时需用短名
-const candidates = findComponentCandidates(getComponentEntryName(componentName), rootDir, packageJson);
-// 命中候选时别名指向组件目录绝对路径（避免从包目录解析用户项目组件失败）
-const component = candidates.length > 0 ? candidates[0].componentPath : resolvedComponent;
-console.log('🎉 当前开发组件：', resolvedComponent);
+// COMPONENT 可能是 @scope/name 完整包名，同名组件存在多个 scope 时按包名精确匹配
+const component = resolveTargetComponentPath(componentName, rootDir, packageJson);
+console.log('🎉 当前构建组件：', component);
 
 module.exports = defineConfig({
     transpileDependencies: baseConfig.transpileDependencies,

package/vue.config.dev.js

@@ -1,7 +1,7 @@
 const { defineConfig } = require('@vue/cli-service')
 const path = require('path')
 const { getBaseConfig } = require('./vue.config.base')
-const { getRootDir, getProjectPackageJson, resolveComponent, findComponentCandidates, getComponentEntryName, toCamelComponentName } = require('./utils')
+const { getRootDir, getProjectPackageJson, resolveTargetComponentPath, toCamelComponentName } = require('./utils')
 
 const rootDir = getRootDir();
 const packageJson = getProjectPackageJson(rootDir);
@@ -11,12 +11,9 @@ const componentName = process.env.COMPONENT || 'ui-component-demo';
 const layout = process.env.LAYOUT || 'pc';
 const camelComponentName = toCamelComponentName(componentName);
 
-const resolvedComponent = resolveComponent(componentName, rootDir, packageJson);
-// COMPONENT 环境变量可能是 @scope/name 完整包名，查找候选时需用短名
-const candidates = findComponentCandidates(getComponentEntryName(componentName), rootDir, packageJson);
-// 命中候选时别名指向组件目录绝对路径（避免从包目录解析用户项目组件失败）
-const component = candidates.length > 0 ? candidates[0].componentPath : resolvedComponent;
-console.log('🎉 当前开发组件：', resolvedComponent);
+// COMPONENT 可能是 @scope/name 完整包名，同名组件存在多个 scope 时按包名精确匹配
+const component = resolveTargetComponentPath(componentName, rootDir, packageJson);
+console.log('🎉 当前开发组件：', component);
 
 module.exports = defineConfig({
     transpileDependencies: baseConfig.transpileDependencies,