Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/examples/auth-zero/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"target": "es2019",
"module": "CommonJS",
"module": "es2020",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true,
Expand Down
3 changes: 2 additions & 1 deletion src/examples/aws-cognito/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"target": "es2019",
"module": "CommonJS",
"module": "es2020",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true,
Expand Down
3 changes: 2 additions & 1 deletion src/examples/databases/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"target": "es2019",
"module": "CommonJS",
"module": "es2020",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"jsx": "react-jsx",
Expand Down
3 changes: 2 additions & 1 deletion src/examples/federation/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"target": "es2019",
"module": "CommonJS",
"module": "es2020",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true
Expand Down
3 changes: 2 additions & 1 deletion src/examples/microsoft-entra/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"target": "es2019",
"module": "CommonJS",
"module": "es2020",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true,
Expand Down
3 changes: 2 additions & 1 deletion src/examples/okta/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"target": "es2019",
"module": "CommonJS",
"module": "es2020",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true,
Expand Down
3 changes: 2 additions & 1 deletion src/examples/rest-with-auth/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"target": "es2019",
"module": "CommonJS",
"module": "es2020",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true,
Expand Down
3 changes: 2 additions & 1 deletion src/examples/rest/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"target": "es2019",
"module": "CommonJS",
"module": "es2020",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Entity, OneToOne, PrimaryKey, Property } from '@mikro-orm/core';
import type { Ref } from '@mikro-orm/core';
import { Submission } from './submission';
import { Ref } from '@mikro-orm/core/entity';

