Skip to content

Commit d24980e

Browse files
QIQI03QIQI03
committed
feat: custom keyboard shortcuts
1 parent 6a1701f commit d24980e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+654
-593
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,22 @@ async function createProject(projectName, options) {
120120
const initialPackageJson = {
121121
name: projectName,
122122
version: "0.0.1",
123+
type: "module",
124+
license: "MIT",
123125
};
124126
writePackageJson(packageJsonFile, initialPackageJson);
125127
console.log("initial package.json generated");
126128

127-
await install([cliPackageName, sdkPackageName]);
129+
await install([
130+
cliPackageName,
131+
sdkPackageName,
132+
"openblocks-design",
133+
"openblocks-core",
134+
"react@17",
135+
"react-dom@17",
136+
"@types/react@17",
137+
"@types/react-dom@17",
138+
]);
128139

129140
await executeNodeScript(
130141
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "create-openblocks-comps",
3-
"version": "0.0.3",
3+
"version": "0.0.7",
44
"bin": "./index.js",
55
"type": "module",
66
"dependencies": {
77
"chalk": "4",
88
"commander": "^9.4.1",
99
"fs-extra": "^10.1.0",
10-
"openblocks-dev-utils": "0.0.1"
10+
"openblocks-dev-utils": "workspace:^"
1111
}
1212
}

‎client/packages/openblocks-cli/ide/index.html renamed to ‎client/packages/openblocks-cli-template-typescript/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<div id="root">
2222
<div id="root-loader">Loading...</div>
2323
</div>
24-
<script src="index.jsx" type="module"></script>
24+
<script src="index.tsx" type="module"></script>
2525
</body>
2626
</html>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import ReactDOM from "react-dom";
2+
import { CompIDE } from "openblocks-sdk";
3+
import { name, version, openblocks } from "./package.json";
4+
import compMap from "./src/index";
5+
6+
import "openblocks-sdk/dist/style.css";
7+
8+
function CompDevApp() {
9+
return (
10+
<CompIDE
11+
compMap={compMap}
12+
packageName={name}
13+
packageVersion={version}
14+
compMeta={openblocks.comps}
15+
/>
16+
);
17+
}
18+
19+
ReactDOM.render(<CompDevApp />, document.querySelector("#root"));

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"name": "openblocks-cli-template-typescript",
3-
"version": "0.0.2",
3+
"version": "0.0.9",
4+
"type": "module",
45
"scripts": {
5-
"start": "openblocks-cli start",
6+
"start": "vite",
67
"build": "openblocks-cli build"
78
},
89
"openblocks": {
@@ -14,11 +15,11 @@
1415
}
1516
}
1617
},
17-
"dependencies": {
18+
"devDependencies": {
1819
"openblocks-cli": "workspace:^",
19-
"openblocks-sdk": "workspace:^"
20+
"openblocks-sdk": "workspace:^",
21+
"typescript": "^4.8.4",
22+
"vite": "^3.2.4"
2023
},
21-
"devDependencies": {
22-
"typescript": "^4.8.4"
23-
}
24+
"license": "MIT"
2425
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Button } from "antd";
21
import {
2+
antd,
33
UICompBuilder,
44
numberExposingStateControl,
55
Section,
@@ -11,6 +11,8 @@ import {
1111
withMethodExposing,
1212
} from "openblocks-sdk";
1313

14+
const { Button } = antd;
15+
1416
const childrenMap = {
1517
value: numberExposingStateControl("value", 10),
1618
step: withDefault(NumberControl, 1),

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,17 @@
1818
"jsx": "react-jsx",
1919
"baseUrl": "src",
2020
"paths": {
21+
"openblocks-sdk": [
22+
"../../openblocks/src/index.sdk.ts",
23+
"../node_modules/openblocks-sdk/src/openblocks/index.sdk.ts"
24+
],
2125
"*": [
2226
"*",
2327
"../../openblocks/src/*",
2428
"../../openblocks-sdk/src/*",
25-
"../node_modules/openblocks-sdk/src/*"
29+
"../node_modules/openblocks-sdk/src/openblocks/*"
2630
]
2731
}
2832
},
29-
"include": ["src"]
33+
"include": ["src", "index.tsx"]
3034
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import config from "openblocks-cli/config/vite.config";
2+
export default {
3+
...config,
4+
server: {
5+
open: true,
6+
port: 9000,
7+
},
8+
};

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import { build } from "vite";
44
import { writeFileSync, existsSync, readFileSync } from "fs";
55
import { resolve } from "path";
66
import paths from "../config/paths.js";
7-
import viteConfig from "../config/vite.config.js";
8-
import { logBug } from "../util/log.js";
7+
import "../util/log.js";
98

109
const { copySync } = fsExtra;
1110
const packageJSON = JSON.parse(readFileSync(paths.appPackageJson).toString());
@@ -74,8 +73,8 @@ export default async function buildAction(options) {
7473
console.log("");
7574
console.cyan("Building...");
7675

77-
const output = await build(viteConfig);
78-
console.log(output);
76+
const viteConfig = await import(paths.appViteConfigJs).default;
77+
await build(viteConfig);
7978

8079
// write package.json
8180
packageJSON.openblocks.entry = "index.js";

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ export default async function initAction(options) {
7676

7777
appPackageJson.openblocks = templatePackageJson.openblocks || {};
7878
appPackageJson.scripts = {
79-
start: "openblocks-cli start",
79+
start: "vite",
8080
build: "openblocks-cli build",
8181
};
8282
fs.writeFileSync(paths.appPackageJson, JSON.stringify(appPackageJson, null, 2));
8383
console.log("package.json updated");
8484

85-
const notCopiedFiles = ["package.json", "README.md", "README-template.md"];
85+
const notCopiedFiles = ["package.json", "README.md", "README-template.md", "node_modules"];
8686
fs.copySync(templateDir, "./", {
87-
filter: (src) => notCopiedFiles.every((i) => !src.endsWith(i)),
87+
filter: (src) => notCopiedFiles.every((i) => !src.startsWith(`${templateDir}/${i}`)),
8888
});
8989
fs.copyFile(`${templateDir}/README-template.md`, "./README.md");
9090
console.log("template files copied");

0 commit comments

Comments
 (0)