create-blocklet 0.2.16 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-blocklet",
-  "version": "0.2.16",
+  "version": "0.3.0",
   "exports": "./index.js",
   "type": "module",
   "repository": "git@github.com:blocklet/create-blocklet.git",
@@ -13,36 +13,37 @@
     "index.js",
     "common",
     "lib",
+    "template-api",
     "template-dapp",
     "template-static"
   ],
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   },
   "bugs": {
     "url": "https://github.com/blocklet/create-blocklet/issues"
   },
   "homepage": "https://github.com/blocklet/create-blocklet/tree/main#readme",
   "scripts": {
-    "lint": "eslint ."
+    "lint": "eslint .",
+    "test": "vitest",
+    "test:ui": "vitest --ui",
+    "test:run": "vitest run"
   },
   "dependencies": {
-    "@arcblock/did": "^1.13.55",
-    "@ocap/mcrypto": "^1.13.55",
-    "@ocap/util": "^1.13.55",
+    "@arcblock/did": "^1.14.25",
+    "@ocap/mcrypto": "^1.14.25",
+    "@ocap/util": "^1.14.25",
+    "boxen": "^6.2.1",
     "ejs": "^3.1.6",
-    "envfile": "^6.15.0",
-    "figlet": "^1.5.0",
-    "gradient-string": "^1.2.0",
+    "envfile": "^6.17.0",
+    "figlet": "^1.5.2",
+    "gradient-string": "^2.0.0",
     "jdenticon": "^3.1.1",
-    "kolorist": "^1.5.0",
-    "minimist": "^1.2.5",
-    "prompts": "^2.4.1",
-    "rc": "^1.2.8",
+    "prompts": "^2.4.2",
     "semver": "^7.3.5",
-    "shelljs": "^0.8.5",
     "terminal-link": "^3.0.0",
-    "yaml": "^1.10.2"
+    "zx": "^6.0.6"
   },
   "devDependencies": {
     "@arcblock/eslint-config": "0.1.8",
@@ -56,6 +57,7 @@
     "eslint-plugin-react": "^7.24.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-unicorn": "^34.0.1",
-    "prettier": "^2.3.2"
+    "prettier": "^2.3.2",
+    "vitest": "^0.7.6"
   }
 }

package/template-dapp/react/README.md

@@ -11,12 +11,12 @@ This blocklet is a dapp project, which means this is a full-stack application. I
   - favicon.svg - favicon
   - index.html - main html file, template for react
 - screenshots/ - Screenshots
-- server/ - Server side code
+- api/ - Api side code
   - hooks/ - blocklet lifecycle hooks
-  - libs/ - Server side libraries
-  - middlewares/ - Server side middlewares
-  - routes/ - Server side routes
-  - index.js - Server side entry point
+  - libs/ - Api side libraries
+  - middlewares/ - Api side middlewares
+  - routes/ - Api side routes
+  - index.js - Api side entry point
 - src/ - Client side code (A standard react app structure)
 - .env - Environment variables
 - .env.local - Local environment variables

package/template-dapp/{vue2/server → react/api}/routes/index.js

@@ -1,6 +1,6 @@
 const middleware = require('@blocklet/sdk/lib/middlewares');
 const router = require('express').Router();
 
-router.use('/user', middleware.user(), (req, res) => res.json(req.user));
+router.use('/user', middleware.user(), (req, res) => res.json(req.user || {}));
 
 module.exports = router;

package/template-dapp/react/blocklet.yml

@@ -6,10 +6,10 @@ keywords:
   - react
 group: dapp
 did: ''
-main: server/index.js
+main: api/index.js
 author:
-  name: zhanghan
-  email: zhanghan@arcblock.io
+  name: Blocklet
+  email: blocklet@arcblock.io
 repository:
   type: git
   url: 'git+https://github.com/blocklet/create-blocklet.git'
@@ -22,7 +22,7 @@ files:
   - README.md
   - blocklet.md
   - screenshots
