Skip to content

Commit c23ad36

Browse files
johnlindquistjohnlindquist
committed
feat(widgets): widgets and term
1 parent 5175ce0 commit c23ad36

29 files changed

+3492
-414
lines changed

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Install Node
3535
run: |
3636
mkdir -p ./.kit/node
37-
./build/install-node.sh v17.2.0 --prefix ./.kit/node
37+
./build/install-node.sh v17.6.0 --prefix ./.kit/node
3838
3939
- name: Build Kit
4040
run: |

‎build/build-ci.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ cp -r src/types $KIT
1414

1515
cp *.md package*.json LICENSE $KIT
1616

17-
./build/install-node.sh v17.2.0 --prefix $KIT/node
17+
./build/install-node.sh v17.6.0 --prefix $KIT/node
1818

1919
node --version
2020
npm --version

‎build/build-editor-types.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
let defs = await readdir(path.resolve("src", "types"));
2+
let content = ``;
3+
for (let def of defs) {
4+
content += await readFile(path.resolve("types", def), "utf8");
5+
}
6+
let globalTypesDir = path.resolve("node_modules", "@johnlindquist", "globals", "types");
7+
let globalTypeDirs = (await readdir(globalTypesDir)).filter(dir => !dir.endsWith(".ts"));
8+
let nodeTypesDir = path.resolve("node_modules", "@types", "node");
9+
let nodeTypeFiles = (await readdir(nodeTypesDir)).filter(f => f.endsWith(".d.ts"));
10+
content += await readFile(path.resolve(globalTypesDir, "index.d.ts"), "utf8");
11+
// content = `declare module '@johnlindquist/kit' {
12+
// ${content}
13+
// }`
14+
for (let typeDir of globalTypeDirs) {
15+
content += await readFile(path.resolve(globalTypesDir, typeDir, "index.d.ts"), "utf8");
16+
}
17+
for (let file of nodeTypeFiles) {
18+
content += await readFile(path.resolve(nodeTypesDir, file), "utf8");
19+
}
20+
content = content.replace(/import {(.|\n)*?} from ".*?"/gim, "");
21+
content = content.replace(/export {(.|\n)*?}/gim, "");
22+
await writeFile("./src/types/kit-editor.d.ts", content, "utf8");
23+
export {};

‎build/build-editor-types.mjs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// build/build-editor-types.ts
2+
var nodeContent = ``;
3+
var kitContent = ``;
4+
var defs = (await readdir(path.resolve("src", "types"))).filter((f) => !f.includes("kit-editor"));
5+
console.log(defs);
6+
for (let def of defs) {
7+
kitContent += await readFile(path.resolve("src", "types", def), "utf8");
8+
}
9+
var globalTypesDir = path.resolve("node_modules", "@johnlindquist", "globals", "types");
10+
var globalTypeDirs = (await readdir(globalTypesDir)).filter((dir) => !dir.endsWith(".ts"));
11+
console.log(globalTypeDirs);
12+
kitContent += await readFile(path.resolve(globalTypesDir, "index.d.ts"), "utf8");
13+
for (let typeDir of globalTypeDirs) {
14+
kitContent += await readFile(path.resolve(globalTypesDir, typeDir, "index.d.ts"), "utf8");
15+
}
16+
kitContent = kitContent.replace(/import {(.|\n)*?} from ".*?"/gim, "");
17+
kitContent = kitContent.replace(/export {(.|\n)*?}/gim, "");
18+
await writeFile("./src/types/kit-editor.d.ts", nodeContent + kitContent, "utf8");

