fix compiled version for easier package installation and usage: no more baseUrl / jsx usage in components

Sascha Braun · Sascha Braun · commit 5e24c8590a44 · 2018-10-26T21:47:29.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-threejs-composer",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
   "repository": "https://github.com/sascha245/vue-threejs-composer",
diff --git a/src/components/Axes.ts b/src/components/Axes.ts
@@ -51,6 +51,6 @@ export class Axes extends Mixins(
     if (!this.m_created) {
       return null;
     }
-    return <div>{this.$slots.default}</div>;
+    return h("div", this.$slots.default);
   }
 }
diff --git a/src/components/Behaviour.ts b/src/components/Behaviour.ts
diff --git a/src/components/Camera.ts b/src/components/Camera.ts
@@ -74,6 +74,6 @@ export class Camera extends Mixins(ThreeComponent, ThreeSceneComponent) {
     if (!this.main || !this.m_created) {
       return null;
     }
-    return <div>{this.$slots.default}</div>;
+    return h("div", this.$slots.default);
   }
 }
diff --git a/src/components/Fog.ts b/src/components/Fog.ts
@@ -86,6 +86,6 @@ export class Fog extends Mixins(ThreeComponent, ThreeSceneComponent) {
     if (!this.m_created) {
       return null;
     }
-    return <div />;
+    return h();
   }
 }
diff --git a/src/components/Geometry.ts b/src/components/Geometry.ts
@@ -21,6 +21,6 @@ export class Geometry extends Mixins(ThreeComponent, ThreeAssetComponent) {
   }
 
   public render(h: any) {
-    return <div />;
+    return h();
   }
 }
diff --git a/src/components/Grid.ts b/src/components/Grid.ts
@@ -1,7 +1,6 @@
 import * as THREE from "three";
 import { Component, Mixins, Prop, Provide } from "vue-property-decorator";
 
-import { AssetTypes, GeometryType, MaterialType } from "../types";
 import { ThreeComponent, ThreeObjectComponent, ThreeSceneComponent } from "./base";
 
 @Component
@@ -54,6 +53,6 @@ export class Grid extends Mixins(
     if (!this.m_created) {
       return null;
     }
-    return <div>{this.$slots.default}</div>;
+    return h("div", this.$slots.default);
   }
 }
diff --git a/src/components/Group.ts b/src/components/Group.ts
@@ -46,6 +46,6 @@ export class Group extends Mixins(
     if (!this.m_created) {
       return null;
     }
-    return <div>{this.$slots.default}</div>;
+    return h("div", this.$slots.default);
   }
 }
diff --git a/src/components/Light.ts b/src/components/Light.ts
@@ -50,6 +50,6 @@ export class Light extends Mixins(
     if (!this.m_created) {
       return null;
     }
-    return <div>{this.$slots.default}</div>;
+    return h("div", this.$slots.default);
   }
 }
diff --git a/src/components/Material.ts b/src/components/Material.ts
@@ -21,6 +21,6 @@ export class Material extends Mixins(ThreeComponent, ThreeAssetComponent) {
   }
 
   public render(h: any) {
-    return <div />;
+    return h();
   }
 }
diff --git a/src/components/Mesh.ts b/src/components/Mesh.ts
@@ -69,7 +69,7 @@ export class Mesh extends Mixins(
     if (!this.m_created) {
       return null;
     }
-    return <div>{this.$slots.default}</div>;
+    return h("div", this.$slots.default);
   }
 
   private async createMeshFromModel() {
diff --git a/src/components/Model.ts b/src/components/Model.ts
@@ -42,7 +42,7 @@ export class Model extends Mixins(ThreeComponent, ThreeAssetComponent) {
   }
 
   public render(h: any) {
-    return <div />;
+    return h();
   }
 
   private overrideMaterials() {
diff --git a/src/components/Property.ts b/src/components/Property.ts
diff --git a/src/components/Scene.ts b/src/components/Scene.ts
@@ -114,11 +114,9 @@ export class Scene extends Mixins(ThreeComponent) {
       return null;
     }
 
-    return (
-      <div>
-        <div>{this.$slots.preload}</div>
-        <div>{this.m_isReady ? this.$slots.default : null}</div>
-      </div>
-    );
+    return h("div", [
+      h("div", this.$slots.preload),
+      h("div", this.m_isReady ? this.$slots.default : null)
+    ]);
   }
 }
diff --git a/src/components/Texture.ts b/src/components/Texture.ts
@@ -35,6 +35,6 @@ export class Texture extends Mixins(ThreeComponent, ThreeAssetComponent) {
   }
 
   public render(h: any) {
-    return <div />;
+    return h();
   }
 }
diff --git a/src/components/Three.ts b/src/components/Three.ts
@@ -1,3 +1,4 @@
+import { CreateElement } from "vue";
 import { Component, Prop, Provide, Vue, Watch } from "vue-property-decorator";
 
 import { Application } from "../core";
@@ -88,7 +89,10 @@ export class Three extends Vue {
     }
   }
 
-  public render(h: any) {
-    return <div>{this.isReady ? this.$slots.default : null}</div>;
+  public render(h: CreateElement) {
+    if (!this.isReady) {
+      return null;
+    }
+    return h("div", this.$slots.default);
   }
 }
diff --git a/src/components/properties/Position.ts b/src/components/properties/Position.ts
@@ -25,6 +25,6 @@ export class Position extends Mixins(ThreeObjectComponent) {
   }
 
   public render(h: any) {
-    return <div />;
+    return h();
   }
 }
diff --git a/src/components/properties/Property.ts b/src/components/properties/Property.ts
@@ -31,6 +31,6 @@ export class Property extends Mixins(ThreeObjectComponent) {
   }
 
   public render(h: any) {
-    return <div />;
+    return h();
   }
 }
