fix(demo generator): fix running demo generator through composeWith()

The real `package.json` file didn't yet exist when the `bat:demo` generator was invoked from the `app` generator.
marviq · Jul 22, 2015 · 0b4ce2a · 0b4ce2a
1 parent 07fd501
commit 0b4ce2a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -349,11 +349,7 @@ var AppGenerator = generators.Base.extend(
                     ]
                 ;
 
-                if ( data.demo )
-                {
-                    this.composeWith( 'bat:demo' );
-                }
-                else
+                if ( !( data.demo ))
                 {
                     //
                     //  Do not write these when a demo app is wanted right now; avoids conflicts.
@@ -386,6 +382,14 @@ var AppGenerator = generators.Base.extend(
 
                 this._templatesProcess( templates );
             }
+
+        ,   setupDemo: function ()
+            {
+                if ( this.templateData.demo )
+                {
+                    this.composeWith( 'bat:demo' );
+                }
+            }
         }
 
     ,   install: function ()

diff --git a/generators/demo/index.js b/generators/demo/index.js
@@ -28,7 +28,7 @@ var DemoGenerator = generators.Base.extend(
         {
             this._assertBatApp();
 
-            var npm = require( this.destinationPath( 'package.json' ));
+            var npm = this.fs.readJSON( this.destinationPath( 'package.json' ));
 
             //  Container for template expansion data.
             //