create-blocklet 0.4.78 → 0.4.80

package/templates/website/.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/website/.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/website/.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/website/.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/website/.prettierrc

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

package/templates/website/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/website/_gitignore

@@ -0,0 +1,28 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+.pnp
+.pnp.js
+.DS_Store
+node_modules
+
+# testing
+coverage
+
+# production
+build
+dist
+dist-ssr
+.blocklet
+
+# local env files
+*.local
+
+# Log files
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*

package/templates/website/_npmrc

@@ -0,0 +1,3 @@
+## force pnpm to hoist
+shamefully-hoist=true
+strict-peer-dependencies=false

package/templates/website/package.json

@@ -5,15 +5,19 @@
   "scripts": {
     "dev": "blocklet dev",
     "start": "xmark start",
-    "clean": "rm -rf .blocklet && rm -rf node_modules/.vite",
+    "clean": "node scripts/build-clean.js",
     "build": "xmark build",
     "bundle": "npm run clean && xmark 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 %>"
+    "dev:child": "blocklet dev --component --app-did=<%= did %>",
+    "bump-version": "zx scripts/bump-version.mjs"
   },
   "dependencies": {
-    "@xmark/cli": "^2.4.83"
+    "@xmark/cli": "^2.4.83",
+    "zx": "^7.1.1",
+    "rimraf": "^3.0.2",
+    "bumpp": "^8.2.1"
   }
 }

package/templates/website/public/robots.txt

@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:

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

@@ -0,0 +1,6 @@
+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/website/scripts/bump-version.mjs

@@ -0,0 +1,33 @@
+/* eslint-disable no-console */
+import { execSync } from 'child_process';
+import { $, chalk, fs } from 'zx';
+
+execSync('bumpp --no-tag --no-commit --no-push package.json', { stdio: 'inherit' });
+
+const { version } = await fs.readJSON('package.json');
+
+let newChangelog = '';
+
+try {
+  const gitRes = await $`git log --pretty=format:"- %s" "master"...HEAD`;
+  newChangelog = gitRes.stdout.trim();
+} catch {
+  console.error(chalk.redBright('Could not get git log, please write changelog manually.'));
+}
+
+const now = new Date();
+const currentDate = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`;
+const title = `## ${version} (${currentDate})`;
+
+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);
+
+console.log(`\nNow you can make adjustments to ${chalk.cyan('CHANGELOG.md')}. Then press enter to continue.`);
+
+process.stdin.setRawMode(true);
+process.stdin.resume();
+process.stdin.on('data', process.exit.bind(process, 0));
+
+await fs.writeFileSync('version', version);

package/templates/website/version

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

package/common/.makefiles/bump_blocklet_version.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-NEW_VERSION=$(cat version)
-blocklet version $NEW_VERSION
-git add blocklet.yml

package/common/.makefiles/bump_node_version.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-cur_ver=$(cat package.json | grep '"version":' |  awk '{print $2}' | sed 's/"//g' | sed 's/,//g')
-new_ver=$(cat version)
-ver_pattern="\"version\": \"$cur_ver\"" # strict match to avoid accidently change dependency version
-ver_replacement="\"version\": \"$new_ver\""
-cat package.json | sed "s/$ver_pattern/$ver_replacement/g" > package.json.tmp
-mv package.json.tmp package.json
-git add package.json

package/common/.makefiles/bump_version.sh