-  - server/hooks/pre-start.js
+  - api/hooks/pre-start.js
 interfaces:
   - type: web
     name: publicUrl
@@ -41,11 +41,11 @@ charging:
 timeout:
   start: 60
 requirements:
-  abtnode: '>=1.4.0'
+  server: '>=1.6.29'
   os: '*'
   cpu: '*'
 scripts:
-  preStart: node server/hooks/pre-start.js
+  preStart: node api/hooks/pre-start.js
   dev: npm run start
 environments:
   - name: CHAIN_HOST

package/template-dapp/react/package.json

@@ -2,19 +2,29 @@
   "name": "template-react",
   "version": "0.1.0",
   "scripts": {
+    "dev": "react-scripts start",
     "build": "react-scripts build",
     "eject": "react-scripts eject",
-    "lint": "eslint src server",
-    "dev": "react-scripts start",
+    "lint": "eslint src api --ext .mjs,.js,.jsx,.ts,.tsx",
     "start": "npm-run-all --parallel start:*",
     "start:client": "npm run dev",
-    "start:server": "NODE_ENV=development nodemon server/index.js -w server",
+    "start:api": "NODE_ENV=development nodemon api/index.js -w api",
     "clean": "rm -rf .blocklet",
-    "bundle": "npm run bundle:client && npm run bundle:server",
+    "bundle": "npm run bundle:client && npm run bundle:api",
     "bundle:client": "PUBLIC_URL='/.blocklet/proxy/<%= did %>' npm run build",
-    "bundle:server": "npm run clean && blocklet bundle --zip --create-release",
+    "bundle:api": "npm run clean && blocklet bundle --zip --create-release",
     "deploy": "npm run bundle && blocklet deploy .blocklet/bundle",
-    "upload": "npm run bundle && blocklet upload .blocklet/release/blocklet.json"
+    "upload": "npm run bundle && blocklet upload .blocklet/release/blocklet.json",
+    "prepare": "husky install"
+  },
+  "lint-staged": {
+    "*.{mjs,js,jsx,ts,tsx}": [
+      "prettier --write",
+      "eslint"
+    ],
+    "*.{css,less,scss,json,graphql}": [
+      "prettier --write"
+    ]
   },
   "browserslist": {
     "production": [
@@ -29,40 +39,42 @@
     ]
   },
   "dependencies": {
-    "@arcblock/did-auth": "latest",
-    "@arcblock/did-auth-storage-nedb": "latest",
-    "@blocklet/sdk": "latest",
-    "@ocap/client": "latest",
-    "@ocap/mcrypto": "latest",
-    "@ocap/wallet": "latest",
-    "axios": "^0.21.1",
+    "@arcblock/did-auth": "^1.15.2",
+    "@arcblock/did-auth-storage-nedb": "^1.6.3",
+    "@blocklet/sdk": "^1.7.0",
+    "@ocap/client": "^1.15.2",
+    "@ocap/mcrypto": "^1.15.2",
+    "@ocap/wallet": "^1.15.2",
+    "axios": "^0.26.1",
     "compression": "^1.7.4",
-    "cookie-parser": "^1.4.5",
+    "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "dotenv-flow": "^3.2.0",
-    "express": "^4.17.1",
+    "express": "^4.17.3",
     "express-async-errors": "^3.1.1",
     "express-history-api-fallback": "^2.2.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router-dom": "^5.2.0",
-    "react-scripts": "4.0.3"
+    "react-router-dom": "^6.2.2",
+    "react-scripts": "5.0.0"
   },
   "devDependencies": {
-    "@arcblock/eslint-config": "latest",
+    "@arcblock/eslint-config": "^0.1.8",
     "babel-eslint": "^10.1.0",
-    "eslint": "^7.31.0",
+    "eslint": "^7.32.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-react": "^7.24.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-unicorn": "^34.0.1",
-    "http-proxy-middleware": "^2.0.1",
-    "nodemon": "^2.0.12",
+    "http-proxy-middleware": "^2.0.4",
+    "husky": "^7.0.4",
+    "lint-staged": "^12.3.7",
+    "nodemon": "^2.0.15",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.2"
+    "prettier": "^2.6.0"
   }
 }

