fix: stop compilation with some javascript syntax error, close #75 (#90)

kaola-fed · Apr 1, 2019 · 5af247a · 5af247a
1 parent 8c25059
commit 5af247a
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 10 deletions.
diff --git a/packages/target/lib/frameworks/shared/utils/extractCompilerOptionsFromScriptSource.js b/packages/target/lib/frameworks/shared/utils/extractCompilerOptionsFromScriptSource.js
@@ -15,7 +15,13 @@ module.exports = function( source, extractComponentsPlugin, loaderContext ) {
     ]
   }
 
-  const { metadata } = babel.transform( source, babelOptions )
+  let metadata
+
+  try {
+    metadata = babel.transform( source, babelOptions ).metadata
+  } catch ( e ) {
+    return Promise.reject( e )
+  }
 
   const components = ( metadata && metadata.megaloComponents ) || {}
 

diff --git a/packages/target/lib/frameworks/vue/loader/template.js b/packages/target/lib/frameworks/vue/loader/template.js
@@ -118,7 +118,7 @@ module.exports = function ( source ) {
       callback( null, code + `\nexport { render, staticRenderFns }` )
     } )
     .catch( e => {
-      loaderContext.emitError( e )
+      deferred.del()
       callback( e, source )
     } )
 }

diff --git a/packages/target/lib/loaders/js-entry.js b/packages/target/lib/loaders/js-entry.js
@@ -24,7 +24,16 @@ module.exports = function ( source ) {
       ]
     }
 
-    const { code, map, metadata } = babel.transform( source, babelOptions )
+    let code, map, metadata
+
+    try {
+      const result = babel.transform( source, babelOptions )
+      code = result.code
+      map = result.map
+      metadata = result.metadata
+    } catch ( e ) {
+      callback( e )
+    }
 
     source = code
     sourcemap = map

diff --git a/packages/target/lib/platforms/shared/index.js b/packages/target/lib/platforms/shared/index.js
@@ -354,11 +354,13 @@ function genSlotsGeneratorArgs( {
 
 function normalizeGeneratorOptions( options, { constants, extensions } ) {
   const entryComponent = options.entryComponent || {}
+  const root = entryComponent.root || ''
+  const name = entryComponent.name || ''
 
   // resolve entryComponent src
   entryComponent.src = constants.COMPONENT_OUTPUT_PATH
-    .replace( /\[root\]/g, entryComponent.root ? entryComponent.root + '/' : '' )
-    .replace( /\[name\]/g, entryComponent.name ) +
+    .replace( /\[root\]/g, root ? root + '/' : '' )
+    .replace( /\[name\]/g, name ) +
     extensions.template
 
   return options

diff --git a/packages/target/lib/plugins/MegaloPlugin.js b/packages/target/lib/plugins/MegaloPlugin.js
@@ -84,11 +84,11 @@ function modifyResolveOption ( compiler, options ) {
   // add to webpack resolve.plugins in order to resolve multi-platform js module
   !compiler.options.resolve.plugins && (compiler.options.resolve.plugins = []);
   compiler.options.resolve.plugins.push(new MultiPlatformResolver(platform));
-  
+
   // require multi-platform module like a directory
   const mainFiles = ['index', `index.${platform}`, 'index.default'];
   const extensions = ['.vue', '.js', '.json'];
-  
+
   compiler.options.resolve.mainFiles = getConcatedArray(compiler.options.resolve.mainFiles, mainFiles);
   compiler.options.resolve.extensions = getConcatedArray(compiler.options.resolve.extensions, extensions);
 
@@ -289,10 +289,17 @@ function normalizePages( { pages, assets, subpackages, entrypoints, platform } )
     const newPage = Object.assign( {}, page, { files } )
 
     // subpackage should prefix root
-    if ( subpackage ) {
-      page.entryComponent.root = subpackage.root
+    if ( page.entryComponent ) {
+      if ( subpackage ) {
+        page.entryComponent.root = subpackage.root
+      } else {
+        page.entryComponent.root = ''
+      }
     } else {
-      page.entryComponent.root = ''
+      newPage.entryComponent = {
+        root: ''
+      }
+      // throw new Error( `Cannot parse entry component for "${ page.file }"` )
     }
 
     normalized.push( newPage )