## Summary - Re-enable one lint rule that was temporarily disabled during the ESLint-to-Oxlint migration: - **`twenty/sort-css-properties-alphabetically`** in twenty-front — 578 violations auto-fixed across 390 files - Document why **`typescript/consistent-type-imports`** cannot be auto-fixed in twenty-server: NestJS relies on `emitDecoratorMetadata` for DI, so converting constructor parameter imports to `import type` erases them at compile time and breaks dependency injection at runtime - Right-size CI runners, reducing 8-core usage from 18 jobs to 3: | Change | Jobs | Rationale | |--------|------|-----------| | **Keep 8-core** | `ci-merge-queue/e2e-test`, `ci-front/front-sb-build`, `ci-front/front-build` | Heavy builds needing max CPU + memory (10GB NODE_OPTIONS, full Storybook webpack bundling) | | **8-core → 4-core** | `ci-server` (build, lint-typecheck, validation, test, integration-test), `ci-front/front-sb-test`, `ci-zapier/server-setup`, `ci-sdk/sdk-e2e-test` | Already sharded into 10-12 parallel instances, I/O-bound (DB/Redis), or moderate single builds | | **8-core → 2-core** | `ci-emails/emails-test` | Trivially lightweight (build + curl health check) | | **Removed** | `ci-front/front-chromatic-deployment` | Dead code — permanently disabled with `if: false` | - Fix merge queue CI issues: - **Concurrency**: Use `merge_group.base_ref` instead of unique merge group ref so new queue entries cancel previous runs - **Required status checks**: Add `merge_group` trigger to all 6 required CI workflows (front, server, shared, website, docker-compose, sdk) with `changed-files-check` auto-skipped for merge_group events — status check jobs auto-pass without re-running full CI - **Build caching**: Add Nx build cache restore/save to E2E test job with fallback to `main` branch cache for faster frontend and server builds ## Test plan - [ ] CI passes on this PR (verifies lint rule auto-fix works) - [ ] Verify 4-core runner jobs complete within their 30-minute timeouts - [ ] Verify merge queue status checks auto-pass (ci-front-status-check, ci-server-status-check, etc.) - [ ] Verify merge queue E2E concurrency cancels previous runs when a new PR enters the queue
135 lines
4.9 KiB
TypeScript
135 lines
4.9 KiB
TypeScript
import {
|
|
type DynamicModule,
|
|
type MiddlewareConsumer,
|
|
Module,
|
|
RequestMethod,
|
|
} from '@nestjs/common';
|
|
import { GraphQLModule } from '@nestjs/graphql';
|
|
import { ServeStaticModule } from '@nestjs/serve-static';
|
|
|
|
import { existsSync } from 'fs';
|
|
import { join } from 'path';
|
|
|
|
import { YogaDriver, type YogaDriverConfig } from '@graphql-yoga/nestjs';
|
|
import { SentryModule } from '@sentry/nestjs/setup';
|
|
|
|
import { CoreGraphQLApiModule } from 'src/engine/api/graphql/core-graphql-api.module';
|
|
import { GraphQLConfigModule } from 'src/engine/api/graphql/graphql-config/graphql-config.module';
|
|
import { GraphQLConfigService } from 'src/engine/api/graphql/graphql-config/graphql-config.service';
|
|
import { MetadataGraphQLApiModule } from 'src/engine/api/graphql/metadata-graphql-api.module';
|
|
import { McpModule } from 'src/engine/api/mcp/mcp.module';
|
|
import { RestApiModule } from 'src/engine/api/rest/rest-api.module';
|
|
import { WorkspaceAuthContextMiddleware } from 'src/engine/core-modules/auth/middlewares/workspace-auth-context.middleware';
|
|
import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';
|
|
import { DataloaderModule } from 'src/engine/dataloaders/dataloader.module';
|
|
import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
|
|
import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
|
|
import { GraphQLHydrateRequestFromTokenMiddleware } from 'src/engine/middlewares/graphql-hydrate-request-from-token.middleware';
|
|
import { MiddlewareModule } from 'src/engine/middlewares/middleware.module';
|
|
import { RestCoreMiddleware } from 'src/engine/middlewares/rest-core.middleware';
|
|
import { GlobalWorkspaceDataSourceModule } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-datasource.module';
|
|
import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
|
|
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
|
|
import { ModulesModule } from 'src/modules/modules.module';
|
|
|
|
import { ClickHouseModule } from './database/clickHouse/clickHouse.module';
|
|
import { CoreEngineModule } from './engine/core-modules/core-engine.module';
|
|
import { I18nModule } from './engine/core-modules/i18n/i18n.module';
|
|
|
|
// TODO: Remove this middleware when all the rest endpoints are migrated to TwentyORM
|
|
const MIGRATED_REST_METHODS = [
|
|
RequestMethod.DELETE,
|
|
RequestMethod.POST,
|
|
RequestMethod.PATCH,
|
|
RequestMethod.PUT,
|
|
RequestMethod.GET,
|
|
];
|
|
|
|
@Module({
|
|
imports: [
|
|
SentryModule.forRoot(),
|
|
GraphQLModule.forRootAsync<YogaDriverConfig>({
|
|
driver: YogaDriver,
|
|
imports: [GraphQLConfigModule, MetricsModule, DataloaderModule],
|
|
useClass: GraphQLConfigService,
|
|
}),
|
|
TwentyORMModule,
|
|
GlobalWorkspaceDataSourceModule,
|
|
ClickHouseModule,
|
|
// Core engine module, contains all the core modules
|
|
CoreEngineModule,
|
|
// Modules module, contains all business logic modules
|
|
ModulesModule,
|
|
// Needed for the user workspace middleware
|
|
WorkspaceCacheStorageModule,
|
|
// Api modules
|
|
CoreGraphQLApiModule,
|
|
MetadataGraphQLApiModule,
|
|
RestApiModule,
|
|
McpModule,
|
|
DataSourceModule,
|
|
MiddlewareModule,
|
|
WorkspaceMetadataVersionModule,
|
|
// I18n module for translations
|
|
I18nModule,
|
|
// Conditional modules
|
|
...AppModule.getConditionalModules(),
|
|
],
|
|
})
|
|
export class AppModule {
|
|
private static getConditionalModules(): DynamicModule[] {
|
|
const modules: DynamicModule[] = [];
|
|
const frontPath = join(__dirname, 'front');
|
|
|
|
// NestJS DevTools - can be useful for debugging and profiling
|
|
/* if (process.env.NODE_ENV === NodeEnvironment.DEVELOPMENT) {
|
|
modules.push(
|
|
DevtoolsModule.register({
|
|
http: true,
|
|
}),
|
|
);
|
|
} */
|
|
|
|
if (existsSync(frontPath)) {
|
|
modules.push(
|
|
ServeStaticModule.forRoot({
|
|
rootPath: frontPath,
|
|
}),
|
|
);
|
|
}
|
|
|
|
// Messaque Queue explorer only for sync driver
|
|
// Maybe we don't need to conditionaly register the explorer, because we're creating a jobs module
|
|
// that will expose classes that are only used in the queue worker
|
|
/*
|
|
if (process.env.MESSAGE_QUEUE_TYPE === MessageQueueDriverType.Sync) {
|
|
modules.push(MessageQueueModule.registerExplorer());
|
|
}
|
|
*/
|
|
|
|
return modules;
|
|
}
|
|
|
|
configure(consumer: MiddlewareConsumer) {
|
|
consumer
|
|
.apply(
|
|
GraphQLHydrateRequestFromTokenMiddleware,
|
|
WorkspaceAuthContextMiddleware,
|
|
)
|
|
.forRoutes({ path: 'graphql', method: RequestMethod.ALL });
|
|
|
|
consumer
|
|
.apply(
|
|
GraphQLHydrateRequestFromTokenMiddleware,
|
|
WorkspaceAuthContextMiddleware,
|
|
)
|
|
.forRoutes({ path: 'metadata', method: RequestMethod.ALL });
|
|
|
|
for (const method of MIGRATED_REST_METHODS) {
|
|
consumer
|
|
.apply(RestCoreMiddleware, WorkspaceAuthContextMiddleware)
|
|
.forRoutes({ path: 'rest/*path', method });
|
|
}
|
|
}
|
|
}
|