Skip to content

Commit 2c37ad2

Browse files
cmwhitedcmwhited
committed
fix(typesync | publish): more build improvements
1 parent 6d592db commit 2c37ad2

File tree

6 files changed

+85
-83
lines changed

6 files changed

+85
-83
lines changed

‎apps/typesync/client/src/routeTree.gen.ts‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -8,88 +8,88 @@
88
// You should NOT make any changes in this file as it will be overwritten.
99
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
1010

11-
import { Route as rootRouteImport } from './routes/__root'
12-
import { Route as IndexRouteImport } from './routes/index'
13-
import { Route as AppsCreateRouteImport } from './routes/apps/create'
14-
import { Route as AppsAppIdDetailsRouteImport } from './routes/apps/$appId/details'
11+
import { Route as rootRouteImport } from './routes/__root';
12+
import { Route as IndexRouteImport } from './routes/index';
13+
import { Route as AppsCreateRouteImport } from './routes/apps/create';
14+
import { Route as AppsAppIdDetailsRouteImport } from './routes/apps/$appId/details';
1515

1616
const IndexRoute = IndexRouteImport.update({
1717
id: '/',
1818
path: '/',
1919
getParentRoute: () => rootRouteImport,
20-
} as any)
20+
} as any);
2121
const AppsCreateRoute = AppsCreateRouteImport.update({
2222
id: '/apps/create',
2323
path: '/apps/create',
2424
getParentRoute: () => rootRouteImport,
25-
} as any)
25+
} as any);
2626
const AppsAppIdDetailsRoute = AppsAppIdDetailsRouteImport.update({
2727
id: '/apps/$appId/details',
2828
path: '/apps/$appId/details',
2929
getParentRoute: () => rootRouteImport,
30-
} as any)
30+
} as any);
3131

3232
export interface FileRoutesByFullPath {
33-
'/': typeof IndexRoute
34-
'/apps/create': typeof AppsCreateRoute
35-
'/apps/$appId/details': typeof AppsAppIdDetailsRoute
33+
'/': typeof IndexRoute;
34+
'/apps/create': typeof AppsCreateRoute;
35+
'/apps/$appId/details': typeof AppsAppIdDetailsRoute;
3636
}
3737
export interface FileRoutesByTo {
38-
'/': typeof IndexRoute
39-
'/apps/create': typeof AppsCreateRoute
40-
'/apps/$appId/details': typeof AppsAppIdDetailsRoute
38+
'/': typeof IndexRoute;
39+
'/apps/create': typeof AppsCreateRoute;
40+
'/apps/$appId/details': typeof AppsAppIdDetailsRoute;
4141
}
4242
export interface FileRoutesById {
43-
__root__: typeof rootRouteImport
44-
'/': typeof IndexRoute
45-
'/apps/create': typeof AppsCreateRoute
46-
'/apps/$appId/details': typeof AppsAppIdDetailsRoute
43+
__root__: typeof rootRouteImport;
44+
'/': typeof IndexRoute;
45+
'/apps/create': typeof AppsCreateRoute;
46+
'/apps/$appId/details': typeof AppsAppIdDetailsRoute;
4747
}
4848
export interface FileRouteTypes {
49-
fileRoutesByFullPath: FileRoutesByFullPath
50-
fullPaths: '/' | '/apps/create' | '/apps/$appId/details'
51-
fileRoutesByTo: FileRoutesByTo
52-
to: '/' | '/apps/create' | '/apps/$appId/details'
53-
id: '__root__' | '/' | '/apps/create' | '/apps/$appId/details'
54-
fileRoutesById: FileRoutesById
49+
fileRoutesByFullPath: FileRoutesByFullPath;
50+
fullPaths: '/' | '/apps/create' | '/apps/$appId/details';
51+
fileRoutesByTo: FileRoutesByTo;
52+
to: '/' | '/apps/create' | '/apps/$appId/details';
53+
id: '__root__' | '/' | '/apps/create' | '/apps/$appId/details';
54+
fileRoutesById: FileRoutesById;
5555
}
5656
export interface RootRouteChildren {
57-
IndexRoute: typeof IndexRoute
58-
AppsCreateRoute: typeof AppsCreateRoute
59-
AppsAppIdDetailsRoute: typeof AppsAppIdDetailsRoute
57+
IndexRoute: typeof IndexRoute;
58+
AppsCreateRoute: typeof AppsCreateRoute;
59+
AppsAppIdDetailsRoute: typeof AppsAppIdDetailsRoute;
6060
}
6161

