Feat: add ability to import container from page generator

Author: RyanCCollins

app/src/components/index.js

@@ -1,4 +1,4 @@
-/* Assemble all components for export */
+/* GENERATOR: Assemble all components for export */
 export Contributor from './Contributor';
 export Avatar from './Avatar';
 export WelcomeModal from './WelcomeModal';

app/src/containers/index.js

@@ -1,3 +1,3 @@
-/* Assemble all containers for export */
+/* GENERATOR: Assemble all containers for export */
 export LandingContainer from './LandingContainer';
 export AppContainer from './AppContainer';

app/src/pages/index.js

@@ -1,3 +1,4 @@
-/* Assemble all pages for export */
+/* GENERATOR: Assemble all pages for export */
+export HelloPage from './HelloPage/index';
 export NotFoundPage from './NotFoundPage/index';
 export LandingPage from './LandingPage/index';

app/src/reducers.js

@@ -3,13 +3,13 @@ import { routerReducer } from 'react-router-redux';
 import { reducer as formReducer } from 'redux-form';
 import client from './apolloClient';
 
-/* Import all of your reducers */
+/* GENERATOR: Import all of your reducers */
 import landing from './containers/LandingContainer/reducer';
 import app from './containers/AppContainer/reducer';
 
 const rootReducer = combineReducers({
   app,
-  /* Compile all of your reducers */
+  /* GENERATOR: Compile all of your reducers */
   landing,
   routing: routerReducer,
   form: formReducer,

app/src/routes.js

@@ -21,7 +21,6 @@ export const routes = {
       });
     },
   },
-  /* Newly generated Routes go here */
   childRoutes: [
     {
       path: '*',
@@ -32,6 +31,7 @@ export const routes = {
         });
       },
     },
+/* GENERATOR: Newly generated Routes go here */
   ],
 };
 

app/src/store.js

@@ -8,13 +8,13 @@ import client from './apolloClient';
 const isClient = typeof document !== 'undefined';
 const isDeveloping = process.env.NODE_ENV !== 'production';
 
-/* Import all of your initial state */
+/* GENERATOR: Import all of your initial state */
 import { initialState as landing } from './containers/LandingContainer/reducer';
 import { initialState as app } from './containers/AppContainer/reducer';
 
 const initialState = {
   app,
-  /* Compile all of your initial state */
+  /* GENERATOR: Compile all of your initial state */
   landing,
 };
 

config/generators/component/index.js

@@ -72,7 +72,7 @@ module.exports = {
     actions.push({
       type: 'modify',
       path: '../../app/src/components/index.js',
-      pattern: /(\/\* Assemble all components for export \*\/)/g,
+      pattern: /(\/\* GENERATOR: Assemble all components for export \*\/)/g,
       template: trimTemplateFile('config/generators/component/export.js.hbs'),
     });
 

config/generators/container/index.js

@@ -53,7 +53,7 @@ module.exports = {
     actions.push({
       type: 'modify',
       path: '../../app/src/containers/index.js',
-      pattern: /(\/\* Assemble all containers for export \*\/)/g,
+      pattern: /(\/\* GENERATOR: Assemble all containers for export \*\/)/g,
       template: trimTemplateFile('config/generators/container/export.js.hbs'),
     });
 
@@ -86,28 +86,28 @@ module.exports = {
       actions.push({
         type: 'modify',
         path: '../../app/src/store.js',
-        pattern: /(\/\* Import all of your initial state \*\/)/g,
+        pattern: /(\/\* GENERATOR: Import all of your initial state \*\/)/g,
         template: trimTemplateFile('config/generators/container/store.import.js.hbs'),
       });
 
       actions.push({
         type: 'modify',
         path: '../../app/src/store.js',
-        pattern: /(\/\* Compile all of your initial state \*\/)/g,
+        pattern: /(\/\* GENERATOR: Compile all of your initial state \*\/)/g,
         template: trimTemplateFile('config/generators/container/store.usage.js.hbs'),
       });
 
       actions.push({
         type: 'modify',
         path: '../../app/src/reducers.js',
-        pattern: /(\/\* Import all of your reducers \*\/)/g,
+        pattern: /(\/\* GENERATOR: Import all of your reducers \*\/)/g,
         template: trimTemplateFile('config/generators/container/reducers.import.js.hbs'),
       });
 
       actions.push({
         type: 'modify',
         path: '../../app/src/reducers.js',
-        pattern: /(\/\* Compile all of your reducers \*\/)/g,
+        pattern: /(\/\* GENERATOR: Compile all of your reducers \*\/)/g,
         template: trimTemplateFile('config/generators/container/reducers.usage.js.hbs'),
       });
 

config/generators/container/index.js.hbs

@@ -51,7 +51,9 @@ const Container = {{ properCase name }}Container;
 {{#if wantGraphQL}}
 const {{ camelCase name }}Query = gql`
   query {{ camelCase name }} {
-    id
+    {{ camelCase name }} {
+      __typename
+    }
   }
 `;
 
@@ -65,7 +67,9 @@ const ContainerWithData = graphql({{ camelCase name }}Query, {
 
 const {{ camelCase name }}Mutation = gql`
   mutation {{ camelCase name }} {
-    id
+    {{ camelCase name }} {
+      __typename
+    }
   }
 `;
 

config/generators/page/index.js

@@ -32,6 +32,12 @@ module.exports = {
         return 'path is required';
       },
     },
+    {
+      type: 'confirm',
+      name: 'wantContainer',
+      default: true,
+      message: 'Do you want to import a container by the same name?',
+    },
   ],
 
 
@@ -55,12 +61,12 @@ module.exports = {
     actions.push({
       type: 'modify',
       path: '../../app/src/routes.js',
-      pattern: /(\/\* Newly generated Routes go here \*\/)/g,
+      pattern: /(\/\* GENERATOR: Newly generated Routes go here \*\/)/g,
       template: trimTemplateFile('config/generators/page/route.js.hbs'),
     }, {
       type: 'modify',
       path: '../../app/src/pages/index.js',
-      pattern: /(\/\* Assemble all pages for export \*\/)/g,
+      pattern: /(\/\* GENERATOR: Assemble all pages for export \*\/)/g,
       template: trimTemplateFile('config/generators/page/export.js.hbs'),
     });