create-blocklet 0.5.0 → 0.5.2

package/{templates/docsite → common}/scripts/bump-version.mjs

@@ -5,11 +5,15 @@ import { $, chalk, fs } from 'zx';
 execSync('bumpp --no-tag --no-commit --no-push package.json', { stdio: 'inherit' });
 
 const { version } = await fs.readJSON('package.json');
+await fs.writeFileSync('version', version);
 
-let newChangelog = '';
+console.log(chalk.greenBright(`[info]: start to modify blocklet version to ${version}`));
+await $`blocklet version ${version}`;
+console.log(chalk.greenBright('[info]: blocklet version modified.'));
 
+let newChangelog = '';
 try {
-  const gitRes = await $`git log --pretty=format:"- %s" "master"...HEAD`;
+  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.'));
@@ -29,5 +33,3 @@ console.log(`\nNow you can make adjustments to ${chalk.cyan('CHANGELOG.md')}. Th
 process.stdin.setRawMode(true);
 process.stdin.resume();
 process.stdin.on('data', process.exit.bind(process, 0));
-
-await fs.writeFileSync('version', version);

package/index.js

@@ -62,12 +62,11 @@ const templates = [
     display: '[dapp] next.js',
     color: blue,
   },
-  // 暂时不用这个模板
-  // {
-  //   name: 'react-gun-dapp',
-  //   display: '[dapp] react + gun.js + express.js',
-  //   color: blue,
-  // },
+  {
+    name: 'react-gun-dapp',
+    display: '[dapp] react + gun.js + express.js',
+    color: blue,
+  },
   {
     name: 'react-static',
     display: '[static] react',
@@ -121,8 +120,6 @@ const renameFiles = {
   _npmrc: '.npmrc',
 };
 
-const excludeFiles = ['.github', '.husky', '.vscode', '.editorconfig', '_gitignore', '_npmrc', 'version'];
-
 async function init() {
   const { version } = await fs.readJSONSync(path.resolve(__dirname, 'package.json'));
   await echoBrand({ version });
@@ -286,17 +283,36 @@ async function init() {
   for (const templateName of templateNames) {
     const templateDir = path.join(__dirname, `templates/${templateName}`);
     const finalTemplateName = `${name}-${templateName}`;
+    // TODO: 需要把 common file copy 的逻辑移除，不同的 template 之间的差异越来越多，就会需要越来越多特殊处理的代码，违背了初衷，移除这部分逻辑可能是更好的选择
+    // copy common files
+    (() => {
+      const commonDir = path.join(__dirname, 'common');
+      const commonFiles = fs.readdirSync(commonDir);
+      for (const file of commonFiles) {
+        // 如果选择多个模板，每个子 package 中 只会包含必要的 文件
+        if (mainBlocklet && !['screenshots', 'public', 'logo.png', '.prettierrc', 'LICENSE'].includes(file)) {
+          continue;
+        }
+        // html-staic 和 xmark 相关的模板不添加 .husky
+        if (fuzzyQuery(['html-static', 'website', 'docsite'], templateName) && ['.husky'].includes(file)) {
+          // eslint-disable-next-line no-continue
+          continue;
+        }
+        const targetPath = renameFiles[file]
+          ? path.join(root, mainBlocklet ? `blocklets/${templateName}` : '', renameFiles[file])
+          : path.join(root, mainBlocklet ? `blocklets/${templateName}` : '', file);
+
+        copy(path.join(commonDir, file), targetPath);
+      }
+    })();
     // copy template files
     (() => {
       // 过滤掉 template-info.json 文件
       let files = fs.readdirSync(templateDir).filter((file) => file !== 'template-info.json');
-      // 如果选择了多个模板，每个子 package 中应该过滤掉一些文件
-      if (mainBlocklet) {
-        files = files.filter((file) => !fuzzyQuery(excludeFiles, file));
-      }
       for (const file of files) {
         write(file, null, templateDir, templateName);
       }
+      // 如果选择了多个模板，每个子 package 中的 bump-version.mjs 文件
       if (mainBlocklet) {
         fs.removeSync(path.join(root, `blocklets/${templateName}`, 'scripts/bump-version.mjs'));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-blocklet",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "exports": "./index.js",
   "type": "module",
   "repository": "git@github.com:blocklet/create-blocklet.git",
@@ -29,9 +29,9 @@
     "test:run": "vitest run"
   },
   "dependencies": {
-    "@arcblock/did": "^1.18.6",
-    "@ocap/mcrypto": "^1.18.6",
-    "@ocap/util": "^1.18.6",
+    "@arcblock/did": "^1.18.11",
+    "@ocap/mcrypto": "^1.18.11",
+    "@ocap/util": "^1.18.11",
     "boxen": "^6.2.1",
     "ejs": "^3.1.8",
     "envfile": "^6.18.0",

package/templates/express-api/package.json

@@ -32,7 +32,7 @@
   "dependencies": {
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
     "@blocklet/sdk": "^1.8.33",
-    "@ocap/client": "^1.18.6",
+    "@ocap/client": "^1.18.11",
     "dotenv-flow": "^3.2.0",
     "express": "^4.18.2"
   },

package/templates/html-static/package.json

@@ -5,7 +5,7 @@
     "dev": "blocklet dev",
     "clean": "node scripts/build-clean.js",
     "bundle": "npm run clean && blocklet bundle --zip --create-release",
-    "deploy": "npm run bundle && blocklet deploy .blocklet/bundle --skip-hooks",
+    "deploy": "npm run bundle && blocklet deploy .blocklet/bundle",
     "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",

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

@@ -1,27 +1,25 @@
 /* eslint-disable no-console */
 import { execSync } from 'child_process';
-import { $, chalk, fs, path, YAML } from 'zx';
+import { $, chalk, fs, path } from 'zx';
+
+const cwd = process.cwd(); // 获取脚本执行目录
 
 // or use pnpm to bump version: `pnpm -r --filter {packages/*, themes/*} -- pnpm version`
 execSync('bumpp package.json blocklets/*/package.json', { stdio: 'inherit' });
 
 const { version } = await fs.readJSON('package.json');
+await fs.writeFileSync('version', version);
 
-(async () => {
-  console.log(chalk.greenBright(`[info]: start to modify blocklets version to ${version}`));
-  const dirPath = path.join(__dirname, '../blocklets');
-  let pathList = await fs.readdirSync(dirPath);
-  pathList = pathList.map((item) => `${dirPath}/${item}/blocklet.yml`);
-  for (const ymlPath of pathList) {
-    const blockletYaml = await fs.readFileSync(ymlPath, 'utf8');
-    const yamlConfig = YAML.parse(blockletYaml);
-    yamlConfig.version = version;
-    fs.writeFileSync(ymlPath, YAML.stringify(yamlConfig, 2));
-  }
-  console.log(chalk.greenBright('[info]: all blocklets version modified.'));
-})();
+console.log(chalk.greenBright(`[info]: start to modify blocklets version to ${version}`));
+const dirPath = path.join(__dirname, '../blocklets');
+let pathList = await fs.readdirSync(dirPath);
+pathList = pathList.map((item) => `${dirPath}/${item}`);
+for (const ymlDir of pathList) {
+  await $`cd ${ymlDir} && blocklet version ${version}`;
+}
+console.log(chalk.greenBright('[info]: all blocklets version modified.'));
 
-console.log(`\nNow you can make adjustments to ${chalk.cyan('CHANGELOG.md')}. Then press enter to continue.`);
+await $`cd ${cwd}`;
 
 let newChangelog = '';
 
@@ -47,5 +45,3 @@ console.log(`\nNow you can make adjustments to ${chalk.cyan('CHANGELOG.md')}. Th
 process.stdin.setRawMode(true);
 process.stdin.resume();
 process.stdin.on('data', process.exit.bind(process, 0));
-
-await fs.writeFileSync('version', version);

package/templates/nextjs-dapp/package.json

@@ -28,12 +28,12 @@
     ]
   },
   "dependencies": {
-    "@arcblock/did-auth": "^1.18.6",
+    "@arcblock/did-auth": "^1.18.11",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
     "@blocklet/sdk": "^1.8.33",
-    "@ocap/client": "^1.18.6",
-    "@ocap/mcrypto": "^1.18.6",
-    "@ocap/wallet": "^1.18.6",
+    "@ocap/client": "^1.18.11",
+    "@ocap/mcrypto": "^1.18.11",
+    "@ocap/wallet": "^1.18.11",
     "dotenv-flow": "^3.2.0",
     "express": "^4.18.2",
     "next": "12.2.3",

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

@@ -1,4 +1,4 @@
 const { setupClient } = require('vite-plugin-blocklet');
-const { server, app } = require('./index');
+const { app } = require('./index');
 
-setupClient(app, server);
+setupClient(app);

package/templates/react-dapp/package.json

@@ -40,12 +40,12 @@
     ]
   },
   "dependencies": {
-    "@arcblock/did-auth": "^1.18.6",
+    "@arcblock/did-auth": "^1.18.11",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
     "@blocklet/sdk": "^1.8.33",
-    "@ocap/client": "^1.18.6",
-    "@ocap/mcrypto": "^1.18.6",
-    "@ocap/wallet": "^1.18.6",
+    "@ocap/client": "^1.18.11",
+    "@ocap/mcrypto": "^1.18.11",
+    "@ocap/wallet": "^1.18.11",
     "axios": "^0.27.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
@@ -72,7 +72,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
     "vite": "^3.2.2",
-    "vite-plugin-blocklet": "^0.5.0",
+    "vite-plugin-blocklet": "^0.5.2",
     "vite-plugin-svgr": "^2.2.2",
     "zx": "^7.1.1"
   }

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

@@ -1,4 +1,4 @@
 const { setupClient } = require('vite-plugin-blocklet');
-const { server, app } = require('./index');
+const { app } = require('./index');
 
-setupClient(app, server);
+setupClient(app);

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

@@ -40,12 +40,12 @@
     ]
   },
   "dependencies": {
-    "@arcblock/did-auth": "^1.18.6",
+    "@arcblock/did-auth": "^1.18.11",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
     "@blocklet/sdk": "^1.8.33",
-    "@ocap/client": "^1.18.6",
-    "@ocap/mcrypto": "^1.18.6",
-    "@ocap/wallet": "^1.18.6",
+    "@ocap/client": "^1.18.11",
+    "@ocap/mcrypto": "^1.18.11",
+    "@ocap/wallet": "^1.18.11",
     "axios": "^0.27.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
@@ -72,7 +72,7 @@
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "vite": "^3.2.2",
-    "vite-plugin-blocklet": "^0.5.0",
+    "vite-plugin-blocklet": "^0.5.2",
     "vite-plugin-svgr": "^2.2.2",
     "zx": "^7.1.1"
   }

package/templates/react-gun-dapp/src/pages/home.jsx

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 import { useEffect, useState } from 'react';
-import Gun from 'gun';
+import Gun from 'gun/browser';
 
 import { Link } from 'react-router-dom';
 

package/templates/react-static/package.json

@@ -53,7 +53,7 @@
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "vite": "^3.2.2",
-    "vite-plugin-blocklet": "^0.5.0",
+    "vite-plugin-blocklet": "^0.5.2",
     "vite-plugin-svgr": "^2.2.2",
     "zx": "^7.1.1"
   }

package/templates/solidjs-dapp/api/dev.js

@@ -1,4 +1,4 @@
 const { setupClient } = require('vite-plugin-blocklet');
-const { server, app } = require('./index');
+const { app } = require('./index');
 
-setupClient(app, server);
+setupClient(app);

package/templates/solidjs-dapp/package.json

@@ -33,17 +33,17 @@
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "vite": "^3.2.2",
-    "vite-plugin-blocklet": "^0.5.0",
+    "vite-plugin-blocklet": "^0.5.2",
     "vite-plugin-solid": "^2.3.10",
     "zx": "^7.1.1"
   },
   "dependencies": {
-    "@arcblock/did-auth": "^1.18.6",
+    "@arcblock/did-auth": "^1.18.11",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
     "@blocklet/sdk": "^1.8.33",
-    "@ocap/client": "^1.18.6",
-    "@ocap/mcrypto": "^1.18.6",
-    "@ocap/wallet": "^1.18.6",
+    "@ocap/client": "^1.18.11",
+    "@ocap/mcrypto": "^1.18.11",
+    "@ocap/wallet": "^1.18.11",
     "axios": "^0.27.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",

package/templates/solidjs-static/package.json

@@ -29,7 +29,7 @@
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "vite": "^3.2.2",
-    "vite-plugin-blocklet": "^0.5.0",
+    "vite-plugin-blocklet": "^0.5.2",
     "vite-plugin-solid": "^2.3.10",
     "zx": "^7.1.1"
   },

package/templates/svelte-dapp/api/dev.js

@@ -1,4 +1,4 @@
 const { setupClient } = require('vite-plugin-blocklet');
-const { server, app } = require('./index');
+const { app } = require('./index');
 
-setupClient(app, server);
+setupClient(app);

package/templates/svelte-dapp/package.json

@@ -17,12 +17,12 @@
     "bump-version": "zx scripts/bump-version.mjs"
   },
   "dependencies": {
-    "@arcblock/did-auth": "^1.18.6",
+    "@arcblock/did-auth": "^1.18.11",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
     "@blocklet/sdk": "^1.8.33",
-    "@ocap/client": "^1.18.6",
-    "@ocap/mcrypto": "^1.18.6",
-    "@ocap/wallet": "^1.18.6",
+    "@ocap/client": "^1.18.11",
+    "@ocap/mcrypto": "^1.18.11",
+    "@ocap/wallet": "^1.18.11",
     "axios": "^0.27.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
@@ -47,7 +47,7 @@
     "rimraf": "^3.0.2",
     "svelte": "^3.52.0",
     "vite": "^3.2.2",
-    "vite-plugin-blocklet": "^0.5.0",
+    "vite-plugin-blocklet": "^0.5.2",
     "vite-plugin-html": "^3.2.0",
     "zx": "^7.1.1"
   },

package/templates/svelte-static/package.json

@@ -30,7 +30,7 @@
     "rimraf": "^3.0.2",
     "svelte": "^3.52.0",
     "vite": "^3.2.2",
-    "vite-plugin-blocklet": "^0.5.0",
+    "vite-plugin-blocklet": "^0.5.2",
     "zx": "^7.1.1"
   },
   "lint-staged": {

package/templates/vue-dapp/api/dev.js

@@ -1,4 +1,4 @@
 const { setupClient } = require('vite-plugin-blocklet');
-const { server, app } = require('./index');
+const { app } = require('./index');
 
-setupClient(app, server);
+setupClient(app);

package/templates/vue-dapp/package.json

@@ -18,12 +18,12 @@
     "bump-version": "zx scripts/bump-version.mjs"
   },
   "dependencies": {
-    "@arcblock/did-auth": "^1.18.6",
+    "@arcblock/did-auth": "^1.18.11",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
     "@blocklet/sdk": "^1.8.33",
-    "@ocap/client": "^1.18.6",
-    "@ocap/mcrypto": "^1.18.6",
-    "@ocap/wallet": "^1.18.6",
+    "@ocap/client": "^1.18.11",
+    "@ocap/mcrypto": "^1.18.11",
+    "@ocap/wallet": "^1.18.11",
     "axios": "^0.27.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
@@ -49,7 +49,7 @@
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "vite": "^3.2.2",
-    "vite-plugin-blocklet": "^0.5.0",
+    "vite-plugin-blocklet": "^0.5.2",
     "zx": "^7.1.1"
   },
   "lint-staged": {

package/templates/vue-static/package.json

@@ -31,7 +31,7 @@
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "vite": "^3.2.2",
-    "vite-plugin-blocklet": "^0.5.0",
+    "vite-plugin-blocklet": "^0.5.2",
     "zx": "^7.1.1"
   },
   "lint-staged": {

package/templates/vue2-dapp/api/dev.js

@@ -1,4 +1,4 @@
 const { setupClient } = require('vite-plugin-blocklet');
-const { server, app } = require('./index');
+const { app } = require('./index');
 
-setupClient(app, server);
+setupClient(app);

package/templates/vue2-dapp/package.json

@@ -18,12 +18,12 @@
     "bump-version": "zx scripts/bump-version.mjs"
   },
   "dependencies": {
-    "@arcblock/did-auth": "^1.18.6",
+    "@arcblock/did-auth": "^1.18.11",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
     "@blocklet/sdk": "^1.8.33",
-    "@ocap/client": "^1.18.6",
-    "@ocap/mcrypto": "^1.18.6",
-    "@ocap/wallet": "^1.18.6",
+    "@ocap/client": "^1.18.11",
+    "@ocap/mcrypto": "^1.18.11",
+    "@ocap/wallet": "^1.18.11",
     "axios": "^0.27.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
@@ -49,7 +49,7 @@
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "vite": "^3.2.2",
-    "vite-plugin-blocklet": "^0.5.0",
+    "vite-plugin-blocklet": "^0.5.2",
     "zx": "^7.1.1"
   },
   "lint-staged": {

package/templates/vue2-static/package.json

@@ -31,7 +31,7 @@
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "vite": "^3.2.2",
-    "vite-plugin-blocklet": "^0.5.0",
+    "vite-plugin-blocklet": "^0.5.2",
     "zx": "^7.1.1"
   },
   "lint-staged": {

package/templates/docsite/scripts/build-clean.js

@@ -1,6 +0,0 @@
-const rimraf = require('rimraf');
-
-console.log('clean .blocklet folder && node_modules/.vite');
-rimraf.sync('.blocklet');
-rimraf.sync('node_modules/.vite');
-console.log('clean .blocklet folder  && node_modules/.vite done!');

package/templates/express-api/.editorconfig

@@ -1,23 +0,0 @@
-# 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/express-api/.github/workflows/main.yml

@@ -1,36 +0,0 @@
-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/express-api/.github/workflows/pr-title.yml

@@ -1,21 +0,0 @@
-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/express-api/.github/workflows/version-check.yml

@@ -1,20 +0,0 @@
-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/express-api/.prettierrc

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

package/templates/express-api/LICENSE

@@ -1,13 +0,0 @@
-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.