Merge main into sweep/add-sweep-config

3DStreet · Aug 8, 2023 · eb0c492 · eb0c492
2 parents b288ef8 + 3d4432e
commit eb0c492
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -1,4 +1,5 @@
 /* global AFRAME, THREE, XMLHttpRequest */
+if (typeof VERSION !== 'undefined') { console.log(`3DStreet Version: ${VERSION} (Date: ${new Date(COMMIT_DATE).toISOString().split('T')[0]}, Commit Hash: #${COMMIT_HASH})`); }
 var streetmixParsers = require('./aframe-streetmix-parsers');
 var streetmixUtils = require('./tested/streetmix-utils');
 require('./components/anisotropy');

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const webpack = require('webpack');
 const TerserPlugin = require('terser-webpack-plugin');
 
 module.exports = {
@@ -14,6 +15,17 @@ module.exports = {
     ]
   },
   optimization: {
-    minimizer: [new TerserPlugin({ extractComments: false })],
-  }
+    minimizer: [new TerserPlugin({ extractComments: false })]
+  },
+  plugins: [
+    new webpack.DefinePlugin({
+      VERSION: JSON.stringify(process.env.npm_package_version)
+    }),
+    new webpack.DefinePlugin({
+      COMMIT_DATE: JSON.stringify(require('child_process').execSync('git log -1 --format=%cd').toString().trim())
+    }),
+    new webpack.DefinePlugin({
+      COMMIT_HASH: JSON.stringify(require('child_process').execSync('git rev-parse --short HEAD').toString().trim())
+    })
+  ]
 };