aboutsummaryrefslogtreecommitdiffstats
path: root/packages/deployer
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-02-10 06:39:05 +0800
committerGitHub <noreply@github.com>2018-02-10 06:39:05 +0800
commitefb6eb28ce072aab0f3bca69d833d20fdef23ea2 (patch)
tree952eab52d555ab8b9cbe7479af926de5a9713693 /packages/deployer
parent2e3c9b87df9b8a0b99533e89ce3442b5f4fec5df (diff)
parentac5531ce850c5ab6f55b8c4733a6909643572508 (diff)
downloaddexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.tar
dexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.tar.gz
dexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.tar.bz2
dexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.tar.lz
dexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.tar.xz
dexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.tar.zst
dexon-sol-tools-efb6eb28ce072aab0f3bca69d833d20fdef23ea2.zip
Merge pull request #389 from 0xProject/fix/npmInclusionIssues
Fix NPM Inclusion Issues
Diffstat (limited to 'packages/deployer')
-rw-r--r--packages/deployer/.npmignore6
-rw-r--r--packages/deployer/CHANGELOG.md5
-rw-r--r--packages/deployer/package.json7
-rw-r--r--packages/deployer/src/commands.ts2
-rw-r--r--packages/deployer/src/globals.d.ts3
-rw-r--r--packages/deployer/src/migrations/config/token_info.ts2
-rw-r--r--packages/deployer/src/migrations/migrate.ts1
-rw-r--r--packages/deployer/test/deploy_test.ts1
-rw-r--r--packages/deployer/tslint.json3
9 files changed, 28 insertions, 2 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 6564d89eb..e1e41271c 100644
--- a/packages/deployer/package.json
+++ b/packages/deployer/package.json
@@ -28,14 +28,21 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/deployer/README.md",
"devDependencies": {
+ "@0xproject/tslint-config": "^0.4.7",
+ "chai": "^4.0.1",
"copyfiles": "^1.2.0",
+ "mocha": "^4.0.1",
+ "tslint": "5.8.0",
"types-bn": "^0.0.1",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.9.9"
},
"dependencies": {
+ "@0xproject/json-schemas": "^0.7.9",
"@0xproject/utils": "^0.3.1",
+ "@0xproject/types": "^0.2.0",
"@0xproject/web3-wrapper": "^0.1.11",
+ "ethereumjs-util": "^5.1.1",
"lodash": "^4.17.4",
"solc": "^0.4.18",
"web3": "^0.20.0",
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"]
+}