create-blocklet 0.4.48 → 0.4.50

package/templates/{blocklet-page-static → blocklet-page}/package.json

@@ -1,16 +1,19 @@
 {
   "name": "blocklet-page",
+  "version": "0.1.0",
   "private": true,
   "scripts": {
     "dev": "blocklet dev",
     "start": "xmark start",
     "clean": "rm -rf .blocklet && rm -rf node_modules/.vite",
-    "build": "xmark build --base=/",
+    "build": "xmark build",
     "bundle": "npm run clean && xmark build && blocklet bundle --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",
+    "deploy:child": "npm run bundle && blocklet deploy .blocklet/bundle --app-did=<%= did %>",
+    "dev:child": "blocklet dev --component --app-did=<%= did %>"
   },
   "dependencies": {
-    "@xmark/cli": "^2.4.36"
+    "@xmark/cli": "^2.4.44"
   }
 }

package/templates/{doc-site-static → doc-site}/blocklet.md

@@ -1,3 +1,3 @@
-# template-blocklet-page
+# template-doc-site
 
 A doc-site template for creating a new blocklet project.

package/templates/{doc-site-static → doc-site}/package.json

@@ -1,17 +1,20 @@
 {
   "name": "doc-site",
+  "version": "0.1.0",
   "private": true,
   "scripts": {
     "dev": "blocklet dev",
     "start": "xmark start",
     "clean": "rm -rf .blocklet && rm -rf node_modules/.vite",
-    "build": "xmark build --base=/",
+    "build": "xmark build",
     "bundle": "npm run clean && xmark build && blocklet bundle --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",
+    "deploy:child": "npm run bundle && blocklet deploy .blocklet/bundle --app-did=<%= did %>",
+    "dev:child": "blocklet dev --component --app-did=<%= did %>"
   },
   "dependencies": {
-    "@xmark/cli": "^2.4.36",
-    "@xmark/theme-docs": "^2.4.36"
+    "@xmark/cli": "^2.4.44",
+    "@xmark/theme-docs": "^2.4.44"
   }
 }

package/templates/express-api/.env

@@ -0,0 +1 @@
+APP_TITLE=''

package/templates/express-api/blocklet.md

@@ -1,3 +1,3 @@
-# template-react
+# template-express
 
-A react template for creating a new blocklet project.
+A express template for creating a new blocklet project.

package/templates/express-api/package.json

@@ -12,6 +12,8 @@
     "bundle": "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",
+    "deploy:child": "npm run bundle && blocklet deploy .blocklet/bundle --app-did=<%= did %>",
+    "dev:child": "blocklet dev --component --app-did=<%= did %>",
     "prepare": "husky install"
   },
   "lint-staged": {
@@ -27,18 +29,18 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@arcblock/did-auth-storage-nedb": "^1.6.3",
-    "@blocklet/sdk": "^1.8.13",
-    "@ocap/client": "^1.17.16",
+    "@arcblock/did-auth-storage-nedb": "^1.7.1",
+    "@blocklet/sdk": "^1.8.22",
+    "@ocap/client": "^1.17.19",
     "dotenv-flow": "^3.2.0",
     "express": "^4.18.1"
   },
   "devDependencies": {
-    "nodemon": "^2.0.19",
     "@arcblock/eslint-config-base": "^0.2.3",
-    "eslint": "^8.23.0",
+    "eslint": "^8.23.1",
     "husky": "^8.0.1",
     "lint-staged": "^12.5.0",
+    "nodemon": "^2.0.20",
     "prettier": "^2.7.1"
   }
 }

package/templates/html-static/package.json

@@ -2,9 +2,12 @@
   "name": "template-html",
   "version": "0.1.0",
   "scripts": {
+    "dev": "blocklet dev",
     "clean": "rm -rf .blocklet",
     "bundle": "npm run clean && blocklet bundle --create-release",
     "deploy": "npm run bundle && blocklet deploy .blocklet/bundle --skip-hooks",
+    "deploy:child": "npm run bundle && blocklet deploy .blocklet/bundle --app-did=<%= did %>",
+    "dev:child": "blocklet dev --component --app-did=<%= did %>",
     "upload": "npm run bundle && blocklet upload .blocklet/release/blocklet.json"
   },
   "keywords": [],

