Fix coding style

Author: posva

package.json

@@ -30,6 +30,7 @@
     "html-minifier": "latest",
     "parse5": "latest",
     "rollup-pluginutils": "latest",
+    "vue-template-compiler": "^2.0.0-rc.4",
     "vue-template-validator": "latest"
   },
   "devDependencies": {
@@ -48,7 +49,6 @@
     "rollup": "latest",
     "rollup-plugin-buble": "^0.13.0",
     "rollup-plugin-replace": "latest",
-    "vue-hot-reload-api": "^1.2.2",
-    "vue-template-compiler": "^2.0.0-rc.4"
+    "vue-hot-reload-api": "^1.2.2"
   }
 }

src/index.js

@@ -7,7 +7,7 @@ export default function vue(options = {}) {
     const filter = createFilter(options.include, options.exclude);
     const styles = {};
     let dest = options.css;
-  const compileTemplate = !!options.compileTemplate
+    const compileTemplate = !!options.compileTemplate;
 
     return {
         name: 'vue',
@@ -20,7 +20,7 @@ export default function vue(options = {}) {
                 return null;
             }
 
-          const { js, css } = vueTransform(source, id, { compileTemplate });
+            const { js, css } = vueTransform(source, id, { compileTemplate });
 
             // Map of every stylesheet
             styles[id] = css || {};
@@ -30,7 +30,9 @@ export default function vue(options = {}) {
         },
         ongenerate(opts, rendered) {
             // Put with statements back
-            rendered.code = rendered.code.replace(/if\s*\("__VUE_WITH__"\)/g, 'with(this)');
+            /* eslint-disable no-param-reassign */
+            rendered.code = rendered.code.replace(/if\s*\(""__VUE_WITH_STATEMENT__"\)/g,
+                                                  'with(this)');
             if (options.css === false) {
                 return;
             }

src/options.js

@@ -12,4 +12,5 @@ export default {
         removeEmptyAttributes: true,
         removeOptionalTags: true,
     },
+    VUE_WITH_STATEMENT: '__VUE_WITH_STATEMENT__',
 };

src/vueTransform.js

@@ -39,6 +39,19 @@ function padContent(content) {
           .join('\n');
 }
 
+/**
+ * Wrap code inside a with statement inside a function
+ * This is necessary for Vue 2 template compilation
+ *
+ * @param {string} code
+ * @returns {string}
+ */
+function wrapRenderFunction(code) {
+    // Replace with(this) by something that works on strict mode
+    // https://github.com/vuejs/vue-template-es2015-compiler/blob/master/index.js
+    return `function(){${code.replace(/with\(this\)/g, 'if("__VUE_WITH_STATEMENT__")')}}`;
+}
+
 /**
  * Only support for es5 modules
  *
@@ -47,17 +60,16 @@ function padContent(content) {
  * @returns {string}
  */
 function injectRender(script, render) {
-  const matches = /(export default[^{]*\{)/g.exec(script);
-  if (matches) {
-    function toFunction (code) {
-      // Replace with(this) by something that works on strict mode
-      // https://github.com/vuejs/vue-template-es2015-compiler/blob/master/index.js
-      return `function(){${code.replace(/with\(this\)/g, 'if("__VUE_WITH__")')}}`;
+    const matches = /(export default[^{]*\{)/g.exec(script);
+    if (matches) {
+        return script.split(matches[1])
+            .join(`${matches[1]}\
+                    render: ${wrapRenderFunction(render.render)},\
+                    staticRenderFns: [\
+                        ${render.staticRenderFns.map(wrapRenderFunction).join(',')}\
+                ],`);
     }
-    return script.split(matches[1])
-      .join(`${matches[1]} \n /* istanbul ignore next */\n render: ${toFunction(render.render)},\n /* istanbul ignore next */\n staticRenderFns: [${render.staticRenderFns.map(toFunction).join(',')}],`);
-  }
-  throw new Error('[rollup-plugin-vue] could not find place to inject template in script.');
+    throw new Error('[rollup-plugin-vue] could not find place to inject template in script.');
 }
 
 /**
@@ -100,7 +112,7 @@ function processTemplate(node, filePath, content) {
  * @param {string} content
  * @param {string} template
  */
-function processScript(node, filePath, content, {template, render}) {
+function processScript(node, filePath, content, { template, render }) {
     const lang = checkLang(node) || 'js';
     let script = parse5.serialize(node);
     // pad the script to ensure correct line number for syntax errors
@@ -117,7 +129,7 @@ function processScript(node, filePath, content, {template, render}) {
     return script;
 }
 
-export default function vueTransform(code, filePath, options) {
+export default function vueTransform(code, filePath, transformOptions) {
     // 1. Parse the file into an HTML tree
     const fragment = parse5.parseFragment(code, { locationInfo: true });
 
@@ -135,13 +147,13 @@ export default function vueTransform(code, filePath, options) {
 
     // 4. Process template
     const template = processTemplate(nodes.template, filePath, code);
-  let js = null
-  if (options.compileTemplate) {
-    const render = compileTemplate(template);
-    js = processScript(nodes.script, filePath, code, { render })
-  } else {
-    js = processScript(nodes.script, filePath, code, { template })
-  }
+    let js;
+    if (transformOptions.compileTemplate) {
+        const render = compileTemplate(template);
+        js = processScript(nodes.script, filePath, code, { render });
+    } else {
+        js = processScript(nodes.script, filePath, code, { template });
+    }
 
     // 5. Process script & style
     return {