updated libraries, removed redundant code

hipertracker · hipertracker · commit 136105761d39 · 2015-07-29T01:11:43.000+01:00
diff --git a/app/components/HelloWorld.js b/app/components/HelloWorld.js
@@ -1,6 +1,6 @@
-import React, { PropTypes } from 'react';
+import React, { Component, PropTypes } from 'react';
 
-export default class HelloWorld extends React.Component {
+export default class HelloWorld extends Component {
     static propTypes = {
         name: PropTypes.string.isRequired
     };
diff --git a/app/startup.js b/app/startup.js
@@ -1,28 +1,5 @@
 import React from 'react';
 
-// see more http://babeljs.io/docs/learn-es2015/
-
-var fibonacci = {
-    [Symbol.iterator]: function*() {
-        var pre = 0, cur = 1;
-        for (;;) {
-            var temp = pre;
-            pre = cur;
-            cur += temp;
-            yield cur;
-        }
-    }
-};
-
-for (var n of fibonacci) {
-    // truncate the sequence at 1000
-    if (n > 1000) {
-        break;
-    }
-    console.log(n);
-}
-
-
-import HelloWorld from 'es6!./components/HelloWorld';
+import HelloWorld from 'es6!app/components/HelloWorld';
 
 React.render(<HelloWorld name="Jarek"/>, document.getElementById('HelloWorld'));
diff --git a/index.html b/index.html
@@ -6,7 +6,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>react-requirejs-boilerplate</title>
     <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
-    <link href="app.css" rel="stylesheet">
 </head>
 <body>
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-requirejs-boilerplate",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Using [React](http://facebook.github.io/react/) with JSX, ES6 modules and all other ES6 and experimental ES7  features provided by [Babel](https://babeljs.io/) transpiler. ES6 files are transpiled on fly (and cached) by the browser  alone (no Grunt/Gulp/Broccoli processing is needed).",
   "main": "require-config.js",
   "scripts": {
@@ -18,15 +18,13 @@
   },
   "homepage": "https://github.com/hipertracker/react-requirejs-boilerplate#readme",
   "dependencies": {
-    "core-decorators": "^0.1.2",
+    "classnames": "^2.1.3",
+    "core-decorators": "^0.1.5",
     "flowcheck": "^0.2.7",
     "immutable": "^3.7.4",
     "react": "^0.13.3",
-    "classnames": "^2.1.3",
-    "requirejs": "^2.1.19",
-    "requirejs-babel": "hipertracker/requirejs-babel",
-    "text": "^0.1.0",
-    "marty": "^0.10.4"
+    "requirejs": "^2.1.20",
+    "requirejs-babel": "hipertracker/requirejs-babel"
   },
   "devDependencies": {
     "babel-eslint": "^3.1.23",
diff --git a/require-config.js b/require-config.js
@@ -9,14 +9,10 @@ var require = {
         babel: vendorPath + '/requirejs-babel/browser',
         polyfill: vendorPath + '/requirejs-babel/polyfill',
         es6: vendorPath + '/requirejs-babel/es6',
-        text: vendorPath + '/text/lib/index',
 
-        react: vendorPath + '/react/dist/react-with-addons'
-        classnames: vendorPath + 'classnames/index',
-        immutable: vendorPath + '/immutable/dist/immutable',
-        
-        marty: vendorPath + 'marty/dist/marty',
-        'react-bootstrap': vendorPath + 'react_bootstrap/dist/react-bootstrap'
+        react: vendorPath + '/react/dist/react-with-addons',
+        classnames: vendorPath + 'classnames/index'
+
     },
     shim: {
         babel: {
@@ -25,11 +21,8 @@ var require = {
     }
 };
 
-if (window.env === 'prod') {
+if (window.ENV === 'prod') {
     require.paths.babel = vendorPath + '/requirejs-babel/browser.min';
     require.paths.polyfill = vendorPath + '/requirejs-babel/polyfill.min';
     require.paths.react = vendorPath + '/react/dist/react-with-addons.min';
-    require.paths.immutable = vendorPath + '/immutable/dist/immutable.min';
-    require.paths.marty = vendorPath + 'marty/dist/marty.min';
-    require.paths['react-bootstrap'] = vendorPath + 'react_bootstrap/dist/react-bootstrap.min';
 }
