Merge branch 'release/1.0-beta-8'

Author: adrienbaron

core/pom.xml

@@ -7,7 +7,7 @@
 <parent>
 <groupId>com.axellience</groupId>
 <artifactId>vue-gwt-parent</artifactId>
-<version>1.0-beta-7</version>
+<version>1.0-beta-8</version>
 </parent>
 
 <artifactId>vue-gwt</artifactId>
@@ -23,6 +23,10 @@
 <dependencies>
 
 <!-- GWT dependencies -->
+<dependency>
+<groupId>com.google.gwt</groupId>
+<artifactId>gwt-user</artifactId>
+</dependency>
 <dependency>
 <groupId>com.google.jsinterop</groupId>
 <artifactId>base</artifactId>

core/src/main/java/com/axellience/vuegwt/core/annotations/component/Component.java

@@ -1,6 +1,6 @@
 package com.axellience.vuegwt.core.annotations.component;
 
-import com.axellience.vuegwt.core.client.component.VueComponent;
+import com.axellience.vuegwt.core.client.component.IsVueComponent;
 import com.axellience.vuegwt.core.client.component.options.CustomizeOptions;
 import com.axellience.vuegwt.core.client.directive.VueDirective;
 
@@ -29,9 +29,9 @@
 
  /**
  * Components to register on this component instance
- * @return This list of {@link VueComponent} to register on this Component
+ * @return This list of {@link IsVueComponent} to register on this Component
  */
- Class<? extends VueComponent>[] components() default {};
+ Class<? extends IsVueComponent>[] components() default {};
 
  /**
  * Directives to register on this component instance

core/src/main/java/com/axellience/vuegwt/core/client/Vue.java

@@ -1,14 +1,14 @@
 package com.axellience.vuegwt.core.client;
 
-import com.axellience.vuegwt.core.client.component.VueComponent;
+import com.axellience.vuegwt.core.client.component.IsVueComponent;
 import com.axellience.vuegwt.core.client.component.options.VueComponentOptions;
 import com.axellience.vuegwt.core.client.customelement.CustomElementOptions;
 import com.axellience.vuegwt.core.client.customelement.VueCustomElementType;
 import com.axellience.vuegwt.core.client.directive.options.VueDirectiveOptions;
 import com.axellience.vuegwt.core.client.jsnative.jsfunctions.JsRunnable;
 import com.axellience.vuegwt.core.client.tools.VueGWTTools;
 import com.axellience.vuegwt.core.client.vue.VueConfig;
-import com.axellience.vuegwt.core.client.vue.VueFactory;
+import com.axellience.vuegwt.core.client.vue.VueComponentFactory;
 import com.axellience.vuegwt.core.client.vue.VueJsConstructor;
 import elemental2.dom.Element;
 import jsinterop.annotations.JsMethod;
@@ -31,83 +31,83 @@ public abstract class Vue
  /**
  * Create a {@link Vue} instance and mount it on a DOM element.
  * @param element CSS selector for the element to attach in
- * @param vueComponentClass The Class of the Component to create
- * @param <T> {@link VueComponent} we want to attach
+ * @param isVueComponentClass The Class of the Component to create
+ * @param <T> {@link IsVueComponent} we want to attach
  * @return The created and attached instance of our Component
  */
  @JsOverlay
- public static <T extends VueComponent> T attach(String element, Class<T> vueComponentClass)
+ public static <T extends IsVueComponent> T attach(String element, Class<T> isVueComponentClass)
  {
- T vueInstance = createInstance(vueComponentClass);
- vueInstance.$mount(element);
+ T vueInstance = createInstance(isVueComponentClass);
+ vueInstance.vue().$mount(element);
  return vueInstance;
  }
 
  /**
  * Create a {@link Vue} instance and mount it on a DOM element.
  * @param element CSS selector for the element to attach in
  * @param vueFactory The factory of the Component to create
- * @param <T> {@link VueComponent} we want to attach
+ * @param <T> {@link IsVueComponent} we want to attach
  * @return The created and attached instance of our Component
  */
  @JsOverlay
