create-blocklet 0.3.3 → 0.3.6

package/{template-dapp/react → templates/react-static}/src/app.css

@@ -8,19 +8,21 @@ body {
 }
 
 .app-logo {
-  height: 40vmin;
+  height: 10vmin;
   pointer-events: none;
 }
 
 .app-header {
-  background-color: #282c34;
   min-height: 100vh;
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
   font-size: calc(10px + 2vmin);
-  color: white;
+}
+
+pre {
+  font-size: 0.75em;
 }
 
 .app-link {

package/templates/react-static/src/app.js

@@ -0,0 +1,32 @@
+import React from 'react';
+import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router-dom';
+
+import './app.css';
+import Home from './pages/home';
+import About from './pages/about';
+
+function App() {
+  return (
+    <div className="app">
+      <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 = App;
+
+export default () => {
+  // While the blocklet is deploy to a sub path, this will be work properly.
+  const basename = window?.blocklet?.prefix || '/';
+
+  return (
+    <Router basename={basename}>
+      <WrappedApp />
+    </Router>
+  );
+};

package/templates/react-static/src/index.js

@@ -0,0 +1,5 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import App from './app';
+
+ReactDOM.render(<App />, document.getElementById('root'));

package/{template-static/react → templates/react-static}/src/pages/home.js

@@ -1,11 +1,15 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
+
 import logo from '../logo.svg';
 
 const Home = () => {
   return (
     <header className="app-header">
       <img src={logo} className="app-logo" alt="logo" />
+      <pre style={{ textAlign: 'left' }}>
+        <code>window.blocklet = {JSON.stringify(window.blocklet, null, 2)}</code>
+      </pre>
       <Link className="app-link" to="/about">
         About
       </Link>

package/{template-dapp/vue → templates/vue-dapp}/blocklet.yml

@@ -34,10 +34,9 @@ community: ''
 documentation: ''
 homepage: ''
 license: ''
-charging:
-  price: 0
-  tokens: []
-  shares: []
+payment:
+  price: []
+  share: []
 timeout:
   start: 60
 requirements:

package/{template-dapp/vue → templates/vue-dapp}/package.json

@@ -10,7 +10,7 @@
     "start:api": "NODE_ENV=development nodemon api/index.js -w api",
     "clean": "rm -rf .blocklet",
     "bundle": "npm run bundle:client && npm run bundle:api",
-    "bundle:client": "vite build --base /.blocklet/proxy/<%= did %>",
+    "bundle:client": "vite build --base /.blocklet/proxy/<%= did %>/",
     "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",
@@ -18,12 +18,12 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@arcblock/did-auth": "^1.15.2",
+    "@arcblock/did-auth": "^1.16.0",
     "@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",
+    "@blocklet/sdk": "^1.7.6",
+    "@ocap/client": "^1.16.0",
+    "@ocap/mcrypto": "^1.16.0",
+    "@ocap/wallet": "^1.16.0",
     "axios": "^0.26.1",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
@@ -47,7 +47,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.6.0",
     "vite": "^2.8.6",
-    "vite-plugin-blocklet": "^0.1.1"
+    "vite-plugin-blocklet": "^0.1.2"
   },
   "lint-staged": {
     "*.{mjs,js,vue}": [

package/{template-static/vue → templates/vue-static}/blocklet.yml

@@ -32,10 +32,9 @@ community: ''
 documentation: ''
 homepage: ''
 license: ''
-charging:
-  price: 0
-  tokens: []
-  shares: []
+payment:
+  price: []
+  share: []
 timeout:
   start: 60
 requirements:

package/{template-static/vue → templates/vue-static}/package.json

@@ -8,7 +8,7 @@
     "lint": "eslint src --ext .mjs,.js,.vue",
     "serve": "vite preview",
     "clean": "rm -rf .blocklet",
-    "bundle": "npm run clean && vite build --base /.blocklet/proxy/<%= did %> && blocklet bundle --zip --create-release",
+    "bundle": "npm run clean && vite build --base /.blocklet/proxy/<%= did %>/ && blocklet bundle --zip --create-release",
     "deploy": "npm run bundle && blocklet deploy .blocklet/bundle",
     "upload": "npm run bundle && blocklet upload .blocklet/release/blocklet.json",
     "prepare": "husky install"

package/templates/vue2-dapp/api/hooks/pre-start.js

@@ -0,0 +1,33 @@
+require('@blocklet/sdk/lib/error-handler');
+require('dotenv-flow').config();
+
+const Client = require('@ocap/client');
+
+const env = require('../libs/env');
+const logger = require('../libs/logger');
+const { wallet } = require('../libs/auth');
+const { name } = require('../../package.json');
+
+const ensureAccountDeclared = async () => {
+  if (env.isComponent) return;
+  if (!env.chainHost) return;
+
+  const client = new Client(env.chainHost);
+  const { state } = await client.getAccountState({ address: wallet.toAddress() }, { ignoreFields: ['context'] });
+  if (!state) {
+    const hash = await client.declare({ moniker: name, wallet });
+    logger.log(`app account declared on chain ${env.chainHost}`, hash);
+  } else {
+    logger.log(`app account already declared on chain ${env.chainHost}`);
+  }
+};
+
+(async () => {
+  try {
+    await ensureAccountDeclared();
+    process.exit(0);
+  } catch (err) {
+    logger.error(`${name} pre-start error`, err.message);
+    process.exit(1);
+  }
+})();

package/templates/vue2-dapp/api/libs/auth.js

@@ -0,0 +1,22 @@
+const path = require('path');
+const AuthStorage = require('@arcblock/did-auth-storage-nedb');
+const getWallet = require('@blocklet/sdk/lib/wallet');
+const WalletAuthenticator = require('@blocklet/sdk/lib/wallet-authenticator');
+const WalletHandler = require('@blocklet/sdk/lib/wallet-handler');
+
+const env = require('./env');
+
+const wallet = getWallet();
+const authenticator = new WalletAuthenticator();
+const handlers = new WalletHandler({
+  authenticator,
+  tokenStorage: new AuthStorage({
+    dbPath: path.join(env.dataDir, 'auth.db'),
+  }),
+});
+
+module.exports = {
+  authenticator,
+  handlers,
+  wallet,
+};

package/templates/vue2-dapp/api/libs/env.js

@@ -0,0 +1,6 @@
+const env = require('@blocklet/sdk/lib/env');
+
+module.exports = {
+  ...env,
+  chainHost: process.env.CHAIN_HOST || '',
+};

package/templates/vue2-dapp/api/libs/logger.js

@@ -0,0 +1,3 @@
+const logger = console;
+
+module.exports = logger;

package/templates/vue2-dapp/api/routes/index.js

@@ -0,0 +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 || {}));
+
+module.exports = router;

package/{template-dapp/vue2 → templates/vue2-dapp}/blocklet.yml

@@ -22,6 +22,7 @@ files:
   - blocklet.md
   - screenshots
   - api/hooks/pre-start.js
+  - dist
 interfaces:
   - type: web
     name: publicUrl
@@ -33,10 +34,9 @@ community: ''
 documentation: ''
 homepage: ''
 license: ''
-charging:
-  price: 0
-  tokens: []
-  shares: []
+payment:
+  price: []
+  share: []
 timeout:
   start: 60
 requirements:

package/{template-dapp/vue2 → templates/vue2-dapp}/package.json

@@ -11,19 +11,19 @@
     "start:api": "NODE_ENV=development nodemon api/index.js -w api",
     "clean": "rm -rf .blocklet",
     "bundle": "npm run bundle:client && npm run bundle:api",
-    "bundle:client": "PUBLIC_PATH=/.blocklet/proxy/z8ia5PYHKJaG7LxTiKK74YhN1vkVMf7N7VncW",
+    "bundle:client": "PUBLIC_PATH=/.blocklet/proxy/<%= did %> npm run build",
     "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",
     "prepare": "husky install"
   },
   "dependencies": {
-    "@arcblock/did-auth": "^1.15.2",
+    "@arcblock/did-auth": "^1.16.0",
     "@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",
+    "@blocklet/sdk": "^1.7.6",
+    "@ocap/client": "^1.16.0",
+    "@ocap/mcrypto": "^1.16.0",
+    "@ocap/wallet": "^1.16.0",
     "axios": "^0.26.1",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",

package/templates/vue2-dapp/src/libs/api.js

@@ -0,0 +1,14 @@
+import axios from 'axios';
+
+axios.interceptors.request.use(
+  (config) => {
+    const prefix = window.blocklet ? window.blocklet.prefix : '/';
+    config.baseURL = prefix || '';
+    config.timeout = 200000;
+
+    return config;
+  },
+  (error) => Promise.reject(error)
+);
+
+export default axios;

package/templates/vue2-dapp/vue.config.js

@@ -0,0 +1,18 @@
+const port = process.env.BLOCKLET_PORT || process.env.PORT || 8080;
+
+module.exports = {
+  publicPath: process.env.PUBLIC_PATH || '/',
+  devServer: {
+    port,
+    allowedHosts: 'all',
+    client: {
+      // If you want to development this blocklet without blocklet-server, you can delete next line, otherwise the hot reload will be failed.
+      webSocketURL: 'wss://0.0.0.0/ws',
+    },
+    proxy: {
+      '/api': {
+        target: 'http://127.0.0.1:3030',
+      },
+    },
+  },
+};

package/{template-static/vue2 → templates/vue2-static}/blocklet.yml

@@ -32,10 +32,9 @@ community: ''
 documentation: ''
 homepage: ''
 license: ''
-charging:
-  price: 0
-  tokens: []
-  shares: []
+payment:
+  price: []
+  share: []
 timeout:
   start: 60
 requirements:

package/templates/vue2-static/vue.config.js

@@ -0,0 +1,13 @@
+const port = process.env.BLOCKLET_PORT || process.env.PORT || 8080;
+
+module.exports = {
+  publicPath: process.env.PUBLIC_PATH || '/',
+  devServer: {
+    port,
+    allowedHosts: 'all',
+    client: {
+      // If you want to development this blocklet without blocklet-server, you can delete next line, otherwise the hot reload will be failed.
+      webSocketURL: 'wss://0.0.0.0/ws',
+    },
+  },
+};

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

@@ -1,12 +0,0 @@
-require('dotenv-flow').config();
-
-const { createProxyMiddleware } = require('http-proxy-middleware');
-
-module.exports = (app) => {
-  app.use(
-    '/api',
-    createProxyMiddleware({
-      target: `http://127.0.0.1:${process.env.APP_PORT || 3030}`,
-    })
-  );
-};

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

@@ -1,10 +0,0 @@
-module.exports = {
-  publicPath: process.env.PUBLIC_PATH || '/',
-  devServer: {
-    proxy: {
-      '/api': {
-        target: 'http://127.0.0.1:3030',
-      },
-    },
-  },
-};

package/template-static/vue2/vue.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  publicPath: process.env.PUBLIC_PATH || '/',
-};