Skip to content

Commit b70d90b

Browse files
committed
Changed where version is taken from and presented
1 parent a5cccc6 commit b70d90b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

default-templates/server/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h2>Server info</h2>
4444
<dd>{{serverDescription}}</dd>
4545
{{/if}}
4646
<dt>Details</dt>
47-
<dd>Running on {{serverVersion}} of <a href="https://solid.mit.edu/">Solid</a> (<a href="https://solid.inrupt.com/docs">Documentation</a>)</dd>
47+
<dd>Running on <a href="https://solid.mit.edu/">Solid {{serverVersion}}</a> (<a href="https://solid.inrupt.com/docs">Documentation</a>)</dd>
4848
</dl>
4949
</section>
5050
</div>

lib/server-config.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@ function ensureDirCopyExists (fromDir, toDir) {
4040
* @param argv {Object} Express.js app object
4141
*/
4242
async function ensureWelcomePage (argv) {
43-
const { multiuser, templates, server, host, parent } = argv
43+
const { multiuser, templates, server, host } = argv
4444
const rootDir = path.resolve(argv.root)
4545
const serverRootDir = multiuser ? path.join(rootDir, argv.host.hostname) : rootDir
4646
const existingIndexPage = path.join(serverRootDir, 'index.html')
47+
const packageData = require('../package.json')
4748

4849
if (!fs.existsSync(existingIndexPage)) {
4950
fs.mkdirp(serverRootDir)
@@ -52,7 +53,7 @@ async function ensureWelcomePage (argv) {
5253
serverName: server ? server.name : host.hostname,
5354
serverDescription: server ? server.description : '',
5455
serverLogo: server ? server.logo : '',
55-
serverVersion: parent._version
56+
serverVersion: packageData.version
5657
})
5758
}
5859
}

0 commit comments

Comments
 (0)