feat: custom keyboard shortcuts

Author: QIQI03

client/packages/create-openblocks-comps/index.js

@@ -120,11 +120,22 @@ async function createProject(projectName, options) {
   const initialPackageJson = {
     name: projectName,
     version: "0.0.1",
+    type: "module",
+    license: "MIT",
   };
   writePackageJson(packageJsonFile, initialPackageJson);
   console.log("initial package.json generated");
 
-  await install([cliPackageName, sdkPackageName]);
+  await install([
+    cliPackageName,
+    sdkPackageName,
+    "openblocks-design",
+    "openblocks-core",
+    "react@17",
+    "react-dom@17",
+    "@types/react@17",
+    "@types/react-dom@17",
+  ]);
 
   await executeNodeScript(
     {

client/packages/create-openblocks-comps/package.json

@@ -1,12 +1,12 @@
 {
   "name": "create-openblocks-comps",
-  "version": "0.0.3",
+  "version": "0.0.7",
   "bin": "./index.js",
   "type": "module",
   "dependencies": {
     "chalk": "4",
     "commander": "^9.4.1",
     "fs-extra": "^10.1.0",
-    "openblocks-dev-utils": "0.0.1"
+    "openblocks-dev-utils": "workspace:^"
   }
 }

…t/packages/openblocks-cli/ide/index.html …locks-cli-template-typescript/index.htmlclient/packages/openblocks-cli/ide/index.html renamed to client/packages/openblocks-cli-template-typescript/index.html client/packages/openblocks-cli/ide/index.html renamed to client/packages/openblocks-cli-template-typescript/index.html

@@ -21,6 +21,6 @@
     <div id="root">
       <div id="root-loader">Loading...</div>
     </div>
-    <script src="index.jsx" type="module"></script>
+    <script src="index.tsx" type="module"></script>
   </body>
 </html>

client/packages/openblocks-cli-template-typescript/index.tsx

@@ -0,0 +1,19 @@
+import ReactDOM from "react-dom";
+import { CompIDE } from "openblocks-sdk";
+import { name, version, openblocks } from "./package.json";
+import compMap from "./src/index";
+
+import "openblocks-sdk/dist/style.css";
+
+function CompDevApp() {
+  return (
+    <CompIDE
+      compMap={compMap}
+      packageName={name}
+      packageVersion={version}
+      compMeta={openblocks.comps}
+    />
+  );
+}
+
+ReactDOM.render(<CompDevApp />, document.querySelector("#root"));

client/packages/openblocks-cli-template-typescript/package.json

@@ -1,8 +1,9 @@
 {
   "name": "openblocks-cli-template-typescript",
-  "version": "0.0.2",
+  "version": "0.0.9",
+  "type": "module",
   "scripts": {
-    "start": "openblocks-cli start",
+    "start": "vite",
     "build": "openblocks-cli build"
   },
   "openblocks": {
@@ -14,11 +15,11 @@
       }
     }
   },
-  "dependencies": {
+  "devDependencies": {
     "openblocks-cli": "workspace:^",
-    "openblocks-sdk": "workspace:^"
+    "openblocks-sdk": "workspace:^",
+    "typescript": "^4.8.4",
+    "vite": "^3.2.4"
   },
-  "devDependencies": {
-    "typescript": "^4.8.4"
-  }
+  "license": "MIT"
 }

client/packages/openblocks-cli-template-typescript/src/HelloWorldComp.tsx

@@ -1,5 +1,5 @@
-import { Button } from "antd";
 import {
+  antd,
   UICompBuilder,
   numberExposingStateControl,
   Section,
@@ -11,6 +11,8 @@ import {
   withMethodExposing,
 } from "openblocks-sdk";
 
+const { Button } = antd;
+
 const childrenMap = {
   value: numberExposingStateControl("value", 10),
   step: withDefault(NumberControl, 1),

client/packages/openblocks-cli-template-typescript/tsconfig.json

@@ -18,13 +18,17 @@
     "jsx": "react-jsx",
     "baseUrl": "src",
     "paths": {
+      "openblocks-sdk": [
+        "../../openblocks/src/index.sdk.ts",
+        "../node_modules/openblocks-sdk/src/openblocks/index.sdk.ts"
+      ],
       "*": [
         "*",
         "../../openblocks/src/*",
         "../../openblocks-sdk/src/*",
-        "../node_modules/openblocks-sdk/src/*"
+        "../node_modules/openblocks-sdk/src/openblocks/*"
       ]
     }
   },
-  "include": ["src"]
+  "include": ["src", "index.tsx"]
 }

client/packages/openblocks-cli-template-typescript/vite.config.js

@@ -0,0 +1,8 @@
+import config from "openblocks-cli/config/vite.config";
+export default {
+  ...config,
+  server: {
+    open: true,
+    port: 9000,
+  },
+};

client/packages/openblocks-cli/actions/build.js

@@ -4,8 +4,7 @@ import { build } from "vite";
 import { writeFileSync, existsSync, readFileSync } from "fs";
 import { resolve } from "path";
 import paths from "../config/paths.js";
-import viteConfig from "../config/vite.config.js";
-import { logBug } from "../util/log.js";
+import "../util/log.js";
 
 const { copySync } = fsExtra;
 const packageJSON = JSON.parse(readFileSync(paths.appPackageJson).toString());
@@ -74,8 +73,8 @@ export default async function buildAction(options) {
   console.log("");
   console.cyan("Building...");
 
-  const output = await build(viteConfig);
-  console.log(output);
+  const viteConfig = await import(paths.appViteConfigJs).default;
+  await build(viteConfig);
 
   // write package.json
   packageJSON.openblocks.entry = "index.js";

client/packages/openblocks-cli/actions/init.js

@@ -76,15 +76,15 @@ export default async function initAction(options) {
 
   appPackageJson.openblocks = templatePackageJson.openblocks || {};
   appPackageJson.scripts = {
-    start: "openblocks-cli start",
+    start: "vite",
     build: "openblocks-cli build",
   };
   fs.writeFileSync(paths.appPackageJson, JSON.stringify(appPackageJson, null, 2));
   console.log("package.json updated");
 
-  const notCopiedFiles = ["package.json", "README.md", "README-template.md"];
+  const notCopiedFiles = ["package.json", "README.md", "README-template.md", "node_modules"];
   fs.copySync(templateDir, "./", {
-    filter: (src) => notCopiedFiles.every((i) => !src.endsWith(i)),
+    filter: (src) => notCopiedFiles.every((i) => !src.startsWith(`${templateDir}/${i}`)),
   });
   fs.copyFile(`${templateDir}/README-template.md`, "./README.md");
   console.log("template files copied");