6262
declare module '@tanstack/react-router' {
6363
interface FileRoutesByPath {
6464
'/': {
65-
id: '/'
66-
path: '/'
67-
fullPath: '/'
68-
preLoaderRoute: typeof IndexRouteImport
69-
parentRoute: typeof rootRouteImport
70-
}
65+
id: '/';
66+
path: '/';
67+
fullPath: '/';
68+
preLoaderRoute: typeof IndexRouteImport;
69+
parentRoute: typeof rootRouteImport;
70+
};
7171
'/apps/create': {
72-
id: '/apps/create'
73-
path: '/apps/create'
74-
fullPath: '/apps/create'
75-
preLoaderRoute: typeof AppsCreateRouteImport
76-
parentRoute: typeof rootRouteImport
77-
}
72+
id: '/apps/create';
73+
path: '/apps/create';
74+
fullPath: '/apps/create';
75+
preLoaderRoute: typeof AppsCreateRouteImport;
76+
parentRoute: typeof rootRouteImport;
77+
};
7878
'/apps/$appId/details': {
79-
id: '/apps/$appId/details'
80-
path: '/apps/$appId/details'
81-
fullPath: '/apps/$appId/details'
82-
preLoaderRoute: typeof AppsAppIdDetailsRouteImport
83-
parentRoute: typeof rootRouteImport
84-
}
79+
id: '/apps/$appId/details';
80+
path: '/apps/$appId/details';
81+
fullPath: '/apps/$appId/details';
82+
preLoaderRoute: typeof AppsAppIdDetailsRouteImport;
83+
parentRoute: typeof rootRouteImport;
84+
};
8585
}
8686
}
8787

8888
const rootRouteChildren: RootRouteChildren = {
8989
IndexRoute: IndexRoute,
9090
AppsCreateRoute: AppsCreateRoute,
9191
AppsAppIdDetailsRoute: AppsAppIdDetailsRoute,
92-
}
92+
};
9393
export const routeTree = rootRouteImport
9494
._addFileChildren(rootRouteChildren)
95-
._addFileTypes<FileRouteTypes>()
95+
._addFileTypes<FileRouteTypes>();

