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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,5 @@ vite.config.*.timestamp*
vitest.config.*.timestamp*
.claude/worktrees
.nx/polygraph
.nx/self-healing
.nx/self-healing
.nx/migrate-runs
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
"@graphql-codegen/typescript-react-apollo": "4.4.2",
"@graphql-codegen/typescript-resolvers": "6.1.0",
"@graphql-tools/merge": "9.2.0",
"@nx/devkit": "22.7.8",
"@nx/eslint": "22.7.8",
"@nx/eslint-plugin": "22.7.8",
"@nx/jest": "22.7.8",
"@nx/js": "22.7.8",
"@nx/node": "22.7.8",
"@nx/plugin": "22.7.8",
"@nx/vite": "22.7.8",
"@nx/vitest": "22.7.8",
"@nx/web": "22.7.8",
"@nx/workspace": "22.7.8",
"@nx/devkit": "23.1.1",
"@nx/eslint": "23.1.1",
"@nx/eslint-plugin": "23.1.1",
"@nx/jest": "23.1.1",
"@nx/js": "23.1.1",
"@nx/node": "23.1.1",
"@nx/plugin": "23.1.1",
"@nx/vite": "23.1.1",
"@nx/vitest": "23.1.1",
"@nx/web": "23.1.1",
"@nx/workspace": "23.1.1",
"@swc-node/register": "1.12.1",
"@swc/cli": "~0.8.0",
"@swc/core": "1.15.8",
Expand All @@ -48,23 +48,23 @@
"eslint-config-prettier": "10.1.8",
"graphql": "17.0.2",
"graphql-scalars": "1.25.0",
"jest": "30.0.4",
"jest": "30.3.0",
"jest-environment-jsdom": "30.4.1",
"jest-environment-node": "30.0.4",
"jest-util": "30.0.5",
"jiti": "2.7.0",
"jsonc-eslint-parser": "^2.1.0",
"micromatch": "4.0.5",
"nx": "22.7.8",
"nx": "23.1.1",
"prettier": "^2.6.2",
"rimraf": "6.1.3",
"ts-jest": "29.4.9",
"ts-morph": "22.0.0",
"ts-node": "10.9.1",
"tsx": "4.23.1",
"typescript": "5.9.3",
"typescript": "6.0.3",
"typescript-eslint": "8.65.0",
"vite": "7.3.6",
"vite": "8.2.0",
"vitest": "4.1.9"
},
"workspaces": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"compilerOptions": {
"module": "commonjs",
"strict": true
"strict": true,
"noUncheckedSideEffectImports": false,
"types": ["*"],
"esModuleInterop": false,
"ignoreDeprecations": "6.0"
},
"include": ["./components/**/*.ts"]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"compilerOptions": {
"module": "commonjs",
"strict": true
"strict": true,
"noUncheckedSideEffectImports": false,
"types": ["*"],
"esModuleInterop": false,
"ignoreDeprecations": "6.0"
},
"include": ["./gql/**/*.ts", "./generated/**/*.ts", "./components/**/*.ts"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
"rootDir": ".",
"baseUrl": ".",
"module": "commonjs",
"strict": true
"strict": true,
"noUncheckedSideEffectImports": false,
"types": ["*"],
"esModuleInterop": false,
"ignoreDeprecations": "6.0"
},
"include": ["./components/**/*.ts", "./gql/**/*.ts"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
"rootDir": ".",
"baseUrl": ".",
"module": "commonjs",
"strict": true
"strict": true,
"noUncheckedSideEffectImports": false,
"types": ["*"],
"esModuleInterop": false,
"ignoreDeprecations": "6.0"
},
"include": ["./components/**/*.ts", "./gql/**/*.ts"]
}
3 changes: 2 additions & 1 deletion packages/operation-location-migration-e2e/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"noImplicitOverride": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"noPropertyAccessFromIndexSignature": true
"noPropertyAccessFromIndexSignature": true,
"ignoreDeprecations": "6.0"
},
"files": [],
"include": [],
Expand Down
3 changes: 2 additions & 1 deletion packages/operation-location-migration/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"strict": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"esModuleInterop": true
"esModuleInterop": true,
"ignoreDeprecations": "6.0"
}
}
3 changes: 2 additions & 1 deletion packages/server-config/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"strict": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"esModuleInterop": true
"esModuleInterop": true,
"ignoreDeprecations": "6.0"
}
}
1 change: 1 addition & 0 deletions packages/server-config/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"module": "commonjs",
"moduleResolution": "bundler",
"types": [
"vitest/globals",
"vitest/importMeta",
Expand Down
3 changes: 2 additions & 1 deletion packages/typescript-resolver-files-e2e/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"strict": true,
"importHelpers": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true
"noFallthroughCasesInSwitch": true,
"ignoreDeprecations": "6.0"
},
"files": [],
"include": [],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Types } from '@graphql-codegen/plugin-helpers';
import * as addPlugin from '@graphql-codegen/add';
import type { AddPluginConfig } from '@graphql-codegen/add/typings/config';
import type { AddPluginConfig } from '@graphql-codegen/add';
import * as typeScriptPlugin from '@graphql-codegen/typescript';
import * as typeScriptResolversPlugin from '@graphql-codegen/typescript-resolvers';
import type { GraphQLSchema } from 'graphql';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as path from 'path';
import type { AddPluginConfig } from '@graphql-codegen/add/typings/config';
import type { AddPluginConfig } from '@graphql-codegen/add';

