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: 0 additions & 3 deletions .github/workflows/operation-location-migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,5 @@ jobs:
- name: Lint
run: yarn nx lint operation-location-migration

- name: Test
run: yarn nx test operation-location-migration

- name: Build
run: yarn nx build operation-location-migration
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ Thumbs.db
.nx/workspace-data
.cursor/rules/nx-rules.mdc
.github/instructions/nx.instructions.md

vite.config.*.timestamp*
vitest.config.*.timestamp*
19 changes: 19 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
"cache": true,
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
},
"@nx/js:tsc": {
"cache": true,
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
}
},
"namedInputs": {
Expand Down Expand Up @@ -69,6 +74,20 @@
"options": {
"targetName": "eslint:lint"
}
},
{
"plugin": "@nx/vite/plugin",
"options": {
"buildTargetName": "build",
"testTargetName": "test",
"serveTargetName": "serve",
"devTargetName": "dev",
"previewTargetName": "preview",
"serveStaticTargetName": "serve-static",
"typecheckTargetName": "typecheck",
"buildDepsTargetName": "build-deps",
"watchDepsTargetName": "watch-deps"
}
}
]
}
9 changes: 8 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
"@nx/js": "21.3.1",
"@nx/node": "21.3.1",
"@nx/plugin": "21.3.1",
"@nx/vite": "21.3.1",
"@nx/web": "21.3.1",
"@nx/workspace": "21.3.1",
"@swc-node/register": "1.9.2",
"@swc/cli": "~0.7.0",
Expand All @@ -39,13 +41,16 @@
"@types/jest": "30.0.0",
"@types/micromatch": "4.0.6",
"@types/node": "22.0.3",
"@vitest/coverage-v8": "3.2.4",
"@vitest/ui": "3.2.4",
"eslint": "9.31.0",
"eslint-config-prettier": "10.1.8",
"graphql": "16.10.0",
"graphql-scalars": "1.24.0",
"jest": "30.0.4",
"jest-environment-jsdom": "30.0.4",
"jest-environment-node": "30.0.4",
"jiti": "2.4.2",
"jsonc-eslint-parser": "^2.1.0",
"micromatch": "4.0.5",
"nx": "21.3.1",
Expand All @@ -56,7 +61,9 @@
"ts-node": "10.9.1",
"tsx": "4.20.3",
"typescript": "5.8.3",
"typescript-eslint": "8.37.0"
"typescript-eslint": "8.37.0",
"vite": "6.4.2",
"vitest": "3.2.4"
},
"workspaces": [
"packages/**",
Expand Down
2 changes: 1 addition & 1 deletion packages/operation-location-migration/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default [
'@nx/dependency-checks': [
'error',
{
ignoredFiles: ['{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}'],
ignoredFiles: ['{projectRoot}/eslint.config.mjs'],
},
],
},
Expand Down
30 changes: 0 additions & 30 deletions packages/operation-location-migration/jest.config.ts

This file was deleted.

7 changes: 0 additions & 7 deletions packages/operation-location-migration/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@
"assets": ["packages/operation-location-migration/*.md"]
}
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "packages/operation-location-migration/jest.config.ts"
}
},
"lint": {
"executor": "@nx/eslint:lint"
}
Expand Down
22 changes: 8 additions & 14 deletions packages/operation-location-migration/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"module": "commonjs",
"forceConsistentCasingInFileNames": true,
"strict": true,
"importHelpers": true,
"noImplicitOverride": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"noPropertyAccessFromIndexSignature": true
},
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.lib.json"
},
{
"path": "./tsconfig.spec.json"
}
]
],
"compilerOptions": {
"forceConsistentCasingInFileNames": true,
"strict": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"esModuleInterop": true
}
}
5 changes: 3 additions & 2 deletions packages/operation-location-migration/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"module": "commonjs",
"outDir": "../../dist/out-tsc",
"declaration": true,
"types": ["node"]
},
"include": ["src/**/*.ts"],
"exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
"exclude": ["vite.config.ts", "src/**/*.spec.ts"],
"include": ["src/**/*.ts"]
}
15 changes: 0 additions & 15 deletions packages/operation-location-migration/tsconfig.spec.json

