From ffac6385286559065d1b8cbfd7718467bb745e34 Mon Sep 17 00:00:00 2001 From: Candid Dauth Date: Sat, 17 Apr 2021 14:43:38 +0200 Subject: [PATCH] Move documentation build to dist/ --- docs/Dockerfile | 2 +- docs/package.json | 2 ++ docs/src/.vuepress/config.js | 1 + docs/src/developers/development/documentation.md | 2 +- docs/yarn.lock | 7 +++++++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/Dockerfile b/docs/Dockerfile index 258eb32e..bbf06b86 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -5,4 +5,4 @@ RUN apk add --no-cache nodejs yarn COPY ./ /tmp/facilmap-docs -RUN cd /tmp/facilmap-docs && yarn install && yarn build && mv src/.vuepress/dist/* /usr/local/apache2/htdocs/ && rm -rf /tmp/facilmap-docs +RUN cd /tmp/facilmap-docs && yarn install && yarn build && mv dist/* /usr/local/apache2/htdocs/ && rm -rf /tmp/facilmap-docs diff --git a/docs/package.json b/docs/package.json index b779914d..86fc5c03 100755 --- a/docs/package.json +++ b/docs/package.json @@ -11,11 +11,13 @@ "scripts": { "dev-server": "vuepress dev src", "build": "vuepress build src", + "clean": "rimraf dist", "check": "vuepress check-md src" }, "private": true, "devDependencies": { "markdown-it-footnote": "^3.0.2", + "rimraf": "^3.0.2", "vuepress": "^1.5.3", "vuepress-plugin-check-md": "^0.0.2" }, diff --git a/docs/src/.vuepress/config.js b/docs/src/.vuepress/config.js index 05ef5e81..8309bce4 100755 --- a/docs/src/.vuepress/config.js +++ b/docs/src/.vuepress/config.js @@ -8,6 +8,7 @@ module.exports = { ['meta', { name: 'apple-mobile-web-app-capable', content: 'yes' }], ['meta', { name: 'apple-mobile-web-app-status-bar-style', content: 'black' }] ], + dest: `${__dirname}/../../dist`, themeConfig: { repo: '', editLinks: false, diff --git a/docs/src/developers/development/documentation.md b/docs/src/developers/development/documentation.md index 7895c415..a10c8fa6 100644 --- a/docs/src/developers/development/documentation.md +++ b/docs/src/developers/development/documentation.md @@ -10,7 +10,7 @@ If you want to make some changes to the documentation, first install the necessa Before building the documentation, run `yarn run check` to check that all links in the markdown point to a valid destination. -To build the documentation, run `yarn run build`. This will create static HTML files in `src/.vuepress/dist` that can be served by a simple HTTP server. +To build the documentation, run `yarn run build`. This will create static HTML files in `dist` that can be served by a simple HTTP server. ## Embed videos diff --git a/docs/yarn.lock b/docs/yarn.lock index db21cfcc..0dd0abb6 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -6534,6 +6534,13 @@ rimraf@^2.5.4, rimraf@^2.6.3: dependencies: glob "^7.1.3" +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"