From f7c1e10b5ac112866ee55e7fededdb37c890d30f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 14 Mar 2018 14:07:24 +0100 Subject: Move configuration into package.json configs section --- packages/connect/package.json | 9 ++++++++ .../connect/src/monorepo_scripts/postpublish.ts | 26 +++------------------- packages/connect/src/monorepo_scripts/stagedocs.ts | 21 +++++------------ 3 files changed, 17 insertions(+), 39 deletions(-) (limited to 'packages/connect') diff --git a/packages/connect/package.json b/packages/connect/package.json index 0c4db7f60..8b3b24fcd 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -23,6 +23,15 @@ "test": "run-s clean build copy_test_fixtures run_mocha", "test:circleci": "yarn test" }, + "config": { + "postpublish": { + "assets": ["_bundles/index.js", "_bundles/index.min.js"], + "docPublishConfigs": { + "s3BucketPath": "s3://connect-docs-jsons/", + "s3StagingBucketPath": "s3://staging-connect-docs-jsons/" + } + } + }, "repository": { "type": "git", "url": "https://github.com/0xProject/0x-monorepo.git" diff --git a/packages/connect/src/monorepo_scripts/postpublish.ts b/packages/connect/src/monorepo_scripts/postpublish.ts index ecbd26872..dcb99d0f7 100644 --- a/packages/connect/src/monorepo_scripts/postpublish.ts +++ b/packages/connect/src/monorepo_scripts/postpublish.ts @@ -1,28 +1,8 @@ import { postpublishUtils } from '@0xproject/monorepo-scripts'; -import { execAsync } from 'async-child-process'; -import * as _ from 'lodash'; import * as packageJSON from '../package.json'; -import * as tsConfig from '../tsconfig.json'; +import * as tsConfigJSON from '../tsconfig.json'; const cwd = `${__dirname}/..`; -const subPackageName = (packageJSON as any).name; -// Include any external packages that are part of the @0xproject/connect public interface -// 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 S3BucketPath = 's3://connect-docs-jsons/'; - -(async () => { - const tagAndVersion = await postpublishUtils.getLatestTagAndVersionAsync(subPackageName); - const tag = tagAndVersion.tag; - const version = tagAndVersion.version; - - const releaseName = postpublishUtils.getReleaseName(subPackageName, version); - const assets = [`${__dirname}/../_bundles/index.js`, `${__dirname}/../_bundles/index.min.js`]; - const release = await postpublishUtils.publishReleaseNotesAsync(tag, releaseName, assets); - - // tslint:disable-next-line:no-console - console.log('POSTPUBLISH: Release successful, generating docs...'); - await postpublishUtils.generateAndUploadDocsAsync(__dirname, cwd, fileIncludesAdjusted, version, S3BucketPath); -})().catch(console.error); +// tslint:disable-next-line:no-floating-promises +postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd); diff --git a/packages/connect/src/monorepo_scripts/stagedocs.ts b/packages/connect/src/monorepo_scripts/stagedocs.ts index efd3ad62d..e732ac8eb 100644 --- a/packages/connect/src/monorepo_scripts/stagedocs.ts +++ b/packages/connect/src/monorepo_scripts/stagedocs.ts @@ -1,19 +1,8 @@ import { postpublishUtils } from '@0xproject/monorepo-scripts'; -import { execAsync } from 'async-child-process'; -import * as _ from 'lodash'; -import * as tsConfig from '../tsconfig.json'; +import * as packageJSON from '../package.json'; +import * as tsConfigJSON from '../tsconfig.json'; -const cwd = __dirname + '/..'; -const S3BucketPath = 's3://staging-connect-docs-jsons/'; -// Include any external packages that are part of the @0xproject/connect public interface -// 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 jsonFilePath = `${__dirname}/../${postpublishUtils.generatedDocsDirectoryName}/index.json`; -const version = process.env.DOCS_VERSION || '0.0.0'; - -(async () => { - await postpublishUtils.generateAndUploadDocsAsync(__dirname, cwd, fileIncludesAdjusted, version, S3BucketPath); -})().catch(console.error); +const cwd = `${__dirname}/..`; +// tslint:disable-next-line:no-floating-promises +postpublishUtils.publishDocsToStagingAsync(packageJSON, tsConfigJSON, cwd); -- cgit v1.2.3