Skip to content

Commit 8c27c3d

Browse files
Merge remote-tracking branch 'upstream/master' into feature/graphql-plugin
# Conflicts: # .prettierignore # packages/graphql/lib/plugin/utils/ast-utils.ts # packages/graphql/lib/plugin/visitors/model-class.visitor.ts # packages/graphql/tests/plugin/fixtures/nullable.dto.ts # packages/graphql/tests/plugin/model-class-visitor.spec.ts
2 parents 17dc544 + 578cff2 commit 8c27c3d

File tree

532 files changed

+18104
-31525
lines changed

Some content is hidden

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

532 files changed

+18104
-31525
lines changed

.circleci/config.yml

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,23 @@ version: 2
33
aliases:
44
- &restore-cache
55
restore_cache:
6-
key: dependency-cache-{{ checksum "package.json" }}
6+
name: Restore Yarn Package Cache
7+
keys:
8+
- yarn-packages-{{ checksum "yarn.lock" }}
79
- &install-deps
810
run:
9-
name: Install dependencies
10-
command: npm ci
11+
name: Install Dependencies
12+
command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
1113
- &build-packages
1214
run:
1315
name: Build
14-
command: npm run build
16+
command: yarn build
17+
- &save-cache
18+
save_cache:
19+
name: Save Yarn Package Cache
20+
key: yarn-packages-{{ checksum "yarn.lock" }}
21+
paths:
22+
- ~/.cache/yarn
1523

1624
jobs:
1725
build:
@@ -20,23 +28,14 @@ jobs:
2028
- image: circleci/node:16
2129
steps:
2230
- checkout
23-
- run:
24-
name: Update NPM version
25-
command: 'sudo npm install -g npm@latest'
26-
- restore_cache:
27-
key: dependency-cache-{{ checksum "package.json" }}
28-
- run:
29-
name: Install dependencies
30-
command: npm ci
31-
- save_cache:
32-
key: dependency-cache-{{ checksum "package.json" }}
33-
paths:
34-
- ./node_modules
31+
- *restore-cache
32+
- *install-deps
33+
- *save-cache
3534
- run:
3635
name: Build
37-
command: npm run build
36+
command: yarn build
3837

39-
integration_tests:
38+
e2e_tests:
4039
working_directory: ~/nest
4140
docker:
4241
- image: circleci/node:16
@@ -45,15 +44,15 @@ jobs:
4544
- *restore-cache
4645
- *install-deps
4746
- run:
48-
name: Integration tests
49-
command: npm run test:integration
47+
name: E2E tests
48+
command: yarn test:e2e
5049

