create-blocklet 0.2.12 → 0.2.13

package/package.json

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

package/template-dapp/react/server/index.js

@@ -47,7 +47,7 @@ if (isProduction) {
   app.use(router);
 }
 
-const port = parseInt(process.env.BLOCKLET_PORT || process.env.APP_PORT, 10) || 3030;
+const port = parseInt(process.env.BLOCKLET_PORT, 10) || 3030;
 
 app.listen(port, (err) => {
   if (err) throw err;

package/template-dapp/react/server/libs/auth.js

@@ -3,20 +3,15 @@ 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 logger = require('./logger');
+
+const env = require('./env');
 
 const wallet = getWallet();
 const authenticator = new WalletAuthenticator();
 const handlers = new WalletHandler({
   authenticator,
-  tokenGenerator: () => Date.now().toString(),
   tokenStorage: new AuthStorage({
-    dbPath: path.join(process.env.BLOCKLET_DATA_DIR, 'auth.db'),
-    onload: (err) => {
-      if (err) {
-        logger.error(`Failed to load database from ${path.join(process.env.BLOCKLET_DATA_DIR, 'auth.db')}`, err);
-      }
-    },
+    dbPath: path.join(env.dataDir, 'auth.db'),
   }),
 });
 

package/template-dapp/react/server/routes/index.js

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

package/template-dapp/react/src/pages/home.js

@@ -1,21 +1,14 @@
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import { Link } from 'react-router-dom';
 
 import logo from '../logo.svg';
-import api from '../libs/api';
 
 const Home = () => {
-  const [env, setEnv] = useState({});
-  useEffect(async () => {
-    const { data } = await api.get('/api/env');
-    setEnv(data);
-  }, []);
-
   return (
     <header className="app-header">
       <img src={logo} className="app-logo" alt="logo" />
       <pre style={{ textAlign: 'left' }}>
-        <code>{JSON.stringify(env, null, 2)}</code>
+        <code>{JSON.stringify(window.blocklet, null, 2)}</code>
       </pre>
       <Link className="app-link" to="/about">
         About

package/template-dapp/vue/server/index.js

@@ -47,7 +47,7 @@ if (isProduction) {
   app.use(router);
 }
 
-const port = parseInt(process.env.BLOCKLET_PORT || process.env.APP_PORT, 10) || 3030;
+const port = parseInt(process.env.BLOCKLET_PORT, 10) || 3030;
 
 app.listen(port, (err) => {
   if (err) throw err;

package/template-dapp/vue/server/libs/auth.js

@@ -3,20 +3,15 @@ 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 logger = require('./logger');
+
+const env = require('./env');
 
 const wallet = getWallet();
 const authenticator = new WalletAuthenticator();
 const handlers = new WalletHandler({
   authenticator,
-  tokenGenerator: () => Date.now().toString(),
   tokenStorage: new AuthStorage({
-    dbPath: path.join(process.env.BLOCKLET_DATA_DIR, 'auth.db'),
-    onload: (err) => {
-      if (err) {
-        logger.error(`Failed to load database from ${path.join(process.env.BLOCKLET_DATA_DIR, 'auth.db')}`, err);
-      }
-    },
+    dbPath: path.join(env.dataDir, 'auth.db'),
   }),
 });
 

package/template-dapp/vue/server/routes/index.js

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

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

@@ -3,14 +3,6 @@ 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';
-import api from './libs/api';
-
-const envData = ref({});
-
-(async () => {
-  const { data } = await api.get('/api/env');
-  envData.value = data;
-})();
 </script>
 
 <template>
@@ -18,7 +10,7 @@ const envData = ref({});
   <HelloWorld msg="Hello Vue 3 + Vite" />
   <div :style="{ display: 'flex', justifyContent: 'center' }">
     <pre :style="{ textAlign: 'left' }">
-<code>{{ JSON.stringify(envData, null, 2) }}</code>
+<code>{{ JSON.stringify(window.blocklet, null, 2) }}</code>
     </pre>
   </div>
 </template>

package/template-dapp/vue2/server/index.js

@@ -47,7 +47,7 @@ if (isProduction) {
   app.use(router);
 }
 
-const port = parseInt(process.env.BLOCKLET_PORT || process.env.APP_PORT, 10) || 3030;
+const port = parseInt(process.env.BLOCKLET_PORT, 10) || 3030;
 
 app.listen(port, (err) => {
   if (err) throw err;

package/template-dapp/vue2/server/libs/auth.js

@@ -3,20 +3,15 @@ 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 logger = require('./logger');
+
+const env = require('./env');
 
 const wallet = getWallet();
 const authenticator = new WalletAuthenticator();
 const handlers = new WalletHandler({
   authenticator,
-  tokenGenerator: () => Date.now().toString(),
   tokenStorage: new AuthStorage({
-    dbPath: path.join(process.env.BLOCKLET_DATA_DIR, 'auth.db'),
-    onload: (err) => {
-      if (err) {
-        logger.error(`Failed to load database from ${path.join(process.env.BLOCKLET_DATA_DIR, 'auth.db')}`, err);
-      }
-    },
+    dbPath: path.join(env.dataDir, 'auth.db'),
   }),
 });
 

package/template-dapp/vue2/server/routes/index.js

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

package/template-dapp/vue2/src/pages/Home.vue

@@ -7,7 +7,7 @@
     <HelloWorld msg="Welcome to Your Vue.js App" />
     <div :style="{ display: 'flex', justifyContent: 'center' }">
       <pre :style="{ textAlign: 'left' }">
-<code>{{ JSON.stringify(envData, null, 2) }}</code>
+<code>{{ JSON.stringify(window.blocklet, null, 2) }}</code>
     </pre>
     </div>
   </div>
@@ -21,16 +21,6 @@ export default {
   components: {
     HelloWorld,
   },
-  data() {
-    return {
-      envData: {},
-    };
-  },
-  mounted() {
-    api.get('/api/env').then(({ data }) => {
-      this.envData = data;
-    });
-  },
 };
 </script>