From f4d2f5346d3893e87da71dd9e5fc89baa720f058 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Wed, 17 Jan 2018 13:16:43 -0500 Subject: [PATCH] import react bootstrap --- chains.json | 1 + lib/pipeline/pipeline.js | 4 ++++ test_app/app/index.html | 1 - test_app/app/js/app.js | 18 ++++++++++++++++++ test_app/app/js/index.js | 25 +++++++++---------------- test_app/package.json | 5 ++++- 6 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 chains.json create mode 100644 test_app/app/js/app.js diff --git a/chains.json b/chains.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/chains.json @@ -0,0 +1 @@ +{} diff --git a/lib/pipeline/pipeline.js b/lib/pipeline/pipeline.js index 11d7c9a1..8fc4b522 100644 --- a/lib/pipeline/pipeline.js +++ b/lib/pipeline/pipeline.js @@ -138,6 +138,9 @@ class Pipeline { ] } }).run((_err, _stats) => { + console.dir('--------------------------'); + console.dir(_stats); + console.dir('--------------------------'); next(); }); @@ -191,6 +194,7 @@ class Pipeline { ] } }).run((_err, _stats) => { + console.dir(_err); next(); }); diff --git a/test_app/app/index.html b/test_app/app/index.html index 9ee0951e..3dddb3bd 100644 --- a/test_app/app/index.html +++ b/test_app/app/index.html @@ -2,7 +2,6 @@ Embark - SimpleStorage Demo - diff --git a/test_app/app/js/app.js b/test_app/app/js/app.js new file mode 100644 index 00000000..64398919 --- /dev/null +++ b/test_app/app/js/app.js @@ -0,0 +1,18 @@ +import { Component } from 'react'; + +class App extends Component { + render() { + return ( +
+
+

Welcome to React

+
+

+ To get started, edit src/App.js and save to reload. +

+
+ ); + } +} + +export default App; diff --git a/test_app/app/js/index.js b/test_app/app/js/index.js index e33f8e34..5633d7d1 100644 --- a/test_app/app/js/index.js +++ b/test_app/app/js/index.js @@ -9,10 +9,16 @@ import ReactDOM from 'react-dom'; //import $ from './_vendor/jquery.min'; import $ from 'jquery'; -import 'bootstrap'; -import 'bootstrap/dist/css/bootstrap.min.css'; +//import 'bootstrap'; +import 'bootstrap/dist/css/bootstrap.css'; +import 'bootstrap/dist/css/bootstrap-theme.css'; +//import 'bootstrap/dist/css/bootstrap.min.css'; //import 'bootstrap/dist/js/bootstrap.min.js'; +//import 'react-bootstrap/dist/react-bootstrap.min.js'; + +import { Navbar, Jumbotron, Button } from 'react-bootstrap'; + window.EmbarkJS = EmbarkJS; window.SimpleStorage = SimpleStorage; window.Test = Test; @@ -21,20 +27,7 @@ window.React = React; import './foo.css'; -class App extends Component { - render() { - return ( -
-
-

Welcome to React

-
-

- To get started, edit src/App.js and save to reload. -

-
- ); - } -} +import App from './app.js'; ReactDOM.render(, document.getElementById('root')); diff --git a/test_app/package.json b/test_app/package.json index b58c37ee..234db24d 100644 --- a/test_app/package.json +++ b/test_app/package.json @@ -9,12 +9,15 @@ "author": "", "license": "ISC", "homepage": "", - "devDependencies": {}, + "devDependencies": { + "babel-code-frame": "^6.26.0" + }, "dependencies": { "bootstrap": "^3.3.6", "embark-service": "./extensions/embark-service", "jquery": "^1.11.3", "react": "^16.0.0", + "react-bootstrap": "^0.32.0", "react-dom": "^16.2.0" } }