5150
workflows:
5251
version: 2
5352
build-and-test:
5453
jobs:
5554
- build
56-
- integration_tests:
55+
- e2e_tests:
5756
requires:
5857
- build
5958

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
tests/**
1+
packages/**/tests/**

.eslintrc.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
module.exports = {
22
parser: '@typescript-eslint/parser',
33
parserOptions: {
4-
project: 'tsconfig.json',
4+
project: 'packages/tsconfig.build.json',
55
sourceType: 'module',
66
},
77
plugins: ['@typescript-eslint/eslint-plugin'],
88
extends: [
99
'plugin:@typescript-eslint/eslint-recommended',
1010
'plugin:@typescript-eslint/recommended',
11-
'prettier',
12-
'prettier/@typescript-eslint',
11+
'plugin:prettier/recommended',
1312
],
1413
root: true,
1514
env: {
@@ -24,5 +23,6 @@ module.exports = {
2423
'@typescript-eslint/no-unused-vars': 'off',
2524
'@typescript-eslint/explicit-module-boundary-types': 'off',
2625
'@typescript-eslint/ban-types': 'off',
26+
'@typescript-eslint/no-empty-function': 'off'
2727
},
2828
};

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/Bug_report.yml

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
name: "\U0001F41B Bug Report"
2+
description: "If something isn't working as expected \U0001F914"
3+
labels: ["needs triage", "bug"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
## :warning: We use GitHub Issues to track bug reports, feature requests and regressions
9+
10+
If you are not sure that your issue is a bug, you could:
11+
12+
- use our [Discord community](https://discord.gg/NestJS)
13+
- use [StackOverflow using the tag `nestjs`](https://stackoverflow.com/questions/tagged/nestjs)
14+
- If it's just a quick question you can ping [our Twitter](https://twitter.com/nestframework)
15+
16+
**NOTE:** You don't need to answer questions that you know that aren't relevant.
17+
18+
---
19+
20+
- type: checkboxes
21+
attributes:
22+
label: "Is there an existing issue for this?"
23+
description: "Please search [here](./?q=is%3Aissue) to see if an issue already exists for the bug you encountered"
24+
options:
25+
- label: "I have searched the existing issues"
26+
required: true
27+
28+
- type: textarea
29+
validations:
30+
required: true
31+
attributes:
32+
label: "Current behavior"
33+
description: "How the issue manifests?"
34+
35+
- type: input
36+
validations:
37+
required: true
38+
attributes:
39+
label: "Minimum reproduction code"
40+
description: "An URL to some git repository or gist that reproduces this issue. [Wtf is a minimum reproduction?](https://jmcdo29.github.io/wtf-is-a-minimum-reproduction)"
41+
placeholder: "https://github.com/..."
42+
43+
- type: textarea
44+
attributes:
45+
label: "Steps to reproduce"
46+
description: |
47+
How the issue manifests?
48+
You could leave this blank if you alread write this in your reproduction code/repo
49+
placeholder: |
50+
1. `npm i`
51+
2. `npm start:dev`
52+
3. See error...
53+
54+
- type: textarea
55+
validations:
56+
required: true
57+
attributes:
58+
label: "Expected behavior"
59+
description: "A clear and concise description of what you expected to happend (or code)"
60+
61+
- type: markdown
62+
attributes:
63+
value: |
64+
---
65+
66+
- type: input
67+
validations:
68+
required: true
69+
attributes:
70+
label: "Package version"
71+
description: |
72+
Which version of `@nestjs/graphql` are you using?
73+
**Tip**: Make sure that all of yours `@nestjs/*` dependencies are in sync!
74+
placeholder: "8.1.3"
75+
76+
- type: textarea
77+
attributes:
78+
label: "Graphql version"
79+
description: "Which version of `graphql`-related packages are you using?"
80+
value: |
81+
`graphql`:
82+
`apollo-server-express`:
83+
`apollo-server-fastify`:
84+
85+
- type: input
86+
attributes:
87+
label: "NestJS version"
88+
description: "Which version of `@nestjs/core` are you using?"
89+
placeholder: "8.1.3"
90+
91+
- type: input
92+
attributes:
93+
label: "Node.js version"
94+
description: "Which version of Node.js are you using?"
95+
placeholder: "14.17.6"
96+
97+
- type: checkboxes
98+
attributes:
99+
label: "In which operating systems have you tested?"
100+
options:
101+
- label: macOS
102+
- label: Windows
103+
- label: Linux
104+
105+
- type: markdown
106+
attributes:
107+
value: |
108+
---
109+
110+
- type: textarea
111+
attributes:
112+
label: "Other"
113+
description: |
114+
Anything else relevant? eg: Logs, OS version, IDE, package manager, etc.
115+
**Tip:** You can attach images, recordings or log files by clicking this area to highlight it and then dragging files in
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: "\U0001F680 Feature Request"
2+
description: "I have a suggestion \U0001F63B!"
3+
labels: ["feature"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
## :warning: We use GitHub Issues to track bug reports, feature requests and regressions
9+
10+
If you are not sure that your issue is a bug, you could:
11+
12+
- use our [Discord community](https://discord.gg/NestJS)
13+
- use [StackOverflow using the tag `nestjs`](https://stackoverflow.com/questions/tagged/nestjs)
14+
- If it's just a quick question you can ping [our Twitter](https://twitter.com/nestframework)
15+
16+
---
17+
18+
- type: checkboxes
19+
attributes:
20+
label: "Is there an existing issue that is already proposing this?"
21+
description: "Please search [here](./?q=is%3Aissue) to see if an issue already exists for the feature you are requesting"
22+
options:
23+
- label: "I have searched the existing issues"
24+
required: true
25+
26+
- type: textarea
27+
validations:
28+
required: true
29+
attributes:
30+
label: "Is your feature request related to a problem? Please describe it"
31+
description: "A clear and concise description of what the problem is"
32+
placeholder: |
33+
I have an issue when ...
34+
35+
- type: textarea
36+
validations:
37+
required: true
38+
attributes:
39+
label: "Describe the solution you'd like"
40+
description: "A clear and concise description of what you want to happen. Add any considered drawbacks"
41+
42+
- type: textarea
43+
attributes:
44+
label: "Teachability, documentation, adoption, migration strategy"
45+
description: "If you can, explain how users will be able to use this and possibly write out a version the docs. Maybe a screenshot or design?"
46+
47+
- type: textarea
48+
validations:
49+
required: true
50+
attributes:
51+
label: "What is the motivation / use case for changing the behavior?"
52+
description: "Describe the motivation or the concrete use case"

0 commit comments

Comments
 (0)