Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/discharge

10 files changed, 32 insertions, 32 deletions

diff --git a/packages/metacoin/README.md b/packages/metacoin/README.md
index 15816cc67..4f9609dde 100644
--- a/packages/metacoin/README.md
+++ b/packages/metacoin/README.md
@@ -1,4 +1,4 @@
-## @0xproject/metacoin
+## @0x/metacoin
 
 This is an example project that demonstrates how the many Ethereum dev tools developed by 0x can be used in any Solidity/TS project.
 It supports:
@@ -35,13 +35,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/metacoin yarn build
+PKG=@0x/metacoin yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/metacoin yarn watch
+PKG=@0x/metacoin yarn watch
 ```
 
 ### Clean
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json
index 58fc0b848..04bdeba4c 100644
--- a/packages/metacoin/package.json
+++ b/packages/metacoin/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/metacoin",
-    "version": "0.0.23",
+    "name": "@0x/metacoin",
+    "version": "0.0.24",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,25 +29,25 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-        "@0xproject/abi-gen": "^1.0.13",
-        "@0xproject/base-contract": "^3.0.1",
-        "@0xproject/sol-cov": "^2.1.7",
-        "@0xproject/subproviders": "^2.0.7",
-        "@0xproject/tslint-config": "^1.0.8",
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/typescript-typings": "^3.0.2",
-        "@0xproject/utils": "^2.0.2",
-        "@0xproject/web3-wrapper": "^3.0.3",
+        "@0x/abi-gen": "^1.0.14",
+        "@0x/base-contract": "^3.0.2",
+        "@0x/sol-cov": "^2.1.8",
+        "@0x/subproviders": "^2.1.0",
+        "@0x/tslint-config": "^1.0.9",
+        "@0x/types": "^1.2.0",
+        "@0x/typescript-typings": "^3.0.3",
+        "@0x/utils": "^2.0.3",
+        "@0x/web3-wrapper": "^3.1.0",
         "@types/mocha": "^5.2.2",
         "copyfiles": "^2.0.0",
-        "ethereum-types": "^1.0.11",
+        "ethereum-types": "^1.1.1",
         "ethers": "~4.0.4",
         "lodash": "^4.17.5",
         "run-s": "^0.0.0"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.12",
-        "@0xproject/sol-compiler": "^1.1.7",
+        "@0x/dev-utils": "^1.0.13",
+        "@0x/sol-compiler": "^1.1.8",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^2.0.1",
diff --git a/packages/metacoin/test/global_hooks.ts b/packages/metacoin/test/global_hooks.ts
index 7328531e4..437061b46 100644
--- a/packages/metacoin/test/global_hooks.ts
+++ b/packages/metacoin/test/global_hooks.ts
@@ -1,4 +1,4 @@
-import { env, EnvVars } from '@0xproject/dev-utils';
+import { env, EnvVars } from '@0x/dev-utils';
 
 import { coverage } from './utils/coverage';
 import { profiler } from './utils/profiler';
diff --git a/packages/metacoin/test/metacoin_test.ts b/packages/metacoin/test/metacoin_test.ts
index 6c16a2d39..a8ba85814 100644
--- a/packages/metacoin/test/metacoin_test.ts
+++ b/packages/metacoin/test/metacoin_test.ts
@@ -1,5 +1,5 @@
-import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils';
-import { BigNumber } from '@0xproject/utils';
+import { BlockchainLifecycle, devConstants } from '@0x/dev-utils';
+import { BigNumber } from '@0x/utils';
 import * as chai from 'chai';
 import { ContractArtifact, LogWithDecodedArgs } from 'ethereum-types';
 
diff --git a/packages/metacoin/test/utils/config.ts b/packages/metacoin/test/utils/config.ts
index c26fe5f25..05f524d52 100644
--- a/packages/metacoin/test/utils/config.ts
+++ b/packages/metacoin/test/utils/config.ts
@@ -1,4 +1,4 @@
-import { devConstants } from '@0xproject/dev-utils';
+import { devConstants } from '@0x/dev-utils';
 
 export const config = {
     networkId: 50,
diff --git a/packages/metacoin/test/utils/coverage.ts b/packages/metacoin/test/utils/coverage.ts
index 945afb0a7..31275a163 100644
--- a/packages/metacoin/test/utils/coverage.ts
+++ b/packages/metacoin/test/utils/coverage.ts
@@ -1,5 +1,5 @@
-import { devConstants } from '@0xproject/dev-utils';
-import { CoverageSubprovider, SolCompilerArtifactAdapter } from '@0xproject/sol-cov';
+import { devConstants } from '@0x/dev-utils';
+import { CoverageSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov';
 import * as _ from 'lodash';
 
 import { config } from './config';
diff --git a/packages/metacoin/test/utils/profiler.ts b/packages/metacoin/test/utils/profiler.ts
index 701337451..e7c373d20 100644
--- a/packages/metacoin/test/utils/profiler.ts
+++ b/packages/metacoin/test/utils/profiler.ts
@@ -1,5 +1,5 @@
-import { devConstants } from '@0xproject/dev-utils';
-import { ProfilerSubprovider, SolCompilerArtifactAdapter } from '@0xproject/sol-cov';
+import { devConstants } from '@0x/dev-utils';
+import { ProfilerSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov';
 import * as _ from 'lodash';
 
 import { config } from './config';
diff --git a/packages/metacoin/test/utils/web3_wrapper.ts b/packages/metacoin/test/utils/web3_wrapper.ts
index 36bd6343f..258cf560f 100644
--- a/packages/metacoin/test/utils/web3_wrapper.ts
+++ b/packages/metacoin/test/utils/web3_wrapper.ts
@@ -1,7 +1,7 @@
-import { env, EnvVars } from '@0xproject/dev-utils';
-import { GanacheSubprovider, prependSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0xproject/subproviders';
-import { errorUtils, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { env, EnvVars } from '@0x/dev-utils';
+import { GanacheSubprovider, prependSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0x/subproviders';
+import { errorUtils, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as fs from 'fs';
 
 import { config } from './config';
diff --git a/packages/metacoin/tsconfig.json b/packages/metacoin/tsconfig.json
index 3065396ff..163465cf5 100644
--- a/packages/metacoin/tsconfig.json
+++ b/packages/metacoin/tsconfig.json
@@ -5,10 +5,10 @@
         "rootDir": ".",
         "typeRoots": [
             "comment: for building within 0x-monorepo:",
-            "../../node_modules/@0xproject/typescript-typings/types",
+            "../../node_modules/@0x/typescript-typings/types",
             "../../node_modules/@types",
             "comment: for building in an isolated environment:",
-            "node_modules/@0xproject/typescript-typings/types",
+            "node_modules/@0x/typescript-typings/types",
             "node_modules/@types"
         ]
     },
diff --git a/packages/metacoin/tslint.json b/packages/metacoin/tslint.json
index ffaefe83a..dd9053357 100644
--- a/packages/metacoin/tslint.json
+++ b/packages/metacoin/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }