@blocklet/component-studio-cli 0.5.56 → 0.6.1

package/dist/commands/dev.js

@@ -6,19 +6,29 @@ import { existsSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import ora from 'ora';
 import { getWorkspaceTemplatePath, installDependencies, getWorkspacePath, getProjectPath, replaceInDirectoryFileNameWithExample, checkShouldInstallDependencies, } from '../utils/helper.js';
-async function createDevServer(projectPath, _options) {
+async function createDevServer(projectPath, options) {
     // 1. 创建工作区
-    const workspacePath = getWorkspacePath();
+    const workspacePath = getWorkspacePath(options.version);
     const workspaceSpinner = ora({ text: 'Creating workspace...', color: 'blue' }).start();
     const workspacePathText = chalk.blue(`The workspace directory: ${workspacePath}`);
+    if (options.version) {
+        console.log(chalk.cyan(`Using version: ${options.version}`));
+    }
     // 2. 准备基础环境
     if (!existsSync(workspacePath)) {
         const workspaceTemplatePath = getWorkspaceTemplatePath();
         const workspaceParentDir = dirname(workspacePath);
-        // 删除 workspace parent 目录（清空历史的 component studio 项目，节省用户磁盘空间）
-        await fs.remove(workspaceParentDir);
-        // 创建 workspace parent 目录
-        await fs.ensureDir(workspaceParentDir);
+        // Selectively clean workspace parent directory, preserving @ prefixed directories
+        if (existsSync(workspaceParentDir)) {
+            const items = await fs.readdir(workspaceParentDir);
+            await Promise.all(items
+                .filter((item) => !item.startsWith('@'))
+                .map((item) => fs.remove(join(workspaceParentDir, item))));
+        }
+        else {
+            // 创建 workspace parent 目录
+            await fs.ensureDir(workspaceParentDir);
+        }
         // 复制 workspace 模板
         await fs.copy(workspaceTemplatePath, workspacePath);
         // 修改 workspace 目录中，_example 后缀的文件名，删除 _example 后缀
@@ -108,7 +118,10 @@ async function createDevServer(projectPath, _options) {
     };
 }
 export function createDevCommand() {
-    return new Command('dev').description('Start development server').action(async (options) => {
+    return new Command('dev')
+        .description('Start development server')
+        .option('-v, --version <version>', 'Specify version to use')
+        .action(async (options) => {
         const projectPath = getProjectPath();
         const server = await createDevServer(projectPath, options);
         // 处理终止信号

package/dist/utils/helper.d.ts

@@ -1,5 +1,5 @@
 export declare function getWorkspaceTemplatePath(): string;
-export declare function getWorkspacePath(): string;
+export declare function getWorkspacePath(version?: string): string;
 export declare function getProjectPath(): string;
 /**
  * 复制模板文件，但排除某些特定文件

package/dist/utils/helper.js

@@ -10,16 +10,16 @@ import { join, resolve, dirname, basename, relative } from 'node:path';
 import ora from 'ora';
 import os from 'os';
 import path from 'path';
-const workspaceVersion = '0.1.8';
+const DEFAULT_WORKSPACE_VERSION = '0.1.8';
 const METADATA_FILE_NAME = '@metadata.json';
 // 获取CLI内置的workspace模板路径
 export function getWorkspaceTemplatePath() {
     return join(import.meta.dirname, '../../templates/workspace');
 }
 // 获取用户电脑的workspace路径
-export function getWorkspacePath() {
+export function getWorkspacePath(version) {
     const homeDir = os.homedir();
-    const workspaceHash = workspaceVersion;
+    const workspaceHash = version || DEFAULT_WORKSPACE_VERSION;
     const workspaceDir = join(homeDir, `.component-studio`, workspaceHash);
     return workspaceDir;
 }

package/package.json

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

package/templates/init/0-basic/package.json

@@ -16,11 +16,11 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/react": "^18.2.0",
-    "@types/react-dom": "^18.2.0",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
     "lint-staged": "^15.5.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
     "typescript": "^5.0.0"
   },
   "peerDependencies": {

package/templates/init/1-professional/package.json

@@ -41,12 +41,12 @@
   "dependencies": {},
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
-    "@types/react": "^18.3.18",
-    "@types/react-dom": "^18.3.5",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
     "bumpp": "^9.9.3",
     "lint-staged": "^15.3.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
     "simple-git-hooks": "^2.11.1",
     "typescript": "^5.7.2",
     "zx": "^8.3.0"

package/templates/init/1-professional/src/atoms/GradientTitle.tsx

@@ -1,4 +1,4 @@
-import React, { CSSProperties } from 'react';
+import React, { CSSProperties, type JSX } from 'react';
 
 export interface GradientTitleProps {
   title: string;

package/templates/init/2-blank/package.json

@@ -16,11 +16,11 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/react": "^18.2.0",
-    "@types/react-dom": "^18.2.0",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
     "lint-staged": "^15.5.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
     "typescript": "^5.0.0"
   },
   "peerDependencies": {

package/templates/workspace/README.md

@@ -43,7 +43,7 @@ your-component-studio/
 
    Blocklet needs blocklet server as a dependency. So you need to install it first.
    `npm install -g @blocklet/cli`
-   See details in [ https://www.arcblock.io/docs/blocklet-developer/install-blocklet-cli#start-blocklet-server]( https://www.arcblock.io/docs/blocklet-developer/install-blocklet-cli#start-blocklet-server)
+   See details in [ https://www.arcblock.io/docs/blocklet-developer/install-blocklet-cli#start-blocklet-server](https://www.arcblock.io/docs/blocklet-developer/install-blocklet-cli#start-blocklet-server)
 
 2. Init blocklet server & start blocklet server
 
@@ -51,7 +51,7 @@ your-component-studio/
    `blocklet server init`
    `blocklet server start`
    See details in [https://www.arcblock.io/docs/blocklet-developer/install-blocklet-cli#start-blocklet-server](https://www.arcblock.io/docs/blocklet-developer/install-blocklet-cli#start-blocklet-server)
-   
+
 3. Go to the project directory `cd [name]`
 4. Install dependencies: `npm install` or `yarn`
 5. Start development server: `blocklet dev`
@@ -124,4 +124,4 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 ## License
 
 The code is licensed under the Apache 2.0 license found in the
-[LICENSE](LICENSE) file.
+[LICENSE](LICENSE) file.

package/templates/workspace/api/src/libs/auth.ts

@@ -1,9 +1,8 @@
-import path from 'path';
-
 import AuthStorage from '@arcblock/did-auth-storage-nedb';
 import getWallet from '@blocklet/sdk/lib/wallet';
 import WalletAuthenticator from '@blocklet/sdk/lib/wallet-authenticator';
 import WalletHandler from '@blocklet/sdk/lib/wallet-handler';
+import path from 'path';
 
 import env from './env';
 

package/templates/workspace/package.json

@@ -51,20 +51,20 @@
     ]
   },
   "dependencies": {
-    "@arcblock/did-auth": "^1.20.14",
+    "@arcblock/did-auth": "^1.20.15",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.13.67",
-    "@arcblock/ux": "^2.13.67",
-    "@blocklet/pages-kit": "^0.5.41",
-    "@blocklet/pages-kit-block-studio": "^0.5.41",
-    "@blocklet/pages-kit-inner-components": "^0.5.41",
-    "@blocklet/pages-kit-runtime": "^0.5.41",
+    "@arcblock/did-connect": "^3.0.8",
+    "@arcblock/ux": "^3.0.8",
+    "@blocklet/pages-kit": "^0.6.0",
+    "@blocklet/pages-kit-block-studio": "^0.6.0",
+    "@blocklet/pages-kit-inner-components": "^0.6.0",
+    "@blocklet/pages-kit-runtime": "^0.6.0",
     "@blocklet/sdk": "^1.16.44",
-    "@blocklet/studio-ui": "^0.4.274",
-    "@blocklet/ui-react": "^2.13.67",
-    "@ocap/client": "^1.20.14",
-    "@ocap/mcrypto": "^1.20.14",
-    "@ocap/wallet": "^1.20.14",
+    "@blocklet/studio-ui": "^0.4.275",
+    "@blocklet/ui-react": "^3.0.8",
+    "@ocap/client": "^1.20.15",
+    "@ocap/mcrypto": "^1.20.15",
+    "@ocap/wallet": "^1.20.15",
     "axios": "^1.7.9",
     "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
@@ -76,16 +76,16 @@
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
     "@blocklet/js-sdk": "^1.16.44",
-    "@tailwindcss/vite": "^4.1.10",
+    "@tailwindcss/vite": "^4.1.11",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/cookie-parser": "^1.4.8",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
     "@types/express": "^4.17.21",
     "@types/node": "^20.17.12",
-    "@types/react": "^18.3.18",
-    "@types/react-dom": "^18.3.5",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
+    "@vitejs/plugin-react": "^4.6.0",
     "autoprefixer": "^10.4.21",
     "bumpp": "^9.9.3",
     "cross-env": "^7.0.3",
@@ -93,19 +93,19 @@
     "lint-staged": "^15.3.0",
     "nodemon": "^3.1.9",
     "npm-run-all": "^4.1.5",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
     "react-router-dom": "^6.26.1",
     "rimraf": "^5.0.10",
     "simple-git-hooks": "^2.11.1",
     "tailwindcss": "^4.1.10",
     "typescript": "^5.7.2",
-    "vite": "^5.4.11",
-    "vite-node": "^2.1.8",
-    "vite-plugin-blocklet": "^0.9.33",
+    "vite": "^7.0.0",
+    "vite-node": "^3.2.4",
+    "vite-plugin-blocklet": "^0.10.0",
     "vite-plugin-require": "^1.2.14",
     "vite-plugin-svgr": "^4.3.0",
-    "vite-tsconfig-paths": "^4.3.2",
+    "vite-tsconfig-paths": "^5.1.4",
     "zx": "^8.3.0"
   },
   "importSort": {
@@ -122,14 +122,14 @@
     "pre-commit": "npx lint-staged"
   },
   "resolutions": {
-    "@vitejs/plugin-react": "4.3.4",
+    "@vitejs/plugin-react": "4.4.1",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
-    "vite": "5.4.11",
-    "vite-node": "2.1.8",
-    "vite-plugin-blocklet": "0.9.31",
+    "vite": "7.0.0",
+    "vite-node": "3.2.4",
+    "vite-plugin-blocklet": "0.10.0",
     "vite-plugin-require": "1.2.14",
     "vite-plugin-svgr": "4.3.0",
-    "vite-tsconfig-paths": "4.3.2"
+    "vite-tsconfig-paths": "5.1.4"
   }
 }

package/templates/workspace/tsconfig.api.json

@@ -5,8 +5,5 @@
     "noEmit": false,
     "noEmitOnError": true
   },
-  "include": [
-    "api/*.d.ts",
-    "api/src"
-  ]
+  "include": ["api/*.d.ts", "api/src"]
 }