Merge pull request shakacode#171 from shakacode/use-bundles-folder-structure

[WIP] Convert to bundles directory structure

Author: justin808

Gemfile.lock

@@ -91,6 +91,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
+    concurrent-ruby (1.0.0)
     connection_pool (2.2.0)
     coveralls (0.8.9)
       json (~> 1.8)
@@ -139,12 +140,12 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.99)
-    mini_portile (0.6.2)
+    mini_portile2 (2.0.0)
     minitest (5.8.3)
     multi_json (1.11.2)
     netrc (0.11.0)
-    nokogiri (1.6.6.4)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7)
+      mini_portile2 (~> 2.0.0.rc2)
     parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
     pg (0.18.4)
@@ -203,7 +204,7 @@ GEM
     rainbow (2.0.0)
     rake (10.4.2)
     rdoc (4.2.0)
-    react_on_rails (1.1.0)
+    react_on_rails (1.1.1)
       connection_pool
       execjs (~> 2.5)
       rails (>= 3.2)
@@ -278,7 +279,8 @@ GEM
     spring (1.4.4)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (3.4.1)
+    sprockets (3.5.1)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)

client/app/actions/commentsActionCreators.js renamed to client/app/bundles/Comments/actions/commentsActionCreators.js

@@ -46,8 +46,8 @@ class CommentForm extends React.Component {
       comment = {
         // This is different because the input is a native HTML element
         // rather than a React element.
-        author: this.refs.inlineAuthor.getDOMNode().value,
-        text: this.refs.inlineText.getDOMNode().value,
+        author: this.refs.inlineAuthor.value,
+        text: this.refs.inlineText.value,
       };
     }
 

client/app/components/Comment.jsx renamed to client/app/bundles/Comments/components/Comment.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 
-import createStore from '../stores/commentsStore';
+import createStore from '../store/commentsStore';
 import NonRouterCommentScreen from '../components/NonRouterCommentScreen';
 
 const App = props => {

client/app/components/CommentBox.jsx renamed to client/app/bundles/Comments/components/CommentBox.jsx

@@ -3,7 +3,7 @@ import { Provider } from 'react-redux';
 import Router from 'react-router';
 import createHistory from 'history/lib/createBrowserHistory';
 
-import createStore from '../stores/commentsStore';
+import createStore from '../store/commentsStore';
 import routes from '../routes/routes';
 
 const RouterApp = (props, location) => {

client/app/components/CommentForm.jsx renamed to client/app/bundles/Comments/components/CommentForm.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 
-import createStore from '../stores/commentsStore';
+import createStore from '../store/commentsStore';
 import NonRouterCommentScreen from '../components/NonRouterCommentScreen';
 
 const App = props => {

client/app/components/CommentList.jsx renamed to client/app/bundles/Comments/components/CommentList.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { match, RoutingContext } from 'react-router';
 
-import createStore from '../stores/commentsStore';
+import createStore from '../store/commentsStore';
 import routes from '../routes/routes';
 
 const RouterApp = (props, location) => {

client/app/components/CommentScreen.jsx renamed to client/app/bundles/Comments/components/CommentScreen.jsx

@@ -3,7 +3,7 @@
 
 import { compose, createStore, applyMiddleware, combineReducers } from 'redux';
 import thunkMiddleware from 'redux-thunk';
-import loggerMiddleware from '../middlewares/loggerMiddleware';
+import loggerMiddleware from 'lib/middlewares/loggerMiddleware';
 import reducers from '../reducers';
 import { initalStates } from '../reducers';
 

client/app/components/NonRouterCommentScreen.jsx renamed to client/app/bundles/Comments/components/NonRouterCommentScreen.jsx

@@ -1,7 +1,7 @@
 import { React, expect, TestUtils } from '../test_helper';
 import { List, Map } from 'immutable';
-import CommentList from '../../app/components/CommentList';
-import Comment from '../../app/components/Comment';
+import CommentList from '../../app/bundles/Comments/components/CommentList';
+import Comment from '../../app/bundles/Comments/components/Comment';
 
 const {
   renderIntoDocument,

client/app/components/RouterCommentScreen.jsx renamed to client/app/bundles/Comments/components/RouterCommentScreen.jsx

@@ -1,5 +1,5 @@
 import { React, expect, TestUtils } from '../test_helper';
-import Comment from '../../app/components/Comment';
+import Comment from '../../app/bundles/Comments/components/Comment';
 
 const {
   renderIntoDocument,

client/app/components/SimpleCommentScreen.jsx renamed to client/app/bundles/Comments/components/SimpleCommentScreen.jsx

@@ -1,6 +1,7 @@
 // Common client-side webpack configuration used by webpack.hot.config and webpack.rails.config.
 
 const webpack = require('webpack');
+const path = require('path');
 
 const devBuild = process.env.NODE_ENV !== 'production';
 const nodeEnv = devBuild ? 'development' : 'production';
@@ -21,10 +22,15 @@ module.exports = {
     ],
 
     // This will contain the app entry points defined by webpack.hot.config and webpack.rails.config
-    app: [],
+    app: [
+      './app/bundles/Comments/startup/clientGlobals',
+    ],
   },
   resolve: {
     extensions: ['', '.webpack.js', '.web.js', '.js', '.jsx', '.scss', '.css', 'config.js'],
+    alias: {
+      lib: path.join(process.cwd(), 'app', 'lib'),
+    },
   },
   plugins: [
     new webpack.DefinePlugin({

client/app/components/TestReactRouter.jsx renamed to client/app/bundles/Comments/components/TestReactRouter.jsx

@@ -16,10 +16,7 @@ config.entry.app.push(
 
   // Test out Css & Sass
   './assets/stylesheets/test-stylesheet.css',
-  './assets/stylesheets/test-sass-stylesheet.scss',
-
-  // App entry point
-  './app/startup/clientGlobals'
+  './assets/stylesheets/test-sass-stylesheet.scss'
 );
 
 config.output = {

client/app/components/TestReactRouterRedirect.jsx renamed to client/app/bundles/Comments/components/TestReactRouterRedirect.jsx

@@ -19,7 +19,6 @@ config.entry.vendor.unshift(
   'es5-shim/es5-shim',
   'es5-shim/es5-sham'
 );
-config.entry.app.push('./app/startup/clientGlobals');
 
 // See webpack.common.config for adding modules common to both the webpack dev server and rails
 

client/app/constants/commentsConstants.js renamed to client/app/bundles/Comments/constants/commentsConstants.js

@@ -1,6 +1,7 @@
 // Common webpack configuration for server bundle
 
 const webpack = require('webpack');
+const path = require('path');
 
 const devBuild = process.env.NODE_ENV !== 'production';
 const nodeEnv = devBuild ? 'development' : 'production';
@@ -9,13 +10,16 @@ module.exports = {
 
   // the project dir
   context: __dirname,
-  entry: ['./app/startup/serverGlobals', 'react-dom/server', 'react'],
+  entry: ['./app/bundles/Comments/startup/serverGlobals', 'react-dom/server', 'react'],
   output: {
     filename: 'server-bundle.js',
     path: '../app/assets/javascripts/generated',
   },
   resolve: {
     extensions: ['', '.webpack.js', '.web.js', '.js', '.jsx', 'config.js'],
+    alias: {
+      lib: path.join(process.cwd(), 'app', 'lib'),
+    },
   },
   plugins: [
     new webpack.DefinePlugin({