@Entity()
export class ImageNote {
Expand Down
3 changes: 2 additions & 1 deletion src/examples/s3-storage/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"target": "es2019",
"module": "CommonJS",
"module": "es2020",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"jsx": "react-jsx",
Expand Down
3 changes: 2 additions & 1 deletion src/examples/sql-server/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"target": "es2019",
"module": "CommonJS",
"module": "es2020",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true,
Expand Down
3 changes: 2 additions & 1 deletion src/examples/sqlite/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"target": "es2019",
"module": "CommonJS",
"module": "es2020",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true,
Expand Down
3 changes: 2 additions & 1 deletion src/examples/xero/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"target": "es2019",
"module": "CommonJS",
"module": "es2020",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true,
Expand Down
1 change: 1 addition & 0 deletions src/packages/admin-ui-components/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"target": "ESNext",
"lib": ["DOM", "DOM.Iterable", "ESNext"],
"module": "ESNext",
"moduleResolution": "bundler",
"jsx": "react-jsx",
"outDir": "./lib",
"rootDir": "./src",
Expand Down
2 changes: 1 addition & 1 deletion src/packages/admin-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@types/react": "19.1.13",
"@types/react-dom": "19.1.9",
"@types/react-modal": "3.16.3",
"@vitejs/plugin-react": "4.3.4",
"@vitejs/plugin-react": "5.0.2",
"esbuild": "0.25.10",
"esbuild-plugin-copy": "2.1.1",
"glob": "11.0.3",
Expand Down
2 changes: 1 addition & 1 deletion src/packages/admin-ui/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"forceConsistentCasingInFileNames": true,
"noImplicitAny": true,
"module": "ESNext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "react-jsx",
Expand Down
1 change: 1 addition & 0 deletions src/packages/apollo-client/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"target": "ESNext",
"lib": ["DOM", "DOM.Iterable", "ESNext"],
"module": "ESNext",
"moduleResolution": "bundler",
"jsx": "react-jsx",
"outDir": "./lib",
"rootDir": "./src"
Expand Down
1 change: 1 addition & 0 deletions src/packages/auth-ui-components/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"target": "ESNext",
"lib": ["DOM", "DOM.Iterable", "ESNext"],
"module": "ESNext",
"moduleResolution": "bundler",
"jsx": "react-jsx",
"outDir": "./lib",
"rootDir": "./src",
Expand Down
5 changes: 4 additions & 1 deletion src/packages/auth/src/authentication/methods/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ import { ApolloError, AuthenticationError } from 'apollo-server-errors';
import { hashPassword } from '../../utils/argon2id';
import { CredentialUpdateInput, CredentialInsertInput } from './password';
import { CredentialStorage } from '../entities';
import { VariableValues } from '@apollo/server/dist/esm/externalTypes/graphql';
import { Kind, OperationDefinitionNode, print, stripIgnoredCharacters, visit } from 'graphql';

// Define VariableValues type based on Apollo Server's definition since we can't import it from
// Apollo Server.
type VariableValues = { [name: string]: any };

export class PasswordStrengthError extends ApolloError {
constructor(message: string, extensions?: Record<string, any>) {
super(message, 'WEAK_PASSWORD', extensions);
Expand Down
3 changes: 2 additions & 1 deletion src/packages/aws-cognito/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"noUnusedLocals": false,
"experimentalDecorators": true,
"target": "es2019",
"module": "CommonJS",
"module": "es2020",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"jsx": "react-jsx"
Expand Down
3 changes: 2 additions & 1 deletion src/packages/builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"@graphql-codegen/typescript-operations": "5.0.0",
"@graphql-codegen/typescript-react-apollo": "4.3.3",
"@serverless/utils": "6.15.0",
"@vitejs/plugin-react": "4.3.4",
"@vitejs/plugin-react": "5.0.2",
"class-validator": "0.14.2",
"dotenv": "17.2.2",
"esbuild": "0.25.10",
"esbuild-css-modules-plugin": "3.1.5",
Expand Down
2 changes: 1 addition & 1 deletion src/packages/cli/src/import/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const checkForMissingDependencies = (source: Source) => {
const packageJson = require(path.join(process.cwd(), 'package.json'));
const dependencies = Object.keys(packageJson.dependencies ?? {});

// These dependencies are required to run the
// These dependencies are required to run the introspection.
const requiredDependencies = [
'@exogee/graphweaver-mikroorm',
'@mikro-orm/core',
Expand Down
3 changes: 2 additions & 1 deletion src/packages/cli/src/init/template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ export const makeTsConfig = (projectName: string) => {
experimentalDecorators: true,
emitDecoratorMetadata: true,
target: 'es2019',
module: 'CommonJS',
module: 'es2020',
moduleResolution: 'bundler',
allowSyntheticDefaultImports: true,
esModuleInterop: true,
skipLibCheck: true,
Expand Down
2 changes: 1 addition & 1 deletion src/packages/core/src/hook-manager.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { HookParams, TraceOptions } from './types';
import type { HookParams, TraceOptions } from './types';
import { TraceMethod } from './open-telemetry';

export enum HookRegister {
Expand Down
3 changes: 2 additions & 1 deletion src/packages/core/src/metadata-service/entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { GraphQLJSON } from '@exogee/graphweaver-scalars';
import { AdminUiFieldMetadata } from './field';
import { AdminUiEntityAttributeMetadata } from './entity-attribute';
import { Entity, Field } from '../decorators';
import { AggregationType, Filter, Sort } from '../types';
import { AggregationType, Sort } from '../types';
import type { Filter } from '../types';
import { graphweaverMetadata } from '../metadata';

graphweaverMetadata.collectEnumInformation({
Expand Down
3 changes: 2 additions & 1 deletion src/packages/core/src/metadata-service/field-format.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { DateTimeFormat, Entity, Field } from '../decorators';
import { Entity, Field } from '../decorators';
import type { DateTimeFormat } from '../decorators';

@Entity('AdminUiFieldFormatMetadata', {
apiOptions: { excludeFromBuiltInOperations: true, excludeFromFederation: true },
Expand Down
4 changes: 1 addition & 3 deletions src/packages/core/src/query-manager.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { logger } from '@exogee/logger';
import { TypeValue } from './types';

import { Filter, PaginationOptions, TraceOptions } from './types';
import type { TypeValue, TraceOptions, Filter, PaginationOptions } from './types';
import { EntityMetadata, graphweaverMetadata } from './metadata';
import { TraceMethod } from './open-telemetry';

Expand Down
3 changes: 2 additions & 1 deletion src/packages/end-to-end/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"compilerOptions": {
"target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ /* Specify what JSX code is generated. */,
"experimentalDecorators": true /* Enable experimental support for legacy experimental decorators. */,
"module": "commonjs" /* Specify what module code is generated. */,
"module": "es2020" /* Specify what module code is generated. */,
"moduleResolution": "bundler",
"esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
"strict": true /* Enable all strict type-checking options. */,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BigIntType, Entity, Ref, Index, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core';

import { BigIntType, Entity, Index, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core';
import type { Ref } from '@mikro-orm/core';
import { AuditChange } from './audit-change';
@Entity()
@Index({ properties: ['relatedEntityType', 'relatedEntityId'] })
Expand Down
24 changes: 13 additions & 11 deletions src/packages/mikroorm/src/provider/provider.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
import {
AggregationType,
BackendProvider,
PaginationOptions,
graphweaverMetadata,
GraphweaverPluginNextFunction,
GraphweaverRequestEvent,
Sort,
Filter,
BackendProviderConfig,
FieldMetadata,
AggregationResult,
AggregationType,
trace as startTrace,
TraceMethod,
TraceOptions,
traceSync,
trace as startTrace,
GraphweaverRequestEvent,
GraphweaverPluginNextFunction,
} from '@exogee/graphweaver';
import type {
AggregationResult,
BackendProviderConfig,
EntityMetadata,
graphweaverMetadata,
FieldMetadata,
Filter,
PaginationOptions,
TraceOptions,
} from '@exogee/graphweaver';
import { logger } from '@exogee/logger';
import {
Expand Down
5 changes: 2 additions & 3 deletions src/packages/rest-legacy/src/provider/provider.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import {
BackendProvider as Provider,
import { BackendProvider as Provider, TraceMethod } from '@exogee/graphweaver';
import type {
Filter,
PaginationOptions,
BackendProviderConfig,
TraceMethod,
TraceOptions,
EntityMetadata,
} from '@exogee/graphweaver';
Expand Down
4 changes: 2 additions & 2 deletions src/packages/rest/src/provider.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'node:path';
import {
import { TraceMethod } from '@exogee/graphweaver';
import type {
BackendProvider,
Filter,
PaginationOptions,
TraceMethod,
TraceOptions,
EntityMetadata,
BackendProviderConfig,
Expand Down
10 changes: 6 additions & 4 deletions src/packages/server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ import { StartServerOptions, startStandaloneServer, startServerless } from './in
import { GraphweaverConfig, mergeConfig } from './config';
import { enableTracing } from './trace';
import { pluginManager } from './plugin-manager';
import {
ExecuteOperationOptions,
GraphQLResponse,
} from '@apollo/server/dist/esm/externalTypes/graphql';
import { GraphQLResponse } from '@apollo/server';

// Define ExecuteOperationOptions type since it's not exported from the main Apollo Server package
interface ExecuteOperationOptions<TContext extends BaseContext> {
contextValue?: TContext;
}
import { onRequestWrapper } from './integrations/utils';
import { apolloPluginManager } from './apollo-plugins/apollo-plugin-manager';

Expand Down
Loading
Loading