‎build/build-editor-types.ts‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
let nodeContent = ``
2+
3+
// nodeContent += await readFile(
4+
// kitPath("node_modules/@types/node/process.d.ts"),
5+
// "utf8"
6+
// )
7+
8+
// nodeContent += await readFile(
9+
// kitPath("node_modules/@types/node/child_process.d.ts"),
10+
// "utf8"
11+
// )
12+
13+
// let nodeTypesDir = path.resolve(
14+
// "node_modules",
15+
// "@types",
16+
// "node"
17+
// )
18+
// let nodeTypeFiles = (await readdir(nodeTypesDir)).filter(
19+
// f => f.endsWith(".d.ts")
20+
// )
21+
22+
// for (let file of nodeTypeFiles) {
23+
// nodeContent += await readFile(
24+
// path.resolve(nodeTypesDir, file),
25+
// "utf8"
26+
// )
27+
// }
28+
29+
// nodeContent = nodeContent.replace(
30+
// /declare module '(\w+)'/g,
31+
// "declare module $1"
32+
// )
33+
34+
let kitContent = ``
35+
36+
// exclude itself 😇
37+
38+
let defs = (
39+
await readdir(path.resolve("src", "types"))
40+
).filter(f => !f.includes("kit-editor"))
41+
42+
console.log(defs)
43+
44+
for (let def of defs) {
45+
kitContent += await readFile(
46+
path.resolve("src", "types", def),
47+
"utf8"
48+
)
49+
}
50+
51+
let globalTypesDir = path.resolve(
52+
"node_modules",
53+
"@johnlindquist",
54+
"globals",
55+
"types"
56+
)
57+
58+
let globalTypeDirs = (await readdir(globalTypesDir)).filter(
59+
dir => !dir.endsWith(".ts")
60+
)
61+
62+
console.log(globalTypeDirs)
63+
64+
// GlobalsAPI
65+
kitContent += await readFile(
66+
path.resolve(globalTypesDir, "index.d.ts"),
67+
"utf8"
68+
)
69+
70+
// content = `declare module '@johnlindquist/kit' {
71+
72+
// ${content}
73+
74+
// }`
75+
76+
kitContent = kitContent.replace(
77+
/import {(.|\n)*?} from ".*?"/gim,
78+
""
79+
)
80+
81+
kitContent = kitContent.replace(/export {(.|\n)*?}/gim, "")
82+
83+
await writeFile(
84+
"./src/types/kit-editor.d.ts",
85+
nodeContent + kitContent,
86+
"utf8"
87+
)
88+
89+
export {}

‎build/build-kit.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ let installNodeWin = async () => {
2323

2424
await new Promise(r => {
2525
download(
26-
`https://nodejs.org/dist/v17.2.0/node-v17.2.0-win-x86.zip`
26+
`https://nodejs.org/dist/v17.6.0/node-v17.6.0-win-x86.zip`
2727
)
2828
.pipe(Extract({ path: kitPath("node") }))
2929
.on("finish", r)
@@ -41,7 +41,7 @@ let installNodeWin = async () => {
4141
let installNode =
4242
platform() === "darwin"
4343
? exec(
44-
`./build/install-node.sh v17.2.0 --prefix '${kitPath(
44+
`./build/install-node.sh v17.6.0 --prefix '${kitPath(
4545
"node"
4646
)}'`
4747
)
@@ -71,13 +71,17 @@ let cjs = exec(
7171
)
7272

7373
await Promise.all([installNode, esm, dec, cjs])
74+
console.log(`Fix cjs`)
7475
await exec(`node ./scripts/cjs-fix.js`)
7576

7677
cd(kitPath())
7778

79+
console.log(`Install deps`)
7880
await exec(`npm i --production`)
7981

82+
console.log(`Downloading data`)
8083
await exec(`node ./run/terminal.js ./help/download-docs.js`)
8184
await exec(`node ./run/terminal.js ./hot/download-hot.js`)
8285

86+
console.log(`Write .kitignore`)
8387
await writeFile(kitPath(".kitignore"), "*")

‎build/build-kit.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ cp -a root/. $KIT
1313
cp -r build $KIT
1414
cp -r src/types $KIT
1515

16-
./build/install-node.sh v17.0.1 --prefix $KIT/node
16+
./build/install-node.sh v17.6.0 --prefix $KIT/node
1717
cp *.md package*.json LICENSE $KIT
1818

1919
echo "Building ESM kit to $KIT"

‎build/install-node.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ resolve_node_version() {
9090
tag=
9191
fi
9292
# fetch "https://resolve-node.vercel.app/$tag"
93-
echo "v17.0.1"
93+
echo "v17.6.0"
9494
}
9595

9696
# Currently known to support:

‎dtsgen.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"input": {
3+
"files": ["./src/types/index.d.ts"],
4+
"urls": [],
5+
"stdin": true
6+
},
7+
"target": "esnext",
8+
"outputAST": false,
9+
"plugins": {}
10+
}

0 commit comments

Comments
 (0)