diff --git a/CHANGELOG.md b/CHANGELOG.md index 9035e876..af7087d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.14.2 (2026-1-4) + +- fix(plugin-blocklet): set node-polyfills default options + ## 0.14.1 (2026-1-4) - fix(plugin-blocklet): fix import @ocap/mcrypto diff --git a/package.json b/package.json index b3b009e5..daf7adc0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "create-blocklet", "private": true, - "version": "0.14.1", + "version": "0.14.2", "description": "", "keywords": [], "author": "", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 17348288..1e3d9fce 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "create-blocklet", - "version": "0.14.1", + "version": "0.14.2", "exports": "./index.js", "type": "module", "repository": "git@github.com:blocklet/create-blocklet.git", diff --git a/packages/create-app/templates/component-studio/package.json b/packages/create-app/templates/component-studio/package.json index 6f514824..59f542cd 100644 --- a/packages/create-app/templates/component-studio/package.json +++ b/packages/create-app/templates/component-studio/package.json @@ -97,7 +97,7 @@ "typescript": "^5.7.2", "vite": "^7.0.0", "vite-node": "^3.2.4", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vite-plugin-require": "^1.2.14", "vite-plugin-svgr": "^4.3.0", "vite-tsconfig-paths": "^5.1.4", diff --git a/packages/create-app/templates/did-connect-dapp/package.json b/packages/create-app/templates/did-connect-dapp/package.json index b5a9c48c..88792457 100644 --- a/packages/create-app/templates/did-connect-dapp/package.json +++ b/packages/create-app/templates/did-connect-dapp/package.json @@ -77,7 +77,7 @@ "simple-git-hooks": "^2.11.1", "tsx": "^4.19.3", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vite-plugin-svgr": "^4.3.0", "zx": "^8.3.2" }, diff --git a/packages/create-app/templates/did-wallet-dapp/package.json b/packages/create-app/templates/did-wallet-dapp/package.json index 91777964..feff55a2 100644 --- a/packages/create-app/templates/did-wallet-dapp/package.json +++ b/packages/create-app/templates/did-wallet-dapp/package.json @@ -54,7 +54,7 @@ "simple-git-hooks": "^2.11.1", "vite": "^7.0.0", "vite-node": "^3.2.4", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vite-plugin-require": "^1.2.14", "vite-plugin-svgr": "^4.3.0", "zx": "^8.3.2" diff --git a/packages/create-app/templates/react-aigne-dapp/package.json b/packages/create-app/templates/react-aigne-dapp/package.json index c8fc88df..104071e6 100644 --- a/packages/create-app/templates/react-aigne-dapp/package.json +++ b/packages/create-app/templates/react-aigne-dapp/package.json @@ -97,7 +97,7 @@ "tsx": "^4.19.3", "typescript": "^5.7.3", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vite-plugin-svgr": "^4.3.0", "zx": "^8.3.2" }, diff --git a/packages/create-app/templates/react-dapp-ts/package.json b/packages/create-app/templates/react-dapp-ts/package.json index 057fc687..c6a53996 100644 --- a/packages/create-app/templates/react-dapp-ts/package.json +++ b/packages/create-app/templates/react-dapp-ts/package.json @@ -81,7 +81,7 @@ "tsx": "^4.19.3", "typescript": "^5.7.3", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vite-plugin-svgr": "^4.3.0", "zx": "^8.3.2" }, diff --git a/packages/create-app/templates/react-dapp/package.json b/packages/create-app/templates/react-dapp/package.json index a43cce87..dd679c33 100644 --- a/packages/create-app/templates/react-dapp/package.json +++ b/packages/create-app/templates/react-dapp/package.json @@ -71,7 +71,7 @@ "simple-git-hooks": "^2.11.1", "tsx": "^4.19.3", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vite-plugin-svgr": "^4.3.0", "zx": "^8.3.2" }, diff --git a/packages/create-app/templates/react-gun-dapp/package.json b/packages/create-app/templates/react-gun-dapp/package.json index ddbab544..df24caa9 100644 --- a/packages/create-app/templates/react-gun-dapp/package.json +++ b/packages/create-app/templates/react-gun-dapp/package.json @@ -71,7 +71,7 @@ "simple-git-hooks": "^2.11.1", "tsx": "^4.19.3", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vite-plugin-svgr": "^4.3.0", "zx": "^8.3.2" }, diff --git a/packages/create-app/templates/react-static/package.json b/packages/create-app/templates/react-static/package.json index 383e1e01..e27a03cd 100644 --- a/packages/create-app/templates/react-static/package.json +++ b/packages/create-app/templates/react-static/package.json @@ -52,7 +52,7 @@ "rimraf": "^5.0.10", "simple-git-hooks": "^2.11.1", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vite-plugin-svgr": "^4.3.0", "zx": "^8.3.2" }, diff --git a/packages/create-app/templates/solidjs-dapp/package.json b/packages/create-app/templates/solidjs-dapp/package.json index 06748c46..1de822ca 100644 --- a/packages/create-app/templates/solidjs-dapp/package.json +++ b/packages/create-app/templates/solidjs-dapp/package.json @@ -37,7 +37,7 @@ "simple-git-hooks": "^2.11.1", "tsx": "^4.19.3", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vite-plugin-solid": "^2.11.7", "zx": "^8.3.2" }, diff --git a/packages/create-app/templates/solidjs-static/package.json b/packages/create-app/templates/solidjs-static/package.json index 5948107f..4429df7d 100644 --- a/packages/create-app/templates/solidjs-static/package.json +++ b/packages/create-app/templates/solidjs-static/package.json @@ -32,7 +32,7 @@ "simple-git-hooks": "^2.11.1", "solid-js": "^1.9.4", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vite-plugin-solid": "^2.11.7", "zx": "^8.3.2" }, diff --git a/packages/create-app/templates/svelte-dapp/package.json b/packages/create-app/templates/svelte-dapp/package.json index f6364b04..854e9af3 100644 --- a/packages/create-app/templates/svelte-dapp/package.json +++ b/packages/create-app/templates/svelte-dapp/package.json @@ -45,7 +45,7 @@ "svelte": "^4.2.19", "tsx": "^4.19.3", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "zx": "^8.3.2" }, "lint-staged": { diff --git a/packages/create-app/templates/svelte-static/package.json b/packages/create-app/templates/svelte-static/package.json index ba281b59..cf10e5c5 100644 --- a/packages/create-app/templates/svelte-static/package.json +++ b/packages/create-app/templates/svelte-static/package.json @@ -26,7 +26,7 @@ "simple-git-hooks": "^2.11.1", "svelte": "^4.2.19", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "zx": "^8.3.2" }, "lint-staged": { diff --git a/packages/create-app/templates/todo-list-example/package.json b/packages/create-app/templates/todo-list-example/package.json index ed3902ae..8bd05871 100644 --- a/packages/create-app/templates/todo-list-example/package.json +++ b/packages/create-app/templates/todo-list-example/package.json @@ -96,7 +96,7 @@ "tsx": "^4.19.3", "typescript": "^5.7.3", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vite-plugin-svgr": "^4.3.0", "zx": "^8.3.2" }, diff --git a/packages/create-app/templates/vue-dapp/package.json b/packages/create-app/templates/vue-dapp/package.json index 110ffea5..b9dd0965 100644 --- a/packages/create-app/templates/vue-dapp/package.json +++ b/packages/create-app/templates/vue-dapp/package.json @@ -49,7 +49,7 @@ "simple-git-hooks": "^2.11.1", "tsx": "^4.19.3", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vue": "^3.5.13", "zx": "^8.3.2" }, diff --git a/packages/create-app/templates/vue-static/package.json b/packages/create-app/templates/vue-static/package.json index c3ae5dae..9e012046 100644 --- a/packages/create-app/templates/vue-static/package.json +++ b/packages/create-app/templates/vue-static/package.json @@ -30,7 +30,7 @@ "rimraf": "^5.0.10", "simple-git-hooks": "^2.11.1", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vue": "^3.5.13", "zx": "^8.3.2" }, diff --git a/packages/create-app/templates/vue-ts-static/package.json b/packages/create-app/templates/vue-ts-static/package.json index 40c4ccb6..c9da12cf 100644 --- a/packages/create-app/templates/vue-ts-static/package.json +++ b/packages/create-app/templates/vue-ts-static/package.json @@ -39,7 +39,7 @@ "taze": "^0.16.9", "typescript": "^5.7.3", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vue-tsc": "^2.2.2", "zx": "^8.3.2" }, diff --git a/packages/create-app/templates/vue2-dapp/package.json b/packages/create-app/templates/vue2-dapp/package.json index 10bbc427..8c850371 100644 --- a/packages/create-app/templates/vue2-dapp/package.json +++ b/packages/create-app/templates/vue2-dapp/package.json @@ -48,7 +48,7 @@ "simple-git-hooks": "^2.11.1", "tsx": "^4.19.3", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vue": "^2.7.16", "zx": "^8.3.2" }, diff --git a/packages/create-app/templates/vue2-static/package.json b/packages/create-app/templates/vue2-static/package.json index f5bf6f42..1ecbfed0 100644 --- a/packages/create-app/templates/vue2-static/package.json +++ b/packages/create-app/templates/vue2-static/package.json @@ -30,7 +30,7 @@ "rimraf": "^5.0.10", "simple-git-hooks": "^2.11.1", "vite": "^7.0.0", - "vite-plugin-blocklet": "^0.14.1", + "vite-plugin-blocklet": "^0.14.2", "vue": "^2.7.16", "zx": "^8.3.2" }, diff --git a/plugins/vite-plugin-blocklet/index.js b/plugins/vite-plugin-blocklet/index.js index 716b2f67..28d520dc 100644 --- a/plugins/vite-plugin-blocklet/index.js +++ b/plugins/vite-plugin-blocklet/index.js @@ -1,4 +1,6 @@ import { nodePolyfills } from 'vite-plugin-node-polyfills'; +import { createDefu } from 'defu'; + import createHmrPlugin from './libs/hmr.js'; import createConfigPlugin from './libs/config.js'; import createMetaPlugin from './libs/meta.js'; @@ -44,6 +46,14 @@ import setupClient from './libs/client.js'; * @property {number} [chunkSizeLimit=2000] - The chunk size limit in KB. */ +const defuReplaceArray = createDefu((obj, key, value) => { + // 如果当前值或默认值是数组,直接使用新值(实现替换) + if (Array.isArray(obj[key]) || Array.isArray(value)) { + obj[key] = value + return true // 返回 true 表示我们已经处理了这个 key,defu 不需要再做默认处理 + } +}) + /** * Create blocklet plugins. * @@ -79,7 +89,15 @@ export function createBlockletPlugin(options = {}) { plugins.push(createHmrPlugin(restOptions)); } if (!disableNodePolyfills) { - plugins.push(nodePolyfills(nodePolyfillsOptions)); + const mergedOptions = defuReplaceArray(nodePolyfillsOptions, { + include: ['buffer'], + globals: { + buffer: true, + global: false, + process: false, + } + }); + plugins.push(nodePolyfills(mergedOptions)); } if (!disableLoading) { plugins.push(createLoadingPlugin(restOptions)); diff --git a/plugins/vite-plugin-blocklet/package.json b/plugins/vite-plugin-blocklet/package.json index f7deaa2c..8dc619a6 100644 --- a/plugins/vite-plugin-blocklet/package.json +++ b/plugins/vite-plugin-blocklet/package.json @@ -1,7 +1,7 @@ { "name": "vite-plugin-blocklet", "type": "module", - "version": "0.14.1", + "version": "0.14.2", "description": "", "main": "index.js", "files": [ @@ -33,6 +33,7 @@ "@arcblock/did": "^1.28.0", "@ocap/mcrypto": "^1.28.0", "@ocap/util": "^1.28.0", + "defu": "^6.1.4", "get-port": "^5.1.1", "http-proxy-middleware": "^3.0.3", "ismobilejs": "^1.1.1", diff --git a/plugins/vite-plugin-wss-hmr/package.json b/plugins/vite-plugin-wss-hmr/package.json index 570bdd7f..a5cd6a8e 100644 --- a/plugins/vite-plugin-wss-hmr/package.json +++ b/plugins/vite-plugin-wss-hmr/package.json @@ -1,7 +1,7 @@ { "name": "vite-plugin-wss-hmr", "type": "module", - "version": "0.14.1", + "version": "0.14.2", "description": "", "main": "index.js", "exports": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f2c9ea37..03f63636 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -91,6 +91,9 @@ importers: '@ocap/util': specifier: ^1.28.0 version: 1.28.0 + defu: + specifier: ^6.1.4 + version: 6.1.4 get-port: specifier: ^5.1.1 version: 5.1.1 diff --git a/version b/version index c39e9c5f..1c16bd1a 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.14.1 \ No newline at end of file +0.14.2 \ No newline at end of file diff --git a/website/docs/blocklet.yml b/website/docs/blocklet.yml index f86d07ec..a82abfe8 100644 --- a/website/docs/blocklet.yml +++ b/website/docs/blocklet.yml @@ -13,7 +13,7 @@ repository: type: git url: git+https://github.com/blocklet/create-blocklet.git specVersion: 1.2.8 -version: 0.14.1 +version: 0.14.2 logo: logo.png files: - logo.png diff --git a/website/pages/blocklet.yml b/website/pages/blocklet.yml index 820e2cfa..259821b6 100644 --- a/website/pages/blocklet.yml +++ b/website/pages/blocklet.yml @@ -13,7 +13,7 @@ repository: type: git url: git+https://github.com/blocklet/create-blocklet.git specVersion: 1.2.8 -version: 0.14.1 +version: 0.14.2 logo: logo.png files: - logo.png