Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 856e126

Browse files
jdaltonjdalton
committed
Update to Babel 7.
1 parent 0c20865 commit 856e126

File tree

65 files changed

+1423
-1673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1423
-1673
lines changed

‎.babelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"lodash"
55
],
66
"presets": [
7-
["env", { "targets": { "node": 4 } }]
7+
["@babel/env", { "targets": { "node": 4 } }]
88
]
99
}

‎package-lock.json‎

Lines changed: 972 additions & 937 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@
1414
"scripts": {
1515
"build": "babel src --out-dir lib || true",
1616
"prepublish": "npm run build",
17-
"test": "mocha --check-leaks --compilers js:babel-register"
17+
"test": "mocha --check-leaks --require @babel/register"
1818
},
1919
"devDependencies": {
2020
"@storybook/addon-links": "^3.2.0",
2121
"async": "^2.6.0",
22-
"babel-cli": "^6.26.0",
23-
"babel-core": "^6.26.0",
22+
"@babel/cli": "^7.0.0-beta.32",
23+
"@babel/core": "^7.0.0-beta.32",
2424
"babel-plugin-add-module-exports": "~0.2.1",
2525
"babel-plugin-lodash": "3.3.2",
26-
"babel-plugin-syntax-flow": "^6.18.0",
27-
"babel-plugin-syntax-jsx": "^6.18.0",
28-
"babel-plugin-transform-object-rest-spread": "^6.26.0",
29-
"babel-plugin-transform-runtime": "^6.15.0",
30-
"babel-preset-env": "^1.6.1",
31-
"babel-preset-react": "^6.24.1",
32-
"babel-preset-stage-0": "^6.24.1",
33-
"babel-register": "^6.26.0",
26+
"@babel/plugin-syntax-flow": "^7.0.0-beta.32",
27+
"@babel/plugin-syntax-jsx": "^7.0.0-beta.32",
28+
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.32",
29+
"@babel/plugin-transform-runtime": "^7.0.0-beta.32",
30+
"@babel/preset-env": "^7.0.0-beta.32",
31+
"@babel/preset-react": "^7.0.0-beta.32",
32+
"@babel/preset-stage-0": "^7.0.0-beta.32",
33+
"@babel/register": "^7.0.0-beta.32",
3434
"chai": "^4.1.2",
3535
"lodash-bound": "^1.1.2",
3636
"lodash-compat": "^3.10.2",
@@ -40,8 +40,8 @@
4040
"react-bootstrap": "^0.31.5"
4141
},
4242
"dependencies": {
43-
"babel-helper-module-imports": "^7.0.0-beta.3",
44-
"babel-types": "^6.26.0",
43+
"@babel/helper-module-imports": "^7.0.0-beta.32",
44+
"@babel/types": "^7.0.0-beta.32",
4545
"glob": "^7.1.1",
4646
"lodash": "^4.17.4",
4747
"require-package-name": "^2.0.1"

‎src/importModule.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import _ from 'lodash'
2-
import { addDefault } from "babel-helper-module-imports"
2+
import { addDefault } from "@babel/helper-module-imports"
33
import mapping from './mapping'
44

55
/*----------------------------------------------------------------------------*/

‎src/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import _ from 'lodash'
2-
import { isModuleDeclaration } from 'babel-types'
2+
import { isModuleDeclaration } from '@babel/types'
33

44
import config from './config'
55
import importModule from './importModule'
@@ -140,12 +140,12 @@ export default function lodash({ types }) {
140140
_.each(specs, (spec) => {
141141
const { imported, local } = spec
142142
const binding = file.scope.getBinding(local)
143-
const { importKind = 'value' } = binding.path.parent
144143

145144
// Skip type annotation imports.
146-
if (importKind !== 'value') {
145+
if (! binding) {
147146
return false
148147
}
148+
149149
const isChain = isLodash && imported === 'chain'
150150

151151
_.each(binding.referencePaths, (refPath) => {

‎test/.babelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"presets": [
3-
["env", { "targets": { "node": 4 } }]
3+
["@babel/env", { "targets": { "node": 4 } }]
44
]
55
}

‎test/fixtures/compat-arguments/expected.js‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
'use strict';
1+
"use strict";
22

3-
var _map2 = require('lodash-compat/collection/map');
3+
var _map2 = _interopRequireDefault(require("lodash-compat/collection/map"));
44

5-
var _map3 = _interopRequireDefault(_map2);
6-
7-
var _capitalize2 = require('lodash-compat/string/capitalize');
8-
9-
var _capitalize3 = _interopRequireDefault(_capitalize2);
5+
var _capitalize2 = _interopRequireDefault(require("lodash-compat/string/capitalize"));
106

117
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
128

13-
(0, _map3.default)([], _capitalize3.default);
9+
(0, _map2.default)([], _capitalize2.default);

‎test/fixtures/compat-basic-default/expected.js‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
1-
'use strict';
1+
"use strict";
22

3-
var _reject2 = require('lodash-compat/collection/reject');
3+
var _reject2 = _interopRequireDefault(require("lodash-compat/collection/reject"));
44

5-
var _reject3 = _interopRequireDefault(_reject2);
5+
var _take2 = _interopRequireDefault(require("lodash-compat/array/take"));
66

7-
var _take2 = require('lodash-compat/array/take');
7+
var _add2 = _interopRequireDefault(require("lodash-compat/math/add"));
88

9-
var _take3 = _interopRequireDefault(_take2);
10-
11-
var _add2 = require('lodash-compat/math/add');
12-
13-
var _add3 = _interopRequireDefault(_add2);
14-
15-
var _map2 = require('lodash-compat/collection/map');
16-
17-
var _map3 = _interopRequireDefault(_map2);
9+
var _map2 = _interopRequireDefault(require("lodash-compat/collection/map"));
1810

1911
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
2012

21-
var result = (0, _map3.default)([], function (n) {
22-
return (0, _add3.default)(1, n);
13+
var result = (0, _map2.default)([], function (n) {
14+
return (0, _add2.default)(1, n);
2315
});
24-
(0, _take3.default)((0, _reject3.default)(result), 1);
16+
(0, _take2.default)((0, _reject2.default)(result), 1);

‎test/fixtures/compat-basic-member/expected.js‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
1-
'use strict';
1+
"use strict";
22

3-
var _take2 = require('lodash-compat/array/take');
3+
var _take2 = _interopRequireDefault(require("lodash-compat/array/take"));
44

5-
var _take3 = _interopRequireDefault(_take2);
5+
var _reject2 = _interopRequireDefault(require("lodash-compat/collection/reject"));
66

7-
var _reject2 = require('lodash-compat/collection/reject');
7+
var _map2 = _interopRequireDefault(require("lodash-compat/collection/map"));
88

9-
var _reject3 = _interopRequireDefault(_reject2);
10-
11-
var _map2 = require('lodash-compat/collection/map');
12-
13-
var _map3 = _interopRequireDefault(_map2);
14-
15-
var _add2 = require('lodash-compat/math/add');
16-
17-
var _add3 = _interopRequireDefault(_add2);
9+
var _add2 = _interopRequireDefault(require("lodash-compat/math/add"));
1810

1911
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
2012

21-
var result = (0, _map3.default)([], function (n) {
22-
return (0, _add3.default)(1, n);
13+
var result = (0, _map2.default)([], function (n) {
14+
return (0, _add2.default)(1, n);
2315
});
24-
(0, _take3.default)((0, _reject3.default)(result), 1);
16+
(0, _take2.default)((0, _reject2.default)(result), 1);

‎test/fixtures/compat-default-and-member/expected.js‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
1-
'use strict';
1+
"use strict";
22

3-
var _reject2 = require('lodash-compat/collection/reject');
3+
var _reject2 = _interopRequireDefault(require("lodash-compat/collection/reject"));
44

5-
var _reject3 = _interopRequireDefault(_reject2);
5+
var _add2 = _interopRequireDefault(require("lodash-compat/math/add"));
66

7-
var _add2 = require('lodash-compat/math/add');
7+
var _take2 = _interopRequireDefault(require("lodash-compat/array/take"));
88

9-
var _add3 = _interopRequireDefault(_add2);
10-
11-
var _take2 = require('lodash-compat/array/take');
12-
13-
var _take3 = _interopRequireDefault(_take2);
14-
15-
var _map2 = require('lodash-compat/collection/map');
16-
17-
var _map3 = _interopRequireDefault(_map2);
9+
var _map2 = _interopRequireDefault(require("lodash-compat/collection/map"));
1810

1911
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
2012

21-
var result = (0, _map3.default)([], function (n) {
22-
return (0, _add3.default)(1, n);
13+
var result = (0, _map2.default)([], function (n) {
14+
return (0, _add2.default)(1, n);
2315
});
24-
(0, _take3.default)((0, _reject3.default)(result), 1);
16+
(0, _take2.default)((0, _reject2.default)(result), 1);

0 commit comments

Comments
 (0)