Skip to content

Commit 5ae12e8

Browse files
layershifterdanez
authored andcommitted
chore(package): update Babel 7 (#294)
* chore(package): update Babel 7 * fix usage of decorators * fix dep
1 parent ee4937e commit 5ae12e8

File tree

3 files changed

+73
-76
lines changed

3 files changed

+73
-76
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"author": "Felix Kling",
3737
"license": "BSD-3-Clause",
3838
"dependencies": {
39-
"@babel/parser": "7.0.0-beta.53",
39+
"@babel/parser": "^7.0.0",
4040
"async": "^2.1.4",
4141
"babel-runtime": "^6.9.2",
4242
"commander": "^2.9.0",
@@ -47,7 +47,7 @@
4747
"devDependencies": {
4848
"babel-cli": "^6.26.0",
4949
"babel-core": "^6.26.0",
50-
"babel-eslint": "^8.2.2",
50+
"babel-eslint": "^9.0.0",
5151
"babel-jest": "^23.0.1",
5252
"babel-plugin-transform-object-rest-spread": "^6.26.0",
5353
"babel-plugin-transform-runtime": "^6.23.0",

src/babelParser.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ function buildOptions(options?: Options = {}) {
5353
if (options.legacyDecorators) {
5454
parserOptions.plugins.push('decorators-legacy');
5555
} else {
56-
parserOptions.plugins.push('decorators');
56+
parserOptions.plugins.push([
57+
'decorators',
58+
{ decoratorsBeforeExport: false },
59+
]);
5760
}
5861

5962
return parserOptions;

yarn.lock

Lines changed: 67 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -2,98 +2,96 @@
22
# yarn lockfile v1
33

44

5-
"@babel/[email protected]-beta.44":
6-
version "7.0.0-beta.44"
7-
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
5+
"@babel/code-frame@^7.0.0":
6+
version "7.0.0"
7+
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
88
dependencies:
9-
"@babel/highlight" "7.0.0-beta.44"
9+
"@babel/highlight" "^7.0.0"
1010

1111
"@babel/code-frame@^7.0.0-beta.35":
1212
version "7.0.0-beta.53"
1313
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.53.tgz#980d1560b863575bf5a377925037e0132ef5921e"
1414
dependencies:
1515
"@babel/highlight" "7.0.0-beta.53"
1616

17-
"@babel/[email protected]-beta.44":
18-
version "7.0.0-beta.44"
19-
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
17+
"@babel/generator@^7.0.0":
18+
version "7.0.0"
19+
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0.tgz#1efd58bffa951dc846449e58ce3a1d7f02d393aa"
2020
dependencies:
21-
"@babel/types" "7.0.0-beta.44"
21+
"@babel/types" "^7.0.0"
2222
jsesc "^2.5.1"
23-
lodash "^4.2.0"
23+
lodash "^4.17.10"
2424
source-map "^0.5.0"
2525
trim-right "^1.0.1"
2626

27-
"@babel/[email protected]-beta.44":
28-
version "7.0.0-beta.44"
29-
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
27+
"@babel/helper-function-name@^7.0.0":
28+
version "7.0.0"
29+
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0.tgz#a68cc8d04420ccc663dd258f9cc41b8261efa2d4"
3030
dependencies:
31-
"@babel/helper-get-function-arity" "7.0.0-beta.44"
32-
"@babel/template" "7.0.0-beta.44"
33-
"@babel/types" "7.0.0-beta.44"
31+
"@babel/helper-get-function-arity" "^7.0.0"
32+
"@babel/template" "^7.0.0"
33+
"@babel/types" "^7.0.0"
3434

35-
"@babel/[email protected]-beta.44":
36-
version "7.0.0-beta.44"
37-
resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
35+
"@babel/helper-get-function-arity@^7.0.0":
36+
version "7.0.0"
37+
resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
3838
dependencies:
39-
"@babel/types" "7.0.0-beta.44"
39+
"@babel/types" "^7.0.0"
4040

41-
"@babel/[email protected]-beta.44":
42-
version "7.0.0-beta.44"
43-
resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
41+
"@babel/helper-split-export-declaration@^7.0.0":
42+
version "7.0.0"
43+
resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
4444
dependencies:
45-
"@babel/types" "7.0.0-beta.44"
45+
"@babel/types" "^7.0.0"
4646

47-
"@babel/[email protected].44":
48-
version "7.0.0-beta.44"
49-
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
47+
"@babel/[email protected].53":
48+
version "7.0.0-beta.53"
49+
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.53.tgz#f4e952dad1787d205e188d3e384cdce49ca368fb"
5050
dependencies:
5151
chalk "^2.0.0"
5252
esutils "^2.0.2"
5353
js-tokens "^3.0.0"
5454

55-
"@babel/[email protected]-beta.53":
56-
version "7.0.0-beta.53"
57-
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.53.tgz#f4e952dad1787d205e188d3e384cdce49ca368fb"
55+
"@babel/highlight@^7.0.0":
56+
version "7.0.0"
57+
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
5858
dependencies:
5959
chalk "^2.0.0"
6060
esutils "^2.0.2"
61-
js-tokens "^3.0.0"
61+
js-tokens "^4.0.0"
6262

63-
64-
version "7.0.0-beta.53"
65-
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-beta.53.tgz#1f45eb617bf9463d482b2c04d349d9e4edbf4892"
66-
67-
68-
version "7.0.0-beta.44"
69-
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
70-
dependencies:
71-
"@babel/code-frame" "7.0.0-beta.44"
72-
"@babel/types" "7.0.0-beta.44"
73-
babylon "7.0.0-beta.44"
74-
lodash "^4.2.0"
75-
76-
77-
version "7.0.0-beta.44"
78-
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
79-
dependencies:
80-
"@babel/code-frame" "7.0.0-beta.44"
81-
"@babel/generator" "7.0.0-beta.44"
82-
"@babel/helper-function-name" "7.0.0-beta.44"
83-
"@babel/helper-split-export-declaration" "7.0.0-beta.44"
84-
"@babel/types" "7.0.0-beta.44"
85-
babylon "7.0.0-beta.44"
63+
"@babel/parser@^7.0.0":
64+
version "7.0.0"
65+
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0.tgz#697655183394facffb063437ddf52c0277698775"
66+
67+
"@babel/template@^7.0.0":
68+
version "7.0.0"
69+
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0.tgz#c2bc9870405959c89a9c814376a2ecb247838c80"
70+
dependencies:
71+
"@babel/code-frame" "^7.0.0"
72+
"@babel/parser" "^7.0.0"
73+
"@babel/types" "^7.0.0"
74+
75+
"@babel/traverse@^7.0.0":
76+
version "7.0.0"
77+
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0.tgz#b1fe9b6567fdf3ab542cfad6f3b31f854d799a61"
78+
dependencies:
79+
"@babel/code-frame" "^7.0.0"
80+
"@babel/generator" "^7.0.0"
81+
"@babel/helper-function-name" "^7.0.0"
82+
"@babel/helper-split-export-declaration" "^7.0.0"
83+
"@babel/parser" "^7.0.0"
84+
"@babel/types" "^7.0.0"
8685
debug "^3.1.0"
8786
globals "^11.1.0"
88-
invariant "^2.2.0"
89-
lodash "^4.2.0"
87+
lodash "^4.17.10"
9088

91-
"@babel/[email protected]-beta.44":
92-
version "7.0.0-beta.44"
93-
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
89+
"@babel/types@^7.0.0":
90+
version "7.0.0"
91+
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0.tgz#6e191793d3c854d19c6749989e3bc55f0e962118"
9492
dependencies:
9593
esutils "^2.0.2"
96-
lodash "^4.2.0"
94+
lodash "^4.17.10"
9795
to-fast-properties "^2.0.0"
9896

9997
abab@^1.0.4:
@@ -364,14 +362,14 @@ babel-core@^6.0.0, babel-core@^6.26.0:
364362
slash "^1.0.0"
365363
source-map "^0.5.7"
366364

367-
babel-eslint@^8.2.2:
368-
version "8.2.6"
369-
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.6.tgz#6270d0c73205628067c0f7ae1693a9e797acefd9"
365+
babel-eslint@^9.0.0:
366+
version "9.0.0"
367+
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-9.0.0.tgz#7d9445f81ed9f60aff38115f838970df9f2b6220"
370368
dependencies:
371-
"@babel/code-frame" "7.0.0-beta.44"
372-
"@babel/traverse" "7.0.0-beta.44"
373-
"@babel/types" "7.0.0-beta.44"
374-
babylon "7.0.0-beta.44"
369+
"@babel/code-frame" "^7.0.0"
370+
"@babel/parser" "^7.0.0"
371+
"@babel/traverse" "^7.0.0"
372+
"@babel/types" "^7.0.0"
375373
eslint-scope "3.7.1"
376374
eslint-visitor-keys "^1.0.0"
377375

@@ -866,10 +864,6 @@ babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.
866864
lodash "^4.17.4"
867865
to-fast-properties "^1.0.3"
868866

869-
870-
version "7.0.0-beta.44"
871-
resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
872-
873867
babylon@^6.18.0:
874868
version "6.18.0"
875869
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
@@ -2000,7 +1994,7 @@ inquirer@^5.2.0:
20001994
strip-ansi "^4.0.0"
20011995
through "^2.3.6"
20021996

2003-
invariant@^2.2.0, invariant@^2.2.2:
1997+
invariant@^2.2.2:
20041998
version "2.2.4"
20051999
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
20062000
dependencies:
@@ -2596,7 +2590,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
25962590
version "3.0.2"
25972591
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
25982592

2599-
"js-tokens@^3.0.0 || ^4.0.0":
2593+
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
26002594
version "4.0.0"
26012595
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
26022596

@@ -2757,7 +2751,7 @@ lodash.sortby@^4.7.0:
27572751
version "4.7.0"
27582752
resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
27592753

2760-
lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0:
2754+
lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
27612755
version "4.17.10"
27622756
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
27632757

0 commit comments

Comments
 (0)