Update npm deps

sharond106 · Sep 8, 2021 · 2a869ce · 2a869ce
1 parent 0783dbd
commit 2a869ce
Show file tree

Hide file tree

Showing 8 changed files with 3,151 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,3 +59,6 @@ typings/
 
 # next.js build output
 .next
+
+dist/bundle.js
+dist/bundle.js.map
diff --git a/index.html → dist/index.html b/index.html → dist/index.html
@@ -15,6 +15,6 @@
   </head>
   <body>
     <canvas id="canvas"></canvas>
-    <script type="text/javascript" src="dist/bundle.js"></script>
+    <script type="text/javascript" src="bundle.js"></script>
   </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,23 +1,22 @@
 {
   "scripts": {
-    "start": "webpack-dev-server --hot --inline",
+    "start": "webpack-dev-server --no-hot --live-reload",
     "build": "webpack"
   },
   "devDependencies": {
-    "@types/node": "^9.3.0",
-    "@types/webgl2": "0.0.2",
-    "@types/dat-gui": "^0.6.3",
-    "@types/gl-matrix": "^2.4.0",
-    "ts-loader": "^3.2.0",
-    "typescript": "^2.6.2",
-    "webpack": "^3.10.0",
-    "webpack-dev-server": "^2.10.1",
+    "@types/dat.gui": "^0.7.7",
+    "@types/webgl2": "0.0.6",
+    "ts-loader": "^9.2.5",
+    "typescript": "^4.4.2",
+    "webpack": "^5.52.0",
+    "webpack-cli": "^4.8.0",
+    "webpack-dev-server": "^4.1.1",
     "webpack-glsl-loader": "^1.0.1"
   },
   "dependencies": {
     "3d-view-controls": "^2.2.2",
-    "dat-gui": "^0.5.0",
-    "gl-matrix": "^2.4.0",
-    "stats-js": "^1.0.0-alpha1"
+    "dat.gui": "^0.7.7",
+    "gl-matrix": "^3.3.0",
+    "stats-js": "^1.0.1"
   }
 }
diff --git a/src/geometry/Icosphere.ts b/src/geometry/Icosphere.ts
@@ -51,9 +51,9 @@ class Icosphere extends Drawable {
     }
 
     // Create 3-float buffer views into the backing buffer to represent positions
-    let vertices: Array<vec4> = new Array(12);
+    let vertices: Array<Float32Array> = new Array(12);
     for (let i = 0; i < 12; ++i) {
-      vertices[i] = <vec4> new Float32Array(buffer0, vertexByteOffset + i * 4 * Float32Array.BYTES_PER_ELEMENT, 4);
+      vertices[i] =new Float32Array(buffer0, vertexByteOffset + i * 4 * Float32Array.BYTES_PER_ELEMENT, 4);
     }
 
     // Initialize normals for a 20-sided icosahedron
@@ -105,7 +105,7 @@ class Icosphere extends Drawable {
       function mid(v0: number, v1: number): number {
         let key = [v0, v1].sort().join('_');
         if (!edgeMap.has(key)) {
-          let midpoint = <vec4> new Float32Array(buffer0, vertexByteOffset + vertices.length * 4 * Float32Array.BYTES_PER_ELEMENT, 4);
+          let midpoint = new Float32Array(buffer0, vertexByteOffset + vertices.length * 4 * Float32Array.BYTES_PER_ELEMENT, 4);
           vec4.add(midpoint, vertices[v0], vertices[v1]);
           vec4.normalize(midpoint, midpoint);
           edgeMap.set(key, vertices.length);

diff --git a/src/main.ts b/src/main.ts
@@ -1,6 +1,6 @@
 import {vec3} from 'gl-matrix';
-import * as Stats from 'stats-js';
-import * as DAT from 'dat-gui';
+const Stats = require('stats-js');
+import * as DAT from 'dat.gui';
 import Icosphere from './geometry/Icosphere';
 import Square from './geometry/Square';
 import OpenGLRenderer from './rendering/gl/OpenGLRenderer';

diff --git a/tsconfig.json b/tsconfig.json
@@ -5,6 +5,7 @@
     "noImplicitAny": true,
     "module": "es6",
     "target": "es6",
-    "allowJs": true
+    "allowJs": true,
+    "moduleResolution": "node"
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,14 +1,15 @@
 const path = require('path');
 
 module.exports = {
+  mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',
   entry: path.resolve(__dirname, "src/main"),
   output: {
     path: path.resolve(__dirname, "dist"),
     filename: "bundle.js",
-    publicPath: 'dist/',
+    publicPath: '/',
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.ts$/,
         use: 'ts-loader',
@@ -26,6 +27,11 @@ module.exports = {
   devtool: 'source-map',
   devServer: {
     port: 5660,
-    overlay: true,
+    static: {
+      directory: path.join(__dirname, 'dist'),
+    },
+    client: {
+      overlay: true,
+    }
   },
 };