Skip to content
This repository has been archived by the owner on Feb 18, 2024. It is now read-only.

Commit

Permalink
Update dependency babel-merge to v2 (#1022)
Browse files Browse the repository at this point in the history 
* Update dependency babel-merge to v2

* Update babel-merge to v2.0.1
  • Loading branch information
@eliperelman
eliperelman committed Aug 15, 2018
1 parent fad8552 commit de34f65
Show file tree
Hide file tree
Showing 3 changed files with 118 additions and 7 deletions.
2 changes: 1 addition & 1 deletion packages/compile-loader/package.json
View file
Expand Up @@ -25,7 +25,7 @@
"dependencies": {
"@babel/core": "7.0.0-rc.1",
"babel-loader": "8.0.0-beta.4",
"babel-merge": "^1.1.1"
"babel-merge": "^2.0.1"
},
"peerDependencies": {
"neutrino": "^9.0.0-0",
Expand Down
2 changes: 1 addition & 1 deletion packages/mocha/package.json
View file
Expand Up @@ -24,7 +24,7 @@
"@babel/plugin-transform-modules-commonjs": "7.0.0-rc.1",
"@babel/register": "7.0.0-rc.1",
"@neutrinojs/loader-merge": "9.0.0-0",
"babel-merge": "^1.1.1",
"babel-merge": "^2.0.1",
"lodash.omit": "^4.5.0"
},
"peerDependencies": {
Expand Down
121 changes: 116 additions & 5 deletions yarn.lock
View file
Expand Up @@ -39,6 +39,12 @@
dependencies:
"@babel/highlight" "7.0.0-beta.44"

"@babel/code-frame@7.0.0-beta.54":
version "7.0.0-beta.54"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.54.tgz#0024f96fdf7028a21d68e273afd4e953214a1ead"
dependencies:
"@babel/highlight" "7.0.0-beta.54"

"@babel/code-frame@7.0.0-rc.1", "@babel/code-frame@^7.0.0-beta.35":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-rc.1.tgz#5c2154415d6c09959a71845ef519d11157e95d10"
Expand All @@ -64,6 +70,25 @@
semver "^5.4.1"
source-map "^0.5.0"

"@babel/core@^7.0.0-beta.49":
version "7.0.0-beta.54"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-beta.54.tgz#253c54d0095403a5cfa764e7d9b458194692d02b"
dependencies:
"@babel/code-frame" "7.0.0-beta.54"
"@babel/generator" "7.0.0-beta.54"
"@babel/helpers" "7.0.0-beta.54"
"@babel/parser" "7.0.0-beta.54"
"@babel/template" "7.0.0-beta.54"
"@babel/traverse" "7.0.0-beta.54"
"@babel/types" "7.0.0-beta.54"
convert-source-map "^1.1.0"
debug "^3.1.0"
json5 "^0.5.0"
lodash "^4.17.5"
resolve "^1.3.2"
semver "^5.4.1"
source-map "^0.5.0"

"@babel/generator@7.0.0-beta.44":
version "7.0.0-beta.44"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
Expand All @@ -74,6 +99,16 @@
source-map "^0.5.0"
trim-right "^1.0.1"

"@babel/generator@7.0.0-beta.54":
version "7.0.0-beta.54"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.54.tgz#c043c7eebeebfd7e665d95c281a4aafc83d4e1c9"
dependencies:
"@babel/types" "7.0.0-beta.54"
jsesc "^2.5.1"
lodash "^4.17.5"
source-map "^0.5.0"
trim-right "^1.0.1"

"@babel/generator@7.0.0-rc.1", "@babel/generator@^7.0.0-beta.54":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-rc.1.tgz#739c87d70b31aeed802bd6bc9fd51480065c45e8"
Expand Down Expand Up @@ -135,6 +170,14 @@
"@babel/template" "7.0.0-beta.44"
"@babel/types" "7.0.0-beta.44"

"@babel/helper-function-name@7.0.0-beta.54":
version "7.0.0-beta.54"
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.54.tgz#307875507a1eda2482a09a9a4df6a25632ffb34b"
dependencies:
"@babel/helper-get-function-arity" "7.0.0-beta.54"
"@babel/template" "7.0.0-beta.54"
"@babel/types" "7.0.0-beta.54"

"@babel/helper-function-name@7.0.0-rc.1":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-rc.1.tgz#20b2cc836a53c669f297c8d309fc553385c5cdde"
Expand All @@ -149,6 +192,12 @@
dependencies:
"@babel/types" "7.0.0-beta.44"

"@babel/helper-get-function-arity@7.0.0-beta.54":
version "7.0.0-beta.54"
resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.54.tgz#757bd189b077074a004028cfde5f083c306cc6c4"
dependencies:
"@babel/types" "7.0.0-beta.54"

"@babel/helper-get-function-arity@7.0.0-rc.1":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-rc.1.tgz#60185957f72ed73766ce74c836ac574921743c46"
Expand Down Expand Up @@ -234,6 +283,12 @@
dependencies:
"@babel/types" "7.0.0-beta.44"

"@babel/helper-split-export-declaration@7.0.0-beta.54":
version "7.0.0-beta.54"
resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.54.tgz#89cd8833c95481a0827ac6a1bfccddb92b75a109"
dependencies:
"@babel/types" "7.0.0-beta.54"

"@babel/helper-split-export-declaration@7.0.0-rc.1":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-rc.1.tgz#b00323834343fd0210f1f46c7a53521ad53efa5e"
Expand All @@ -249,6 +304,14 @@
"@babel/traverse" "7.0.0-rc.1"
"@babel/types" "7.0.0-rc.1"

"@babel/helpers@7.0.0-beta.54":
version "7.0.0-beta.54"
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-beta.54.tgz#b86a99a80efd81668caef307610b961197446a74"
dependencies:
"@babel/template" "7.0.0-beta.54"
"@babel/traverse" "7.0.0-beta.54"
"@babel/types" "7.0.0-beta.54"

"@babel/helpers@7.0.0-rc.1":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-rc.1.tgz#e59092cdf4b28026b3fc9d272e27e0ef152b4bee"
Expand All @@ -265,6 +328,14 @@
esutils "^2.0.2"
js-tokens "^3.0.0"

"@babel/highlight@7.0.0-beta.54":
version "7.0.0-beta.54"
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.54.tgz#155d507358329b8e7068970017c3fd74a9b08584"
dependencies:
chalk "^2.0.0"
esutils "^2.0.2"
js-tokens "^3.0.0"

"@babel/highlight@7.0.0-rc.1":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-rc.1.tgz#e0ca4731fa4786f7b9500421d6ff5e5a7753e81e"
Expand All @@ -273,6 +344,10 @@
esutils "^2.0.2"
js-tokens "^3.0.0"

"@babel/parser@7.0.0-beta.54":
version "7.0.0-beta.54"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-beta.54.tgz#c01aa63b57c9c8dce8744796c81d9df121f20db4"

"@babel/parser@7.0.0-rc.1", "@babel/parser@^7.0.0-beta.54":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-rc.1.tgz#d009a9bba8175d7b971e30cd03535b278c44082d"
Expand Down Expand Up @@ -646,6 +721,15 @@
babylon "7.0.0-beta.44"
lodash "^4.2.0"

"@babel/template@7.0.0-beta.54":
version "7.0.0-beta.54"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.54.tgz#d5b0d2d2d55c0e78b048c61a058f36cfd7d91af3"
dependencies:
"@babel/code-frame" "7.0.0-beta.54"
"@babel/parser" "7.0.0-beta.54"
"@babel/types" "7.0.0-beta.54"
lodash "^4.17.5"

"@babel/template@7.0.0-rc.1":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-rc.1.tgz#5f9c0a481c9f22ecdb84697b3c3a34eadeeca23c"
Expand All @@ -670,6 +754,20 @@
invariant "^2.2.0"
lodash "^4.2.0"

"@babel/traverse@7.0.0-beta.54":
version "7.0.0-beta.54"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.54.tgz#2c17f98dcdbf19aa918fde128f0e1a0bc089e05a"
dependencies:
"@babel/code-frame" "7.0.0-beta.54"
"@babel/generator" "7.0.0-beta.54"
"@babel/helper-function-name" "7.0.0-beta.54"
"@babel/helper-split-export-declaration" "7.0.0-beta.54"
"@babel/parser" "7.0.0-beta.54"
"@babel/types" "7.0.0-beta.54"
debug "^3.1.0"
globals "^11.1.0"
lodash "^4.17.5"

"@babel/traverse@7.0.0-rc.1":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-rc.1.tgz#867b4b45ada2d51ae2d0076f1c1d5880f8557158"
Expand All @@ -692,6 +790,14 @@
lodash "^4.2.0"
to-fast-properties "^2.0.0"

"@babel/types@7.0.0-beta.54":
version "7.0.0-beta.54"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.54.tgz#025ad68492fed542c13f14c579a44c848e531063"
dependencies:
esutils "^2.0.2"
lodash "^4.17.5"
to-fast-properties "^2.0.0"

"@babel/types@7.0.0-rc.1":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-rc.1.tgz#6abf6d14ddd9fc022617e5b62e6b32f4fa6526ad"
Expand Down Expand Up @@ -1497,11 +1603,12 @@ babel-loader@8.0.0-beta.4:
mkdirp "^0.5.1"
util.promisify "^1.0.0"

babel-merge@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/babel-merge/-/babel-merge-1.1.1.tgz#626af5682cdb99c5ad5675424be868e644173d52"
babel-merge@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/babel-merge/-/babel-merge-2.0.1.tgz#6b2dfad78a655df66e3418eb37b1c3c5e676ad1a"
dependencies:
deepmerge "^1.5.1"
"@babel/core" "^7.0.0-beta.49"
deepmerge "^2.1.0"
object.omit "^3.0.0"

babel-messages@^6.23.0:
Expand Down Expand Up @@ -3458,10 +3565,14 @@ deep-is@~0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"

deepmerge@^1.5.1, deepmerge@^1.5.2:
deepmerge@^1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"

deepmerge@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768"

default-require-extensions@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
Expand Down

0 comments on commit de34f65

Please sign in to comment.