Merge branch 'master' of github.com:styled-components/vue-styled-components

Author: codebender828

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-styled-components",
-  "version": "1.4.13",
+  "version": "1.4.14",
   "description": "Visual primitives for the component age. A simple port of styled-components 💅 for Vue",
   "main": "lib/index.js",
   "module": "dist/vue-styled-components.es.js",

src/test/basic.test.js

@@ -34,6 +34,11 @@ describe('basic', () => {
     expect(() => styled.notExistTag``).toThrow()
   })
 
+  it('should allow for inheriting components that are not styled', () => {
+    const componentConfig = { name: 'Parent', template: '<div><slot/></div>', methods: {} }
+    expect(() => styled(componentConfig, {})``).toNotThrow()
+  })
+
   // it('should generate an empty tag once rendered', () => {
   //   const Comp = styled.div``
   //   const vm = new Vue(Comp).$mount()

src/utils/isStyledComponent.js

@@ -1,5 +1,5 @@
 export default function isStyledComponent (target) {
   return target &&
     target.methods &&
-    typeof target.methods.generateAndInjectStyles() === 'string'
+    typeof target.methods.generateAndInjectStyles === 'function'
 }