Skip to content

Improves the build setup #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 26, 2024
Merged

Improves the build setup #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c26bfc2
wip
nikgraf Nov 26, 2024
6d2d028
improve test setup
nikgraf Nov 26, 2024
4d36e80
fix build scripts
nikgraf Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/events/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "module",
"scripts": {
"dev": "vite --force",
"build": "tsc -b && vite build",
"build": "echo 'TODO'",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we not do the tsc -b && vite build?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

currently it's broken. Mentioned it also here: #56

"lint": "pnpm biome lint src/*",
"lint:fix": "pnpm biome lint --write src/*",
"format": "pnpm biome format src/*",
Expand Down
10 changes: 9 additions & 1 deletion apps/events/tsconfig.app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"target": "ES2020",
"useDefineForClassFields": true,
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"skipLibCheck": true,

"composite": false,
"incremental": false,
"declaration": false,
"declarationMap": false,

/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
Expand All @@ -24,7 +30,9 @@
/* Shadcn */
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"]
"@/*": ["./src/*"],
"graph-framework": ["../../packages/graph-framework/src/index.js"],
"graph-framework/*": ["../../packages/graph-framework/src/*.js"]
}
},
"include": ["src"]
Expand Down
4 changes: 3 additions & 1 deletion apps/events/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
/* Shadcn */
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"]
"@/*": ["./src/*"],
"graph-framework": ["../../packages/graph-framework/src/index.js"],
"graph-framework/*": ["../../packages/graph-framework/src/*.js"]
}
}
}
6 changes: 6 additions & 0 deletions apps/events/tsconfig.node.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"target": "ES2022",
"lib": ["ES2023"],
"module": "ESNext",
"skipLibCheck": true,

"composite": false,
"incremental": false,
"declaration": false,
"declarationMap": false,

/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
Expand Down
9 changes: 8 additions & 1 deletion apps/events/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from 'node:path';
import { TanStackRouterVite } from '@tanstack/router-plugin/vite';
import react from '@vitejs/plugin-react';
import path from 'node:path';
import { defineConfig } from 'vite';
import { nodePolyfills } from 'vite-plugin-node-polyfills';
import topLevelAwait from 'vite-plugin-top-level-await';
Expand All @@ -23,6 +23,13 @@ export default defineConfig({
resolve: {
alias: {
'@': path.resolve(__dirname, './src'),
'graph-framework': path.resolve(__dirname, '../../packages/graph-framework/src'),
'graph-framework-space-events': path.resolve(__dirname, '../../packages/graph-framework-space-events/src'),
'graph-framework-utils': path.resolve(__dirname, '../../packages/graph-framework-utils/src'),
'graph-framework-schema': path.resolve(__dirname, '../../packages/graph-framework-schema/src'),
'graph-framework-identity': path.resolve(__dirname, '../../packages/graph-framework-identity/src'),
'graph-framework-key': path.resolve(__dirname, '../../packages/graph-framework-key/src'),
'graph-framework-messages': path.resolve(__dirname, '../../packages/graph-framework-messages/src'),
},
},
});
2 changes: 1 addition & 1 deletion apps/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.0.0",
"type": "module",
"scripts": {
"dev": "TS_NODE_TRANSPILE_ONLY=true nodemon --exec node --loader ts-node/esm ./src/index.ts",
"dev": "bun run ./src/index.ts",
"build:ts": "rm -rf dist && pnpm tsc --project tsconfig.json",
"build:deploy": "rm -rf build && pnpm deploy --filter=server --prod build",
"build": "pnpm run build:ts && pnpm build:deploy",
Expand Down
27 changes: 8 additions & 19 deletions apps/server/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
{
"extends": "../../tsconfig.base.json",
"include": ["./src"],
"compilerOptions": {
"skipLibCheck": true,
"module": "ESNext",
"moduleResolution": "Bundler",
"target": "ESNext",
"isolatedModules": true,
"esModuleInterop": true,
"noEmit": false,
"outDir": "dist",
"lib": ["esnext"],
"types": ["node"],
"baseUrl": "./",
"strict": true,
"exactOptionalPropertyTypes": true
},
"ts-node": {
"esm": true
},
"exclude": ["node_modules"],
"include": ["./src"]
"composite": false,
"noEmit": true,
"incremental": false,
"declaration": false,
"declarationMap": false
}
}
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"vite-plugin-dts": "^4.3.0"
},
"scripts": {
"build": "pnpm --filter graph-framework-utils build",
"build": "pnpm -r build",
"ts:check": "pnpm -r ts:check",
"test": "pnpm -r test",
"test": "vitest",
"lint": "pnpm -r lint",
"format": "pnpm -r format",
"check": "pnpm -r check"
Expand Down
2 changes: 1 addition & 1 deletion packages/graph-framework-identity/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"exports": {
".": {
"default": "./src/index.js"
"default": "./dist/index.js"
}
},
"peerDependencies": {
Expand Down
12 changes: 7 additions & 5 deletions packages/graph-framework-identity/tsconfig.build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"extends": "../../tsconfig.options.json",
"extends": "./tsconfig.src.json",
"references": [{ "path": "../graph-framework-utils/tsconfig.build.json" }],
"compilerOptions": {
"outDir": "./dist",
"rootDir": "./src"
"tsBuildInfoFile": ".tsbuildinfo/build.tsbuildinfo",
"outDir": "build/esm",
"declarationDir": "build/dts",
"stripInternal": true
},
"include": ["./src"],
"exclude": ["node_modules", "src/**/*.test.ts", "src/**/*.spec.ts", "dist"]
"exclude": ["node_modules", "src/**/*.test.ts", "src/**/*.spec.ts"]
}
11 changes: 3 additions & 8 deletions packages/graph-framework-identity/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
{
"extends": "../../tsconfig.options.json",
"compilerOptions": {
"baseUrl": ".",
"rootDir": ".",
"noEmit": true
},
"include": ["**/*", "vite.config.mts"],
"exclude": ["**/node_modules", "**/dist"]
"extends": "../../tsconfig.base.json",
"include": [],
"references": [{ "path": "tsconfig.src.json" }]
}
10 changes: 10 additions & 0 deletions packages/graph-framework-identity/tsconfig.src.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": "../../tsconfig.base.json",
"include": ["src"],
"references": [{ "path": "../graph-framework-utils" }],
"compilerOptions": {
"tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo",
"rootDir": "src",
"outDir": "build/src"
}
}
4 changes: 0 additions & 4 deletions packages/graph-framework-identity/vite.config.js
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions packages/graph-framework-identity/vitest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { type UserConfigExport, mergeConfig } from 'vitest/config';
import shared from '../../vitest.shared.js';

