Skip to content

Commit ff450d0

Browse files
build: fix blazebuild issues
1 parent 8556f9b commit ff450d0

File tree

9 files changed

+22
-17
lines changed

9 files changed

+22
-17
lines changed

blazebuild/bun.lockb

-5.15 KB
Binary file not shown.

blazebuild/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
"type": "module",
55
"devDependencies": {
66
"@types/bun": "latest",
7+
"@types/glob": "^8.1.0",
78
"typescript": "^5.4.5"
89
},
910
"dependencies": {
10-
"chalk": "4"
11+
"chalk": "4",
12+
"glob": "^10.4.1",
13+
"reflect-metadata": "^0.2.2"
1114
}
1215
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { glob } from 'glob'
2+
3+
export const files = glob
4+
export { glob }

build_src/src/main/typescript/tasks/CompileTask.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { TaskDependencyGenerator } from "blazebuild/tasks/TaskDependencyGenerato
44
import { TaskInputGenerator } from "blazebuild/tasks/TaskInputGenerator";
55
import { TaskOutputGenerator } from "blazebuild/tasks/TaskOutputGenerator";
66
import type { Awaitable } from "blazebuild/types/utils";
7-
import { glob } from "glob";
7+
import { files } from "blazebuild/utils/glob";
88
import path from "path";
99

1010
class CompileTask extends AbstractTask {
@@ -18,12 +18,12 @@ class CompileTask extends AbstractTask {
1818

1919
@TaskInputGenerator
2020
protected override generateInput(): Awaitable<string[]> {
21-
return glob(path.resolve(process.cwd(), "src/**/*.ts"));
21+
return files(path.resolve(process.cwd(), "src/**/*.ts"));
2222
}
2323

2424
@TaskOutputGenerator
2525
protected override generateOutput(): Awaitable<string[]> {
26-
return glob(path.resolve(process.cwd(), "build/out/**/*.js"));
26+
return files(path.resolve(process.cwd(), "build/out/**/*.js"));
2727
}
2828
}
2929

build_src/src/main/typescript/tasks/CompileTypeScriptTask.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { TaskDependencyGenerator } from "blazebuild/tasks/TaskDependencyGenerato
44
import { TaskInputGenerator } from "blazebuild/tasks/TaskInputGenerator";
55
import { TaskOutputGenerator } from "blazebuild/tasks/TaskOutputGenerator";
66
import type { Awaitable } from "blazebuild/types/utils";
7+
import { files } from "blazebuild/utils/glob";
78
import { $ } from "bun";
8-
import { glob } from "glob";
99
import path from "path";
1010

1111
class CompileTypeScriptTask extends AbstractTask {
@@ -16,12 +16,12 @@ class CompileTypeScriptTask extends AbstractTask {
1616

1717
@TaskInputGenerator
1818
protected override generateInput(): Awaitable<string[]> {
19-
return glob(path.resolve(process.cwd(), "src/**/*.ts"));
19+
return files(path.resolve(process.cwd(), "src/**/*.ts"));
2020
}
2121

2222
@TaskOutputGenerator
2323
protected override generateOutput(): Awaitable<string[]> {
24-
return glob(path.resolve(process.cwd(), "build/out/**/*.js"));
24+
return files(path.resolve(process.cwd(), "build/out/**/*.js"));
2525
}
2626

2727
@TaskDependencyGenerator

build_src/src/main/typescript/tasks/DependenciesTask.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
import AbstractTask from "blazebuild/tasks/AbstractTask";
22
import { TaskAction } from "blazebuild/tasks/TaskAction";
3-
import { TaskInputGenerator } from "blazebuild/tasks/TaskInputGenerator";
3+
import { TaskOutputGenerator } from "blazebuild/tasks/TaskOutputGenerator";
44
import { $ } from "bun";
55

66
class DependenciesTask extends AbstractTask {
77
@TaskAction
88
protected override async run(): Promise<void> {
99
await $`bun install`;
10-
await $`test -e $(pwd)/node_modules/blazebuild && rm -r $(pwd)/node_modules/blazebuild || true`;
11-
await $`ln -s $(pwd)/blazebuild/src/main/typescript $(pwd)/node_modules/blazebuild`;
1210
}
1311

14-
@TaskInputGenerator
15-
protected override generateInput(): string[] {
12+
@TaskOutputGenerator
13+
protected override generateOutput(): string[] {
1614
return ["node_modules"];
1715
}
1816
}

build_src/src/main/typescript/tasks/LintTask.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { TaskAction } from "blazebuild/tasks/TaskAction";
55
import { TaskDependencyGenerator } from "blazebuild/tasks/TaskDependencyGenerator";
66
import { TaskInputGenerator } from "blazebuild/tasks/TaskInputGenerator";
77
import type { Awaitable } from "blazebuild/types/utils";
8+
import { files } from "blazebuild/utils/glob";
89
import { $ } from "bun";
9-
import { glob } from "glob";
1010
import path from "path";
1111

1212
class LintTask extends AbstractTask {
@@ -17,7 +17,7 @@ class LintTask extends AbstractTask {
1717

1818
@TaskInputGenerator
1919
protected override generateInput(): Awaitable<string[]> {
20-
return glob(path.resolve(process.cwd(), "src/**/*.ts"));
20+
return files(path.resolve(process.cwd(), "src/**/*.ts"));
2121
}
2222

2323
@TaskDependencyGenerator

build_src/src/main/typescript/tasks/TestTask.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import { TaskAction } from "blazebuild/tasks/TaskAction";
33
import { TaskDependencyGenerator } from "blazebuild/tasks/TaskDependencyGenerator";
44
import { TaskInputGenerator } from "blazebuild/tasks/TaskInputGenerator";
55
import type { Awaitable } from "blazebuild/types/utils";
6+
import { files } from "blazebuild/utils/glob";
67
import { $ } from "bun";
7-
import { glob } from "glob";
88

99
class TestTask extends AbstractTask {
1010
@TaskInputGenerator
1111
protected override generateInput(): Awaitable<string[]> {
12-
return glob(`${process.cwd()}/tests/**/*.ts`);
12+
return files(`${process.cwd()}/tests/**/*.ts`);
1313
}
1414

1515
@TaskAction

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"scripts": {
3838
"start": "node build/out/main/typescript/index.js",
3939
"start:bun": "bun --tsconfig-override=tsconfig.bun.json src/bun.ts",
40-
"prepare": "husky",
40+
"prepare": "husky && rm -f node_modules/blazebuild && ln -s $(pwd)/blazebuild/src/main/typescript $(pwd)/node_modules/blazebuild",
4141
"dev": "bun run src/main/typescript/bun.ts",
4242
"start:blazew": "node build/out/main/typescript/index.js",
4343
"lint": "eslint src",

0 commit comments

Comments
 (0)