From 811b513ae34a78f47226a636b7b9809fd447b068 Mon Sep 17 00:00:00 2001 From: David Manthey Date: Thu, 7 Dec 2017 10:11:36 -0500 Subject: [PATCH 1/3] Don't automatically install website node modules. When geojs is used as a node module in another project, we should install all of the website's node modules. Doing so bloats the deployment directory of other projects. This should be a safe change unless we expect other projects to use the generated geojs website as components within those projects. This skips installing 10,000 files that total 76 Mb. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 019ae9813b..9e61df800e 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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" + "install-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", From a739950a3d8f606207a5ccc0ccdefbc09279b261 Mon Sep 17 00:00:00 2001 From: Matthew Ma Date: Thu, 7 Dec 2017 11:36:34 -0500 Subject: [PATCH 2/3] Add setup instruction to the webiste README.md file --- package.json | 2 +- website/README.md | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9e61df800e..e5e19543d7 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "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", - "install-website": "cd website && npm install", + "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": [ diff --git a/website/README.md b/website/README.md index ec34354005..91c7f875ee 100644 --- a/website/README.md +++ b/website/README.md @@ -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``` @@ -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. \ No newline at end of file +- Run ```npm run website``` and navigate to ```localhost:4000```. The website will update when there is a file change. From ff9648ee5ccf5e04a812ae55ddc20766677713d8 Mon Sep 17 00:00:00 2001 From: David Manthey Date: Tue, 12 Dec 2017 08:56:16 -0500 Subject: [PATCH 3/3] Fix Kitware link in the website template. --- website/themes/agency/layout/layout.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/themes/agency/layout/layout.ejs b/website/themes/agency/layout/layout.ejs index d74f832a53..931209cc44 100644 --- a/website/themes/agency/layout/layout.ejs +++ b/website/themes/agency/layout/layout.ejs @@ -116,7 +116,7 @@