vuejs-fr
diff --git a/‎lib/runtime/component-normalizer.js
Copy file name to clipboardExpand all lines: lib/runtime/component-normalizer.js
+12-19Lines changed: 12 additions & 19 deletions b/‎lib/runtime/component-normalizer.js
Copy file name to clipboardExpand all lines: lib/runtime/component-normalizer.js
+12-19Lines changed: 12 additions & 19 deletions
diff --git a/‎test.html
Copy file name to clipboardExpand all lines: test.html
-1Lines changed: 0 additions & 1 deletion b/‎test.html
Copy file name to clipboardExpand all lines: test.html
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎test/fixtures/service.js
Copy file name to clipboardExpand all lines: test/fixtures/service.js
-3Lines changed: 0 additions & 3 deletions b/‎test/fixtures/service.js
Copy file name to clipboardExpand all lines: test/fixtures/service.js
-3Lines changed: 0 additions & 3 deletions
diff --git a/‎test/fixtures/ssr-style.js
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎test/fixtures/ssr-style.js
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
@@ -68,35 +68,28 @@ export default function normalizeComponent (
     // never gets called
     options._ssrRegister = hook
   } else if (injectStyles) {
-    if (shadowMode) {
-      hook = function () {
-        injectStyles(this.$root.$options.shadowRoot)
-      }
-    } else {
-      hook = injectStyles
-    }
+    hook = shadowMode
+      ? function () { injectStyles(this.$root.$options.shadowRoot) }
+      : injectStyles
   }
 
   if (hook) {
-    var functional = options.functional
-    var existing = functional
-      ? options.render
-      : options.beforeCreate
-
-    if (!functional) {
-      // inject component registration as beforeCreate hook
-      options.beforeCreate = existing
-        ? [].concat(existing, hook)
-        : [hook]
-    } else {
+    if (options.functional) {
       // for template-only hot-reload because in that case the render fn doesn't
       // go through the normalizer
       options._injectStyles = hook
       // register for functioal component in vue file
+      var render = options.render
       options.render = function renderWithStyleInjection (h, context) {
         hook.call(context)
-        return existing(h, context)
+        return render(h, context)
       }
+    } else {
+      // inject component registration as beforeCreate hook
+      var existing = options.beforeCreate
+      options.beforeCreate = existing
+        ? [].concat(existing, hook)
+        : [hook]
     }
   }
 
 
@@ -1,6 +1,6 @@
-var Vue = require('vue')
-var App = require('./ssr-style.vue').default
+import Vue from 'vue'
+import App from './ssr-style.vue'
 
-module.exports = () => new Vue({
+export default () => new Vue({
   render: h => h(App)
 })