const config: UserConfigExport = {};

export default mergeConfig(shared, config);
4 changes: 2 additions & 2 deletions packages/graph-framework-key/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"type": "module",
"exports": {
".": {
"default": "./src/index.js"
"default": "./dist/index.js"
}
},
"scripts": {
"build": "vite build",
"build": "tsc",
"test": "vitest run --typecheck",
"ts:check": "tsc --noEmit",
"lint": "pnpm biome lint src/*",
Expand Down
11 changes: 6 additions & 5 deletions packages/graph-framework-key/tsconfig.build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"extends": "../../tsconfig.options.json",
"extends": "./tsconfig.src.json",
"compilerOptions": {
"outDir": "./dist",
"rootDir": "./src"
"tsBuildInfoFile": ".tsbuildinfo/build.tsbuildinfo",
"outDir": "build/esm",
"declarationDir": "build/dts",
"stripInternal": true
},
"include": ["./src"],
"exclude": ["node_modules", "src/**/*.test.ts", "src/**/*.spec.ts", "dist"]
"exclude": ["node_modules", "src/**/*.test.ts", "src/**/*.spec.ts"]
}
10 changes: 3 additions & 7 deletions packages/graph-framework-key/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{
"extends": "../../tsconfig.options.json",
"compilerOptions": {
"baseUrl": ".",
"noEmit": true
},
"include": ["**/*", "vite.config.mts", "../../shared/*.ts"],
"exclude": ["**/node_modules", "**/dist"]
"extends": "../../tsconfig.base.json",
"include": [],
"references": [{ "path": "tsconfig.src.json" }]
}
9 changes: 9 additions & 0 deletions packages/graph-framework-key/tsconfig.src.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "../../tsconfig.base.json",
"include": ["src"],
"compilerOptions": {
"tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo",
"rootDir": "src",
"outDir": "build/src"
}
}
24 changes: 0 additions & 24 deletions packages/graph-framework-key/vite.config.mts
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions packages/graph-framework-key/vitest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { type UserConfigExport, mergeConfig } from 'vitest/config';
import shared from '../../vitest.shared.js';

const config: UserConfigExport = {};

export default mergeConfig(shared, config);
4 changes: 2 additions & 2 deletions packages/graph-framework-messages/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"type": "module",
"exports": {
".": {
"default": "./src/index.js"
"default": "./dist/index.js"
}
},
"scripts": {
"build": "vite build",
"build": "tsc",
"test": "vitest run --typecheck",
"ts:check": "tsc --noEmit",
"lint": "pnpm biome lint src/*",
Expand Down
12 changes: 7 additions & 5 deletions packages/graph-framework-messages/tsconfig.build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"extends": "../../tsconfig.options.json",
"extends": "./tsconfig.src.json",
"references": [{ "path": "../graph-framework-space-events/tsconfig.build.json" }],
"compilerOptions": {
"outDir": "./dist",
"rootDir": "./src"
"tsBuildInfoFile": ".tsbuildinfo/build.tsbuildinfo",
"outDir": "build/esm",
"declarationDir": "build/dts",
"stripInternal": true
},
"include": ["./src"],
"exclude": ["node_modules", "src/**/*.test.ts", "src/**/*.spec.ts", "dist"]
"exclude": ["node_modules", "src/**/*.test.ts", "src/**/*.spec.ts"]
}
10 changes: 3 additions & 7 deletions packages/graph-framework-messages/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{
"extends": "../../tsconfig.options.json",
"compilerOptions": {
"baseUrl": ".",
"noEmit": true
},
"include": ["**/*", "vite.config.mts", "../../shared/*.ts"],
"exclude": ["**/node_modules", "**/dist"]
"extends": "../../tsconfig.base.json",
"include": [],
"references": [{ "path": "tsconfig.src.json" }]
}
10 changes: 10 additions & 0 deletions packages/graph-framework-messages/tsconfig.src.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": "../../tsconfig.base.json",
"include": ["src"],
"references": [{ "path": "../graph-framework-space-events" }],
"compilerOptions": {
"tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo",
"rootDir": "src",
"outDir": "build/src"
}
}
24 changes: 0 additions & 24 deletions packages/graph-framework-messages/vite.config.mts
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions packages/graph-framework-messages/vitest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { type UserConfigExport, mergeConfig } from 'vitest/config';
import shared from '../../vitest.shared.js';

const config: UserConfigExport = {};

export default mergeConfig(shared, config);
2 changes: 1 addition & 1 deletion packages/graph-framework-schema/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"exports": {
".": {
"default": "./src/index.js"
"default": "./dist/index.js"
}
},
"peerDependencies": {
Expand Down
Loading