package/templates/monorepo/.editorconfig

@@ -0,0 +1,23 @@
+# For more information about the properties used in
+# this file, please see the EditorConfig documentation:
+# http://editorconfig.org/
+#
+# Sensible EditorConfig defaults
+# https://gist.github.com/matijs/662bf45dd4ec37b3a068
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Make sure package.json always uses 2 spaces to indent
+[{package.json}]
+indent_size = 2
+indent_style = space
+
+[{makefile, Makefile}]
+indent_style = tab

package/templates/monorepo/.github/workflows/main.yml

@@ -0,0 +1,36 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  Deploy:
+    runs-on: ubuntu-latest
+
+    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: Set yarn cache
+        uses: c-hive/gha-yarn-cache@v2
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Blocklet workflow
+        uses: blocklet/action-workflow@v1
+        with:
+          skip-upload: false
+          skip-deploy: false
+          bundle-command: yarn bundle
+          store-endpoint: ${{ secrets.STORE_ENDPOINT }}
+          store-access-token: ${{ secrets.STORE_ACCESS_TOKEN }}
+          server-endpoint: ${{ secrets.SERVER_ENDPOINT }}
+          server-access-key: ${{ secrets.SERVER_ACCESS_KEY }}
+          server-access-secret: ${{ secrets.SERVER_ACCESS_SECRET }}
+          slack-webhook: ${{ secrets.SLACK_WEBHOOK }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}

package/templates/monorepo/.github/workflows/pr-title.yml

@@ -0,0 +1,21 @@
+name: 'Lint PR Title'
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - edited
+      - synchronize
+    branches:
+      - main
+      - dev
+      - master
+
+jobs:
+  lint-title:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: ArcBlock/action-lint-pull-request-title@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/templates/monorepo/.github/workflows/version-check.yml

@@ -0,0 +1,20 @@
+name: 'Version Check'
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - edited
+      - synchronize
+    branches:
+      - main
+      - master
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: action-version-check
+        uses: arcblock/action-version-check@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/templates/monorepo/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

package/templates/monorepo/.prettierrc

@@ -0,0 +1,9 @@
+{
+  "printWidth": 120,
+  "useTabs": false,
+  "tabWidth": 2,
+  "trailingComma": "es5",
+  "bracketSameLine": true,
+  "semi": true,
+  "singleQuote": true
+}

package/templates/monorepo/LICENSE

@@ -0,0 +1,13 @@
+Copyright 2018-2020 ArcBlock
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

package/templates/monorepo/Makefile

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+init: install dep
+	@echo "Initializing the repo..."
+
+install:
+	@echo "Install software required for this repo..."
+
+dep:
+	@echo "Install dependencies required for this repo..."
+	@lerna bootstrap
+	@lerna link
+
+test:
+	@echo "Running test suites..."
+
+build:
+	@echo "Building the software..."
+
+
+github-init:
+	@make dep

package/templates/monorepo/README.md

