@blocklet/component-studio-cli 0.4.151 → 0.4.153

package/dist/commands/dev.js

@@ -5,7 +5,7 @@ import fs from 'fs-extra';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import ora from 'ora';
-import { getWorkspaceTemplatePath, installDependencies, getWorkspacePath, getProjectPath, replaceInDirectoryFileNameWithExample, } from '../utils/helper.js';
+import { getWorkspaceTemplatePath, installDependencies, getWorkspacePath, getProjectPath, replaceInDirectoryFileNameWithExample, checkShouldInstallDependencies, } from '../utils/helper.js';
 async function createDevServer(projectPath, _options) {
     // 1. 创建工作区
     const workspacePath = getWorkspacePath();
@@ -54,18 +54,18 @@ async function createDevServer(projectPath, _options) {
         await fs.ensureSymlink(projectPath, projectLinkDir);
         projectLinkSpinner.succeed(chalk.green('Project linked to workspace successfully!'));
     }
-    let shouldInstallWorkspaceDeps = !(await fs.exists(join(workspacePath, 'node_modules')));
-    let shouldInstallProjectDeps = !(await fs.exists(join(projectPath, 'node_modules')));
+    let shouldInstallWorkspaceDeps = await checkShouldInstallDependencies(workspacePath);
+    let shouldInstallProjectDeps = await checkShouldInstallDependencies(projectPath);
     // 5. 安装依赖
     if (shouldInstallWorkspaceDeps || shouldInstallProjectDeps) {
-        const dirsToInstall = {};
-        if (shouldInstallWorkspaceDeps) {
-            dirsToInstall['Workspace'] = workspacePath;
-        }
+        const installDeps = {};
         if (shouldInstallProjectDeps) {
-            dirsToInstall['Project'] = projectPath;
+            installDeps.Project = projectPath;
+        }
+        if (shouldInstallWorkspaceDeps) {
+            installDeps.Workspace = workspacePath;
         }
-        const result = await installDependencies(dirsToInstall);
+        const result = await installDependencies(installDeps);
         if (!result) {
             process.exit(1);
         }

package/dist/utils/helper.d.ts

@@ -100,3 +100,4 @@ export declare function isCommandAvailable(command: string): boolean;
  * @returns 安装是否成功
  */
 export declare function installGlobalPackage(packageName: string): Promise<boolean>;
+export declare function checkShouldInstallDependencies(dirPath: string): Promise<boolean>;

package/dist/utils/helper.js

@@ -107,7 +107,7 @@ export async function installDependencies(dirs, operation = 'install') {
                 let errorOutput = '';
                 const process = spawn('pnpm', ['update:deps'], {
                     cwd: dirPath,
-                    stdio: ['inherit', 'pipe', 'pipe'], // 将 stdout 和 stderr 设为 pipe
+                    stdio: 'inherit',
                 });
                 // 收集错误输出
                 process.stderr?.on('data', (data) => {
@@ -125,7 +125,7 @@ export async function installDependencies(dirs, operation = 'install') {
                         resolve();
                     }
                     else {
-                        reject(new Error(`${dirType} dependencies install failed with code ${code}.\nError details:\n${errorOutput?.trimStart()}`));
+                        reject(new Error(`${dirType} dependencies install failed with code ${code}. ${errorOutput ? `\nError details:\n${errorOutput?.trimStart()}` : ''}}`));
                     }
                 });
                 process.on('error', (error) => {
@@ -513,3 +513,6 @@ export async function installGlobalPackage(packageName) {
         return false;
     }
 }
+export async function checkShouldInstallDependencies(dirPath) {
+    return !(await fs.exists(join(dirPath, 'node_modules'))) || !(await fs.exists(join(dirPath, 'pnpm-lock.yaml')));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/component-studio-cli",
-  "version": "0.4.151",
+  "version": "0.4.153",
   "description": "CLI for Component Studio",
   "publishConfig": {
     "access": "public"