diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 02ae87cd52..2866f1a9ed 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -98,6 +98,7 @@ "lodash": "^4.17.4", "publish-release": "^1.3.3", "uuid": "^3.1.0", - "web3": "^0.20.0" + "web3": "^0.20.0", + "@0xproject/assert": "0.0.3" } } diff --git a/packages/0x.js/src/utils/assert.ts b/packages/0x.js/src/utils/assert.ts index b6f6c5c95a..775a7a609f 100644 --- a/packages/0x.js/src/utils/assert.ts +++ b/packages/0x.js/src/utils/assert.ts @@ -5,7 +5,7 @@ import {SchemaValidator, Schema} from '0x-json-schemas'; import {Web3Wrapper} from '../web3_wrapper'; import {signatureUtils} from '../utils/signature_utils'; import {ECSignature} from '../types'; -import {assert as sharedAssert} from '0x-assert'; +import {assert as sharedAssert} from '@0xproject/assert'; const HEX_REGEX = /^0x[0-9A-F]*$/i; diff --git a/packages/0x-assert/README.md b/packages/assert/README.md similarity index 100% rename from packages/0x-assert/README.md rename to packages/assert/README.md diff --git a/packages/0x-assert/circle.yml b/packages/assert/circle.yml similarity index 100% rename from packages/0x-assert/circle.yml rename to packages/assert/circle.yml diff --git a/packages/0x-assert/package.json b/packages/assert/package.json similarity index 94% rename from packages/0x-assert/package.json rename to packages/assert/package.json index c560ca5dc9..ab640b3614 100644 --- a/packages/0x-assert/package.json +++ b/packages/assert/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "0x-assert", + "name": "@0xproject/assert", "version": "0.0.3", "description": "Provides a standard way of performing type and schema validation across 0x projects", "main": "lib/src/index.js", @@ -41,7 +41,6 @@ "bignumber.js": "~4.1.0", "ethereum-address": "^0.0.4", "lodash": "^4.17.4", - "valid-url": "^1.0.9", - "0x-assert": "0.0.3" + "valid-url": "^1.0.9" } } diff --git a/packages/0x-assert/src/globals.d.ts b/packages/assert/src/globals.d.ts similarity index 100% rename from packages/0x-assert/src/globals.d.ts rename to packages/assert/src/globals.d.ts diff --git a/packages/0x-assert/src/index.ts b/packages/assert/src/index.ts similarity index 100% rename from packages/0x-assert/src/index.ts rename to packages/assert/src/index.ts diff --git a/packages/0x-assert/test/assert_test.ts b/packages/assert/test/assert_test.ts similarity index 100% rename from packages/0x-assert/test/assert_test.ts rename to packages/assert/test/assert_test.ts diff --git a/packages/0x-assert/tsconfig.json b/packages/assert/tsconfig.json similarity index 100% rename from packages/0x-assert/tsconfig.json rename to packages/assert/tsconfig.json diff --git a/packages/0x-assert/tslint.json b/packages/assert/tslint.json similarity index 100% rename from packages/0x-assert/tslint.json rename to packages/assert/tslint.json