cli: change output directory to .apibara

apibara · Aug 6, 2024 · 6413527 · 6413527
1 parent 585a503
commit 6413527
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,9 +33,9 @@ jobs:
         run: pnpm lint
       - name: Run format
         run: pnpm format
-      - name: Run typecheck
-        run: pnpm typecheck
       - name: Run build
         run: pnpm build
+      - name: Run typecheck
+        run: pnpm typecheck
       - name: Run test
         run: pnpm test:ci
diff --git a/examples/cli/package.json b/examples/cli/package.json
@@ -4,10 +4,10 @@
   "private": true,
   "scripts": {
     "apibara:build": "apibara build",
-    "apibara:start": "jiti ./dist/main.mjs",
+    "apibara:start": "jiti ./.apibara/build/main.mjs",
     "apibara:prepare": "apibara prepare",
     "apibara:dev": "apibara dev",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "pnpm apibara:prepare && tsc --noEmit",
     "lint": "biome check .",
     "lint:fix": "pnpm lint --write",
     "format": "biome format . --write"

diff --git a/packages/cli/src/cli/commands/dev.ts b/packages/cli/src/cli/commands/dev.ts
@@ -87,7 +87,7 @@ export default defineCommand({
         }
 
         const childArgs = [
-          resolve(apibara.options.outputDir || "./dist", "main.mjs"),
+          resolve(apibara.options.outputDir || "./.apibara/build", "main.mjs"),
           ...(args.indexers ? ["--indexers", args.indexers] : []),
           ...(args.preset ? ["--preset", args.preset] : []),
           ...(args.sink ? ["--sink", args.sink] : []),

diff --git a/packages/cli/src/cli/commands/prepare.ts b/packages/cli/src/cli/commands/prepare.ts
@@ -14,7 +14,7 @@ export default defineCommand({
     ...commonArgs,
   },
   async run({ args }) {
-    consola.start("Prepairing Types");
+    consola.start("Preparing Types");
     const rootDir = resolve((args.dir || ".") as string);
     const apibara = await createApibara({ rootDir });
     await writeTypes(apibara);

diff --git a/packages/cli/src/core/config/defaults.ts b/packages/cli/src/core/config/defaults.ts
@@ -3,7 +3,7 @@ import type { ApibaraConfig } from "apibara/types";
 
 export const ApibaraDefaults: ApibaraConfig = {
   rootDir: ".",
-  outputDir: "./dist",
+  outputDir: "./.apibara/build",
 
   runtimeConfig: {},
   hooks: {},

diff --git a/packages/cli/src/rollup/config.ts b/packages/cli/src/rollup/config.ts
@@ -139,7 +139,7 @@ runMain(command);
       main: "virtual:main.ts",
     },
     output: {
-      dir: join(apibara.options.outputDir || "dist"),
+      dir: join(apibara.options.outputDir || "./.apibara/build"),
       format: "esm",
       exports: "auto",
       entryFileNames: "[name].mjs",
@@ -177,6 +177,12 @@ runMain(command);
       json(),
       typescript({
         tsconfig: join("./tsconfig.json"),
+        compilerOptions: {
+          outDir: join(apibara.options.outputDir || "./.apibara/build"),
+          declarationDir: join(apibara.options.outputDir || "./.apibara/build"),
+          noEmit: false,
+          types: ["node"],
+        },
       }),
     ],
     onwarn(warning, rollupWarn) {

diff --git a/turbo.json b/turbo.json
@@ -12,6 +12,7 @@
       "dependsOn": ["build"]
     },
     "typecheck": {
+      "dependsOn": ["^build"],
       "cache": false
     },
     "lint": {