- public static <T extends VueComponent> T attach(String element, VueFactory<T> vueFactory)
+ public static <T extends IsVueComponent> T attach(String element, VueComponentFactory<T> vueFactory)
  {
  T vueInstance = vueFactory.create();
- vueInstance.$mount(element);
+ vueInstance.vue().$mount(element);
  return vueInstance;
  }
 
  /**
  * Create a {@link Vue} instance and mount it on a DOM element.
  * @param element DOM Element we want to attach our component in
- * @param vueComponentClass The Class of the Component to create
- * @param <T> {@link VueComponent} we want to attach
+ * @param isVueComponentClass The Class of the Component to create
+ * @param <T> {@link IsVueComponent} we want to attach
  * @return The created and attached instance of our Component
  */
  @JsOverlay
- public static <T extends VueComponent> T attach(Element element, Class<T> vueComponentClass)
+ public static <T extends IsVueComponent> T attach(Element element, Class<T> isVueComponentClass)
  {
- T vueInstance = createInstance(vueComponentClass);
- vueInstance.$mount(element);
+ T vueInstance = createInstance(isVueComponentClass);
+ vueInstance.vue().$mount(element);
  return vueInstance;
  }
 
  /**
  * Create a {@link Vue} instance and mount it on a DOM element.
  * @param element DOM Element we want to attach our component in
  * @param vueFactory The factory of the Component to create
- * @param <T> {@link VueComponent} we want to attach
+ * @param <T> {@link IsVueComponent} we want to attach
  * @return The created and attached instance of our Component
  */
  @JsOverlay
- public static <T extends VueComponent> T attach(Element element, VueFactory<T> vueFactory)
+ public static <T extends IsVueComponent> T attach(Element element, VueComponentFactory<T> vueFactory)
  {
  T vueInstance = vueFactory.create();
- vueInstance.$mount(element);
+ vueInstance.vue().$mount(element);
  return vueInstance;
  }
 
  /**
- * Register a {@link VueComponent} globally
+ * Register a {@link IsVueComponent} globally
  * @param id Id for our component in the templates
- * @param vueComponentClass The Class of the {@link VueComponent} to create
- * @param <T> {@link VueComponent} we want to attach
+ * @param isVueComponentClass The Class of the {@link IsVueComponent} to create
+ * @param <T> {@link IsVueComponent} we want to attach
  */
  @JsOverlay
- public static <T extends VueComponent> void component(String id, Class<T> vueComponentClass)
+ public static <T extends IsVueComponent> void component(String id, Class<T> isVueComponentClass)
  {
- component(id, VueGWT.getFactory(vueComponentClass));
+ component(id, VueGWT.getVueComponentFactory(isVueComponentClass));
  }
 
  /**
- * Register a {@link VueComponent} globally
+ * Register a {@link IsVueComponent} globally
  * @param id Id for our component in the templates
  * @param vueFactory The factory of the Component to create
- * @param <T> {@link VueComponent} we want to attach
+ * @param <T> {@link IsVueComponent} we want to attach
  */
  @JsOverlay
- public static <T extends VueComponent> void component(String id, VueFactory<T> vueFactory)
+ public static <T extends IsVueComponent> void component(String id, VueComponentFactory<T> vueFactory)
  {
  component(id, vueFactory.getJsConstructor());
  }
@@ -125,61 +125,61 @@ public static void setConfig(VueConfig config)
  }
 
  @JsOverlay
- public static <T extends VueComponent> VueJsConstructor<T> extendJavaComponent(
+ public static <T extends IsVueComponent> VueJsConstructor<T> extendJavaComponent(
  VueComponentOptions<T> componentOptions)
  {
  VueJsConstructor<T> extendedVueJsConstructor = extend(componentOptions);
  VueGWTTools.extendVueConstructorWithJavaPrototype(extendedVueJsConstructor,
- componentOptions.getComponentJavaPrototype());
+ componentOptions.getComponentExportedTypePrototype());
 
  return extendedVueJsConstructor;
  }
 
  @JsOverlay
