transition work

PlutoVR · May 21, 2021 · 0592890 · 0592890
1 parent 6ffc5c1
commit 0592890
Show file tree

Hide file tree

Showing 8 changed files with 371 additions and 39 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,4 +1,4 @@
 {
-  "presets": ["@babel/preset-env"],
+  "presets": ["@babel/preset-typescript", "@babel/preset-env"],
   "plugins": [["@babel/plugin-proposal-class-properties"]]
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,13 +20,16 @@
     "cannon": "^0.6.2",
     "firebase": "^8.0.0",
     "inquirer": "^7.2.0",
+    "loader-utils": "^2.0.0",
     "speak-tts": "^2.0.8",
     "three": "^0.128.0"
   },
   "devDependencies": {
     "@babel/core": "^7.9.6",
     "@babel/plugin-proposal-class-properties": "^7.13.0",
     "@babel/preset-env": "^7.9.6",
+    "@babel/preset-typescript": "^7.13.0",
+    "@types/three": "^0.128.0",
     "babel-loader": "^8.1.0",
     "clean-webpack-plugin": "^3.0.0",
     "compression-webpack-plugin": "^4.0.0",
@@ -44,7 +47,7 @@
     "script-ext-html-webpack-plugin": "^2.1.4",
     "shader-loader": "^1.3.1",
     "style-loader": "^1.2.1",
-    "ts-loader": "^9.2.1",
+    "ts-loader": "^8.2.0",
     "typescript": "^4.2.4",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11",

diff --git a/src/engine/util/webxr/raycaster.d.ts b/src/engine/util/webxr/raycaster.d.ts
@@ -1,4 +1,4 @@
-import { Vector3 } from "three";
+import { Vector3 } from "@types/three";
 
 export class SCRaycaster {
   constructor(

diff --git a/src/index.d.ts b/src/index.d.ts
diff --git a/src/index.js → src/index.ts b/src/index.js → src/index.ts
diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -1,11 +1,15 @@
 {
   "compilerOptions": {
     "outDir": "./dist/",
+    "allowJs": true,
+    "typeRoots": ["node_modules/@types/"],
     "noImplicitAny": true,
     "module": "es6",
     "target": "es5",
     "jsx": "react",
-    "allowJs": true,
-    "moduleResolution": "node"
-  }
+    "moduleResolution": "node",
+    "types": ["three"]
+  },
+  "include": ["src/**"],
+  "exclude": ["node_modules", "**/*.spec.ts"]
 }
diff --git a/webpack.common.js b/webpack.common.js
@@ -6,7 +6,7 @@ const APP_DIR = path.resolve(__dirname, "src/");
 const BUILD_DIR = path.resolve(__dirname, "dist/");
 
 module.exports = {
-  entry: APP_DIR + "/index.js",
+  entry: APP_DIR + "/index.ts",
   output: {
     path: BUILD_DIR,
     filename: "./bundle.js",
@@ -17,6 +17,11 @@ module.exports = {
       //     test: /\.worker\.js$/,
       //     use: { loader: 'worker-loader' }
       // },
+      {
+        test: /\.tsx?$/,
+        use: "ts-loader",
+        exclude: /node_modules/,
+      },
       {
         test: /\.html$/,
         use: [
@@ -111,6 +116,6 @@ module.exports = {
     }),
   ],
   resolve: {
-    extensions: [".js", ".es6"],
+    extensions: [".js", ".es6", "ts"],
   },
 };