@@ -0,0 +1,64 @@
+# Getting Started with Create Blocklet
+
+This project was bootstrapped with [Create Blocklet](https://github.com/blocklet/create-blocklet).
+
+This project is a monorepo project, which means that there are multiple blocklet applications.
+
+## File Structure
+
+- .prettierrc - Prettier configuration
+- LICENSE - License file
+- Makefile - Makefile
+- package.json - Npm package file
+- eslintrc.js
+- lerna.json
+- README.md - A guide for this blocklet
+- version - Version file
+- .gitignore
+- .npmrc
+- scripts/
+  - batch-modify-deps-version.mjs
+  - bump-version.mjs
+- blocklets/ - Blocklet applications
+
+## Development
+
+1. Make sure you have [@blocklet/cli](https://www.npmjs.com/package/@blocklet/cli) installed
+
+   Blocklet needs blocklet server as a dependency. So you need to install it first.  
+   `npm install -g @blocklet/cli`  
+   See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#use-the-binary-distribution)
+
+2. Init blocklet server & start blocklet server
+
+   Before starting an blocklet server, you need to init blocklet server.  
+   `blocklet server init --mode=debug`  
+   `blocklet server start`  
+   See details in [https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node](https://docs.arcblock.io/abtnode/en/introduction/abtnode-setup#configure-abt-node)
+
+3. init project
+
+```bash
+ make init
+```
+
+4. Go to the main blocklet directory `cd blocklets/[main blocklet]`
+5. Start development server: `npm run dev`
+6. Go to the other blocklet directory `cd blocklets/[other blocklet]`
+7. Start development server: `npm run dev:child`
+
+## update version
+
+```bash
+npm run bump-version
+```
+
+## Reference
+
+Our docs site is generate by Create Blocklet itself.
+
+We use Blocklet Page to write our docs
+
+check more details on
+
+- [Create Blocklet Docs](https://www.createblocklet.dev/docs/en/intro)

package/templates/monorepo/eslintrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  root: true,
+  extends: '@arcblock/eslint-config',
+  globals: {
+    logger: true,
+  },
+};

package/templates/monorepo/lerna.json

@@ -0,0 +1,14 @@
+{
+    "version": "0.1.0",
+    "useWorkspaces": true,
+    "npmClient": "yarn",
+    "command": {
+      "publish": {
+        "message": "[skip ci] %s"
+      }
+    },
+    "packages": [
+      "blocklets/*"
+    ]
+  }
+  

package/templates/monorepo/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "root",
+  "private": true,
+  "workspaces": [
+    "blocklets/*"
+  ],
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run lint"
+    }
+  },
+  "scripts": {
+    "lint": "lerna run lint",
+    "lint:fix": "lerna run lint:fix",
+    "build": "lerna run clean && lerna run build",
+    "clean": "lerna clean && lerna run clean",
+    "bump-version": "zx scripts/bump-version.mjs --quiet",
+    "update:deps": "lerna exec --no-bail -- \"ncu -u -f /arcblock\\|ocap\\|abtnode\\|blocklet\\|did-connect/\" && lerna bootstrap && npx yarn-deduplicate yarn.lock && yarn"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@arcblock/eslint-config": "0.2.2",
+    "bumpp": "^7.2.0",
+    "eslint": "^8.23.1",
+    "husky": "^4.3.8",
+    "prettier": "^2.7.1",
+    "zx": "^7.0.8"
+  }
+}

package/templates/monorepo/scripts/bump-version.mjs

@@ -0,0 +1,32 @@
+/* eslint-disable no-console */
+import { execSync } from 'child_process';
+import { $, chalk, fs } from 'zx';
+
+// or use pnpm to bump version: `pnpm -r --filter {packages/*, themes/*} -- pnpm version`
+execSync('bumpp package.json packages/*/package.json plugins/*/package.json', { stdio: 'inherit' });
+
+const { version } = await fs.readJSON('package.json');
+
+console.log(`\nNow you can make adjustments to ${chalk.cyan('CHANGELOG.md')}. Then press enter to continue.`);
+
+let newChangelog = '';
+
+try {
+  const gitRes = await $`git log --pretty=format:"- %s" "main"...HEAD`;
+  newChangelog = gitRes.stdout.trim();
+} catch {
+  console.error(chalk.redBright('Could not get git log, please write changelog manually.'));
+}
+
+// TODO: 这里可以直接用 nodejs 来获取日期？不需要区分系统语言
+const dateRes = await $`date +'%B %d, %Y'`;
+const date = dateRes.stdout.trim();
+const title = `## ${version} (${date})`;
+
+await fs.ensureFile('CHANGELOG.md');
+const oldChangelog = await fs.readFile('CHANGELOG.md', 'utf8');
+const changelog = [title, newChangelog, oldChangelog].filter((item) => !!item).join('\n\n');
+
+await fs.writeFile('CHANGELOG.md', changelog);
+await $`read`;
+await fs.writeFileSync('version', version);

