Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies to enable Greenkeeper 🌴 #349

Merged
merged 5 commits into from Jan 14, 2020
Merged

Update dependencies to enable Greenkeeper 🌴 #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe6384c
[Fix] `parse`: throw a TypeError instead of an Error for bad charset
ljharb Jan 14, 2020
76e4570
[actions] add automatic rebasing / merge commit blocking
ljharb Jan 14, 2020
72dc89f
[meta] fix indentation in package.json
ljharb Jan 14, 2020
5af2bf8
[meta] ignore eclint transitive audit warning
ljharb Jan 14, 2020
eac5616
[Dev Deps] update `eslint`, `@ljharb/eslint-config`, `object-inspect`…
ljharb Jan 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/workflows/rebase.yml
View file
Open in desktop
@@ -0,0 +1,15 @@
name: Automatic Rebase

on: [pull_request]

jobs:
_:
name: "Automatic Rebase"

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: ljharb/rebase@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .npmrc
View file
Open in desktop
@@ -1 +1,2 @@
package-lock=false
audit-level=moderate
2 changes: 1 addition & 1 deletion lib/parse.js
View file
Open in desktop
Expand Up @@ -201,7 +201,7 @@ var normalizeParseOptions = function normalizeParseOptions(opts) {
}

if (typeof opts.charset !== 'undefined' && opts.charset !== 'utf-8' && opts.charset !== 'iso-8859-1') {
throw new Error('The charset option must be either utf-8, iso-8859-1, or undefined');
throw new TypeError('The charset option must be either utf-8, iso-8859-1, or undefined');
}
var charset = typeof opts.charset === 'undefined' ? defaults.charset : opts.charset;

Expand Down
18 changes: 9 additions & 9 deletions package.json
View file
Open in desktop
Expand Up @@ -7,9 +7,9 @@
"type": "git",
"url": "https://github.com/ljharb/qs.git"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
},
"main": "lib/index.js",
"contributors": [
{
Expand All @@ -31,21 +31,21 @@
},
"dependencies": {},
"devDependencies": {
"@ljharb/eslint-config": "^15.0.0",
"@ljharb/eslint-config": "^15.1.0",
"browserify": "^16.5.0",
"covert": "^1.1.1",
"eclint": "^2.8.1",
"eslint": "^6.6.0",
"eslint": "^6.8.0",
"evalmd": "^0.0.19",
"for-each": "^0.3.3",
"has-symbols": "^1.0.0",
"has-symbols": "^1.0.1",
"iconv-lite": "^0.4.24",
"mkdirp": "^0.5.1",
"object-inspect": "^1.6.0",
"object-inspect": "^1.7.0",
"qs-iconv": "^1.0.4",
"safe-publish-latest": "^1.1.3",
"safe-publish-latest": "^1.1.4",
"safer-buffer": "^2.1.2",
"tape": "^4.11.0"
"tape": "^5.0.0-next.3"
},
"scripts": {
"prepublish": "safe-publish-latest && npm run dist",
Expand Down
2 changes: 1 addition & 1 deletion test/parse.js
View file
Open in desktop
Expand Up @@ -599,7 +599,7 @@ test('parse()', function (t) {

st.deepEqual(
qs.parse('a[b]=c&a=toString', { plainObjects: true }),
{ a: { b: 'c', toString: true } },
{ __proto__: null, a: { __proto__: null, b: 'c', toString: true } },
'can overwrite prototype with plainObjects true'
);

Expand Down