refactor: tweaks

Author: eddyerburgh

packages/create-instance/create-instance.js

@@ -17,12 +17,7 @@ import { validateSlots } from './validate-slots'
 import createScopedSlots from './create-scoped-slots'
 import { createStubsFromStubsObject } from './create-component-stubs'
 import { patchCreateElement } from './patch-create-element'
-import {
-  isReservedTag,
-  isConstructor,
-  isDynamicComponent,
-  isComponentOptions
-} from 'shared/validators'
+import { isConstructor } from 'shared/validators'
 
 function vueExtendUnsupportedOption (option: string) {
   return `options.${option} is not supported for ` +
@@ -45,9 +40,6 @@ export default function createInstance (
   options: Options,
   _Vue: Component
 ): Component {
-  // make sure all extends are based on this instance
-  _Vue.options._base = _Vue
-
   if (
     VUE_VERSION < 2.3 && isConstructor(component)
   ) {
@@ -78,7 +70,11 @@ export default function createInstance (
   patchCreateElement(_Vue, stubComponentsObject, options.shouldProxy)
 
   if (componentOptions.functional) {
-    componentOptions = createFunctionalComponent(componentOptions, options, _Vue)
+    componentOptions = createFunctionalComponent(
+      componentOptions,
+      options,
+      _Vue
+    )
   } else if (options.context) {
     throwError(
       `mount.context can only be used when mounting a ` +
@@ -90,6 +86,7 @@ export default function createInstance (
     compileTemplate(componentOptions)
   }
 
+  // make sure all extends are based on this instance
   componentOptions._base = _Vue
 
   const Constructor = _Vue.extend(componentOptions).extend(instanceOptions)

packages/create-instance/patch-create-element.js

@@ -84,7 +84,7 @@ export function patchCreateElement (_Vue, stubs, stubAllComponents) {
       }
 
       if (typeof el === 'string') {
-        let original = resolveComponent(el, originalComponents)
+        const original = resolveComponent(el, originalComponents)
 
         if (!original) {
           return originalCreateElement(el, ...args)

packages/test-utils/src/matches.js

@@ -3,7 +3,7 @@ import {
   COMPONENT_SELECTOR,
   FUNCTIONAL_OPTIONS
 } from 'shared/consts'
-import { isConstructor } from 'shared/validators';
+import { isConstructor } from 'shared/validators'
 
 export function vmMatchesName (vm, name) {
   return !!name && (

test/specs/mount.spec.js

@@ -408,6 +408,8 @@ describeRunIf(process.env.TEST_ENV !== 'node', 'mount', () => {
     mount(TestComponent, {
       localVue
     })
+  })
+
   it('throws if component throws during update', () => {
     const TestComponent = {
       template: '<div :p="a" />',