package/template-dapp/react/public/index.html

@@ -2,9 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" type="image/svg+xml" href="%PUBLIC_URL%/favicon.svg" />
-    <link rel="alternate icon" href="%PUBLIC_URL%/favicon.ico" />
-    <link rel="mask-icon" href="%PUBLIC_URL%/favicon.svg" color="#4F6AF5" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
     <meta name="theme-color" content="#4F6AF5" />
     <meta name="description" content="Web site created using create-blocklet" />

package/template-dapp/react/src/app.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BrowserRouter as Router, Route, Switch, Redirect, withRouter } from 'react-router-dom';
+import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router-dom';
 
 import './app.css';
 import Home from './pages/home';
@@ -8,17 +8,17 @@ import About from './pages/about';
 function App() {
   return (
     <div className="app">
-      <Switch>
-        <Route exact path="/" component={Home} />
-        <Route path="/about" component={About} />
-        <Route path="/home" component={Home} />
-        <Redirect to="/" />
-      </Switch>
+      <Routes>
+        <Route exact path="/" element={<Home />} />
+        <Route path="/about" element={<About />} />
+        <Route path="/home" element={<Home />} />
+        <Route path="*" element={<Navigate to="/" />} />
+      </Routes>
     </div>
   );
 }
 
-const WrappedApp = withRouter(App);
+const WrappedApp = App;
 
 export default () => {
   // While the blocklet is deploy to a sub path, this will be work properly.

package/template-dapp/vue/.browserslistrc

@@ -0,0 +1,4 @@
+> 1%
+last 2 versions
+not dead
+not ie 11

package/template-dapp/vue/.eslintrc.js

@@ -0,0 +1,25 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true,
+  },
+  extends: ['plugin:vue/vue3-essential', 'eslint:recommended', 'plugin:prettier/recommended'],
+  globals: {
+    // Ref sugar (take 2)
+    $: 'readonly',
+    $$: 'readonly',
+    $ref: 'readonly',
+    $shallowRef: 'readonly',
+    $computed: 'readonly',
+
+    // script setup
+    defineProps: 'readonly',
+    defineEmits: 'readonly',
+    defineExpose: 'readonly',
+    withDefaults: 'readonly',
+  },
+  rules: {
+    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+  },
+};

package/template-dapp/{react/server → vue/api}/routes/index.js

@@ -1,6 +1,6 @@
 const middleware = require('@blocklet/sdk/lib/middlewares');
 const router = require('express').Router();
 
-router.use('/user', middleware.user(), (req, res) => res.json(req.user));
+router.use('/user', middleware.user(), (req, res) => res.json(req.user || {}));
 
 module.exports = router;

package/template-dapp/vue/blocklet.yml

@@ -6,10 +6,10 @@ keywords:
   - vue
 group: dapp
 did: ''
-main: server/index.js
+main: api/index.js
 author:
-  name: zhanghan
-  email: zhanghan@arcblock.io
+  name: Blocklet
+  email: blocklet@arcblock.io
 repository:
   type: git
   url: 'git+https://github.com/blocklet/create-blocklet.git'
@@ -22,6 +22,7 @@ files:
   - README.md
   - blocklet.md
   - screenshots
+  - api/hooks/pre-start.js
 interfaces:
   - type: web
     name: publicUrl
@@ -40,11 +41,11 @@ charging:
 timeout:
   start: 60
 requirements:
-  abtnode: '>=1.4.0'
+  server: '>=1.6.29'
   os: '*'
   cpu: '*'
 scripts:
-  preStart: node server/hooks/pre-start.js
+  preStart: node api/hooks/pre-start.js
   dev: npm run start
 environments:
   - name: CHAIN_HOST

package/template-dapp/vue/index.html

