From dba1b8a7e92ebd18132e0e714d5109f87b9ab7a9 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 13 Mar 2018 17:55:16 +0100
Subject: Consolidate docs generation and uploading logic

---
 packages/connect/src/monorepo_scripts/postpublish.ts | 17 +----------------
 packages/connect/src/monorepo_scripts/stagedocs.ts   | 14 ++------------
 2 files changed, 3 insertions(+), 28 deletions(-)

(limited to 'packages/connect/src')

diff --git a/packages/connect/src/monorepo_scripts/postpublish.ts b/packages/connect/src/monorepo_scripts/postpublish.ts
index 4cb8bf071..ecbd26872 100644
--- a/packages/connect/src/monorepo_scripts/postpublish.ts
+++ b/packages/connect/src/monorepo_scripts/postpublish.ts
@@ -11,7 +11,6 @@ const subPackageName = (packageJSON as any).name;
 // to this array so that TypeDoc picks it up and adds it to the Docs JSON
 const fileIncludes = [...(tsConfig as any).include];
 const fileIncludesAdjusted = postpublishUtils.adjustFileIncludePaths(fileIncludes, __dirname);
-const projectFiles = fileIncludesAdjusted.join(' ');
 const S3BucketPath = 's3://connect-docs-jsons/';
 
 (async () => {
@@ -25,19 +24,5 @@ const S3BucketPath = 's3://connect-docs-jsons/';
 
     // tslint:disable-next-line:no-console
     console.log('POSTPUBLISH: Release successful, generating docs...');
-    const jsonFilePath = `${__dirname}/../${postpublishUtils.generatedDocsDirectoryName}/index.json`;
-
-    const result = await execAsync(`JSON_FILE_PATH=${jsonFilePath} PROJECT_FILES="${projectFiles}" yarn docs:json`, {
-        cwd,
-    });
-    if (!_.isEmpty(result.stderr)) {
-        throw new Error(result.stderr);
-    }
-    const fileName = `v${version}.json`;
-    // tslint:disable-next-line:no-console
-    console.log(`POSTPUBLISH: Doc generation successful, uploading docs... as ${fileName}`);
-    const s3Url = S3BucketPath + fileName;
-    return execAsync(`S3_URL=${s3Url} yarn upload_docs_json`, {
-        cwd,
-    });
+    await postpublishUtils.generateAndUploadDocsAsync(__dirname, cwd, fileIncludesAdjusted, version, S3BucketPath);
 })().catch(console.error);
diff --git a/packages/connect/src/monorepo_scripts/stagedocs.ts b/packages/connect/src/monorepo_scripts/stagedocs.ts
index ae0383ed7..efd3ad62d 100644
--- a/packages/connect/src/monorepo_scripts/stagedocs.ts
+++ b/packages/connect/src/monorepo_scripts/stagedocs.ts
@@ -12,18 +12,8 @@ const fileIncludes = [...(tsConfig as any).include];
 const fileIncludesAdjusted = postpublishUtils.adjustFileIncludePaths(fileIncludes, __dirname);
 const projectFiles = fileIncludesAdjusted.join(' ');
 const jsonFilePath = `${__dirname}/../${postpublishUtils.generatedDocsDirectoryName}/index.json`;
-const version = process.env.DOCS_VERSION;
+const version = process.env.DOCS_VERSION || '0.0.0';
 
 (async () => {
-    const result = await execAsync(`JSON_FILE_PATH=${jsonFilePath} PROJECT_FILES="${projectFiles}" yarn docs:json`, {
-        cwd,
-    });
-    if (!_.isEmpty(result.stderr)) {
-        throw new Error(result.stderr);
-    }
-    const fileName = `v${version}.json`;
-    const s3Url = S3BucketPath + fileName;
-    return execAsync(`S3_URL=${s3Url} yarn upload_docs_json`, {
-        cwd,
-    });
+    await postpublishUtils.generateAndUploadDocsAsync(__dirname, cwd, fileIncludesAdjusted, version, S3BucketPath);
 })().catch(console.error);
-- 
cgit