/**
* normalizeAddConfigPath
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
import * as path from 'path';
import * as fs from 'fs';
import type { AddPluginConfig } from '@graphql-codegen/add/typings/config';
import type { AddPluginConfig } from '@graphql-codegen/add';
import type * as typeScriptPlugin from '@graphql-codegen/typescript';
import type * as typeScriptResolversPlugin from '@graphql-codegen/typescript-resolvers';
import type * as schemaAstPlugin from '@graphql-codegen/schema-ast';
import type { ProjectOptions } from 'ts-morph';
import { cwd, fmt, logger, normalizeImportExtension, type ImportExtension } from '../utils';
import {
cwd,
fmt,
logger,
normalizeImportExtension,
type ImportExtension,
} from '../utils';

const defaultResolverRelativeTargetDirMap: Record<
ParsedPresetConfig['mode'],
Expand Down Expand Up @@ -126,32 +132,33 @@ export interface TypedPresetConfig extends RawPresetConfig {
| { path: string; config: schemaAstPlugin.SchemaASTConfig };
}

export const validatePresetConfig = ({
add,
resolverTypesPath = './types.generated.ts',
resolverRelativeTargetDir,
resolverMainFile = 'resolvers.generated.ts',
resolverMainFileMode = 'merged',
resolverGeneration = 'recommended',
typeDefsFilePath = defaultTypeDefsFilePath,
typeDefsFileMode: inputTypeDefsFileMode = 'merged',
mappersRelativeTargetDir = './',
mappersFileExtension = '.mappers.ts',
mappersSuffix = 'Mapper',
moduleNamingMode = 'last',
mergeSchema,
scalarsModule = 'graphql-scalars',
scalarsOverrides = {},
mode = 'modules',
whitelistedModules,
blacklistedModules,
externalResolvers = {},
typesPluginsConfig = {},
tsConfigFilePath = './tsconfig.json',
fixObjectTypeResolvers = 'fast',
emitLegacyCommonJSImports,
importExtension,
}: RawPresetConfig,
export const validatePresetConfig = (
{
add,
resolverTypesPath = './types.generated.ts',
resolverRelativeTargetDir,
resolverMainFile = 'resolvers.generated.ts',
resolverMainFileMode = 'merged',
resolverGeneration = 'recommended',
typeDefsFilePath = defaultTypeDefsFilePath,
typeDefsFileMode: inputTypeDefsFileMode = 'merged',
mappersRelativeTargetDir = './',
mappersFileExtension = '.mappers.ts',
mappersSuffix = 'Mapper',
moduleNamingMode = 'last',
mergeSchema,
scalarsModule = 'graphql-scalars',
scalarsOverrides = {},
mode = 'modules',
whitelistedModules,
blacklistedModules,
externalResolvers = {},
typesPluginsConfig = {},
tsConfigFilePath = './tsconfig.json',
fixObjectTypeResolvers = 'fast',
emitLegacyCommonJSImports,
importExtension,
}: RawPresetConfig,
baseConfig?: {
emitLegacyCommonJSImports?: boolean;
importExtension?: ImportExtension;
Expand Down Expand Up @@ -319,9 +326,12 @@ export const validatePresetConfig = ({
}

const validatedAdd = validateAddOption(add);

const normalizedImportExtension = normalizeImportExtension(finalImportExtension, finalEmitLegacyCommonJSImports);


const normalizedImportExtension = normalizeImportExtension(
finalImportExtension,
finalEmitLegacyCommonJSImports
);

return {
add: validatedAdd,
resolverTypesPath,
Expand Down
3 changes: 2 additions & 1 deletion packages/typescript-resolver-files/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"strict": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"esModuleInterop": true
"esModuleInterop": true,
"ignoreDeprecations": "6.0"
}
}
1 change: 1 addition & 0 deletions packages/typescript-resolver-files/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"module": "commonjs",
"moduleResolution": "bundler",
"types": [
"vitest/globals",
"vitest/importMeta",
Expand Down
3 changes: 2 additions & 1 deletion tools/testing/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"module": "commonjs"
"module": "commonjs",
"ignoreDeprecations": "6.0"
},
"files": [],
"include": [],
Expand Down
3 changes: 2 additions & 1 deletion tools/tsconfig.tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"module": "commonjs",
"target": "es5",
"types": ["node"],
"importHelpers": false
"importHelpers": false,
"ignoreDeprecations": "6.0"
},
"include": ["**/*.ts"]
}
3 changes: 2 additions & 1 deletion tools/workspace-plugin/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"module": "commonjs"
"module": "commonjs",
"ignoreDeprecations": "6.0"
},
"files": [],
"include": [],
Expand Down
7 changes: 6 additions & 1 deletion tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@
],
"@workspace/testing": ["tools/testing/src/index.ts"],
"@workspace/workspace-plugin": ["tools/workspace-plugin/src/index.ts"]
}
},
"strict": false,
"noUncheckedSideEffectImports": false,
"types": ["*"],
"esModuleInterop": false,
"ignoreDeprecations": "6.0"
},
"exclude": ["node_modules", "tmp"]
}
Loading