Merge pull request #195 from concord-consortium/v1.1.0

Version 1.1.0
concord-consortium · Sep 8, 2020 · 8248946 · 8248946
2 parents ba0ae85 + 3a57b5c
commit 8248946
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/build-support/build-opts.js b/build-support/build-opts.js
@@ -1,12 +1,18 @@
 const execSync = require('sync-exec')
+const packageJSON = require('../package.json')
 const { env } = process
 const codap = !!env.codap // include CODAP-specific modifications
 
 const commitHash = execSync('git log -1 --pretty=format:"%H"').stdout
 const date = new Date()
+const version = packageJSON.version
 
 const replacementStrings = {
   html: [
+    {
+      search: /__VERSION__/g,
+      replace: version
+    },
     {
       search: /__COMMIT__/g,
       replace: commitHash

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "cloud-file-manager",
   "description": "Wrapper for providing file management for web applications",
   "author": "The Concord Consortium",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/concord-consortium/cloud-file-manger"

diff --git a/src/assets/index.html b/src/assets/index.html
@@ -15,7 +15,7 @@ <h1>
       <a href="https://github.com/concord-consortium/cloud-file-manager">Cloud File Manager Library</a>
     </h1>
     <p>
-      Commit <a href="https://github.com/concord-consortium/cloud-file-manager/commit/__COMMIT__">__COMMIT__</a> deployed on __DATE__.
+      Version __VERSION__ using commit <a href="https://github.com/concord-consortium/cloud-file-manager/commit/__COMMIT__">__COMMIT__</a> deployed on __DATE__.
     </p>
   </body>
 </html>