- public static <T extends VueComponent> VueCustomElementType<T> customElement(
- String componentTag, Class<T> vueComponentClass)
+ public static <T extends IsVueComponent> VueCustomElementType<T> customElement(
+ String componentTag, Class<T> isVueComponentClass)
  {
- return Vue.customElement(componentTag, vueComponentClass, new CustomElementOptions<>());
+ return Vue.customElement(componentTag, isVueComponentClass, new CustomElementOptions<>());
  }
 
  @JsOverlay
- public static <T extends VueComponent> VueCustomElementType<T> customElement(
- String componentTag, VueFactory<T> vueFactory)
+ public static <T extends IsVueComponent> VueCustomElementType<T> customElement(
+ String componentTag, VueComponentFactory<T> vueFactory)
  {
  return Vue.customElement(componentTag, vueFactory, new CustomElementOptions<>());
  }
 
  @JsOverlay
- public static <T extends VueComponent> VueCustomElementType<T> customElement(
+ public static <T extends IsVueComponent> VueCustomElementType<T> customElement(
  String componentTag, VueJsConstructor<T> vueJsConstructor)
  {
  return Vue.customElement(componentTag, vueJsConstructor, new CustomElementOptions<>());
  }
 
  @JsOverlay
- public static <T extends VueComponent> VueCustomElementType<T> customElement(
- String componentTag, Class<T> vueComponentClass, CustomElementOptions<T> options)
+ public static <T extends IsVueComponent> VueCustomElementType<T> customElement(
+ String componentTag, Class<T> isVueComponentClass, CustomElementOptions<T> options)
  {
- return Vue.customElement(componentTag, VueGWT.getFactory(vueComponentClass), options);
+ return Vue.customElement(componentTag, VueGWT.getVueComponentFactory(isVueComponentClass), options);
  }
 
  @JsOverlay
- public static <T extends VueComponent> VueCustomElementType<T> customElement(
- String componentTag, VueFactory<T> vueFactory, CustomElementOptions<T> options)
+ public static <T extends IsVueComponent> VueCustomElementType<T> customElement(
+ String componentTag, VueComponentFactory<T> vueFactory, CustomElementOptions<T> options)
  {
  return Vue.customElement(componentTag, vueFactory.getJsConstructor(), options);
  }
 
  @JsOverlay
- public static <T extends VueComponent> VueCustomElementType<T> customElement(
+ public static <T extends IsVueComponent> VueCustomElementType<T> customElement(
  String componentTag, VueJsConstructor<T> vueJsConstructor, CustomElementOptions<T> options)
  {
  VueCustomElementLibInjector.ensureInjected();
  return Vue.customElementNative(componentTag, vueJsConstructor, options);
  }
 
  // @formatter:off
- public static native <T extends VueComponent> VueJsConstructor<T> extend(VueComponentOptions<T> componentOptions);
+ public static native <T extends IsVueComponent> VueJsConstructor<T> extend(VueComponentOptions<T> componentOptions);
 
  public static native void nextTick(JsRunnable callback);
 
@@ -197,10 +197,10 @@ public static <T extends VueComponent> VueCustomElementType<T> customElement(
  public static native VueDirectiveOptions directive(String id);
 
  @JsMethod(name = "customElement")
- public static native <T extends VueComponent> VueCustomElementType<T> customElementNative(String componentTag, VueJsConstructor<T> vueJsConstructor, CustomElementOptions options);
+ public static native <T extends IsVueComponent> VueCustomElementType<T> customElementNative(String componentTag, VueJsConstructor<T> vueJsConstructor, CustomElementOptions options);
 
- public static native <T extends VueComponent> void component(String id, VueComponentOptions<T> componentOptions);
- public static native <T extends VueComponent> void component(String id, VueJsConstructor<T> vueJsConstructor);
- public static native <T extends VueComponent> VueJsConstructor<T> component(String id);
+ public static native <T extends IsVueComponent> void component(String id, VueComponentOptions<T> componentOptions);
+ public static native <T extends IsVueComponent> void component(String id, VueJsConstructor<T> vueJsConstructor);
+ public static native <T extends IsVueComponent> VueJsConstructor<T> component(String id);
  // @formatter:on
 }