@@ -2,9 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="<%- base %>/favicon.svg" />
-    <link rel="alternate icon" href="<%- base %>/favicon.ico" />
-    <link rel="mask-icon" href="<%- base %>/favicon.svg" color="#4F6AF5" />
+    <link rel="icon" href="<%- base %>/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
     <meta name="theme-color" content="#4F6AF5" />
     <meta name="description" content="Web site created using create-blocklet" />
@@ -12,6 +10,7 @@
     <script src="__meta__.js"></script>
   </head>
   <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="app"></div>
     <script type="module" src="/src/main.js"></script>
   </body>

package/template-dapp/vue/package.json

@@ -2,42 +2,59 @@
   "name": "template-vue",
   "version": "0.1.0",
   "scripts": {
-    "dev": "vite",
+    "dev": "vite --host",
     "build": "vite build",
     "serve": "vite preview",
     "start": "npm-run-all --parallel start:*",
-    "start:client": "vite --host",
-    "start:server": "NODE_ENV=development nodemon server/index.js -w server",
+    "start:client": "npm run dev",
+    "start:api": "NODE_ENV=development nodemon api/index.js -w api",
     "clean": "rm -rf .blocklet",
-    "bundle": "npm run bundle:client && npm run bundle:server",
+    "bundle": "npm run bundle:client && npm run bundle:api",
     "bundle:client": "vite build --base /.blocklet/proxy/<%= did %>",
-    "bundle:server": "npm run clean && blocklet bundle --zip --create-release",
+    "bundle:api": "npm run clean && blocklet bundle --zip --create-release",
     "deploy": "npm run bundle && blocklet deploy .blocklet/bundle",
-    "upload": "npm run bundle && blocklet upload .blocklet/release/blocklet.json"
+    "upload": "npm run bundle && blocklet upload .blocklet/release/blocklet.json",
+    "lint": "eslint src api --ext .mjs,.js,.vue",
+    "prepare": "husky install"
   },
   "dependencies": {
-    "@arcblock/did-auth": "latest",
-    "@arcblock/did-auth-storage-nedb": "latest",
-    "@blocklet/sdk": "latest",
-    "@ocap/client": "latest",
-    "@ocap/mcrypto": "latest",
-    "@ocap/wallet": "latest",
-    "axios": "^0.21.1",
+    "@arcblock/did-auth": "^1.15.2",
+    "@arcblock/did-auth-storage-nedb": "^1.6.3",
+    "@blocklet/sdk": "^1.7.0",
+    "@ocap/client": "^1.15.2",
+    "@ocap/mcrypto": "^1.15.2",
+    "@ocap/wallet": "^1.15.2",
+    "axios": "^0.26.1",
     "compression": "^1.7.4",
-    "cookie-parser": "^1.4.5",
+    "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "dotenv-flow": "^3.2.0",
-    "express": "^4.17.1",
+    "express": "^4.17.3",
     "express-async-errors": "^3.1.1",
     "express-history-api-fallback": "^2.2.1",
-    "vite-plugin-html": "^2.1.1",
-    "vue": "^3.2.16"
+    "vite-plugin-html": "^3.2.0",
+    "vue": "^3.2.31"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^1.9.3",
-    "nodemon": "^2.0.12",
+    "@vitejs/plugin-vue": "^2.2.4",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-vue": "^8.5.0",
+    "husky": "^7.0.4",
+    "lint-staged": "^12.3.7",
+    "nodemon": "^2.0.15",
     "npm-run-all": "^4.1.5",
-    "vite": "^2.6.4",
-    "prettier": "^2.3.2"
+    "prettier": "^2.6.0",
+    "vite": "^2.8.6"
+  },
+  "lint-staged": {
+    "*.{mjs,js,vue}": [
+      "prettier --write",
+      "eslint --ext .mjs,.js,.vue"
+    ],
+    "*.{css,less,scss,json,graphql}": [
+      "prettier --write"
+    ]
   }
 }