diff --git a/src/components/properties/Rotation.ts b/src/components/properties/Rotation.ts
@@ -41,6 +41,6 @@ export class Rotation extends Mixins(ThreeObjectComponent) {
   }
 
   public render(h: any) {
-    return <div />;
+    return h();
   }
 }
diff --git a/src/components/properties/Scale.ts b/src/components/properties/Scale.ts
@@ -25,6 +25,6 @@ export class Scale extends Mixins(ThreeObjectComponent) {
   }
 
   public render(h: any) {
-    return <div />;
+    return h();
   }
 }
diff --git a/src/components/properties/Shadows.ts b/src/components/properties/Shadows.ts
@@ -42,7 +42,7 @@ export class Shadows extends Mixins(ThreeObjectComponent) {
   }
 
   public render(h: any) {
-    return <div />;
+    return h();
   }
 
   private changeReceive(obj: THREE.Object3D) {
diff --git a/src/core/Utils.ts b/src/core/Utils.ts
@@ -1,6 +1,7 @@
-import { ModelType, TextureType } from "src/types";
 import * as THREE from "three";
 
+import { ModelType, TextureType } from "../types";
+
 const REGEXP_EXT = /(?:\.([^.]+))?$/;
 
 export function getFileExtension(file: string) {
diff --git a/src/types.ts b/src/types.ts
@@ -2,8 +2,19 @@ import * as THREE from "three";
 
 import { Application } from "./core";
 
+export type MeshMaterialType =
+  | THREE.MeshBasicMaterial
+  | THREE.MeshDepthMaterial
+  | THREE.MeshFaceMaterial
+  | THREE.MeshLambertMaterial
+  | THREE.MeshNormalMaterial
+  | THREE.MeshPhongMaterial
+  | THREE.MeshStandardMaterial
+  | THREE.ShaderMaterial
+  | THREE.ShadowMaterial;
+
 export type GeometryType = THREE.Geometry | THREE.BufferGeometry;
-export type MaterialType = THREE.MeshMaterialType;
+export type MaterialType = MeshMaterialType;
 export type TextureType = THREE.Texture;
 export type ModelType = THREE.Object3D;
 
diff --git a/tsconfig.json b/tsconfig.json
@@ -10,7 +10,6 @@
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "sourceMap": true,
-    "baseUrl": ".",
     "types": ["webpack-env", "jest"],
     "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
   },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vue-threejs-composer",`
`3`		`- "version": "0.3.0",`
	`3`	`+ "version": "0.3.1",`
`4`	`4`	`"main": "build/src/index.js",`
`5`	`5`	`"typings": "build/src/index.d.ts",`
`6`	`6`	`"repository": "https://github.com/sascha245/vue-threejs-composer",`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,6 @@ export class Axes extends Mixins(`
`51`	`51`	`if (!this.m_created) {`
`52`	`52`	`return null;`
`53`	`53`	`}`
`54`		`- return <div>{this.$slots.default}</div>;`
	`54`	`+ return h("div", this.$slots.default);`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,6 @@ export class Camera extends Mixins(ThreeComponent, ThreeSceneComponent) {`
`74`	`74`	`if (!this.main \|\| !this.m_created) {`
`75`	`75`	`return null;`
`76`	`76`	`}`
`77`		`- return <div>{this.$slots.default}</div>;`
	`77`	`+ return h("div", this.$slots.default);`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,6 @@ export class Fog extends Mixins(ThreeComponent, ThreeSceneComponent) {`
`86`	`86`	`if (!this.m_created) {`
`87`	`87`	`return null;`
`88`	`88`	`}`
`89`		`- return <div />;`
	`89`	`+ return h();`
`90`	`90`	`}`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ export class Geometry extends Mixins(ThreeComponent, ThreeAssetComponent) {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public render(h: any) {`
`24`		`- return <div />;`
	`24`	`+ return h();`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`import * as THREE from "three";`
`2`	`2`	`import { Component, Mixins, Prop, Provide } from "vue-property-decorator";`
`3`	`3`
`4`		`-import { AssetTypes, GeometryType, MaterialType } from "../types";`
`5`	`4`	`import { ThreeComponent, ThreeObjectComponent, ThreeSceneComponent } from "./base";`
`6`	`5`
`7`	`6`	`@Component`
`@@ -54,6 +53,6 @@ export class Grid extends Mixins(`
`54`	`53`	`if (!this.m_created) {`
`55`	`54`	`return null;`
`56`	`55`	`}`
`57`		`- return <div>{this.$slots.default}</div>;`
	`56`	`+ return h("div", this.$slots.default);`
`58`	`57`	`}`
`59`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ export class Group extends Mixins(`
`46`	`46`	`if (!this.m_created) {`
`47`	`47`	`return null;`
`48`	`48`	`}`
`49`		`- return <div>{this.$slots.default}</div>;`
	`49`	`+ return h("div", this.$slots.default);`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,6 @@ export class Light extends Mixins(`
`50`	`50`	`if (!this.m_created) {`
`51`	`51`	`return null;`
`52`	`52`	`}`
`53`		`- return <div>{this.$slots.default}</div>;`
	`53`	`+ return h("div", this.$slots.default);`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ export class Material extends Mixins(ThreeComponent, ThreeAssetComponent) {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public render(h: any) {`
`24`		`- return <div />;`
	`24`	`+ return h();`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ export class Mesh extends Mixins(`
`69`	`69`	`if (!this.m_created) {`
`70`	`70`	`return null;`
`71`	`71`	`}`
`72`		`- return <div>{this.$slots.default}</div>;`
	`72`	`+ return h("div", this.$slots.default);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`private async createMeshFromModel() {`