aboutsummaryrefslogtreecommitdiffstats
path: root/packages/monorepo-scripts
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-08-15 05:39:59 +0800
committerFabio Berger <me@fabioberger.com>2018-08-15 05:39:59 +0800
commit1d9408a8e04aaea35bcf517fd3332b9bcc62bba0 (patch)
treee49c2ee1763134c9d56255a643b25f8aaa3e858d /packages/monorepo-scripts
parent2f2582a0da3095d61a99ef09744dc0995677558e (diff)
downloaddexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar
dexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.gz
dexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.bz2
dexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.lz
dexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.xz
dexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.tar.zst
dexon-sol-tools-1d9408a8e04aaea35bcf517fd3332b9bcc62bba0.zip
Fix additional merge conflicts
Diffstat (limited to 'packages/monorepo-scripts')
-rw-r--r--packages/monorepo-scripts/src/utils/doc_generate_and_upload_utils.ts15
1 files changed, 8 insertions, 7 deletions
diff --git a/packages/monorepo-scripts/src/utils/doc_generate_and_upload_utils.ts b/packages/monorepo-scripts/src/utils/doc_generate_and_upload_utils.ts
index 84fb9d20c..777d908fb 100644
--- a/packages/monorepo-scripts/src/utils/doc_generate_and_upload_utils.ts
+++ b/packages/monorepo-scripts/src/utils/doc_generate_and_upload_utils.ts
@@ -1,15 +1,14 @@
-import * as _ from 'lodash';
-
-import { constants } from '../constants';
-import { utils } from './utils';
-
import { readFileSync, writeFileSync } from 'fs';
+import * as _ from 'lodash';
import * as path from 'path';
import { exec as execAsync } from 'promisify-child-process';
import * as ts from 'typescript';
+import { constants } from '../constants';
import { ExportPathToExportedItems } from '../types';
+import { utils } from './utils';
+
interface ExportInfo {
exportPathToExportedItems: ExportPathToExportedItems;
exportPathOrder: string[];
@@ -83,8 +82,8 @@ export async function generateAndUploadDocsAsync(packageName: string, isStaging:
}
if (!_.startsWith(innerExportPath, './')) {
throw new Error(
- `GENERATE_UPLOAD_DOCS: WARNING - ${packageName} is exporting one of ${innerExportItems} which is
- itself exported from an external package. To fix this, export the external dependency directly,
+ `GENERATE_UPLOAD_DOCS: WARNING - ${packageName} is exporting one of ${innerExportItems} which is
+ itself exported from an external package. To fix this, export the external dependency directly,
not indirectly through ${innerExportPath}.`,
);
} else {
@@ -192,6 +191,8 @@ export async function generateAndUploadDocsAsync(packageName: string, isStaging:
// Remove the generated docs directory
await execAsync(`rm -rf ${jsonFilePath}`, {
cwd,
+ });
+}
function getAllReferenceNames(propertyName: string, node: any, referenceNames: string[]): string[] {
let updatedReferenceNames = referenceNames;