package/template-dapp/vue/src/App.vue

@@ -3,14 +3,16 @@ import { ref } from 'vue';
 // This starter template is using Vue 3 <script setup> SFCs
 // Check out https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup
 import HelloWorld from './components/HelloWorld.vue';
+
+const msg = ref('Hello Vue 3 + Vite');
 </script>
 
 <template>
   <img alt="Vue logo" src="./assets/logo.png" />
-  <HelloWorld msg="Hello Vue 3 + Vite" />
+  <HelloWorld :msg="msg" />
   <div :style="{ display: 'flex', justifyContent: 'center' }">
     <pre :style="{ textAlign: 'left' }">
-<code>{{ JSON.stringify(window.blocklet, null, 2) }}</code>
+<code>{{ JSON.stringify(window?.blocklet, null, 2) }}</code>
     </pre>
   </div>
 </template>

package/template-dapp/vue/vite.config.js

@@ -1,6 +1,6 @@
 import { defineConfig, loadEnv } from 'vite';
 import vue from '@vitejs/plugin-vue';
-import { minifyHtml, injectHtml } from 'vite-plugin-html';
+import { createHtmlPlugin } from 'vite-plugin-html';
 
 // https://vitejs.dev/config/
 export default ({ mode }) => {
@@ -8,11 +8,13 @@ export default ({ mode }) => {
   return defineConfig({
     plugins: [
       vue(),
-      minifyHtml(),
-      injectHtml({
-        data: {
-          base: process.env.BASE_URL || '/',
-          title: envMap.VITE_APP_TITLE,
+      createHtmlPlugin({
+        minify: true,
+        inject: {
+          data: {
+            base: process.env.BASE_URL || '/',
+            title: envMap.VITE_APP_TITLE,
+          },
         },
       }),
     ],

package/template-dapp/vue2/.browserslistrc

@@ -0,0 +1,4 @@
+> 1%
+last 2 versions
+not dead
+not ie 11

package/template-dapp/vue2/.eslintrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true,
+  },
+  extends: ['plugin:vue/essential', 'eslint:recommended', 'plugin:prettier/recommended'],
+  parserOptions: {
+    parser: '@babel/eslint-parser',
+  },
+  rules: {
+    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+  },
+};

package/template-dapp/{vue/server → vue2/api}/routes/index.js

@@ -1,6 +1,6 @@
 const middleware = require('@blocklet/sdk/lib/middlewares');
 const router = require('express').Router();
 
-router.use('/user', middleware.user(), (req, res) => res.json(req.user));
+router.use('/user', middleware.user(), (req, res) => res.json(req.user || {}));
 
 module.exports = router;

package/template-dapp/vue2/blocklet.yml

@@ -4,12 +4,12 @@ description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - vue
-group: static
+group: dapp
 did: ''
-main: dist
+main: api/index.js
 author:
-  name: zhanghan
-  email: zhanghan@arcblock.io
+  name: Blocklet
+  email: blocklet@arcblock.io
 repository:
   type: git
   url: git+https://github.com/blocklet/create-blocklet.git
@@ -21,6 +21,7 @@ files:
   - README.md
   - blocklet.md
   - screenshots
+  - api/hooks/pre-start.js
 interfaces:
   - type: web
     name: publicUrl
@@ -39,10 +40,11 @@ charging:
 timeout:
   start: 60
 requirements:
-  abtnode: '>=1.4.0'
+  server: '>=1.6.29'
   os: '*'
   cpu: '*'
 scripts:
+  preStart: node api/hooks/pre-start.js
   dev: npm run start
 environments:
   - name: CHAIN_HOST

package/template-dapp/vue2/jsconfig.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "esnext",
+    "baseUrl": "./",
+    "moduleResolution": "node",
+    "paths": {
+      "@/*": [
+        "src/*"
+      ]
+    },
+    "lib": [
+      "esnext",
+      "dom",
+      "dom.iterable",
+      "scripthost"
+    ]
+  }
+}