Skip to content

Commit c184195

Browse files
authored
Upgrade to latest dependencies (#136)
1 parent a95673c commit c184195

File tree

6 files changed

+970
-988
lines changed

6 files changed

+970
-988
lines changed

.eslintrc

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,14 @@
55

66
"parser": "babel-eslint",
77

8-
"plugins": [
9-
"babel"
10-
],
11-
128
"env": {
139
"es6": true,
1410
"node": true
1511
},
1612

17-
"ecmaFeatures": {
18-
"arrowFunctions": true,
19-
"binaryLiterals": true,
20-
"blockBindings": true,
21-
"classes": true,
22-
"defaultParams": true,
23-
"destructuring": true,
24-
"experimentalObjectRestSpread": true,
25-
"forOf": true,
26-
"generators": true,
27-
"globalReturn": true,
28-
"jsx": true,
29-
"modules": true,
30-
"objectLiteralComputedProperties": true,
31-
"objectLiteralDuplicateProperties": true,
32-
"objectLiteralShorthandMethods": true,
33-
"objectLiteralShorthandProperties": true,
34-
"octalLiterals": true,
35-
"regexUFlag": true,
36-
"regexYFlag": true,
37-
"restParams": true,
38-
"spread": true,
39-
"superInFunctions": true,
40-
"templateStrings": true,
41-
"unicodeCodePointEscapes": true
42-
},
43-
4413
"rules": {
45-
"babel/arrow-parens": [2, "as-needed"],
46-
4714
"array-bracket-spacing": [2, "always"],
15+
"arrow-parens": [2, "as-needed"],
4816
"arrow-spacing": 2,
4917
"block-scoped-var": 0,
5018
"brace-style": [2, "1tbs", {"allowSingleLine": true}],

package.json

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"url": "http://github.com/facebook/dataloader.git"
1818
},
1919
"main": "index.js",
20+
"typings": "index.d.ts",
2021
"options": {
2122
"mocha": "--require resources/mocha-bootload src/**/__tests__/**/*.js"
2223
},
@@ -44,16 +45,9 @@
4445
}
4546
],
4647
"transform-es2015-parameters",
47-
[
48-
"transform-es2015-destructuring",
49-
{
50-
"loose": true
51-
}
52-
],
53-
"add-module-exports",
5448
"transform-es2015-block-scoping",
5549
[
56-
"transform-es2015-modules-commonjs",
50+
"transform-es2015-destructuring",
5751
{
5852
"loose": true
5953
}
@@ -82,32 +76,28 @@
8276
"PATENTS"
8377
],
8478
"devDependencies": {
85-
"babel-cli": "6.14.0",
86-
"babel-eslint": "6.1.2",
87-
"babel-plugin-add-module-exports": "0.2.1",
88-
"babel-plugin-transform-async-to-generator": "6.8.0",
89-
"babel-plugin-transform-class-properties": "6.11.5",
90-
"babel-plugin-transform-es2015-arrow-functions": "6.8.0",
91-
"babel-plugin-transform-es2015-block-scoping": "6.15.0",
92-
"babel-plugin-transform-es2015-classes": "6.14.0",
93-
"babel-plugin-transform-es2015-destructuring": "6.9.0",
94-
"babel-plugin-transform-es2015-function-name": "6.9.0",
95-
"babel-plugin-transform-es2015-literals": "6.8.0",
96-
"babel-plugin-transform-es2015-modules-commonjs": "6.14.0",
97-
"babel-plugin-transform-es2015-parameters": "6.11.4",
98-
"babel-plugin-transform-es2015-shorthand-properties": "6.8.0",
99-
"babel-plugin-transform-es2015-spread": "6.8.0",
100-
"babel-plugin-transform-es2015-template-literals": "6.8.0",
101-
"babel-plugin-transform-flow-strip-types": "6.14.0",
102-
"babel-plugin-transform-regenerator": "6.14.0",
103-
"chai": "3.5.0",
104-
"coveralls": "2.11.14",
105-
"eslint": "3.5.0",
106-
"eslint-plugin-babel": "3.3.0",
107-
"flow-bin": "0.53.0",
79+
"babel-cli": "6.26.0",
80+
"babel-eslint": "8.2.1",
81+
"babel-plugin-transform-async-to-generator": "6.24.1",
82+
"babel-plugin-transform-class-properties": "6.24.1",
83+
"babel-plugin-transform-es2015-arrow-functions": "6.22.0",
84+
"babel-plugin-transform-es2015-block-scoping": "6.26.0",
85+
"babel-plugin-transform-es2015-classes": "6.24.1",
86+
"babel-plugin-transform-es2015-destructuring": "6.23.0",
87+
"babel-plugin-transform-es2015-function-name": "6.24.1",
88+
"babel-plugin-transform-es2015-literals": "6.22.0",
89+
"babel-plugin-transform-es2015-parameters": "6.24.1",
90+
"babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
91+
"babel-plugin-transform-es2015-spread": "6.22.0",
92+
"babel-plugin-transform-es2015-template-literals": "6.22.0",
93+
"babel-plugin-transform-flow-strip-types": "6.22.0",
94+
"babel-plugin-transform-regenerator": "6.26.0",
95+
"chai": "4.1.2",
96+
"coveralls": "3.0.0",
97+
"eslint": "4.16.0",
98+
"flow-bin": "0.64.0",
10899
"isparta": "4.0.0",
109-
"mocha": "3.0.2",
110-
"sane": "1.4.1"
111-
},
112-
"typings": "index.d.ts"
100+
"mocha": "5.0.0",
101+
"sane": "2.3.0"
102+
}
113103
}

src/__tests__/abuse-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
* of patent rights can be found in the PATENTS file in the same directory.
99
*/
1010

11-
import { expect } from 'chai';
12-
import { describe, it } from 'mocha';
13-
import DataLoader from '../';
11+
const { expect } = require('chai');
12+
const { describe, it } = require('mocha');
13+
const DataLoader = require('../');
1414

1515
describe('Provides descriptive error messages for API abuse', () => {
1616

src/__tests__/dataloader-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
* of patent rights can be found in the PATENTS file in the same directory.
99
*/
1010

11-
import { expect } from 'chai';
12-
import { describe, it } from 'mocha';
13-
import DataLoader from '../';
11+
const { expect } = require('chai');
12+
const { describe, it } = require('mocha');
13+
const DataLoader = require('../');
1414

1515
function idLoader(options) {
1616
var loadCalls = [];

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ function dispatchQueueBatch<K, V>(
289289

290290
// Step through the values, resolving or rejecting each Promise in the
291291
// loaded queue.
292-
queue.forEach(({ key, resolve, reject }, index) => {
292+
queue.forEach(({ resolve, reject }, index) => {
293293
var value = values[index];
294294
if (value instanceof Error) {
295295
reject(value);

0 commit comments

Comments
 (0)