Revert "Add config class & Vue instance options (#90)"

This reverts commit fe6038a.
akxcv · Sep 9, 2019 · d0acc55 · d0acc55
1 parent fe6038a
commit d0acc55
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 92 deletions.
diff --git a/dist/vuera.cjs.js b/dist/vuera.cjs.js
@@ -185,11 +185,6 @@ var wrapReactChildren = function wrapReactChildren(createElement, children) {
   });
 };
 
-var vueInstanceOptions = {};
-var setVueInstanceOptions = function setVueInstanceOptions(opts) {
-  vueInstanceOptions = opts;
-};
-
 var VueContainer = function (_React$Component) {
   inherits(VueContainer, _React$Component);
 
@@ -260,10 +255,9 @@ var VueContainer = function (_React$Component) {
 
       // `this` refers to Vue instance in the constructor
 
-      reactThisBinding.vueInstance = new Vue(_extends({
+      reactThisBinding.vueInstance = new Vue({
         el: targetElement,
-        data: props
-      }, vueInstanceOptions, {
+        data: props,
         render: function render(createElement) {
           return createElement(VUE_COMPONENT_NAME, {
             props: this.$data,
@@ -272,7 +266,7 @@ var VueContainer = function (_React$Component) {
         },
 
         components: (_components = {}, defineProperty(_components, VUE_COMPONENT_NAME, component), defineProperty(_components, 'vuera-internal-react-wrapper', ReactWrapper), _components)
-      }));
+      });
     }
   }, {
     key: 'updateVueComponent',
@@ -486,7 +480,6 @@ function babelReactResolver$$1(component, props, children) {
   return isReactComponent(component) ? React.createElement(component, props, children) : React.createElement(VueContainer, Object.assign({ component: component }, props), children);
 }
 
-exports.setVueInstanceOptions = setVueInstanceOptions;
 exports.ReactWrapper = ReactWrapper;
 exports.VueWrapper = VueContainer;
 exports.__vueraReactResolver = babelReactResolver$$1;

diff --git a/dist/vuera.es.js b/dist/vuera.es.js
@@ -179,11 +179,6 @@ var wrapReactChildren = function wrapReactChildren(createElement, children) {
   });
 };
 
-var vueInstanceOptions = {};
-var setVueInstanceOptions = function setVueInstanceOptions(opts) {
-  vueInstanceOptions = opts;
-};
-
 var VueContainer = function (_React$Component) {
   inherits(VueContainer, _React$Component);
 
@@ -254,10 +249,9 @@ var VueContainer = function (_React$Component) {
 
       // `this` refers to Vue instance in the constructor
 
-      reactThisBinding.vueInstance = new Vue(_extends({
+      reactThisBinding.vueInstance = new Vue({
         el: targetElement,
-        data: props
-      }, vueInstanceOptions, {
+        data: props,
         render: function render(createElement) {
           return createElement(VUE_COMPONENT_NAME, {
             props: this.$data,
@@ -266,7 +260,7 @@ var VueContainer = function (_React$Component) {
         },
 
         components: (_components = {}, defineProperty(_components, VUE_COMPONENT_NAME, component), defineProperty(_components, 'vuera-internal-react-wrapper', ReactWrapper), _components)
-      }));
+      });
     }
   }, {
     key: 'updateVueComponent',
@@ -480,4 +474,4 @@ function babelReactResolver$$1(component, props, children) {
   return isReactComponent(component) ? React.createElement(component, props, children) : React.createElement(VueContainer, Object.assign({ component: component }, props), children);
 }
 
-export { setVueInstanceOptions, ReactWrapper, VueContainer as VueWrapper, babelReactResolver$$1 as __vueraReactResolver, VuePlugin, ReactResolver$$1 as VueInReact, VueResolver$$1 as ReactInVue };
+export { ReactWrapper, VueContainer as VueWrapper, babelReactResolver$$1 as __vueraReactResolver, VuePlugin, ReactResolver$$1 as VueInReact, VueResolver$$1 as ReactInVue };
diff --git a/dist/vuera.iife.js b/dist/vuera.iife.js
@@ -182,11 +182,6 @@ var wrapReactChildren = function wrapReactChildren(createElement, children) {
   });
 };
 
-var vueInstanceOptions = {};
-var setVueInstanceOptions = function setVueInstanceOptions(opts) {
-  vueInstanceOptions = opts;
-};
-
 var VueContainer = function (_React$Component) {
   inherits(VueContainer, _React$Component);
 
@@ -257,10 +252,9 @@ var VueContainer = function (_React$Component) {
 
       // `this` refers to Vue instance in the constructor
 
-      reactThisBinding.vueInstance = new Vue(_extends({
+      reactThisBinding.vueInstance = new Vue({
         el: targetElement,
-        data: props
-      }, vueInstanceOptions, {
+        data: props,
         render: function render(createElement) {
           return createElement(VUE_COMPONENT_NAME, {
             props: this.$data,
@@ -269,7 +263,7 @@ var VueContainer = function (_React$Component) {
         },
 
         components: (_components = {}, defineProperty(_components, VUE_COMPONENT_NAME, component), defineProperty(_components, 'vuera-internal-react-wrapper', ReactWrapper), _components)
-      }));
+      });
     }
   }, {
     key: 'updateVueComponent',
@@ -483,7 +477,6 @@ function babelReactResolver$$1(component, props, children) {
   return isReactComponent(component) ? React.createElement(component, props, children) : React.createElement(VueContainer, Object.assign({ component: component }, props), children);
 }
 
-exports.setVueInstanceOptions = setVueInstanceOptions;
 exports.ReactWrapper = ReactWrapper;
 exports.VueWrapper = VueContainer;
 exports.__vueraReactResolver = babelReactResolver$$1;

diff --git a/src/config.js b/src/config.js
diff --git a/src/index.js b/src/index.js
@@ -1,17 +1,16 @@
 import ReactWrapper from './wrappers/React'
-import VueWrapper, { setVueInstanceOptions } from './wrappers/Vue'
+import VueWrapper from './wrappers/Vue'
 import VuePlugin from './VuePlugin'
-import VueInReact, { babelReactResolver as __vueraReactResolver } from './resolvers/React'
-import config from './config'
+import VueInReact, {
+  babelReactResolver as __vueraReactResolver,
+} from './resolvers/React'
 import ReactInVue from './resolvers/Vue'
 
 export {
-  setVueInstanceOptions,
   ReactWrapper,
   VueWrapper,
   __vueraReactResolver,
   VuePlugin,
   VueInReact,
   ReactInVue,
-  config,
 }
diff --git a/src/wrappers/Vue.js b/src/wrappers/Vue.js
@@ -1,7 +1,6 @@
 import React from 'react'
 import Vue from 'vue'
 import ReactWrapper from './React'
-import { config } from '../../src'
 
 const VUE_COMPONENT_NAME = 'vuera-internal-component-name'
 
@@ -66,7 +65,6 @@ export default class VueContainer extends React.Component {
     reactThisBinding.vueInstance = new Vue({
       el: targetElement,
       data: props,
-      ...config.vueInstanceOptions,
       render (createElement) {
         return createElement(
           VUE_COMPONENT_NAME,

diff --git a/tests/config-test.js b/tests/config-test.js
diff --git a/tests/fixtures/VueInstanceOptionsComponent.js b/tests/fixtures/VueInstanceOptionsComponent.js
diff --git a/tests/wrappers/VueWrapper-test.js b/tests/wrappers/VueWrapper-test.js
@@ -1,9 +1,7 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import Vue from 'vue'
-import { VueWrapper, config } from '../../src'
+import { VueWrapper } from '../../src'
 import VueComponent from '../fixtures/VueComponent'
-import VueInstanceOptionsComponent, { Plugin } from '../fixtures/VueInstanceOptionsComponent'
 import VueRegisteredComponent from '../fixtures/VueRegisteredComponent'
 import VueSingleFileComponent from '../fixtures/VueSingleFileComponent.vue'
 
@@ -207,19 +205,4 @@ describe('VueInReact', () => {
       )
     })
   })
-
-  describe('config', () => {
-    afterEach(() => {
-      config.vueInstanceOptions = {}
-    })
-
-    it('adds vue instance options', () => {
-      Vue.use(Plugin)
-
-      config.vueInstanceOptions = { foo: 'New message!', bar: 'Other message' }
-      makeReactInstanceWithVueComponent(VueInstanceOptionsComponent)
-      expect(document.body.innerHTML).toContain('New message!')
-      expect(document.body.innerHTML).toContain('Other message')
-    })
-  })
 })