Skip to content

Commit 230c2b1

Browse files
committed
chore: update dependencies
BREAKING CHANGE: drop Node 4 support, requires `node >= v6.0.0`
1 parent b2e9ae7 commit 230c2b1

File tree

7 files changed

+1013
-884
lines changed

7 files changed

+1013
-884
lines changed

.babelrc

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
{
22
"plugins": [
3-
"transform-object-rest-spread",
4-
"transform-flow-strip-types",
3+
"@babel/plugin-proposal-object-rest-spread",
4+
"@babel/plugin-transform-flow-strip-types"
55
],
66
"env": {
77
"cjs": {
88
"plugins": [
9-
"transform-class-properties",
10-
["transform-runtime", { "polyfill": false }]
9+
"@babel/plugin-proposal-class-properties"
1110
],
1211
"presets": [
13-
["env", {
14-
"targets": {
15-
"node": 6
16-
},
17-
}]
12+
[
13+
"@babel/preset-env",
14+
{
15+
"targets": {
16+
"node": 6
17+
}
18+
}
19+
]
1820
]
1921
},
2022
"mjs": {
21-
"plugins": ["transform-class-properties"],
23+
"plugins": [
24+
"@babel/plugin-proposal-class-properties"
25+
],
2226
"presets": [
2327
[
24-
"env",
28+
"@babel/preset-env",
2529
{
2630
"targets": {
2731
"node": "8.0.0"
@@ -33,33 +37,40 @@
3337
]
3438
},
3539
"es": {
36-
"plugins": ["transform-class-properties"],
40+
"plugins": [
41+
"@babel/plugin-proposal-class-properties"
42+
]
3743
},
3844
"node8": {
3945
"plugins": [
40-
"transform-class-properties",
41-
["transform-runtime", { "polyfill": false }]
46+
"@babel/plugin-proposal-class-properties"
4247
],
4348
"presets": [
44-
["env", {
45-
"targets": {
46-
"node": "8.0.0"
47-
},
48-
"loose": true,
49-
"modules": "commonjs"
50-
}]
49+
[
50+
"@babel/preset-env",
51+
{
52+
"targets": {
53+
"node": "8.0.0"
54+
},
55+
"loose": true,
56+
"modules": "commonjs"
57+
}
58+
]
5159
]
5260
},
5361
"test": {
5462
"plugins": [
55-
"transform-class-properties",
63+
"@babel/plugin-proposal-class-properties"
5664
],
5765
"presets": [
58-
["env", {
59-
"targets": {
60-
"node": "current"
61-
},
62-
}]
66+
[
67+
"@babel/preset-env",
68+
{
69+
"targets": {
70+
"node": "current"
71+
}
72+
}
73+
]
6374
]
6475
}
6576
}

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cache:
88
notifications:
99
email: true
1010
node_js:
11-
- "9"
11+
- "10"
1212
- "8"
1313
script:
1414
- yarn run test

package.json

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,50 +28,51 @@
2828
},
2929
"homepage": "https://github.com/graphql-compose/graphql-compose-mongoose",
3030
"dependencies": {
31-
"babel-runtime": "^6.26.0",
3231
"object-path": "^0.11.4"
3332
},
3433
"optionalDependencies": {
35-
"graphql-compose-connection": ">=3.2.1",
36-
"graphql-compose-pagination": ">=3.3.0"
34+
"graphql-compose-connection": ">=4.0.0",
35+
"graphql-compose-pagination": ">=4.0.0"
3736
},
3837
"peerDependencies": {
39-
"graphql-compose": ">=4.7.1",
40-
"mongoose": ">=4.4.0 || >=5.0.0"
38+
"graphql-compose": ">=5.0.2 || >=4.7.1",
39+
"mongoose": ">=5.0.0 || >=4.4.0"
4140
},
4241
"devDependencies": {
43-
"@types/graphql": "^0.13.4",
44-
"@types/mongoose": "^5.2.6",
45-
"babel-cli": "^6.26.0",
46-
"babel-core": "^6.26.3",
47-
"babel-eslint": "^8.2.6",
42+
"@babel/cli": "^7.0.0",
43+
"@babel/core": "^7.0.0",
44+
"@babel/plugin-proposal-class-properties": "^7.0.0",
45+
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
46+
"@babel/plugin-transform-flow-strip-types": "^7.0.0",
47+
"@babel/plugin-transform-runtime": "^7.0.0",
48+
"@babel/preset-env": "^7.0.0",
49+
"@babel/preset-flow": "^7.0.0",
50+
"@types/graphql": "^14.0.0",
51+
"@types/mongoose": "^5.2.10",
52+
"babel-core": "^7.0.0-bridge.0",
53+
"babel-eslint": "^9.0.0",
4854
"babel-jest": "^23.4.2",
49-
"babel-plugin-transform-class-properties": "^6.24.1",
50-
"babel-plugin-transform-flow-strip-types": "^6.22.0",
51-
"babel-plugin-transform-object-rest-spread": "^6.13.0",
52-
"babel-plugin-transform-runtime": "^6.23.0",
53-
"babel-preset-env": "^1.7.0",
5455
"cz-conventional-changelog": "^2.1.0",
55-
"eslint": "^5.4.0",
56+
"eslint": "^5.5.0",
5657
"eslint-config-airbnb-base": "^13.1.0",
5758
"eslint-config-prettier": "^3.0.1",
5859
"eslint-plugin-flowtype": "^2.50.0",
5960
"eslint-plugin-import": "^2.14.0",
6061
"eslint-plugin-prettier": "^2.6.2",
61-
"flow-bin": "^0.79.1",
62-
"graphql": "0.13.2",
63-
"graphql-compose": "^4.8.2",
64-
"graphql-compose-connection": ">=3.2.1",
65-
"graphql-compose-pagination": ">=3.3.0",
62+
"flow-bin": "^0.80.0",
63+
"graphql": "14.0.0",
64+
"graphql-compose": "^5.0.2",
65+
"graphql-compose-connection": ">=4.0.0",
66+
"graphql-compose-pagination": ">=4.0.0",
6667
"jest": "^23.5.0",
67-
"mongodb-memory-server": "^2.0.1",
68-
"mongoose": "^5.2.9",
68+
"mongodb-memory-server": "^2.1.0",
69+
"mongoose": "^5.2.13",
6970
"prettier": "^1.14.2",
7071
"request": "^2.88.0",
7172
"rimraf": "^2.6.2",
72-
"semantic-release": "^15.9.9",
73+
"semantic-release": "^15.9.12",
7374
"tslint": "^5.11.0",
74-
"typescript": "^3.0.1"
75+
"typescript": "^3.0.3"
7576
},
7677
"config": {
7778
"commitizen": {

src/__mocks__/mongooseCommon.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
/* @flow */
22
/* eslint-disable no-param-reassign, no-console */
33

4-
import mongoose, { Schema, Types } from 'mongoose';
4+
import mongoose from 'mongoose';
55
import MongodbMemoryServer from 'mongodb-memory-server';
66

7+
const { Schema, Types } = mongoose;
8+
79
mongoose.Promise = Promise;
810

911
jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000;

src/discriminators/DiscriminatorTypeComposer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* @flow */
22

3-
import type { ComposeFieldConfigMap } from 'graphql-compose';
43
import {
54
EnumTypeComposer,
65
schemaComposer,
@@ -10,6 +9,7 @@ import {
109
type ComposeFieldConfig,
1110
type RelationOpts,
1211
type GetRecordIdFn,
12+
type ComposeFieldConfigMap,
1313
} from 'graphql-compose';
1414
import type { ComposePartialFieldConfigAsObject } from 'graphql-compose/lib/TypeComposer';
1515
import type { Model } from 'mongoose';
@@ -97,7 +97,8 @@ export class DiscriminatorTypeComposer<TContext> extends TypeComposerClass<TCont
9797
throw Error('Discriminator Key not Set, Use composeWithMongoose for Normal Collections');
9898
}
9999

100-
opts = { // eslint-disable-line
100+
// eslint-disable-next-line
101+
opts = {
101102
reorderFields: true,
102103
schemaComposer,
103104
...opts,

src/resolvers/__tests__/findOne-test.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,19 @@ describe('findOne() ->', () => {
4949
});
5050

5151
it('should have `filter` arg only with indexed fields', async () => {
52-
const result: any = findOne(UserModel, UserTC, {
52+
const resolver = findOne(UserModel, UserTC, {
5353
filter: { onlyIndexed: true, operators: false },
5454
});
55-
const filterFields = result.args.filter.type._typeConfig.fields();
56-
expect(Object.keys(filterFields)).toEqual(
55+
expect(resolver.getArgTC('filter').getFieldNames()).toEqual(
5756
expect.arrayContaining(['_id', 'name', 'employment'])
5857
);
5958
});
6059

6160
it('should have `filter` arg with required `name` field', async () => {
62-
const result: any = findOne(UserModel, UserTC, {
61+
const resolver = findOne(UserModel, UserTC, {
6362
filter: { requiredFields: 'name' },
6463
});
65-
const filterFields = result.args.filter.type._typeConfig.fields();
66-
expect(filterFields.name.type).toBeInstanceOf(GraphQLNonNull);
64+
expect(resolver.getArgTC('filter').getFieldType('name')).toBeInstanceOf(GraphQLNonNull);
6765
});
6866

6967
it('should have `skip` arg', () => {

0 commit comments

Comments
 (0)