mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Use react-bootstrap-ss fork
The react-bootstrap project won't update their codebase for TWBS4 compat until they're out of alpha (https://github.com/react-bootstrap/react-bootstrap/issues/1187). So we have to work in a fork for the meantime.
This commit is contained in:
parent
b14804fc2d
commit
0cc91d3b38
@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import { Modal } from 'react-bootstrap-4';
|
||||
import { Modal } from 'react-bootstrap-ss';
|
||||
import SilverStripeComponent from 'lib/SilverStripeComponent';
|
||||
import FormBuilder from 'components/FormBuilder/FormBuilder';
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import { Popover, OverlayTrigger } from 'react-bootstrap-4';
|
||||
import { Popover, OverlayTrigger } from 'react-bootstrap-ss';
|
||||
import SilverStripeComponent from 'lib/SilverStripeComponent';
|
||||
|
||||
class PopoverField extends SilverStripeComponent {
|
||||
|
@ -234,8 +234,8 @@ gulp.task('bundle-lib', function bundleLib() {
|
||||
.require('tether',
|
||||
{ expose: 'tether' }
|
||||
)
|
||||
.require('react-bootstrap-4',
|
||||
{ expose: 'react-bootstrap-4' }
|
||||
.require('react-bootstrap-ss',
|
||||
{ expose: 'react-bootstrap-ss' }
|
||||
)
|
||||
.require('react-addons-css-transition-group',
|
||||
{ expose: 'react-addons-css-transition-group' }
|
||||
@ -389,7 +389,7 @@ gulp.task('bundle-legacy', function bundleLeftAndMain() {
|
||||
.external('i18nx')
|
||||
.external('lib/Router')
|
||||
.external('react-dom')
|
||||
.external('react-bootstrap-4')
|
||||
.external('react-bootstrap-ss')
|
||||
.external('components/FormBuilderModal/FormBuilderModal')
|
||||
.bundle()
|
||||
.on('update', bundleLeftAndMain)
|
||||
@ -432,7 +432,7 @@ gulp.task('bundle-framework', function bundleBoot() {
|
||||
.external('react-addons-test-utils')
|
||||
.external('react-dom')
|
||||
.external('tether')
|
||||
.external('react-bootstrap-4')
|
||||
.external('react-bootstrap-ss')
|
||||
.external('react-redux')
|
||||
.external('react-router-redux')
|
||||
.external('react-router')
|
||||
|
18
npm-shrinkwrap.json
generated
18
npm-shrinkwrap.json
generated
@ -13349,17 +13349,21 @@
|
||||
"version": "0.14.8",
|
||||
"resolved": "https://registry.npmjs.org/react-addons-test-utils/-/react-addons-test-utils-0.14.8.tgz"
|
||||
},
|
||||
"react-bootstrap-4": {
|
||||
"version": "0.29.1",
|
||||
"resolved": "https://registry.npmjs.org/react-bootstrap-4/-/react-bootstrap-4-0.29.1.tgz",
|
||||
"react-bootstrap-ss": {
|
||||
"version": "0.30.5",
|
||||
"resolved": "https://registry.npmjs.org/react-bootstrap-ss/-/react-bootstrap-ss-0.30.5.tgz",
|
||||
"dependencies": {
|
||||
"babel-runtime": {
|
||||
"version": "5.8.38",
|
||||
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.38.tgz",
|
||||
"version": "6.11.6",
|
||||
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz",
|
||||
"dependencies": {
|
||||
"core-js": {
|
||||
"version": "1.2.6",
|
||||
"resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.6.tgz"
|
||||
"version": "2.4.1",
|
||||
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz"
|
||||
},
|
||||
"regenerator-runtime": {
|
||||
"version": "0.9.5",
|
||||
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -54,7 +54,7 @@
|
||||
"query-string": "^3.0.3",
|
||||
"react": "^0.14.8",
|
||||
"react-addons-css-transition-group": "^0.14.8",
|
||||
"react-bootstrap-4": "^0.29.1",
|
||||
"react-bootstrap-ss": "^0.30.5",
|
||||
"react-dom": "^0.14.8",
|
||||
"react-redux": "^4.4.1",
|
||||
"react-router": "^2.4.1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user