@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-
-NOW="$(date +'%B %d, %Y')"
-# RED="\033[1;31m"
-# GREEN="\033[0;32m"
-# YELLOW="\033[1;33m"
-# BLUE="\033[1;34m"
-# PURPLE="\033[1;35m"
-# CYAN="\033[1;36m"
-# WHITE="\033[1;37m"
-# RESET="\033[0m"
-
-LATEST_HASH=$(git log --pretty=format:'%h' -n 1)
-
-# QUESTION_FLAG="${GREEN}?"
-# WARNING_FLAG="${YELLOW}!"
-# NOTICE_FLAG="${CYAN}❯"
-
-VERSION=version
-
-ADJUSTMENTS_MSG="${QUESTION_FLAG} ${CYAN}Now you can make adjustments to ${WHITE}CHANGELOG.md${CYAN}. Then press enter to continue."
-
-if [ -f $VERSION ]; then
-    BASE_STRING=$(cat $VERSION)
-    BASE_LIST=($(echo $BASE_STRING | tr '.' ' '))
-    V_MAJOR=${BASE_LIST[0]}
-    V_MINOR=${BASE_LIST[1]}
-    V_PATCH=${BASE_LIST[2]}
-    echo -e "${NOTICE_FLAG} Current version: ${WHITE}$BASE_STRING"
-    echo -e "${NOTICE_FLAG} Latest commit hash: ${WHITE}$LATEST_HASH"
-    V_PATCH=$((V_PATCH + 1))
-    SUGGESTED_VERSION="$V_MAJOR.$V_MINOR.$V_PATCH"
-    echo -ne "${QUESTION_FLAG} ${CYAN}Enter a version number [${WHITE}$SUGGESTED_VERSION${CYAN}]: "
-    read INPUT_STRING
-    if [ "$INPUT_STRING" = "" ]; then
-        INPUT_STRING=$SUGGESTED_VERSION
-    fi
-    echo -e "${NOTICE_FLAG} Will set new version to be ${WHITE}$INPUT_STRING"
-    echo $INPUT_STRING >$VERSION
-
-    echo "## $INPUT_STRING ($NOW)" >tmpfile
-    echo "" >>tmpfile
-    git log --pretty=format:"- %s" "$BASE_STRING"...HEAD >>tmpfile
-    echo "" >>tmpfile
-    echo "" >>tmpfile
-    cat CHANGELOG.md >>tmpfile
-    mv tmpfile CHANGELOG.md
-    echo -e "$ADJUSTMENTS_MSG"
-    read
-    git add CHANGELOG.md $VERSION
-fi

package/common/.makefiles/release.mk

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-RELEASE_VERSION=v$(VERSION)
-GIT_BRANCH=$(strip $(shell git symbolic-ref --short HEAD))
-GIT_VERSION="$(strip $(shell git rev-parse --short HEAD))"
-
-release:
-	@git config --local user.name "bot"
-	@git config --local user.email "bot@arcblock.io"
-	@git tag -a $(RELEASE_VERSION) -m "Release $(RELEASE_VERSION). Revision is: $(GIT_VERSION)" | true
-	@git push origin $(RELEASE_VERSION) | true
-
-delete-release:
-	@echo "Delete a release on $(RELEASE_VERSION)"
-	@git tag -d $(RELEASE_VERSION) | true
-	@git push -f -d origin $(RELEASE_VERSION) | true
-
-bump-version:
-	@echo "Bump version..."
-	@.makefiles/bump_version.sh
-	@test -f "package.json" && .makefiles/bump_node_version.sh
-	@test -f "blocklet.yml" && .makefiles/bump_blocklet_version.sh
-
-create-pr:
-	@echo "Creating pull request..."
-	@make bump-version || true
-	@git add .;git commit -a -m "bump version";git push origin $(GIT_BRANCH)
-	@hub pull-request
-
-browse-pr:
-	@hub browse -- pulls

package/common/.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "editor.formatOnSave": true,
-  "prettier.enable": true
-}

package/common/Makefile

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-dep:
-	@echo "Install dependencies required for this repo..."
-	@npm install
-	@npm install -g @blocklet/cli
-
-test:
-	@echo "Running test suites..."
-
-build:
-	@echo "Building the software..."
-
-bundle:
-	@echo "Bundling the software..."
-	@npm run bundle
-
-github-init:
-	@make dep
-
-include .makefiles/*.mk

package/templates/monorepo/Makefile

@@ -1,22 +0,0 @@
-#!/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