‎apps/typesync/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@graphprotocol/hypergraph-cli",
3-
"version": "0.0.0-alpha.7",
3+
"version": "0.0.0-alpha.8",
44
"type": "module",
55
"license": "MIT",
66
"description": "CLI toolchain to view existing types, select, pick, extend to create schemas and generate a @graphprotocol/hypergraph schema.",
@@ -15,19 +15,19 @@
1515
"linkDirectory": false
1616
},
1717
"bin": {
18-
"hypergraph": "./dist/bin.cjs",
19-
"hg": "./dist/bin.cjs"
18+
"hypergraph": "./dist/bin.js",
19+
"hg": "./dist/bin.js"
2020
},
2121
"files": ["README.md", "dist"],
2222
"scripts": {
2323
"codegen:gql": "graphql-codegen --config ./graphql.codegen.ts",
2424
"build:client": "vite build",
25-
"build": "rm -rf ./client/dist && pnpm run build:client && tsup && pnpm run copy-all",
25+
"build": "pnpm run clean && pnpm run build:client && tsup && pnpm run copy-all",
2626
"build:ts": "tsup",
2727
"dev": "vite build && pnpx tsx ./src/bin.ts typesync",
2828
"dev:cli": "pnpx tsx ./src/bin.ts typesync",
2929
"dev:client": "vite --force",
30-
"clean": "rimraf dist/*",
30+
"clean": "rm -rf dist client/dist",
3131
"start": "node ./dist/bin.js",
3232
"check": "tsc --noEmit",
3333
"test": "vitest run",
@@ -39,14 +39,14 @@
3939
"hypergraph": "pnpx tsx ./src/bin.ts typesync"
4040
},
4141
"devDependencies": {
42-
"@effect/cli": "latest",
42+
"@effect/cli": "^0.66.1",
4343
"@effect/experimental": "^0.51.1",
44-
"@effect/language-service": "latest",
45-
"@effect/platform": "latest",
46-
"@effect/platform-node": "latest",
47-
"@effect/sql": "latest",
48-
"@effect/sql-sqlite-node": "latest",
49-
"@effect/vitest": "latest",
44+
"@effect/language-service": "^0.23.3",
45+
"@effect/platform": "^0.87.1",
46+
"@effect/platform-node": "^0.88.3",
47+
"@effect/sql": "^0.40.1",
48+
"@effect/sql-sqlite-node": "^0.41.1",
49+
"@effect/vitest": "^0.23.10",
5050
"@graphprotocol/grc-20": "^0.21.3",
5151
"@graphql-codegen/cli": "^5.0.7",
5252
"@graphql-codegen/client-preset": "^4.8.3",

‎apps/typesync/scripts/copy-client-dist.ts‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
import { cp, mkdir } from 'node:fs/promises';
2-
import { resolve } from 'node:path';
1+
import { FileSystem, Path } from '@effect/platform';
2+
import { NodeContext } from '@effect/platform-node';
3+
import { Effect } from 'effect';
34

4-
(async () => {
5-
try {
6-
const src = resolve(process.cwd(), 'client', 'dist');
7-
const dest = resolve(process.cwd(), 'dist', 'client', 'dist');
5+
const program = Effect.gen(function* () {
6+
const fs = yield* FileSystem.FileSystem;
7+
const path = yield* Path.Path;
88

9-
await mkdir(dest, { recursive: true });
10-
// Node >=16.7 has cp with recursive
11-
await cp(src, dest, { recursive: true });
9+
const src = path.resolve('./', 'client', 'dist');
10+
const dest = path.resolve('./', 'dist', 'client', 'dist');
1211

13-
console.info('[Build] Copied client/dist to dist/client/dist');
14-
} catch (err) {
15-
console.error('[Build] Failed to copy client/dist', err);
16-
process.exitCode = 1;
17-
}
18-
})();
12+
yield* fs
13+
.makeDirectory(dest, { recursive: true })
14+
.pipe(Effect.andThen(() => fs.copy(src, dest, { overwrite: true })));
15+
16+
return yield* Effect.logInfo('[Build] Copied client/dist to dist/client/dist');
17+
}).pipe(Effect.provide(NodeContext.layer));
18+
19+
Effect.runPromise(program).catch(console.error);

‎apps/typesync/src/Generator.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,8 @@ function generatePackageJson(app: Domain.InsertAppSchema) {
264264
'@automerge/automerge': '^2.2.9',
265265
'@automerge/automerge-repo': '=2.0.0-beta.5',
266266
'@automerge/automerge-repo-react-hooks': '=2.0.0-beta.5',
267-
'@graphprotocol/hypergraph': 'https://pkg.pr.new/graphprotocol/hypergraph/@graphprotocol/hypergraph@82b867a',
268-
'@graphprotocol/hypergraph-react':
269-
'https://pkg.pr.new/graphprotocol/hypergraph/@graphprotocol/hypergraph-react@82b867a',
267+
'@graphprotocol/hypergraph': '@graphprotocol/hypergraph',
268+
'@graphprotocol/hypergraph-react': '@graphprotocol/hypergraph-react',
270269
'@privy-io/react-auth': '^2.13.7',
271270
'@tailwindcss/vite': '^4.1.8',
272271
'@tanstack/react-query': '^5.79.2',

‎apps/typesync/vite.config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ export default defineConfig({
2121
autoCodeSplitting: true,
2222
routesDirectory: 'client/src/routes',
2323
generatedRouteTree: 'client/src/routeTree.gen.ts',
24+
tmpDir: 'client/.tanstack',
25+
semicolons: true,
2426
}),
2527
react(),
2628
tailwindcss(),

‎pnpm-lock.yaml‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)