Skip to content

Commit cce65e3

Browse files
authored
Standardise setup (#384)
* Update server preset project.json and test setup * Handle test setup * Move testing-utils to tools * Standardise project.json and rename workspace-plugin * Use projectRoot for simplicity when generating e2e test * Move testing-utils to testing * Update comment * Update tests * Fix tsconfig path * Update root README * Add concurrency in CI group to stop early * Test stop * Revert * Name sub workflows * Update renovate not to rebase - costs money
1 parent 9c50b48 commit cce65e3

File tree

63 files changed

+182
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+182
-198
lines changed

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
"access": "public",
88
"baseBranch": "master",
99
"updateInternalDependencies": "patch",
10-
"ignore": []
10+
"ignore": ["@workspace/workspace-plugin"]
1111
}

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
- master
77
- master-next
88

9+
concurrency:
10+
group: ci-${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
env:
1014
node-version: '22.x'
1115

.github/workflows/operation-location-migration-e2e.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
name: operation-location-migration-e2e
2+
13
on:
24
workflow_call:
35

.github/workflows/operation-location-migration.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
name: operation-location-migration
2+
13
on:
24
workflow_call:
35

.github/workflows/typescript-resolver-files-e2e.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
name: typescript-resolver-files-e2e
2+
13
on:
24
workflow_call:
35

.github/workflows/typescript-resolver-files.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
name: typescript-resolver-files
2+
13
on:
24
workflow_call:
35

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ List of [GraphQL Code Generator](https://www.the-guild.dev/graphql/codegen) plug
77
## Plugins
88

99
- [@eddeee888/gcg-typescript-resolver-files](./packages/typescript-resolver-files): Generates module-based resolvers based on types from [typescript](https://the-guild.dev/graphql/codegen/plugins/typescript/typescript) and [typescript-resolvers](https://www.the-guild.dev/graphql/codegen/plugins/typescript/typescript-resolvers) plugins
10+
- [@eddeee888/gcg-operation-location-migration](./packages/operation-location-migration/): Codemod to migrate various client approaches such as [@graphql-codegen/typescript-react-apollo](https://the-guild.dev/graphql/codegen/plugins/typescript/typescript-react-apollo) to [Client Preset](https://the-guild.dev/graphql/codegen/plugins/presets/preset-client) approach.
1011

1112
## Development
1213

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
"typescript-eslint": "8.37.0"
6060
},
6161
"workspaces": [
62-
"packages/**"
62+
"packages/**",
63+
"tools/*"
6364
],
6465
"nx": {
6566
"includedScripts": []

packages/operation-location-migration-e2e/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
44
"sourceRoot": "packages/operation-location-migration-e2e/src",
55
"projectType": "library",
6+
"tags": [],
67
"implicitDependencies": ["operation-location-migration"],
78
"targets": {
89
"e2e": {
@@ -13,7 +14,7 @@
1314
"nx graphql-codegen operation-location-migration-e2e --verbose -c test-index-to-colocation-migrate",
1415
"nx test-setup operation-location-migration-e2e -c test-near-operation-file-to-colocation",
1516
"nx graphql-codegen operation-location-migration-e2e --verbose -c test-near-operation-file-to-colocation-migrate",
16-
"bash packages/testing-utils/bin/assert-e2e.sh \"{projectRoot}/src/**/*.ts\""
17+
"bash tools/testing/bin/assert-e2e.sh \"{projectRoot}/src/**/*.ts\""
1718
],
1819
"parallel": false
1920
}
@@ -69,6 +70,5 @@
6970
"lint": {
7071
"executor": "@nx/eslint:lint"
7172
}
72-
},
73-
"tags": []
73+
}
7474
}

packages/operation-location-migration-e2e/src/test-index-to-colocation/components/MeComponent.lazy-query.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* This file has been created on filesystem by @workspace/testing-utils#createTestSetup */
1+
/* This file has been created on filesystem by @workspace/testing#createTestSetup */
22
import { useLazyQuery } from "@apollo/client/react";
33
import { graphql } from "../gql";
44

0 commit comments

Comments
 (0)