Skip to content

Commit

Permalink
Merge branch 'master' into reuse-map-node-in-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
manthey committed Dec 12, 2017
2 parents b1d234c + 1103cab commit 2a13128
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
"xmlbuilder": "^8.2.2"
},
"scripts": {
"postinstall": "cd website && npm install",
"build": "webpack --config webpack.config.js && webpack --config external.config.js",
"build-examples": "node examples/build.js && webpack --config webpack-examples.config.js",
"build-website-examples": "node examples/build-website.js && webpack --config webpack-website-examples.config.js",
Expand All @@ -113,7 +112,8 @@
"stop-test": "forever stop ./testing/test-runners/server.js",
"docs": "jsdoc --pedantic -d dist/apidocs -r src -c jsdoc.conf.json",
"website": "cd website && npx hexo server",
"build-website": "npm run build && cp -a dist/built/. website/source/built && npm run build-website-examples && npm run build-website-tutorials && npm run docs && cp -ar dist/data/. website/source/data && cp -ar dist/apidocs/. website/source/apidocs && cd website && rm -f db.json && npx hexo generate"
"setup-website": "cd website && npm install",
"build-website": "npm run build && cp -a dist/built/. website/source/built && npm run build-website-examples && npm run build-website-tutorials && npm run docs && cp -ar dist/data/. website/source/data && cp -ar dist/apidocs/. website/source/apidocs && cd website && npm install && rm -f db.json && npx hexo generate"
},
"keywords": [
"map",
Expand Down
6 changes: 5 additions & 1 deletion website/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Setup environment
=================
- Run ```npm run setup-website```

Update website
==============
- Run ```npm run build-website``` to build the website, the output will be available under ```website\public```
Expand All @@ -6,4 +10,4 @@ Update website
Develop website
===============
- Run ```npm run build-website```
- Run ```npm run website``` and navigate to ```localhost:4000```. The website will update when there is a file change.
- Run ```npm run website``` and navigate to ```localhost:4000```. The website will update when there is a file change.
2 changes: 1 addition & 1 deletion website/themes/agency/layout/layout.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
</div>
<div class="col-md-3">
<ul class="list-inline quicklinks">
<li><a href="kitware.com">Kitware</a>
<li><a href="http://www.kitware.com">Kitware</a>
</li>
</ul>
</div>
Expand Down

0 comments on commit 2a13128

Please sign in to comment.