diff options
Diffstat (limited to 'packages/deployer')
-rw-r--r-- | packages/deployer/.npmignore | 6 | ||||
-rw-r--r-- | packages/deployer/CHANGELOG.md | 5 | ||||
-rw-r--r-- | packages/deployer/package.json | 15 | ||||
-rw-r--r-- | packages/deployer/scripts/postpublish.js | 36 | ||||
-rw-r--r-- | packages/deployer/src/commands.ts | 2 | ||||
-rw-r--r-- | packages/deployer/src/globals.d.ts | 3 | ||||
-rw-r--r-- | packages/deployer/src/migrations/config/token_info.ts | 2 | ||||
-rw-r--r-- | packages/deployer/src/migrations/migrate.ts | 1 | ||||
-rw-r--r-- | packages/deployer/test/deploy_test.ts | 1 | ||||
-rw-r--r-- | packages/deployer/tslint.json | 3 |
10 files changed, 33 insertions, 41 deletions
diff --git a/packages/deployer/.npmignore b/packages/deployer/.npmignore new file mode 100644 index 000000000..05fa23a59 --- /dev/null +++ b/packages/deployer/.npmignore @@ -0,0 +1,6 @@ +.* +yarn-error.log +/src/ +/scripts/ +test/ +tsconfig.json diff --git a/packages/deployer/CHANGELOG.md b/packages/deployer/CHANGELOG.md new file mode 100644 index 000000000..ad8c64538 --- /dev/null +++ b/packages/deployer/CHANGELOG.md @@ -0,0 +1,5 @@ +# CHANGELOG + +## v0.0.8 - _February 9, 2018_ + + * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) diff --git a/packages/deployer/package.json b/packages/deployer/package.json index c0a4f369b..89dfd3ef1 100644 --- a/packages/deployer/package.json +++ b/packages/deployer/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/deployer", - "version": "0.0.7", + "version": "0.0.9", "description": "Smart contract deployer of 0x protocol", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", @@ -28,15 +28,22 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/deployer/README.md", "devDependencies": { + "@0xproject/tslint-config": "^0.4.9", + "chai": "^4.0.1", "copyfiles": "^1.2.0", "shx": "^0.2.2", + "mocha": "^4.0.1", + "tslint": "5.8.0", "types-bn": "^0.0.1", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.9" + "web3-typescript-typings": "^0.9.10" }, "dependencies": { - "@0xproject/utils": "^0.3.1", - "@0xproject/web3-wrapper": "^0.1.11", + "@0xproject/json-schemas": "^0.7.11", + "@0xproject/types": "^0.2.2", + "@0xproject/utils": "^0.3.3", + "@0xproject/web3-wrapper": "^0.1.13", + "ethereumjs-util": "^5.1.1", "lodash": "^4.17.4", "solc": "^0.4.18", "web3": "^0.20.0", diff --git a/packages/deployer/scripts/postpublish.js b/packages/deployer/scripts/postpublish.js index 24384b228..b3e5407c8 100644 --- a/packages/deployer/scripts/postpublish.js +++ b/packages/deployer/scripts/postpublish.js @@ -1,39 +1,5 @@ -const execAsync = require('async-child-process').execAsync; const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); -const cwd = __dirname + '/..'; const subPackageName = packageJSON.name; -const S3BucketPath = 's3://connect-docs-jsons/'; - -let tag; -let version; -postpublish_utils - .getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - tag = result.tag; - version = result.version; - const releaseName = postpublish_utils.getReleaseName(subPackageName, version); - return postpublish_utils.publishReleaseNotes(tag, releaseName); - }) - .then(function(release) { - console.log('POSTPUBLISH: Release successful, generating docs...'); - const jsonFilePath = __dirname + '/../' + postpublish_utils.generatedDocsDirectoryName + '/index.json'; - return execAsync('JSON_FILE_PATH=' + jsonFilePath + ' PROJECT_DIR=' + __dirname + '/.. yarn docs:json', { - cwd, - }); - }) - .then(function(result) { - if (result.stderr !== '') { - throw new Error(result.stderr); - } - const fileName = 'v' + version + '.json'; - console.log('POSTPUBLISH: Doc generation successful, uploading docs... as ', fileName); - const s3Url = S3BucketPath + fileName; - return execAsync('S3_URL=' + s3Url + ' yarn upload_docs_json', { - cwd, - }); - }) - .catch(function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/deployer/src/commands.ts b/packages/deployer/src/commands.ts index 2acef8e8f..d1707c5ed 100644 --- a/packages/deployer/src/commands.ts +++ b/packages/deployer/src/commands.ts @@ -1,6 +1,6 @@ -import { migrator } from './migrations/migrate'; import { Compiler } from './compiler'; import { Deployer } from './deployer'; +import { migrator } from './migrations/migrate'; import { CompilerOptions, DeployerOptions } from './utils/types'; export const commands = { diff --git a/packages/deployer/src/globals.d.ts b/packages/deployer/src/globals.d.ts index 0a35002da..2e04d83ea 100644 --- a/packages/deployer/src/globals.d.ts +++ b/packages/deployer/src/globals.d.ts @@ -1,8 +1,11 @@ declare module 'solc' { + // tslint:disable:completed-docs export function compile(sources: any, optimizerEnabled: number, findImports: (importPath: string) => any): any; export function setupMethods(solcBin: any): any; + // tslint:enable:completed-docs } declare module 'web3-eth-abi' { + // tslint:disable-next-line:completed-docs export function encodeParameters(typesArray: string[], parameters: any[]): string; } diff --git a/packages/deployer/src/migrations/config/token_info.ts b/packages/deployer/src/migrations/config/token_info.ts index 7e822fc3b..a815f5801 100644 --- a/packages/deployer/src/migrations/config/token_info.ts +++ b/packages/deployer/src/migrations/config/token_info.ts @@ -1,5 +1,5 @@ -import { constants } from '../../utils/constants'; import { Token } from '../../types'; +import { constants } from '../../utils/constants'; export const tokenInfo: Token[] = [ { diff --git a/packages/deployer/src/migrations/migrate.ts b/packages/deployer/src/migrations/migrate.ts index 393806b45..d3b397f0a 100644 --- a/packages/deployer/src/migrations/migrate.ts +++ b/packages/deployer/src/migrations/migrate.ts @@ -4,6 +4,7 @@ import * as _ from 'lodash'; import { Deployer } from '../deployer'; import { constants } from '../utils/constants'; + import { tokenInfo } from './config/token_info'; export const migrator = { diff --git a/packages/deployer/test/deploy_test.ts b/packages/deployer/test/deploy_test.ts index 5df729a04..5fe2ffbd7 100644 --- a/packages/deployer/test/deploy_test.ts +++ b/packages/deployer/test/deploy_test.ts @@ -5,6 +5,7 @@ import { Compiler } from '../src/compiler'; import { Deployer } from '../src/deployer'; import { fsWrapper } from '../src/utils/fs_wrapper'; import { CompilerOptions, ContractArtifact, ContractData, DoneCallback } from '../src/utils/types'; + import { constructor_args, exchange_binary } from './fixtures/exchange_bin'; import { constants } from './util/constants'; diff --git a/packages/deployer/tslint.json b/packages/deployer/tslint.json new file mode 100644 index 000000000..ffaefe83a --- /dev/null +++ b/packages/deployer/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": ["@0xproject/tslint-config"] +} |