create-blocklet 0.2.9 → 0.2.10

package/common/.github/workflows/main.yml

@@ -27,8 +27,8 @@ jobs:
           skip-upload: false
           skip-deploy: false
           bundle-command: yarn bundle
-          store-endpoint: ${{ secrets.STORE_ENDPOINT_STAGING }}
-          store-access-token: ${{ secrets.STORE_ACCESS_TOKEN_STAGING }}
+          store-endpoint: ${{ secrets.STORE_ENDPOINT_DEV }}
+          store-access-token: ${{ secrets.STORE_ACCESS_TOKEN_DEV }}
           server-endpoint: ${{ secrets.STAGING_NODE_ENDPOINT }}
           server-access-key: ${{ secrets.STAGING_NODE_ACCESS_KEY }}
           server-access-secret: ${{ secrets.STAGING_NODE_ACCESS_SECRET }}

package/index.js

@@ -12,12 +12,7 @@ import * as envfile from 'envfile';
 
 import { echoBrand, echoDocument } from './lib/arcblock.js';
 import { getAuthor } from './lib/npm.js';
-import {
-  checkAbtnodeInstalled,
-  checkAbtnodeRunning,
-  checkSatisfiedVersion,
-  getAbtnodeDirectory,
-} from './lib/abtnode.js';
+import { checkServerInstalled, checkServerRunning, checkSatisfiedVersion, getServerDirectory } from './lib/server.js';
 import { toBlockletDid, toDidIcon } from './lib/did.js';
 
 const argv = minimist(process.argv.slice(2));
