Skip to content

Commit 19e52fc

Browse files
committed
Merge branch 'release/6.0.0'
2 parents 7382a2a + 0b1c840 commit 19e52fc

File tree

85 files changed

+9371
-2549
lines changed

Some content is hidden

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

85 files changed

+9371
-2549
lines changed

.eslintrc

Lines changed: 104 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
2-
"plugins": [
3-
"jsdoc",
4-
"lodash",
5-
"security"
6-
],
2+
"plugins": ["jsdoc", "lodash", "security"],
73
"env": {
84
"browser": false,
95
"node": true,
@@ -15,6 +11,9 @@
1511
"pragma": "_"
1612
}
1713
},
14+
"parserOptions": {
15+
"ecmaVersion": 2018
16+
},
1817
"rules": {
1918
// Possible Errors
2019
"for-direction": "error",
@@ -25,9 +24,12 @@
2524
"no-await-in-loop": "error",
2625
"no-compare-neg-zero": "error",
2726
"no-cond-assign": "error",
28-
"no-console": ["error", {
29-
"allow": ["info", "warn", "error"]
30-
}],
27+
"no-console": [
28+
"error",
29+
{
30+
"allow": ["info", "warn", "error"]
31+
}
32+
],
3133
"no-constant-condition": "error",
3234
"no-control-regex": "error",
3335
"no-constructor-return": "error",
@@ -47,7 +49,9 @@
4749
"no-inner-declarations": "error",
4850
"no-invalid-regexp": "error",
4951
"no-irregular-whitespace": "error",
52+
"no-loss-of-precision": "error",
5053
"no-misleading-character-class": "error",
54+
"no-nonoctal-decimal-escape": "error",
5155
"no-obj-calls": "error",
5256
"no-prototype-builtins": "error",
5357
"no-regex-spaces": "error",
@@ -57,6 +61,7 @@
5761
"no-unreachable": "error",
5862
"no-unsafe-finally": "error",
5963
"no-unsafe-negation": "error",
64+
"no-unsafe-optional-chaining": "error",
6065
"prefer-regex-literals": "error",
6166
"require-atomic-updates": "error",
6267
"require-unicode-regexp": "off",
@@ -69,14 +74,16 @@
6974
"block-scoped-var": "error",
7075
"class-methods-use-this": "error",
7176
"complexity": "off",
72-
"consistent-return": "warn",
77+
"consistent-return": "off",
7378
"curly": "error",
7479
"default-case": "error",
80+
"default-case-last": "error",
7581
"dot-location": ["error", "property"],
7682
"dot-notation": "error",
7783
"eqeqeq": "error",
7884
"grouped-accessor-pairs": "warn",
7985
"guard-for-in": "warn",
86+
"id-denylist": "warn",
8087
"max-classes-per-file": ["error", 1],
8188
"max-lines-per-function": "off",
8289
"no-alert": "error",
@@ -111,8 +118,10 @@
111118
"no-octal": "error",
112119
"no-octal-escape": "error",
113120
"no-param-reassign": "off",
121+
"no-promise-executor-return": "error",
114122
"no-proto": "error",
115123
"no-redeclare": "error",
124+
"no-restricted-exports": "error",
116125
"no-restricted-properties": "error",
117126
"no-return-assign": "error",
118127
"no-return-await": "error",
@@ -123,10 +132,12 @@
123132
"no-setter-return": "error",
124133
"no-throw-literal": "error",
125134
"no-unmodified-loop-condition": "error",
135+
"no-unreachable-loop": "error",
126136
"no-unused-expressions": "off",
127137
"no-unused-labels": "error",
128138
"no-useless-call": "error",
129139
"no-useless-concat": "error",
140+
"no-useless-backreference": "error",
130141
"no-useless-escape": "error",
131142
"no-useless-return": "error",
132143
"no-void": "error",
@@ -176,75 +187,102 @@
176187
"array-bracket-spacing": "error",
177188
"array-element-newline": "off",
178189
"block-spacing": "error",
179-
"brace-style": ["error", "stroustrup", {
180-
"allowSingleLine": true
181-
}],
190+
"brace-style": [
191+
"error",
192+
"stroustrup",
193+
{
194+
"allowSingleLine": true
195+
}
196+
],
182197
"camelcase": "off",
183198
"capitalized-comments": "off",
184199
"comma-dangle": ["error", "never"],
185-
"comma-spacing": ["error", {
186-
"before": false,
187-
"after": true
188-
}],
200+
"comma-spacing": [
201+
"error",
202+
{
203+
"before": false,
204+
"after": true
205+
}
206+
],
189207
"comma-style": ["error", "last"],
190208
"computed-property-spacing": "error",
191209
"consistent-this": "off",
192210
"eol-last": "error",
193211
"func-call-spacing": "error",
194-
"func-name-matching": "error",
212+
"func-name-matching": "off",
195213
"func-names": "off",
196214
"func-style": "off",
197215
"function-paren-newline": ["error", "never"],
198216
"id-blacklist": "error",
199217
"id-length": "off",
200218
"id-match": "error",
201219
"implicit-arrow-linebreak": ["error", "beside"],
202-
"indent": ["error", 4, {
203-
"VariableDeclarator": {
204-
"var": 1,
205-
"let": 1,
206-
"const": 1
207-
},
208-
"SwitchCase": 1
209-
}],
220+
"indent": [
221+
"error",
222+
4,
223+
{
224+
"VariableDeclarator": {
225+
"var": 1,
226+
"let": 1,
227+
"const": 1
228+
},
229+
"SwitchCase": 1
230+
}
231+
],
210232
"jsx-quotes": ["error", "prefer-single"],
211233
"key-spacing": "error",
212234
"keyword-spacing": "error",
213235
"line-comment-position": "off",
214236
"linebreak-style": ["error", "unix"],
215-
"lines-around-comment": ["error", {
216-
"beforeBlockComment": true,
217-
"afterBlockComment": false,
218-
"beforeLineComment": false,
219-
"afterLineComment": false,
220-
"allowBlockStart": true,
221-
"allowBlockEnd": false,
222-
"allowObjectStart": true,
223-
"allowObjectEnd": false,
224-
"allowArrayStart": true,
225-
"allowArrayEnd": false
226-
}],
227-
"lines-between-class-members": ["error", "always", {
228-
"exceptAfterSingleLine": true
229-
}],
237+
"lines-around-comment": [
238+
"error",
239+
{
240+
"beforeBlockComment": true,
241+
"afterBlockComment": false,
242+
"beforeLineComment": false,
243+
"afterLineComment": false,
244+
"allowBlockStart": true,
245+
"allowBlockEnd": false,
246+
"allowObjectStart": true,
247+
"allowObjectEnd": false,
248+
"allowArrayStart": true,
249+
"allowArrayEnd": false
250+
}
251+
],
252+
"lines-between-class-members": [
253+
"error",
254+
"always",
255+
{
256+
"exceptAfterSingleLine": true
257+
}
258+
],
230259
"max-depth": "error",
231-
"max-len": ["error", {
232-
"code": 120
233-
}],
260+
"max-len": [
261+
"error",
262+
{
263+
"code": 120
264+
}
265+
],
234266
"max-lines": "off",
235267
"max-nested-callbacks": "error",
236268
"max-params": "off",
237269
"max-statements": "off",
238-
"max-statements-per-line": ["error", {
239-
"max": 2
240-
}],
270+
"max-statements-per-line": [
271+
"error",
272+
{
273+
"max": 2
274+
}
275+
],
241276
"multiline-comment-style": "off",
242277
"multiline-ternary": "off",
243278
"new-cap": "off",
244279
"new-parens": "error",
245-
"newline-per-chained-call": ["error", {
246-
"ignoreChainWithDepth": 4
247-
}],
280+
"newline-per-chained-call": [
281+
"error",
282+
{
283+
"ignoreChainWithDepth": 4
284+
}
285+
],
248286
"no-array-constructor": "error",
249287
"no-bitwise": "off",
250288
"no-continue": "off",
@@ -274,7 +312,8 @@
274312
"operator-assignment": "error",
275313
"operator-linebreak": ["error", "after"],
276314
"padded-blocks": ["error", "never"],
277-
"padding-line-between-statements": ["error",
315+
"padding-line-between-statements": [
316+
"error",
278317
{
279318
"blankLine": "always",
280319
"prev": "*",
@@ -303,11 +342,15 @@
303342
"space-in-parens": "error",
304343
"space-infix-ops": "error",
305344
"space-unary-ops": "error",
306-
"spaced-comment": ["error", "always", {
307-
"block": {
308-
"exceptions": ["!"]
345+
"spaced-comment": [
346+
"error",
347+
"always",
348+
{
349+
"block": {
350+
"exceptions": ["!"]
351+
}
309352
}
310-
}],
353+
],
311354
"switch-colon-spacing": "error",
312355
"template-tag-spacing": "error",
313356
"unicode-bom": "error",
@@ -349,7 +392,7 @@
349392

350393
// Lodash
351394
"lodash/callback-binding": "error",
352-
"lodash/collection-method-value": "warn",
395+
"lodash/collection-method-value": "off",
353396
"lodash/collection-return": "error",
354397
"lodash/no-double-unwrap": "error",
355398
"lodash/no-extra-args": "error",
@@ -378,9 +421,12 @@
378421

379422
"lodash/prefer-constant": "off",
380423
"lodash/prefer-get": ["warn", 4],
381-
"lodash/prefer-includes": ["error", {
382-
"includeNative": true
383-
}],
424+
"lodash/prefer-includes": [
425+
"error",
426+
{
427+
"includeNative": true
428+
}
429+
],
384430
"lodash/prefer-is-nil": "error",
385431
"lodash/prefer-lodash-chain": "error",
386432
"lodash/prefer-lodash-method": "off",
@@ -396,7 +442,6 @@
396442
"jsdoc/check-param-names": "error",
397443
"jsdoc/check-tag-names": "off",
398444
"jsdoc/check-types": "off",
399-
"jsdoc/newline-after-description": "error",
400445
"jsdoc/require-description-complete-sentence": "off",
401446
"jsdoc/require-example": "off",
402447
"jsdoc/require-hyphen-before-param-description": "off",

.github/CONTRIBUTING.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ This repository uses standard `git-flow` branch management policy/strategy. If y
8181
refer to [tutorial from Atlassian](https://www.atlassian.com/git/workflows#!workflow-gitflow) and more details at
8282
[http://nvie.com/posts/a-successful-git-branching-model/](http://nvie.com/posts/a-successful-git-branching-model).
8383

84-
> Deletion of `master` and `develop`.
85-
> Rebasing on `master` is blocked.
84+
> Deletion of `main` and `develop`.
85+
> Rebasing on `main` is blocked.
8686
8787
## Preferred IDE
8888
It is advised to use an IDE that provides [EditorConfig](http://editorconfig.org) support via `.editorconfig` files,
@@ -245,7 +245,7 @@ file-name.postman_data.csv
245245

246246
## Guidelines for sending a Pull Request
247247

248-
Commit to master branch and develop branch is locked. As such, `git-flow` for feature completion and release will not
248+
Commit to `main` branch and `develop` branch is locked. As such, `git-flow` for feature completion and release will not
249249
work. Thus, the last steps of feature completion in `git-flow` will happen as a Pull Request from website. Avoid
250250
changing the `version` field in `package.json` for feature pull requests, as `version` bumps are handled separately.
251251

@@ -297,10 +297,6 @@ scripts (`pwd`) is always the repository root.
297297
The script associated with `npm test` will run all tests that ensures that your commit does not break anything in the
298298
repository. As such run `npm test` before you push
299299

300-
### Accessing build log on CI server
301-
302-
Build logs for this project can be accessed [here](https://travis-ci.org/postmanlabs/newman)
303-
304300
### Security
305301

306302
Security concerns are always treated with high priority. Should you come across a security vulnerability, please report

0 commit comments

Comments
 (0)