Skip to content

Commit f814a7f

Browse files
committed
[Dev Deps] backport from main
1 parent fd950b0 commit f814a7f

11 files changed

+89
-45
lines changed

.editorconfig

+14-1
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ end_of_line = lf
77
charset = utf-8
88
trim_trailing_whitespace = true
99
insert_final_newline = true
10-
max_line_length = 140
10+
max_line_length = 160
11+
quote_type = single
1112

1213
[test/*]
1314
max_line_length = off
1415

16+
[LICENSE.md]
17+
indent_size = off
18+
1519
[*.md]
1620
max_line_length = off
1721

@@ -28,3 +32,12 @@ indent_size = 2
2832
[LICENSE]
2933
indent_size = 2
3034
max_line_length = off
35+
36+
[coverage/**/*]
37+
indent_size = off
38+
indent_style = off
39+
indent = off
40+
max_line_length = off
41+
42+
[.nycrc]
43+
indent_style = tab

.eslintignore

-1
This file was deleted.

.eslintrc

+21-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,35 @@
33

44
"extends": "@ljharb",
55

6+
"ignorePatterns": [
7+
"dist/",
8+
],
9+
610
"rules": {
711
"complexity": 0,
812
"consistent-return": 1,
9-
"func-name-matching": 0,
13+
"func-name-matching": 0,
1014
"id-length": [2, { "min": 1, "max": 25, "properties": "never" }],
1115
"indent": [2, 4],
16+
"max-lines-per-function": 0,
1217
"max-params": [2, 12],
1318
"max-statements": [2, 45],
19+
"multiline-comment-style": 0,
1420
"no-continue": 1,
1521
"no-magic-numbers": 0,
22+
"no-param-reassign": 1,
1623
"no-restricted-syntax": [2, "BreakStatement", "DebuggerStatement", "ForInStatement", "LabeledStatement", "WithStatement"],
17-
"operator-linebreak": [2, "before"],
18-
}
24+
},
25+
26+
"overrides": [
27+
{
28+
"files": "test/**",
29+
"rules": {
30+
"max-lines-per-function": 0,
31+
"max-statements": 0,
32+
"no-extend-native": 0,
33+
"function-paren-newline": 0,
34+
},
35+
},
36+
],
1937
}

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ dist/*
1010
yarn.lock
1111
package-lock.json
1212
npm-shrinkwrap.json
13+
14+
.nyc_output/
15+
coverage/

.npmignore

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
bower.json
2-
component.json
3-
.npmignore
4-
.travis.yml
1+
# gitignore
2+
npm-debug.log
3+
node_modules
4+
.DS_Store
5+
6+
# Only apps should have lockfiles
7+
yarn.lock
8+
package-lock.json
9+
npm-shrinkwrap.json
10+
11+
.nyc_output/
12+
coverage/
13+
14+
.github/workflows

.nycrc

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"all": true,
3+
"check-coverage": false,
4+
"reporter": ["text-summary", "text", "html", "json"],
5+
"lines": 86,
6+
"statements": 85.93,
7+
"functions": 82.43,
8+
"branches": 76.06,
9+
"exclude": [
10+
"coverage",
11+
"dist"
12+
]
13+
}

lib/stringify.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ var utils = require('./utils');
44
var formats = require('./formats');
55

66
var arrayPrefixGenerators = {
7-
brackets: function brackets(prefix) { // eslint-disable-line func-name-matching
7+
brackets: function brackets(prefix) {
88
return prefix + '[]';
99
},
10-
indices: function indices(prefix, key) { // eslint-disable-line func-name-matching
10+
indices: function indices(prefix, key) {
1111
return prefix + '[' + key + ']';
1212
},
13-
repeat: function repeat(prefix) { // eslint-disable-line func-name-matching
13+
repeat: function repeat(prefix) {
1414
return prefix;
1515
}
1616
};
@@ -28,14 +28,14 @@ var defaults = {
2828
encode: true,
2929
encoder: utils.encode,
3030
encodeValuesOnly: false,
31-
serializeDate: function serializeDate(date) { // eslint-disable-line func-name-matching
31+
serializeDate: function serializeDate(date) {
3232
return toISO.call(date);
3333
},
3434
skipNulls: false,
3535
strictNullHandling: false
3636
};
3737

38-
var stringify = function stringify( // eslint-disable-line func-name-matching
38+
var stringify = function stringify(
3939
object,
4040
prefix,
4141
generateArrayPrefix,

lib/utils.js

+1
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ var encode = function encode(str) {
159159

160160
i += 1;
161161
c = 0x10000 + (((c & 0x3FF) << 10) | (string.charCodeAt(i) & 0x3FF));
162+
/* eslint operator-linebreak: [2, "before"] */
162163
out += hexTable[0xF0 | (c >> 18)]
163164
+ hexTable[0x80 | ((c >> 12) & 0x3F)]
164165
+ hexTable[0x80 | ((c >> 6) & 0x3F)]

