Skip to content

Commit fc5cbb0

Browse files
Merge remote-tracking branch 'upstream/master' into query-graphql/return-all-the-items-even-when-paginated
# Conflicts: # packages/query-graphql/src/types/connection/cursor/pager/strategies/keyset.pager-strategy.ts
2 parents 7f8913f + bbe86c3 commit fc5cbb0

File tree

548 files changed

+45841
-14579
lines changed

Some content is hidden

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

548 files changed

+45841
-14579
lines changed

.eslintrc.json

Lines changed: 20 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
{
22
"root": true,
3-
"ignorePatterns": [
4-
"**/*"
5-
],
6-
"plugins": [
7-
"@nrwl/nx",
8-
"simple-import-sort"
9-
],
3+
"ignorePatterns": ["**/*"],
4+
"plugins": ["@nx", "simple-import-sort"],
105
"extends": [
116
"airbnb-typescript/base",
127
"eslint:recommended",
@@ -24,48 +19,30 @@
2419
},
2520
"overrides": [
2621
{
27-
"files": [
28-
"*.ts",
29-
"*.tsx",
30-
"*.js",
31-
"*.jsx"
32-
],
22+
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
3323
"rules": {
34-
"@nrwl/nx/enforce-module-boundaries": [
24+
"@nx/enforce-module-boundaries": [
3525
"error",
3626
{
3727
"enforceBuildableLibDependency": true,
3828
"allow": [],
3929
"depConstraints": [
4030
{
4131
"sourceTag": "*",
42-
"onlyDependOnLibsWithTags": [
43-
"*"
44-
]
32+
"onlyDependOnLibsWithTags": ["*"]
4533
}
4634
]
4735
}
4836
],
49-
"semi": [
50-
"warn",
51-
"never"
52-
]
37+
"semi": ["warn", "never"]
5338
}
5439
},
5540
{
56-
"files": [
57-
"*.ts",
58-
"*.tsx"
59-
],
60-
"extends": [
61-
"plugin:@nrwl/nx/typescript"
62-
],
41+
"files": ["*.ts", "*.tsx"],
42+
"extends": ["plugin:@nx/typescript"],
6343
"rules": {
6444
// airbnb default is 1
65-
"max-classes-per-file": [
66-
"error",
67-
5
68-
],
45+
"max-classes-per-file": ["error", 5],
6946
// never allow default export
7047
"import/prefer-default-export": "off",
7148
// never allow default export
@@ -89,60 +66,40 @@
8966
{
9067
"groups": [
9168
// Packages. `react` related packages come first.
92-
[
93-
"^react",
94-
"^@?\\w"
95-
],
69+
["^react", "^@?\\w"],
9670
// "type" imports.
97-
[
98-
"^.*\\u0000$"
99-
],
71+
["^.*\\u0000$"],
10072
// Absolute imports and other imports such as Vue-style `@/foo`.
10173
// Anything not matched in another group.
102-
[
103-
"^"
104-
],
74+
["^"],
10575
// Relative imports.
10676
// Anything that starts with a dot.
107-
[
108-
"^\\."
109-
]
77+
["^\\."]
11078
]
11179
}
11280
],
11381
"simple-import-sort/exports": "warn"
11482
}
11583
},
11684
{
117-
"files": [
118-
"*.js",
119-
"*.jsx"
120-
],
121-
"extends": [
122-
"plugin:@nrwl/nx/javascript"
123-
],
85+
"files": ["*.js", "*.jsx"],
86+
"extends": ["plugin:@nx/javascript"],
12487
"rules": {}
12588
},
12689
{
127-
"files": [
128-
"*.spec.ts",
129-
"*/__fixtures__/*.ts"
130-
],
131-
"extends": [
132-
"plugin:@nrwl/nx/typescript"
133-
],
90+
"files": ["*.spec.ts", "*/__fixtures__/*.ts"],
91+
"extends": ["plugin:@nx/typescript"],
13492
"rules": {
135-
"max-classes-per-file": [
136-
"off"
137-
],
93+
"max-classes-per-file": ["off"],
13894
"@typescript-eslint/no-unsafe-assignment": "off",
13995
"@typescript-eslint/no-unsafe-argument": "off",
14096
"@typescript-eslint/no-unsafe-member-access": "off",
14197
"@typescript-eslint/ban-ts-comment": "off",
14298
"@typescript-eslint/no-non-null-assertion": "off",
14399
"@typescript-eslint/no-explicit-any": "off",
144100
"import/no-extraneous-dependencies": "off",
145-
"jest/expect-expect": "off"
101+
"jest/expect-expect": "off",
102+
"@nx/enforce-module-boundaries": ["off"]
146103
}
147104
}
148105
]

.github/actions/setup-step/action.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@ name: 'Setup Step'
22
description: 'Setup Step'
33
author: 'Tycho Bokdam'
44

5-
inputs:
6-
set_shas:
7-
description: 'Should the shas be set for nx affected:* commands'
8-
required: false
9-
default: 'true'
10-
115
runs:
126
using: "composite"
137
steps:
@@ -16,12 +10,6 @@ runs:
1610
uses: actions/cache@v3
1711
with:
1812
path: |
19-
~/.cache/Cypress
13+
~/.cache/mongodb-memory-server
2014
**/node_modules
2115
key: cache-node-modules-${{ hashFiles('yarn.lock') }}
22-
23-
- name: Derive appropriate SHAs for base and head for `nx affected` commands
24-
uses: nrwl/nx-set-shas@v2
25-
if: ${{ inputs.set_shas == 'true' }}
26-
with:
27-
main-branch-name: master

.github/workflows/release.yml

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
11
name: Release
22

33
on:
4-
push:
5-
branches:
6-
- master
4+
workflow_dispatch:
5+
inputs:
6+
environment:
7+
description: Environment
8+
required: true
9+
default: prod
10+
type: choice
11+
options:
12+
- prod
13+
- alpha
14+
15+
releaseAs:
16+
description: Release as (Required if env = alpha)
17+
required: false
18+
type: choice
19+
options:
20+
- premajor
21+
- preminor
22+
- prepatch
23+
- prerelease
724

825
env:
926
NX_BRANCH: ${{ github.event.number }}
@@ -52,23 +69,27 @@ jobs:
5269
**/node_modules
5370
key: ${{ env.DEPENDENCIES_CACHE }}-${{ hashFiles('yarn.lock') }}
5471

55-
- name: GIT config
72+
- name: GIT/NPM config
5673
run: |
5774
git config user.name "${GITHUB_ACTOR}"
5875
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
76+
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
77+
env:
78+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
5979

60-
- name: nx workspace:version
80+
- name: Version
81+
if: ${{ inputs.environment == 'prod' }}
6182
run: yarn nx run workspace:version
6283

63-
- name: nx affected:build
64-
run: node ./tools/scripts/run-many.js build origin/${{ needs.prepare-env.outputs.GITHUB_HEAD_REF }} ${{ needs.prepare-env.outputs.GITHUB_BASE_REF }}
84+
- name: Version (Alpha)
85+
if: ${{ inputs.environment == 'alpha' }}
86+
run: yarn nx run workspace:version --releaseAs=${{inputs.releaseAs}} --preid=alpha
6587

66-
- name: nx affected:publish
67-
run: |
68-
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
69-
node ./tools/scripts/run-many.js publish origin/${{ needs.prepare-env.outputs.GITHUB_HEAD_REF }} ${{ needs.prepare-env.outputs.GITHUB_BASE_REF }}
70-
env:
71-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
88+
- name: Build
89+
run: yarn nx run-many --target=build --all
90+
91+
- name: Publish
92+
run: yarn nx run-many --target=publish --all
7293

7394
- name: Push GIT
7495
run: git push --follow-tags origin ${{ needs.prepare-env.outputs.GITHUB_HEAD_REF }}

.github/workflows/shared.setup-env.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/cache@v3
1717
with:
1818
path: |
19-
~/.cache/Cypress
19+
~/.cache/mongodb-memory-server
2020
**/node_modules
2121
key: cache-node-modules-${{ hashFiles('yarn.lock') }}
2222

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
node-version: [ 16.x ]
25+
node-version: [ 20.x, 21.x ]
2626
target: [ 'build', 'test', 'lint' ]
2727
steps:
2828
- name: Use Node.js ${{ matrix.node-version }}
@@ -48,7 +48,7 @@ jobs:
4848
run: yarn nx run workspace:version
4949

5050
- name: nx affected:${{ matrix.target }}
51-
run: node ./tools/scripts/run-many.js ${{ matrix.target }}
51+
run: yarn nx run-many --target=${{ matrix.target }} --all
5252

5353
- name: Codecov
5454
uses: codecov/codecov-action@v2
@@ -65,7 +65,7 @@ jobs:
6565
strategy:
6666
fail-fast: false
6767
matrix:
68-
node-version: [ 16.x ]
68+
node-version: [ 20.x, 21.x ]
6969
db-type: ['postgres', 'mysql']
7070
steps:
7171
- name: Use Node.js ${{ matrix.node-version }}
@@ -84,7 +84,7 @@ jobs:
8484
run: docker-compose -f ./examples/docker-compose.yml up -d
8585

8686
- name: nx affected:e2e
87-
run: npx nx affected:e2e
87+
run: yarn nx run-many --target=e2e --all
8888
env:
8989
NESTJS_QUERY_DB_TYPE: ${{ matrix.db-type }}
9090

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ tsconfig.tsbuildinfo
8383
# intelliJ workspace files
8484
.idea
8585

86-
schema.gql
87-
8886
documentation/.docusaurus
8987
/**/package-lock.json
9088

@@ -94,3 +92,5 @@ documentation/.docusaurus
9492

9593
# VSCode workspace files
9694
.vscode
95+
96+
.nx/cache

.ncurc.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"upgrade": true,
3+
"interactive": true,
4+
"root": true,
5+
"workspaces": true,
6+
"packageManager": "yarn",
7+
"format": ["group", "repo"],
8+
"reject": ["@nx/*", "nx"]
9+
}

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.prettierignore
2-
.docusaurus/
2+
.docusaurus/
3+
/.nx/cache

0 commit comments

Comments
 (0)