fix(ionic2): Fix issue with ionic2

mcfly-io · Apr 6, 2016 · bf88794 · bf88794
1 parent 4b0ae79
commit bf88794
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/generators/app/templates/webpack.config.js b/generators/app/templates/webpack.config.js
@@ -27,6 +27,11 @@ var fileExistsSync = function(file) {
 var isTargetFuse = function(target) {
     return fileExistsSync(path.join(clientFolder, 'scripts', target, 'index.ux'));
 };
+
+var isTargetIonic2 = function(target) {
+    return fileExistsSync(path.join(clientFolder, 'scripts', target, 'ionic.config.json'));
+};
+
 // make sure the target exists
 if (!fileExistsSync(path.join(clientFolder, 'scripts', target))) {
     var error = 'The target ' + target + ' does not exist';
@@ -264,6 +269,13 @@ module.exports = {
             .concat(isTargetFuse(target) ? [{
                 from: './**/*.uno'
             }] : [])
+            .concat(isTargetIonic2(target) ? [{
+                from: './config.xml'
+            }] : [])
+            .concat(isTargetIonic2(target) ? [{
+                from: './ionic.config.json'
+            }] : [])
+
         ),
         new PostCompilePlugin({
             filename: path.join(distFolder, 'bundle.js'),

diff --git a/generators/component/templates/_component.ionic2.ts b/generators/component/templates/_component.ionic2.ts
@@ -2,8 +2,8 @@ import { App, Platform } from 'ionic-angular';
 import { StatusBar, Globalization } from 'ionic-native';
 
 @App({
-    styles: [require('./app.component.scss').toString()],
-    template: require('./app.component.html'),
+    styles: [require('./<%=componentnameFile%>.component.scss').toString()],
+    template: require('./<%=componentnameFile%>.component.html'),
     config: {
         // http://ionicframework.com/docs/v2/api/config/Config/
     },
@@ -20,6 +20,6 @@ export class <%=componentnameClass%>Component {
                 res => { },
                 err => { }
             );
-        };
+        });
     }
 }