package.json

+17-15
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,32 @@
2222
"engines": {
2323
"node": ">=0.6"
2424
},
25-
"dependencies": {},
2625
"devDependencies": {
27-
"@ljharb/eslint-config": "^12.2.1",
28-
"browserify": "^16.2.0",
29-
"covert": "^1.1.0",
30-
"editorconfig-tools": "^0.1.1",
31-
"eslint": "^4.19.1",
26+
"@ljharb/eslint-config": "^20.1.0",
27+
"aud": "^1.1.5",
28+
"browserify": "^16.5.2",
29+
"eclint": "^2.8.1",
30+
"eslint": "^8.6.0",
3231
"evalmd": "^0.0.17",
33-
"iconv-lite": "^0.4.21",
32+
"iconv-lite": "^0.4.24",
33+
"in-publish": "^2.0.1",
3434
"mkdirp": "^0.5.1",
35+
"nyc": "^10.3.2",
3536
"qs-iconv": "^1.0.4",
36-
"safe-publish-latest": "^1.1.1",
37+
"safe-publish-latest": "^2.0.0",
3738
"safer-buffer": "^2.1.2",
38-
"tape": "^4.9.0"
39+
"tape": "^5.4.0"
3940
},
4041
"scripts": {
41-
"prepublish": "safe-publish-latest && npm run dist",
42+
"prepublishOnly": "safe-publish-latest && npm run dist",
43+
"prepublish": "not-in-publish || npm run prepublishOnly",
4244
"pretest": "npm run --silent readme && npm run --silent lint",
43-
"test": "npm run --silent coverage",
44-
"tests-only": "node test",
45+
"test": "npm run --silent tests-only",
46+
"tests-only": "nyc tape 'test/**/*.js'",
47+
"posttest": "aud --production",
4548
"readme": "evalmd README.md",
46-
"postlint": "editorconfig-tools check * lib/* test/*",
47-
"lint": "eslint lib/*.js test/*.js",
48-
"coverage": "covert test",
49+
"postlint": "eclint check $(git ls-files | xargs find 2> /dev/null | grep -vE 'node_modules|\\.git')",
50+
"lint": "eslint --ext=js,mjs .",
4951
"dist": "mkdirp dist && browserify --standalone Qs lib/index.js > dist/qs.js"
5052
},
5153
"license": "BSD-3-Clause"

test/.eslintrc

-15
This file was deleted.

test/parse.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ test('parse()', function (t) {
523523

524524
st.deepEqual(
525525
qs.parse('a[b]=c&a=toString', { plainObjects: true }),
526-
{ a: { b: 'c', toString: true } },
526+
{ __proto__: null, a: { __proto__: null, b: 'c', toString: true } },
527527
'can overwrite prototype with plainObjects true'
528528
);
529529

0 commit comments

Comments
 (0)