package/templates/monorepo/version

@@ -0,0 +1 @@
+0.1.0

package/templates/nextjs-dapp/blocklet.md

@@ -1,3 +1,3 @@
-# template-react
+# template-nextjs
 
-A react template for creating a new blocklet project.
+A nextjs template for creating a new blocklet project.

package/templates/nextjs-dapp/package.json

@@ -13,6 +13,8 @@
     "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",
+    "deploy:child": "npm run bundle && blocklet deploy .blocklet/bundle --app-did=<%= did %>",
+    "dev:child": "blocklet dev --component --app-did=<%= did %>",
     "prepare": "husky install"
   },
   "lint-staged": {
@@ -25,12 +27,12 @@
     ]
   },
   "dependencies": {
-    "@arcblock/did-auth": "^1.17.16",
-    "@arcblock/did-auth-storage-nedb": "^1.6.3",
-    "@blocklet/sdk": "^1.8.13",
-    "@ocap/client": "^1.17.16",
-    "@ocap/mcrypto": "^1.17.16",
-    "@ocap/wallet": "^1.17.16",
+    "@arcblock/did-auth": "^1.17.19",
+    "@arcblock/did-auth-storage-nedb": "^1.7.1",
+    "@blocklet/sdk": "^1.8.22",
+    "@ocap/client": "^1.17.19",
+    "@ocap/mcrypto": "^1.17.19",
+    "@ocap/wallet": "^1.17.19",
     "dotenv-flow": "^3.2.0",
     "express": "^4.18.1",
     "next": "12.2.3",
@@ -42,7 +44,7 @@
     "eslint-config-next": "12.2.3",
     "husky": "^8.0.1",
     "lint-staged": "^12.5.0",
-    "nodemon": "^2.0.19",
+    "nodemon": "^2.0.20",
     "npm-run-all": "^4.1.5"
   }
 }

package/templates/react-dapp/api/index.js

