Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/beta-render-et-al

6 files changed, 32 insertions, 27 deletions

diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json
index f8a2eab70..b9840957e 100644
--- a/packages/fill-scenarios/CHANGELOG.json
+++ b/packages/fill-scenarios/CHANGELOG.json
@@ -6,7 +6,8 @@
                 "note": "Updated to use new @0xproject/contract-artifacts and @0xproject/abi-gen-wrappers packages",
                 "pr": 1105
             }
-        ]
+        ],
+        "timestamp": 1539871071
     },
     {
         "version": "1.0.7",
diff --git a/packages/fill-scenarios/CHANGELOG.md b/packages/fill-scenarios/CHANGELOG.md
index bf6fcf13e..20ef1322c 100644
--- a/packages/fill-scenarios/CHANGELOG.md
+++ b/packages/fill-scenarios/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.8 - _October 18, 2018_
+
+    * Updated to use new @0xproject/contract-artifacts and @0xproject/abi-gen-wrappers packages (#1105)
+
 ## v1.0.7 - _October 4, 2018_
 
     * Dependencies updated
@@ -41,7 +45,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.1-rc.3 - _August 13, 2018_
+## v1.0.1-rc.3 - _August 14, 2018_
 
     * Updated to use latest orderFactory interface, fixed `feeRecipient` spelling error in public interface (#936)
     * Dependencies updated
diff --git a/packages/fill-scenarios/README.md b/packages/fill-scenarios/README.md
index 67df0941f..794b70e56 100644
--- a/packages/fill-scenarios/README.md
+++ b/packages/fill-scenarios/README.md
@@ -1,18 +1,18 @@
-## @0xproject/fill-scenarios
+## @0x/fill-scenarios
 
 0x order fill scenario generator
 
 ## Installation
 
 ```bash
-yarn add @0xproject/fill-scenarios
+yarn add @0x/fill-scenarios
 ```
 
 If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
 
 ```json
 "compilerOptions": {
-    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+    "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"],
 }
 ```
 
@@ -41,13 +41,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/fill-scenarios yarn build
+PKG=@0x/fill-scenarios yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/fill-scenarios yarn watch
+PKG=@0x/fill-scenarios yarn watch
 ```
 
 ### Clean
diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json
index fc30f11dc..0e1303259 100644
--- a/packages/fill-scenarios/package.json
+++ b/packages/fill-scenarios/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/fill-scenarios",
-    "version": "1.0.7",
+    "name": "@0x/fill-scenarios",
+    "version": "1.0.8",
     "description": "0x order fill scenario generator",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -20,7 +20,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md",
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.9",
         "@types/lodash": "4.14.104",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
@@ -28,15 +28,15 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/abi-gen-wrappers": "^1.0.0",
-        "@0xproject/base-contract": "^3.0.1",
-        "@0xproject/contract-artifacts": "^1.0.0",
-        "@0xproject/order-utils": "^1.0.7",
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/typescript-typings": "^3.0.2",
-        "@0xproject/utils": "^2.0.2",
-        "@0xproject/web3-wrapper": "^3.0.3",
-        "ethereum-types": "^1.0.11",
+        "@0x/abi-gen-wrappers": "^1.0.1",
+        "@0x/base-contract": "^3.0.2",
+        "@0x/contract-artifacts": "^1.0.1",
+        "@0x/order-utils": "^2.0.0",
+        "@0x/types": "^1.2.0",
+        "@0x/typescript-typings": "^3.0.3",
+        "@0x/utils": "^2.0.3",
+        "@0x/web3-wrapper": "^3.1.0",
+        "ethereum-types": "^1.1.1",
         "ethers": "~4.0.4",
         "lodash": "^4.17.5"
     },
diff --git a/packages/fill-scenarios/src/fill_scenarios.ts b/packages/fill-scenarios/src/fill_scenarios.ts
index 131828e8d..0154bcd0a 100644
--- a/packages/fill-scenarios/src/fill_scenarios.ts
+++ b/packages/fill-scenarios/src/fill_scenarios.ts
@@ -1,10 +1,10 @@
-import { DummyERC20TokenContract, DummyERC721TokenContract, ExchangeContract } from '@0xproject/abi-gen-wrappers';
-import * as artifacts from '@0xproject/contract-artifacts';
-import { assetDataUtils } from '@0xproject/order-utils';
-import { orderFactory } from '@0xproject/order-utils/lib/src/order_factory';
-import { AssetProxyId, ERC721AssetData, OrderWithoutExchangeAddress, SignedOrder } from '@0xproject/types';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { DummyERC20TokenContract, DummyERC721TokenContract, ExchangeContract } from '@0x/abi-gen-wrappers';
+import * as artifacts from '@0x/contract-artifacts';
+import { assetDataUtils } from '@0x/order-utils';
+import { orderFactory } from '@0x/order-utils/lib/src/order_factory';
+import { AssetProxyId, ERC721AssetData, OrderWithoutExchangeAddress, SignedOrder } from '@0x/types';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import { Provider } from 'ethereum-types';
 import * as _ from 'lodash';
 
diff --git a/packages/fill-scenarios/tslint.json b/packages/fill-scenarios/tslint.json
index ffaefe83a..dd9053357 100644
--- a/packages/fill-scenarios/tslint.json
+++ b/packages/fill-scenarios/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }