pleroma-fe

commit: d35684144126c5af067e43ebf18282ded12f15a6
parent 1d679b59a07444e18f24167cb7e8563c5e385d9f
Author: tusooa <tusooa@kazv.moe>
Date:   Wed,  4 Oct 2023 09:31:14 +0000

Merge branch 'export-subst-hash' into 'develop'

Use export-subst gitattribute to allow tarball builds

See merge request pleroma/pleroma-fe!1854
Diffstat:
A
.gitattributes
1
+
M
build/webpack.prod.conf.js
13
++++++++++---
A
changelog.d/export-subst-hash.fix
1
+

3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/build/webpack.prod.conf.js export-subst
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
@@ -11,9 +11,16 @@ var env = process.env.NODE_ENV === 'testing'
     ? require('../config/test.env')
     : config.build.env
 
-let commitHash = require('child_process')
-    .execSync('git rev-parse --short HEAD')
-    .toString();
+let commitHash = (() => {
+  const subst = "$Format:%h$";
+  if(!subst.match(/Format:/)) {
+    return subst;
+  } else {
+    return require('child_process')
+      .execSync('git rev-parse --short HEAD')
+      .toString();
+  }
+})();
 
 var webpackConfig = merge(baseWebpackConfig, {
   mode: 'production',
diff --git a/changelog.d/export-subst-hash.fix b/changelog.d/export-subst-hash.fix
@@ -0,0 +1 @@
+Use export-subst gitattribute to allow tarball builds