From 71985b6b92207bf5edfdd7b58d1c750b733af14b Mon Sep 17 00:00:00 2001 From: Lancelot Lewis Date: Fri, 19 Dec 2025 23:49:00 +0800 Subject: [PATCH 1/3] feat(vite-plugin-blocklet): support show poweredby in html loading --- plugins/vite-plugin-blocklet/index.js | 24 ++-- plugins/vite-plugin-blocklet/libs/loading.js | 113 ++++++++++++++----- 2 files changed, 99 insertions(+), 38 deletions(-) diff --git a/plugins/vite-plugin-blocklet/index.js b/plugins/vite-plugin-blocklet/index.js index a398e338..0ae4c4ca 100644 --- a/plugins/vite-plugin-blocklet/index.js +++ b/plugins/vite-plugin-blocklet/index.js @@ -20,19 +20,25 @@ import setupClient from './libs/client.js'; * @property {boolean} [disableLoading=false] - Disable loading plugin. * @property {boolean} [disableDebug=false] - Disable debug plugin. * @property {boolean} [disableEmbed=false] - Disable embed plugin. + * * @property {import('vite-plugin-node-polyfills').PolyfillOptions} [nodePolyfillsOptions] * - * @property {string} [loadingElementId] - * @property {string} [loadingColor] - * @property {string} [loadingImage] + * @property {string} [loadingElementId='app'] + * @property {string} [loadingColor='#8abaf0'] + * @property {string} [loadingImage='/.well-known/service/blocklet/logo?imageFilter=convert&f=png&w=80'] + * @property {boolean} [loadingShowPoweredBy=true] + * @property {string} [loadingPoweredByText='Powered by ArcBlock'] + * * @property {'all'|'mobile'|'desktop'} [debugPlatform='mobile'] * @property {string} [debugScript] - * @property {number} [positionX] - * @property {number} [positionY] - * @param {object} [embeds={}] - The embeds to be built. - * @param {array} [embedExternals=['react', '@arcblock/ux/lib/Locale/context', '@arcblock/did-connect-react/lib/Session']] - The external modules to be used in the embeds. - * @param {array} [embedPlugins=[]] - The plugins to be used in the embeds. - * @param {number} [embedBuildConcurrency=0] - The plugins to be used in the embeds. + * @property {number} [positionX=0] + * @property {number} [positionY=0] + * + * @property {object} [embeds={}] - The embeds to be built. + * @property {array} [embedExternals=['react', '@arcblock/ux/lib/Locale/context', '@arcblock/did-connect-react/lib/Session']] - The external modules to be used in the embeds. + * @property {array} [embedPlugins=[]] - The plugins to be used in the embeds. + * @property {number} [embedBuildConcurrency=0] - The plugins to be used in the embeds. + * * @property {'middleware'|'client'|'server'|'wsUpgrade'} [hmrMode='middleware'] - 当未传入任何 option 参数时,会自动变为 middleware 模式 */ diff --git a/plugins/vite-plugin-blocklet/libs/loading.js b/plugins/vite-plugin-blocklet/libs/loading.js index e3df2598..130188bd 100644 --- a/plugins/vite-plugin-blocklet/libs/loading.js +++ b/plugins/vite-plugin-blocklet/libs/loading.js @@ -6,25 +6,18 @@ import { withQuery } from 'ufo'; * @param {Object} options - The options for generating the HTML. * @param {string} options.color - The color of the spinner. Defaults to "#333". * @param {string} options.image - The URL of the image to display alongside the spinner. + * @param {boolean} options.showPoweredBy - Whether to show the "Powered by" text. + * @param {string} [options.poweredByText='Powered by ArcBlock'] - The text to display for "Powered by". * @return {string} The generated HTML string. */ -function generateHtml({ color, image }) { +function generateHtml({ color, image, showPoweredBy, poweredByText = 'Powered by ArcBlock' }) { return ` -
- +
+
+
${poweredByText}
`; } @@ -135,9 +180,17 @@ function generateHtml({ color, image }) { * @param {string} [options.loadingElementId='app'] - The ID of the loading element. * @param {string} [options.loadingColor='#8abaf0'] - The color of the loading animation. * @param {string} [options.loadingImage='/.well-known/service/blocklet/logo?imageFilter=convert&f=png&w=80'] - The URL of the loading image. + * @param {boolean} [options.loadingShowPoweredBy=true] - Whether to show the "Powered by" text. + * @param {string} [options.loadingPoweredByText='Powered by ArcBlock'] - The text to display for "Powered by". * @return {Object} - The Vite plugin object. */ -export default function createLoadingPlugin({ loadingElementId = 'app', loadingColor = '#8abaf0', loadingImage } = {}) { +export default function createLoadingPlugin({ + loadingElementId = 'app', + loadingColor = '#8abaf0', + loadingImage, + loadingShowPoweredBy = true, + loadingPoweredByText = 'Powered by ArcBlock', +} = {}) { if (!loadingImage) { loadingImage = withQuery('/.well-known/service/blocklet/logo', { imageFilter: 'convert', @@ -148,6 +201,8 @@ export default function createLoadingPlugin({ loadingElementId = 'app', loadingC const injectHtml = generateHtml({ color: loadingColor, image: loadingImage, + showPoweredBy: loadingShowPoweredBy, + poweredByText: loadingPoweredByText, }); return { From 85b98193e94e4cf3362bbe26abb4ecb7d376fb20 Mon Sep 17 00:00:00 2001 From: Lancelot Lewis Date: Fri, 19 Dec 2025 23:50:43 +0800 Subject: [PATCH 2/3] chore(release): v0.13.0 --- CHANGELOG.md | 4 ++++ package.json | 2 +- packages/create-app/package.json | 2 +- packages/create-app/templates/component-studio/package.json | 2 +- packages/create-app/templates/did-connect-dapp/package.json | 2 +- packages/create-app/templates/did-wallet-dapp/package.json | 2 +- packages/create-app/templates/react-aigne-dapp/package.json | 2 +- packages/create-app/templates/react-dapp-ts/package.json | 2 +- packages/create-app/templates/react-dapp/package.json | 2 +- packages/create-app/templates/react-gun-dapp/package.json | 2 +- packages/create-app/templates/react-static/package.json | 2 +- packages/create-app/templates/solidjs-dapp/package.json | 2 +- packages/create-app/templates/solidjs-static/package.json | 2 +- packages/create-app/templates/svelte-dapp/package.json | 2 +- packages/create-app/templates/svelte-static/package.json | 2 +- packages/create-app/templates/todo-list-example/package.json | 2 +- packages/create-app/templates/vue-dapp/package.json | 2 +- packages/create-app/templates/vue-static/package.json | 2 +- packages/create-app/templates/vue-ts-static/package.json | 2 +- packages/create-app/templates/vue2-dapp/package.json | 2 +- packages/create-app/templates/vue2-static/package.json | 2 +- plugins/vite-plugin-blocklet/package.json | 2 +- plugins/vite-plugin-wss-hmr/package.json | 2 +- version | 2 +- website/docs/blocklet.yml | 2 +- website/pages/blocklet.yml | 2 +- 26 files changed, 29 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8deac451..bd83277e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.13.0 (2025-12-19) + +- feat(vite-plugin-blocklet): support show poweredby in html loading + ## 0.12.5 (2025-12-15) - chore: update deps to the latest version diff --git a/package.json b/package.json index 96d25684..f8127934 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "create-blocklet", "private": true, - "version": "0.12.5", + "version": "0.13.0", "description": "", "keywords": [], "author": "", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index baa73e16..c93fe2cd 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "create-blocklet", - "version": "0.12.5", + "version": "0.13.0", "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 e92db868..4189d11f 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 a1ccf276..ee8ca779 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 ca76ce39..7c51fba6 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 46a3fda2..627e59b8 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 0a39dd26..ef7f262d 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 74157a6c..773fe688 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 f9523a5d..39b2ad00 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 35028fc2..fa8c097f 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 77024783..d45f99db 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 5940dcd7..c996ba9e 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 b86036f0..5d2e2549 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 e2d8d2f5..58630891 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 68482298..89984e33 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 5d0f183f..b74b7ec4 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 6ac083d2..f3981e23 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 e9a7274c..a8fda740 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 901d9b48..cf61488f 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "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 e8cd241c..3a5b3476 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.12.5", + "vite-plugin-blocklet": "^0.13.0", "vue": "^2.7.16", "zx": "^8.3.2" }, diff --git a/plugins/vite-plugin-blocklet/package.json b/plugins/vite-plugin-blocklet/package.json index db97e165..51a50a07 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.12.5", + "version": "0.13.0", "description": "", "main": "index.js", "files": [ diff --git a/plugins/vite-plugin-wss-hmr/package.json b/plugins/vite-plugin-wss-hmr/package.json index 39f9e4a3..d68e6654 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.12.5", + "version": "0.13.0", "description": "", "main": "index.js", "exports": { diff --git a/version b/version index 67993434..51de3305 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.12.5 \ No newline at end of file +0.13.0 \ No newline at end of file diff --git a/website/docs/blocklet.yml b/website/docs/blocklet.yml index bb7a3c11..28bfb6a2 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.12.5 +version: 0.13.0 logo: logo.png files: - logo.png diff --git a/website/pages/blocklet.yml b/website/pages/blocklet.yml index 533c1bf5..381afa04 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.12.5 +version: 0.13.0 logo: logo.png files: - logo.png From 2eb48b42e1cd45485624b6f50b9e2110f3c9aebe Mon Sep 17 00:00:00 2001 From: Lancelot Lewis Date: Fri, 19 Dec 2025 23:57:59 +0800 Subject: [PATCH 3/3] feat: support hide animation dots --- plugins/vite-plugin-blocklet/index.js | 19 ++++++++++--------- plugins/vite-plugin-blocklet/libs/loading.js | 16 ++++++++++++---- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/plugins/vite-plugin-blocklet/index.js b/plugins/vite-plugin-blocklet/index.js index 0ae4c4ca..fa9adf2f 100644 --- a/plugins/vite-plugin-blocklet/index.js +++ b/plugins/vite-plugin-blocklet/index.js @@ -23,16 +23,17 @@ import setupClient from './libs/client.js'; * * @property {import('vite-plugin-node-polyfills').PolyfillOptions} [nodePolyfillsOptions] * - * @property {string} [loadingElementId='app'] - * @property {string} [loadingColor='#8abaf0'] - * @property {string} [loadingImage='/.well-known/service/blocklet/logo?imageFilter=convert&f=png&w=80'] - * @property {boolean} [loadingShowPoweredBy=true] - * @property {string} [loadingPoweredByText='Powered by ArcBlock'] + * @property {string} [loadingElementId='app'] - The ID of the loading element. + * @property {string} [loadingColor='#8abaf0'] - The color of the loading animation. + * @property {string} [loadingImage='/.well-known/service/blocklet/logo?imageFilter=convert&f=png&w=80'] - The URL of the loading image. + * @property {boolean} [loadingShowDots=true] - Whether to show the loading dots animation. + * @property {boolean} [loadingShowPoweredBy=true] - Whether to show the "Powered by" text. + * @property {string} [loadingPoweredByText='Powered by ArcBlock'] - The text to display for "Powered by". * - * @property {'all'|'mobile'|'desktop'} [debugPlatform='mobile'] - * @property {string} [debugScript] - * @property {number} [positionX=0] - * @property {number} [positionY=0] + * @property {'all'|'mobile'|'desktop'} [debugPlatform='mobile'] - The platforms to enable debug mode for. + * @property {string} [debugScript] - The initialization code for the debug script. + * @property {number} [positionX=0] - The initialization positionX for entry button. + * @property {number} [positionY=0] - The initialization positionY for entry button. * * @property {object} [embeds={}] - The embeds to be built. * @property {array} [embedExternals=['react', '@arcblock/ux/lib/Locale/context', '@arcblock/did-connect-react/lib/Session']] - The external modules to be used in the embeds. diff --git a/plugins/vite-plugin-blocklet/libs/loading.js b/plugins/vite-plugin-blocklet/libs/loading.js index 130188bd..4d8771ed 100644 --- a/plugins/vite-plugin-blocklet/libs/loading.js +++ b/plugins/vite-plugin-blocklet/libs/loading.js @@ -6,11 +6,12 @@ import { withQuery } from 'ufo'; * @param {Object} options - The options for generating the HTML. * @param {string} options.color - The color of the spinner. Defaults to "#333". * @param {string} options.image - The URL of the image to display alongside the spinner. + * @param {boolean} [options.showDots=true] - Whether to show the loading dots animation. * @param {boolean} options.showPoweredBy - Whether to show the "Powered by" text. * @param {string} [options.poweredByText='Powered by ArcBlock'] - The text to display for "Powered by". * @return {string} The generated HTML string. */ -function generateHtml({ color, image, showPoweredBy, poweredByText = 'Powered by ArcBlock' }) { +function generateHtml({ color, image, showDots = true, showPoweredBy, poweredByText = 'Powered by ArcBlock' }) { return `
-
+ ${ + showDots + ? `
-
+
` + : '' + }
${poweredByText}