create-blocklet 0.4.50 → 0.4.52

package/index.js

@@ -117,8 +117,6 @@ const templates = [
 
 const renameFiles = {
   _gitignore: '.gitignore',
-  '_eslintrc.js': '.eslintrc.js',
-  _eslintignore: '.eslintignore',
   _npmrc: '.npmrc',
   _editorconfig: '.editorconfig',
   _prettierrc: '.prettierrc',
@@ -273,21 +271,15 @@ async function init() {
       const commonDir = path.join(__dirname, 'common');
       const commonFiles = fs.readdirSync(commonDir);
       for (const file of commonFiles) {
-        // 如果选中了多个模板时，应该排除掉这些
-        if (mainBlocklet && ['Makefile', 'version', '_npmrc', '_editorconfig', '_gitignore'].includes(file)) {
+        // 如果选择多个模板，每个子 package 中 只会包含必要的 文件
+        if (mainBlocklet && !['screenshots', 'public', 'logo.png', '_prettierrc'].includes(file)) {
           continue;
         }
-        // react 相关的模板使用通用的 eslintrc.js 文件
-        if (!fuzzyQuery(['react', 'react-gun'], templateName) && file === '_eslintrc.js') {
+        // xmark 相关的模板不添加 .husky
+        if (fuzzyQuery(['blocklet-page', 'doc-site'], templateName) && ['.husky'].includes(file)) {
           // eslint-disable-next-line no-continue
           continue;
         }
-        // xmark 相关的模板不添加 .eslintignore 和 .includes
-        if (fuzzyQuery(['blocklet-page', 'doc-site'], templateName) && ['_eslintignore', '.husky'].includes(file)) {
-          // eslint-disable-next-line no-continue
-          continue;
-        }
-        // 如果选中了多个模板，则要将 common file copy 到项目 root 目录下的 blocklets 中
         const targetPath = renameFiles[file]
           ? path.join(root, mainBlocklet ? `blocklets/${templateName}` : '', renameFiles[file])
           : path.join(root, mainBlocklet ? `blocklets/${templateName}` : '', file);
@@ -306,15 +298,15 @@ async function init() {
 
     modifyPackage(
       (pkg) => {
-        pkg.name = finalTemplateName;
+        pkg.name = mainBlocklet ? finalTemplateName : name;
       },
       templateDir,
       templateName
     );
     modifyBlockletYaml(
       (yamlConfig) => {
-        yamlConfig.name = finalTemplateName;
-        yamlConfig.title = finalTemplateName;
+        yamlConfig.name = mainBlocklet ? finalTemplateName : name;
+        yamlConfig.title = mainBlocklet ? templateName : name;
       },
       templateDir,
       templateName

package/lib/utils.js

@@ -7,7 +7,7 @@ export function copy(src, dest) {
   if (stat.isDirectory()) {
     copyDir(src, dest);
   } else {
-    fs.copyFileSync(src, dest);
+    fs.copySync(src, dest);
   }
 }
 

package/package.json

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

package/templates/monorepo/package.json

@@ -1,5 +1,6 @@
 {
   "name": "root",
+  "version": "0.1.1",
   "private": true,
   "workspaces": [
     "blocklets/*"

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

@@ -1,12 +1,26 @@
 /* eslint-disable no-console */
 import { execSync } from 'child_process';
-import { $, chalk, fs } from 'zx';
+import { $, chalk, fs, path, YAML } 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' });
+execSync('bumpp package.json blocklets/*/package.json', { stdio: 'inherit' });
 
 const { version } = await fs.readJSON('package.json');
 
+(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(`\nNow you can make adjustments to ${chalk.cyan('CHANGELOG.md')}. Then press enter to continue.`);
 
 let newChangelog = '';

package/templates/react-gun-dapp/.eslintrc.js

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

package/templates/react-static/.eslintrc.js

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

package/templates/solidjs-dapp/blocklet.yml

@@ -4,7 +4,7 @@ description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - solidjs
-group: static
+group: dapp
 did: ''
 main: dist
 author:

package/templates/solidjs-dapp/package.json

@@ -32,7 +32,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
     "vite": "^3.1.2",
-    "vite-plugin-blocklet": "^0.4.50",
+    "vite-plugin-blocklet": "^0.4.52",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-solid": "^2.3.3"
   },

package/templates/solidjs-dapp/vite.config.js

@@ -18,7 +18,7 @@ export default defineConfig(async ({ mode }) => {
           },
         },
       }),
-      createBlockletPlugin({ version: 2 }),
+      createBlockletPlugin(),
     ],
     build: {
       target: 'esnext',

package/templates/solidjs-static/package.json

@@ -26,7 +26,7 @@
     "lint-staged": "^12.5.0",
     "prettier": "^2.7.1",
     "vite": "^3.1.2",
-    "vite-plugin-blocklet": "^0.4.50",
+    "vite-plugin-blocklet": "^0.4.52",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-solid": "^2.3.3"
   },

package/templates/solidjs-static/vite.config.js

@@ -17,7 +17,7 @@ export default defineConfig(async ({ mode }) => {
           },
         },
       }),
-      createBlockletPlugin({ version: 2 }),
+      createBlockletPlugin(),
     ],
     build: {
       target: 'esnext',

package/templates/svelte-dapp/blocklet.yml

@@ -4,7 +4,7 @@ description: A Blocklet Server blocklet
 keywords:
   - blocklet
   - svelte
-group: static
+group: dapp
 did: ''
 main: dist
 author:

package/templates/svelte-dapp/package.json

@@ -46,7 +46,7 @@
     "prettier": "^2.7.1",
     "svelte": "^3.50.1",
     "vite": "^3.1.2",
-    "vite-plugin-blocklet": "^0.4.50",
+    "vite-plugin-blocklet": "^0.4.52",
     "vite-plugin-html": "^3.2.0"
   },
   "lint-staged": {

package/templates/svelte-dapp/vite.config.js

@@ -19,7 +19,7 @@ export default defineConfig(async ({ mode }) => {
           },
         },
       }),
-      createBlockletPlugin({ version: 2 }),
+      createBlockletPlugin(),
     ],
     server: {
       proxy: {

package/templates/svelte-static/package.json

@@ -27,7 +27,7 @@
     "prettier": "^2.7.1",
     "svelte": "^3.50.1",
     "vite": "^3.1.2",
-    "vite-plugin-blocklet": "^0.4.50",
+    "vite-plugin-blocklet": "^0.4.52",
     "vite-plugin-html": "^3.2.0"
   },
   "lint-staged": {

package/templates/svelte-static/vite.config.js

@@ -18,7 +18,7 @@ export default defineConfig(async ({ mode }) => {
           },
         },
       }),
-      createBlockletPlugin({ version: 2 }),
+      createBlockletPlugin(),
     ],
   };
 });

package/templates/vue-dapp/package.json

@@ -49,7 +49,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
     "vite": "^3.1.2",
-    "vite-plugin-blocklet": "^0.4.50"
+    "vite-plugin-blocklet": "^0.4.52"
   },
   "lint-staged": {
     "*.{mjs,js,vue}": [

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

@@ -19,7 +19,7 @@ export default defineConfig(async ({ mode }) => {
           },
         },
       }),
-      createBlockletPlugin({ version: 2 }),
+      createBlockletPlugin(),
     ],
     server: {
       proxy: {

package/templates/vue-static/package.json

@@ -28,7 +28,7 @@
     "lint-staged": "^12.5.0",
     "prettier": "^2.7.1",
     "vite": "^3.1.2",
-    "vite-plugin-blocklet": "^0.4.50",
+    "vite-plugin-blocklet": "^0.4.52",
     "vite-plugin-html": "^3.2.0"
   },
   "lint-staged": {

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

@@ -18,7 +18,7 @@ export default defineConfig(async ({ mode }) => {
           },
         },
       }),
-      createBlockletPlugin({ version: 2 }),
+      createBlockletPlugin(),
     ],
   };
 });