resolve conficts

Author: nikos-fytros

src/parser/script.js

@@ -63,7 +63,11 @@ function scriptParser(scriptObject: ScriptObjectType, defaults: Object, type: st
             const cachedBabelScript = Cache.get(cacheKey);
             if (cachedBabelScript) {
                 const finalScript = dataMerge(cachedBabelScript, defaults, type);
-                resolve(finalScript);
+                const finalObject = {
+                    script: finalScript,
+                    style: cachedBabelScript.style
+                };
+                resolve(finalObject);
             } else {
                 const babelScript = babel.transform(scriptObject.content, options);
                 // const filename = path.join(defaults.rootPath, '/', defaults.component);
@@ -72,12 +76,16 @@ function scriptParser(scriptObject: ScriptObjectType, defaults: Object, type: st
                     defaults: defaults
                 };
                 Utils.requireFromString(babelScript.code, defaults.component, requireFromStringOptions, Cache)
-                    .then(scriptFromString => {
+                    .then(requiredObject => {
                         // set the cache for the babel script string
-                        Cache.set(cacheKey, scriptFromString);
+                        Cache.set(cacheKey, requiredObject);
 
-                        const finalScript = dataMerge(scriptFromString, defaults, type);
-                        resolve(finalScript);
+                        const finalScript = dataMerge(requiredObject.code, defaults, type);
+                        const finalObject = {
+                            script: finalScript,
+                            style: requiredObject.style
+                        };
+                        resolve(finalObject);
                     })
                     .catch(error => reject(error));
             }

src/utils/require.js

@@ -78,6 +78,7 @@ function replaceRelativePaths(code: string, rootPath: string): string {
 function requireFromString(code: string, filename: string = '', optsObj: Object = {}, Cache: Object): Promise < Object > {
     return new Promise((resolve, reject) => {
         const options = new Options(optsObj);
+        let style = '';
         let promiseArray = [];
 
         if (typeof code !== 'string') {
@@ -108,7 +109,9 @@ function requireFromString(code: string, filename: string = '', optsObj: Object
                     for (var renderedItem of renderedItemArray) {
                         const rawString = renderedItem.rendered.scriptStringRaw;
                         code = code.replace(renderedItem.match, rawString);
-                        styles += renderedItem.rendered.layout.style;
+                        if (renderedItem.rendered.layout && renderedItem.rendered.layout.style) {
+                            styles += renderedItem.rendered.layout.style;
+                        }
                     }
                     //check if its the last element and then render
                     const last_element = code.match(options.vueFileRegex);
@@ -123,7 +126,11 @@ function requireFromString(code: string, filename: string = '', optsObj: Object
                 });
         } else {
             m._compile(code, filename);
-            resolve(m.exports.default);
+            const resolvedObject = {
+                code: m.exports.default,
+                style: style
+            };
+            resolve(resolvedObject);
         }
     });
 }