@@ -27,7 +27,7 @@ if (isProduction) {
   app.use(cors());
   app.use(compression());
 
-  const staticDir = path.resolve(__dirname, '../', 'build');
+  const staticDir = path.resolve(process.env.BLOCKLET_APP_DIR, 'build');
   app.use(express.static(staticDir, { maxAge: '30d', index: false }));
   app.use(router);
   app.use(fallback('index.html', { root: staticDir }));

package/templates/react-dapp/package.json

@@ -15,6 +15,8 @@
     "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",
+    "deploy:child": "npm run bundle && blocklet deploy .blocklet/bundle --app-did=<%= did %>",
+    "dev:child": "blocklet dev --component --app-did=<%= did %>",
     "prepare": "husky install"
   },
   "lint-staged": {
@@ -39,12 +41,12 @@
     ]
   },
   "dependencies": {
-    "@arcblock/did-auth": "^1.17.16",
-    "@arcblock/did-auth-storage-nedb": "^1.6.3",
-    "@blocklet/sdk": "^1.8.13",
-    "@ocap/client": "^1.17.16",
-    "@ocap/mcrypto": "^1.17.16",
-    "@ocap/wallet": "^1.17.16",
+    "@arcblock/did-auth": "^1.17.19",
+    "@arcblock/did-auth-storage-nedb": "^1.7.1",
+    "@blocklet/sdk": "^1.8.22",
+    "@ocap/client": "^1.17.19",
+    "@ocap/mcrypto": "^1.17.19",
+    "@ocap/wallet": "^1.17.19",
     "axios": "^0.27.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
@@ -55,16 +57,16 @@
     "express-history-api-fallback": "^2.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.3.0"
+    "react-router-dom": "^6.4.0"
   },
   "devDependencies": {
     "@arcblock/eslint-config": "^0.2.3",
     "@craco/craco": "^6.4.5",
-    "eslint": "^8.23.0",
+    "eslint": "^8.23.1",
     "husky": "^8.0.1",
     "lint-staged": "^12.5.0",
-    "nodemon": "^2.0.19",
     "node-polyfill-webpack-plugin": "^2.0.1",
+    "nodemon": "^2.0.20",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
     "react-scripts": "5.0.1"

package/templates/react-gun-dapp/api/index.js

@@ -32,7 +32,7 @@ if (isProduction) {
   app.use(cors());
   app.use(compression());
 
-  const staticDir = path.resolve(__dirname, '../', 'build');
+  const staticDir = path.resolve(process.env.BLOCKLET_APP_DIR, 'build');
   app.use(express.static(staticDir, { maxAge: '30d', index: false }));
   app.use(router);
   app.use(fallback('index.html', { root: staticDir }));

package/templates/react-gun-dapp/blocklet.md

@@ -1,3 +1,3 @@
-# template-react
+# template-react-gun
 
-A react template for creating a new blocklet project.
+A react gun for creating a new blocklet project.

package/templates/react-gun-dapp/package.json

@@ -15,6 +15,8 @@
     "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",
+    "deploy:child": "npm run bundle && blocklet deploy .blocklet/bundle --app-did=<%= did %>",
+    "dev:child": "blocklet dev --component --app-did=<%= did %>",
     "prepare": "husky install"
   },
   "lint-staged": {
@@ -39,12 +41,12 @@
     ]
   },
   "dependencies": {
-    "@arcblock/did-auth": "^1.17.16",
-    "@arcblock/did-auth-storage-nedb": "^1.6.3",
-    "@blocklet/sdk": "^1.8.13",
-    "@ocap/client": "^1.17.16",
-    "@ocap/mcrypto": "^1.17.16",
-    "@ocap/wallet": "^1.17.16",
+    "@arcblock/did-auth": "^1.17.19",
+    "@arcblock/did-auth-storage-nedb": "^1.7.1",
+    "@blocklet/sdk": "^1.8.22",
+    "@ocap/client": "^1.17.19",
+    "@ocap/mcrypto": "^1.17.19",
+    "@ocap/wallet": "^1.17.19",
     "axios": "^0.27.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
@@ -56,15 +58,15 @@
     "gun": "^0.2020.1238",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.3.0"
+    "react-router-dom": "^6.4.0"
   },
   "devDependencies": {
     "@arcblock/eslint-config": "^0.2.3",
     "@craco/craco": "^6.4.5",
-    "eslint": "^8.23.0",
+    "eslint": "^8.23.1",
     "husky": "^8.0.1",
     "lint-staged": "^12.5.0",
-    "nodemon": "^2.0.19",
+    "nodemon": "^2.0.20",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
     "react-scripts": "5.0.1"

package/templates/react-static/package.json

@@ -11,6 +11,8 @@
     "bundle": "npm run clean && PUBLIC_URL='/.blocklet/proxy/<%= did %>' craco build && blocklet bundle --zip --create-release",
     "deploy": "npm run bundle && blocklet deploy .blocklet/bundle",
     "upload": "npm run bundle && blocklet upload .blocklet/release/blocklet.json",
+    "deploy:child": "npm run bundle && blocklet deploy .blocklet/bundle --app-did=<%= did %>",
+    "dev:child": "blocklet dev --component --app-did=<%= did %>",
     "prepare": "husky install"
   },
   "lint-staged": {
@@ -37,12 +39,12 @@
   "dependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.3.0"
+    "react-router-dom": "^6.4.0"
   },
   "devDependencies": {
     "@arcblock/eslint-config": "^0.2.3",
     "@craco/craco": "^6.4.5",
-    "eslint": "^8.23.0",
+    "eslint": "^8.23.1",
     "husky": "^8.0.1",
     "lint-staged": "^12.5.0",
     "prettier": "^2.7.1",