Skip to content

Commit ab6e8df

Browse files
committed
build(Babel): Remove babel-runtime, migrate to babel-preset-env, refreshed package.json
1 parent 9dc98fe commit ab6e8df

File tree

4 files changed

+298
-1294
lines changed

4 files changed

+298
-1294
lines changed

.babelrc

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,33 @@
11
{
2-
"presets": ["react", "es2015", "stage-0"],
3-
"plugins": ["dev-expression", "transform-runtime"],
4-
2+
"plugins": [
3+
"babel-plugin-transform-object-rest-spread"
4+
],
55
"env": {
6-
"cjs": {
7-
"presets": ["es2015-loose", "stage-0"],
8-
"plugins": ["add-module-exports"]
6+
"lib": {
7+
"presets": [
8+
["env", {
9+
"targets": {
10+
"browsers": [
11+
"last 5 versions",
12+
"defaults"
13+
]
14+
},
15+
"include": ["transform-es2015-classes"],
16+
"debug": true,
17+
}]
18+
]
919
},
1020
"es": {
11-
"presets": ["es2015-loose-native-modules", "stage-0"]
21+
"presets": [
22+
["env", {
23+
"targets": {
24+
"chrome": 52
25+
},
26+
"loose": true,
27+
"modules": false,
28+
"debug": true
29+
}]
30+
]
1231
}
1332
}
14-
}
33+
}

package.json

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,42 +28,30 @@
2828
"homepage": "https://github.com/nodkz/react-relay-network-layer#readme",
2929
"dependencies": {},
3030
"peerDependencies": {
31-
"babel-runtime": "^6.6.1",
3231
"react-relay": ">=0.7.0"
3332
},
3433
"devDependencies": {
35-
"babel-cli": "^6.7.7",
36-
"babel-core": "^6.7.7",
3734
"babel-eslint": "^7.1.1",
38-
"babel-loader": "^6.2.4",
39-
"babel-plugin-add-module-exports": "^0.2.1",
40-
"babel-plugin-dev-expression": "^0.2.1",
41-
"babel-plugin-transform-runtime": "^6.7.5",
42-
"babel-polyfill": "^6.7.4",
43-
"babel-preset-es2015": "^6.6.0",
44-
"babel-preset-es2015-loose": "^8.0.0",
45-
"babel-preset-es2015-loose-native-modules": "^1.0.0",
46-
"babel-preset-react": "^6.5.0",
47-
"babel-preset-stage-0": "^6.5.0",
48-
"babel-register": "^6.7.2",
49-
"babel-relay-plugin": "^0.11.0",
35+
"babel-plugin-transform-object-rest-spread": "^6.23.0",
36+
"babel-polyfill": "^6.23.0",
37+
"babel-preset-env": "^1.2.0",
38+
"babel-register": "^6.23.0",
5039
"chai": "^3.5.0",
5140
"chai-as-promised": "^6.0.0",
52-
"eslint": "^3.15.0",
53-
"eslint-config-airbnb-base": "^11.1.0",
41+
"eslint": "^3.17.0",
42+
"eslint-config-airbnb-base": "^11.1.1",
43+
"eslint-module-utils": "^2.0.0",
5444
"eslint-plugin-import": "^2.2.0",
55-
"fetch-mock": "^5.5.0",
56-
"graphql": "^0.9.1",
57-
"graphql-relay": "^0.5.1",
45+
"fetch-mock": "^5.9.4",
5846
"mocha": "^3.1.1",
59-
"rimraf": "^2.5.2"
47+
"rimraf": "^2.6.1"
6048
},
6149
"scripts": {
62-
"build": "npm run build-cjs && npm run build-es",
63-
"build-cjs": "rimraf lib && BABEL_ENV=cjs babel src -d lib",
50+
"build": "npm run build-lib && npm run build-es",
51+
"build-lib": "rimraf lib && BABEL_ENV=lib babel src -d lib",
6452
"build-es": "rimraf es && BABEL_ENV=es babel src -d es",
6553
"lint": "eslint src test *.js",
6654
"prepublish": "npm run test && npm run build",
67-
"test": "mocha --require test/mocha-bootload --compilers js:babel-core/register test/*.test.js"
55+
"test": "npm run lint && BABEL_ENV=lib mocha --require test/mocha-bootload --compilers js:babel-register test/*.test.js"
6856
}
6957
}

src/relayNetworkLayer.js

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/* eslint-disable arrow-body-style, no-unused-vars */
2-
31
import queries from './relay/queries';
42
import queriesBatch from './relay/queriesBatch';
53
import mutation from './relay/mutation';
@@ -21,29 +19,35 @@ export default class RelayNetworkLayer {
2119
}
2220
}
2321
});
22+
23+
this.supports = this.supports.bind(this);
24+
this.sendQueries = this.sendQueries.bind(this);
25+
this.sendMutation = this.sendMutation.bind(this);
26+
this._fetchWithMiddleware = this._fetchWithMiddleware.bind(this);
27+
this._isBatchQueriesDisabled = this._isBatchQueriesDisabled.bind(this);
2428
}
2529

26-
supports = (...options) => {
30+
supports(...options) {
2731
return options.every(option => this._supportedOptions.indexOf(option) !== -1);
28-
};
32+
}
2933

30-
sendQueries = (requests) => {
34+
sendQueries(requests) {
3135
if (requests.length > 1 && !this._isBatchQueriesDisabled()) {
3236
return queriesBatch(requests, this._fetchWithMiddleware);
3337
}
3438

3539
return queries(requests, this._fetchWithMiddleware);
36-
};
40+
}
3741

38-
sendMutation = (request) => {
42+
sendMutation(request) {
3943
return mutation(request, this._fetchWithMiddleware);
40-
};
44+
}
4145

42-
_fetchWithMiddleware = (req) => {
46+
_fetchWithMiddleware(req) {
4347
return fetchWrapper(req, this._middlewares);
44-
};
48+
}
4549

46-
_isBatchQueriesDisabled = () => {
50+
_isBatchQueriesDisabled() {
4751
return this._options && this._options.disableBatchQuery;
48-
};
52+
}
4953
}

0 commit comments

Comments
 (0)