From a70c4070f8c16ffdc35c947b02474a07d11058ca Mon Sep 17 00:00:00 2001 From: Sebastian Qvarfordt Date: Tue, 14 Jul 2020 20:37:00 +0200 Subject: [PATCH 1/3] fix(techdocs): fix cli publishing no dist folder --- packages/techdocs-cli/bin/build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/techdocs-cli/bin/build b/packages/techdocs-cli/bin/build index a86954ace9..45fb71f9d5 100755 --- a/packages/techdocs-cli/bin/build +++ b/packages/techdocs-cli/bin/build @@ -18,6 +18,9 @@ ROOT_DIR=$(git rev-parse --show-toplevel) TECHDOCS_PREVIEW_SOURCE=$ROOT_DIR/plugins/techdocs/dist TECHDOCS_PREVIEW_DEST=$ROOT_DIR/packages/techdocs-cli/dist/techdocs-preview-bundle +# Clean output +yarn workspace @backstage/plugin-techdocs clean + # Build the CLI backstage-cli build --outputs cjs @@ -27,9 +30,6 @@ APP_CONFIG_techdocs_storageUrl='"http://localhost:3000/api"' yarn workspace @bac # Copy over export to techdocs-cli dist/ folder cp -r $TECHDOCS_PREVIEW_SOURCE $TECHDOCS_PREVIEW_DEST -# Clean output -yarn workspace @backstage/plugin-techdocs clean - # Write to console echo "[techdocs-cli]: Built the dist/ folder" echo "[techdocs-cli]: Imported @backstage/plugin-techdocs dist/ folder into techdocs-preview-bundle/" From bb63c4ceba4bce6daf100d0c41fcbf1d524c0fce Mon Sep 17 00:00:00 2001 From: Sebastian Qvarfordt Date: Wed, 15 Jul 2020 10:48:52 +0200 Subject: [PATCH 2/3] Updated techdocs-cli build script --- packages/techdocs-cli/bin/{build => build.sh} | 7 +++---- packages/techdocs-cli/package.json | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename packages/techdocs-cli/bin/{build => build.sh} (92%) diff --git a/packages/techdocs-cli/bin/build b/packages/techdocs-cli/bin/build.sh similarity index 92% rename from packages/techdocs-cli/bin/build rename to packages/techdocs-cli/bin/build.sh index 45fb71f9d5..225cc334aa 100755 --- a/packages/techdocs-cli/bin/build +++ b/packages/techdocs-cli/bin/build.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # Copyright 2020 Spotify AB # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,11 +20,8 @@ ROOT_DIR=$(git rev-parse --show-toplevel) TECHDOCS_PREVIEW_SOURCE=$ROOT_DIR/plugins/techdocs/dist TECHDOCS_PREVIEW_DEST=$ROOT_DIR/packages/techdocs-cli/dist/techdocs-preview-bundle -# Clean output -yarn workspace @backstage/plugin-techdocs clean - # Build the CLI -backstage-cli build --outputs cjs +yarn run backstage-cli -- build --outputs cjs # Create export of the TechDocs plugin APP_CONFIG_techdocs_storageUrl='"http://localhost:3000/api"' yarn workspace @backstage/plugin-techdocs export diff --git a/packages/techdocs-cli/package.json b/packages/techdocs-cli/package.json index 2e06c4a71e..8b954d2277 100644 --- a/packages/techdocs-cli/package.json +++ b/packages/techdocs-cli/package.json @@ -18,11 +18,12 @@ "license": "Apache-2.0", "main": "dist/index.cjs.js", "scripts": { - "build": "./bin/build", + "build": "./bin/build.sh", "lint": "backstage-cli lint", "test": "backstage-cli test --passWithNoTests", "clean": "backstage-cli clean", - "start": "nodemon --" + "start": "nodemon --", + "backstage-cli": "backstage-cli --" }, "bin": { "techdocs": "bin/techdocs-cli" From a59ac48e7a242b5533b4b2286bca9c1ea4a0d85c Mon Sep 17 00:00:00 2001 From: Sebastian Qvarfordt Date: Wed, 15 Jul 2020 10:51:57 +0200 Subject: [PATCH 3/3] Removed backstage-cli from scripts in package.json --- packages/techdocs-cli/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/techdocs-cli/package.json b/packages/techdocs-cli/package.json index 8b954d2277..e02474e195 100644 --- a/packages/techdocs-cli/package.json +++ b/packages/techdocs-cli/package.json @@ -22,8 +22,7 @@ "lint": "backstage-cli lint", "test": "backstage-cli test --passWithNoTests", "clean": "backstage-cli clean", - "start": "nodemon --", - "backstage-cli": "backstage-cli --" + "start": "nodemon --" }, "bin": { "techdocs": "bin/techdocs-cli"