This file was deleted.

8 changes: 4 additions & 4 deletions packages/server-config/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ export default [
'@nx/dependency-checks': [
'error',
{
ignoredFiles: ['{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}'],
ignoredFiles: [
'{projectRoot}/eslint.config.mjs',
'{projectRoot}/vite.config.ts',
],
},
],
},
languageOptions: {
parser: await import('jsonc-eslint-parser'),
},
},
{
ignores: ['**/out-tsc'],
},
];
11 changes: 0 additions & 11 deletions packages/server-config/jest.config.ts

This file was deleted.

3 changes: 0 additions & 3 deletions packages/server-config/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
},
"lint": {
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest"
}
}
}
16 changes: 8 additions & 8 deletions packages/server-config/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"module": "commonjs",
"forceConsistentCasingInFileNames": true,
"strict": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true
},
"files": [],
"include": [],
"references": [
Expand All @@ -16,5 +9,12 @@
{
"path": "./tsconfig.spec.json"
}
]
],
"compilerOptions": {
"forceConsistentCasingInFileNames": true,
"strict": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"esModuleInterop": true
}
}
2 changes: 1 addition & 1 deletion packages/server-config/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"declaration": true,
"types": ["node"]
},
"exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"],
"exclude": ["vite.config.ts", "src/**/*.spec.ts"],
"include": ["src/**/*.ts"]
}
15 changes: 8 additions & 7 deletions packages/server-config/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"module": "commonjs",
"types": ["jest", "node"]
"types": [
"vitest/globals",
"vitest/importMeta",
"vite/client",
"node",
"vitest"
]
},
"include": [
"jest.config.ts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.d.ts"
]
"include": ["vite.config.ts", "src/**/*.spec.ts"]
}
24 changes: 24 additions & 0 deletions packages/server-config/vite.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { defineConfig } from 'vite';
import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';

export default defineConfig(() => ({
root: __dirname,
cacheDir: '../../node_modules/.vite/packages/server-config',
plugins: [nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
// Uncomment this if you are using workers.
// worker: {
// plugins: [ nxViteTsPaths() ],
// },
test: {
watch: false,
globals: true,
environment: 'node',
include: ['src/**/*.spec.ts'],
reporters: ['default'],
coverage: {
reportsDirectory: '../../coverage/packages/server-config',
provider: 'v8',
},
},
}));
5 changes: 4 additions & 1 deletion packages/typescript-resolver-files/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ export default [
'@nx/dependency-checks': [
'error',
{
ignoredFiles: ['{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}'],
ignoredFiles: [
'{projectRoot}/eslint.config.mjs',
'{projectRoot}/vite.config.ts',
],
},
],
},
Expand Down
11 changes: 0 additions & 11 deletions packages/typescript-resolver-files/jest.config.ts

This file was deleted.

3 changes: 0 additions & 3 deletions packages/typescript-resolver-files/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
},
"lint": {
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -781,9 +781,9 @@ describe('collectTypeMappersFromSourceFile', () => {
result
)
).toThrowErrorMatchingInlineSnapshot(`
"GraphQL type "User" has duplicated "UserTypeMapper" mappers:
[Error: GraphQL type "User" has duplicated "UserTypeMapper" mappers:
- ./module2/schema.mappers#UserTypeMapper
- ./module1/schema.mappers#UserTypeMapper"
- ./module1/schema.mappers#UserTypeMapper]
`);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ describe('parseLocationForWhitelistedModule', () => {
blacklistedModules: [],
whitelistedModules: [],
} as unknown as ParseLocationForWhitelistedModule)
).toThrowErrorMatchingInlineSnapshot(
`"Unable to find /path/to/module10/schema.graphqls in sourceMap"`
);
).toThrowErrorMatchingInlineSnapshot(`[Error: Unable to find /path/to/module10/schema.graphqls in sourceMap]`);
});
});
Loading
Loading