@@ -201,11 +196,11 @@ async function init() {
 
   console.log('Checking blocklet server runtime environment...', '\n');
 
-  const isAbtnodeInstalled = checkAbtnodeInstalled();
+  const isServerInstalled = checkServerInstalled();
   const isSatisfiedVersion = checkSatisfiedVersion();
-  const isAbtnodeRunning = checkAbtnodeRunning();
+  const isServerRunning = checkServerRunning();
 
-  if (!isAbtnodeInstalled) {
+  if (!isServerInstalled) {
     // 未安装 blocklet server
     console.log(red('To run the blocklet, you need a running blocklet server instance on local machine.'), '\n');
     console.log(`Checkout ${green('README.md')} for more usage instructions.`);
@@ -216,9 +211,9 @@ async function init() {
     // 已安装 blocklet server，但版本不满足
     console.log(red('Your blocklet server version is outdate, please update it to the latest version.'));
     console.log('Now you should run:', '\n');
-    if (isAbtnodeRunning) {
+    if (isServerRunning) {
       // blocklet server 已经启动
-      const serverPath = getAbtnodeDirectory();
+      const serverPath = getServerDirectory();
       console.log(cyan(`cd ${serverPath}`));
       console.log(cyan('blocklet server stop'));
       console.log(cyan('npm install -g @blocklet/cli'));
@@ -230,7 +225,7 @@ async function init() {
       console.log(cyan('npm install -g @blocklet/cli'));
       console.log(cyan('blocklet server start -a'));
     }
-  } else if (!isAbtnodeRunning) {
+  } else if (!isServerRunning) {
     // 已经安装 blocklet server，且版本满足，并且 blocklet server 未启动
     console.log(red('You need to start your blocklet server before develop this blocklet.'));
     console.log('Now you should run:', '\n');

package/lib/{abtnode.js → server.js}

@@ -1,27 +1,27 @@
 import semver from 'semver';
 import { getOutput } from './index.js';
 
-export function checkAbtnodeInstalled() {
+export function checkServerInstalled() {
   const output = getOutput('which blocklet');
   return !!output;
 }
 
-export function getAbtnodeVersion() {
+export function getServerVersion() {
   const output = getOutput('blocklet --version');
   return output.trim();
 }
 
-export function getAbtnodeStatus() {
+export function getServerStatus() {
   const output = getOutput('blocklet server status');
-  const [matchStr] = output.match(/ABT Node status:[\s\S]*?\n/gm) || [];
+  const [matchStr] = output.match(/Blocklet Server status:[\s\S]*?\n/g) || [];
   if (!matchStr) {
     return 'stop';
   }
-  const status = matchStr.replace(/ABT Node status:[\s]*([\S]+)\n/gm, '$1');
+  const status = matchStr.replace(/Blocklet Server status:\s*(\S+)\s*\S*\n*[\s\S]*/gm, '$1');
   return status.toLowerCase();
 }
-export function checkAbtnodeRunning() {
-  const status = getAbtnodeStatus();
+export function checkServerRunning() {
+  const status = getServerStatus();
   return status === 'running';
 }
 
@@ -31,7 +31,7 @@ export function checkSatisfiedVersion() {
   return semver.satisfies(version, '>= 1.6.1');
 }
 
-export function getAbtnodeDirectory() {
+export function getServerDirectory() {
   const output = getOutput('blocklet server status');
   const [matchStr] = output.match(/Blocklet Server Data Directory:[\s\S]*?\n/gm) || [];
   if (!matchStr) return null;
@@ -39,7 +39,3 @@ export function getAbtnodeDirectory() {
   const directory = matchStr.replace(/Blocklet Server Data Directory:[\s]*([\S]+)\/\.abtnode\n/gm, '$1');
   return directory;
 }
-
-const dic = getAbtnodeDirectory();
-
-console.log(dic);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-blocklet",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "exports": "./index.js",
   "type": "module",
   "repository": "git@github.com:blocklet/create-blocklet.git",

package/template-dapp/react/README.md

@@ -145,7 +145,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 ## Learn More
 
 - Full specification of `blocklet.yml`: [https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md](https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md)
-- Full document of AbtNode & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
+- Full document of Blocklet Server & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
 
 ## License
 

package/template-dapp/react/blocklet.yml

@@ -1,6 +1,6 @@
 name: template-react
 title: Blocklet Template React
-description: An ABT Node blocklet
+description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - react

package/template-dapp/vue/README.md

@@ -139,7 +139,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 ## Learn More
 
 - Full specification of `blocklet.yml`: [https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md](https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md)
-- Full document of AbtNode & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
+- Full document of Blocklet Server & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
 
 ## License
 

package/template-dapp/vue/blocklet.yml

@@ -1,6 +1,6 @@
 name: template-vue
 title: Blocklet Template Vue
-description: ABT Node blocklet project
+description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - vue

package/template-dapp/vue2/README.md

@@ -139,7 +139,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 ## Learn More
 
 - Full specification of `blocklet.yml`: [https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md](https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md)
-- Full document of AbtNode & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
+- Full document of Blocklet Server & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
 
 ## License
 

package/template-dapp/vue2/blocklet.yml

@@ -1,6 +1,6 @@
 name: template-vue2
 title: Blocklet Template Vue2
-description: ABT Node blocklet project
+description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - vue

package/template-static/react/README.md

@@ -139,7 +139,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 ## Learn More
 
 - Full specification of `blocklet.yml`: [https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md](https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md)
-- Full document of AbtNode & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
+- Full document of Blocklet Server & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
 
 ## License
 

package/template-static/react/blocklet.yml

@@ -1,6 +1,6 @@
 name: template-react
 title: Blocklet Template React
-description: ABT Node blocklet project
+description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - react

package/template-static/vue/README.md

@@ -139,7 +139,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 ## Learn More
 
 - Full specification of `blocklet.yml`: [https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md](https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md)
-- Full document of AbtNode & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
+- Full document of Blocklet Server & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
 
 ## License
 

package/template-static/vue/blocklet.yml

@@ -1,6 +1,6 @@
 name: template-vue
 title: Blocklet Template Vue
-description: ABT Node blocklet project
+description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - vue

package/template-static/vue2/README.md

@@ -139,7 +139,7 @@ After developing a blocklet, you may need to bundle it. Use `npm run bundle` com
 ## Learn More
 
 - Full specification of `blocklet.yml`: [https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md](https://github.com/blocklet/blocklet-specification/blob/main/docs/meta.md)
-- Full document of AbtNode & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
+- Full document of Blocklet Server & blocklet development: [https://docs.arcblock.io/abtnode/en/introduction](https://docs.arcblock.io/abtnode/en/introduction)
 
 ## License
 

package/template-static/vue2/blocklet.yml

@@ -1,6 +1,6 @@
 name: template-vue2
 title: Blocklet Template Vue2
-description: ABT Node blocklet project
+description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - vue