Skip to content

Commit 5156d57

Browse files
committed
Specify babel-runtime as dependencies, not as peerDependencies
babel-runtime is not installed Babel 7 environment. (Babel 7 denpends @babel/runtime.) So this should be depended as "dependencies".
1 parent 4d7f2a9 commit 5156d57

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Changes since last non-beta release.
1010

1111
#### Fixed
1212
- Ignore Arrays in Rails i18n yml files. [PR 1129](https://github.com/shakacode/react_on_rails/pull/1129) by [vcarel](https://github.com/vcarel).
13+
- Fix to apply transform-runtime. And work with Babel 6 and 7. (Include revert of [PR 1136](https://github.com/shakacode/react_on_rails/pull/1136)) [PR 1140](https://github.com/shakacode/react_on_rails/pull/1140) by [Ryunosuke Sato](https://github.com/tricknotes).
1314

1415
*Please add entries here for your pull requests that are not yet released.*
1516

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"babel-preset-es2015": "^6.24.1",
1717
"babel-preset-react": "^6.24.1",
1818
"babel-preset-stage-2": "^6.24.1",
19-
"babel-runtime": "^6.25.0",
2019
"babel-tape-runner": "^2.0.1",
2120
"babel-types": "^6.25.0",
2221
"babelify": "^7.3.0",
@@ -41,7 +40,6 @@
4140
"webpack-manifest-plugin": "^1.2.1"
4241
},
4342
"peerDependencies": {
44-
"babel-runtime": ">= 6",
4543
"js-yaml": ">= 3.0.0",
4644
"react": ">= 0.14",
4745
"react-dom": ">= 0.14"
@@ -88,5 +86,7 @@
8886
"url": "https://github.com/shakacode/react_on_rails/issues"
8987
},
9088
"homepage": "https://github.com/shakacode/react_on_rails#readme",
91-
"dependencies": {}
89+
"dependencies": {
90+
"babel-runtime": "6"
91+
}
9292
}

yarn.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ babel-register@^6.26.0, babel-register@^6.3.13:
854854
mkdirp "^0.5.1"
855855
source-map-support "^0.4.15"
856856

857-
babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.25.0, babel-runtime@^6.26.0:
857+
babel-runtime@6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
858858
version "6.26.0"
859859
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
860860
dependencies:

0 commit comments

Comments
 (0)