diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2019-01-29 00:26:13 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2019-01-29 00:26:13 +0800 |
| commit | 141ac0ca0be15602a1bcf466e873134e084f30c1 (patch) | |
| tree | f0e08db40c46e8c671a99231b645365747a8073f /packages | |
| parent | 0c12128f64f7d9a8de6088e98c2e638533d6f5bf (diff) | |
| parent | 25e42c0ad47e9ec06e474cd12a488ae837660302 (diff) | |
| download | dexon-0x-contracts-141ac0ca0be15602a1bcf466e873134e084f30c1.tar dexon-0x-contracts-141ac0ca0be15602a1bcf466e873134e084f30c1.tar.gz dexon-0x-contracts-141ac0ca0be15602a1bcf466e873134e084f30c1.tar.bz2 dexon-0x-contracts-141ac0ca0be15602a1bcf466e873134e084f30c1.tar.lz dexon-0x-contracts-141ac0ca0be15602a1bcf466e873134e084f30c1.tar.xz dexon-0x-contracts-141ac0ca0be15602a1bcf466e873134e084f30c1.tar.zst dexon-0x-contracts-141ac0ca0be15602a1bcf466e873134e084f30c1.zip | |
Merge development
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/asset-buyer/src/asset_buyer.ts | 1 | ||||
| -rw-r--r-- | packages/instant/README.md | 6 | ||||
| -rw-r--r-- | packages/instant/package.json | 8 | ||||
| -rw-r--r-- | packages/instant/webpack.config.js | 25 | ||||
| -rw-r--r-- | packages/website/public/images/team/marcs.jpg | bin | 0 -> 40348 bytes | |||
| -rw-r--r-- | packages/website/ts/pages/about/team.tsx | 5 |
6 files changed, 36 insertions, 9 deletions
diff --git a/packages/asset-buyer/src/asset_buyer.ts b/packages/asset-buyer/src/asset_buyer.ts index ad4b3bb60..b22b1a122 100644 --- a/packages/asset-buyer/src/asset_buyer.ts +++ b/packages/asset-buyer/src/asset_buyer.ts @@ -193,6 +193,7 @@ export class AssetBuyer { ): Promise<LiquidityForAssetData> { const shouldForceOrderRefresh = options.shouldForceOrderRefresh !== undefined ? options.shouldForceOrderRefresh : false; + assert.isString('assetData', assetData); assetDataUtils.decodeAssetDataOrThrow(assetData); assert.isBoolean('options.shouldForceOrderRefresh', shouldForceOrderRefresh); diff --git a/packages/instant/README.md b/packages/instant/README.md index 8832e562d..f09c4776c 100644 --- a/packages/instant/README.md +++ b/packages/instant/README.md @@ -8,11 +8,11 @@ Check out a live sample integration [here](https://www.rexrelay.com/instant). ## Installation -The package is available as a UMD module named `zeroExInstant` at https://instant.0xproject.com/instant.js. +The package is available as a UMD module named `zeroExInstant` at https://instant.0x.org/instant.js. ```html <head> - <script type="text/javascript" src="https://instant.0xproject.com/instant.js" charset="utf-8"></script> + <script type="text/javascript" src="https://instant.0x.org/instant.js" charset="utf-8"></script> </head> <body> <div id="zeroExInstantContainer"></div> @@ -47,7 +47,7 @@ To build and deploy to this bundle, run yarn deploy_staging ``` -Finally, we have our live production bundle that is only meant to be updated with stable, polished releases: https://instant.0xproject.com/instant.js +Finally, we have our live production bundle that is only meant to be updated with stable, polished releases: https://instant.0x.org/instant.js To build and deploy to this bundle, run diff --git a/packages/instant/package.json b/packages/instant/package.json index 86fac9afe..f7e15a3e0 100644 --- a/packages/instant/package.json +++ b/packages/instant/package.json @@ -9,6 +9,7 @@ "main": "umd/instant.js", "scripts": { "build": "webpack --mode production", + "build:dev": "webpack --mode development", "build:ci": "yarn build", "dev": "dotenv webpack-dev-server -- --mode development", "lint": "tslint --format stylish --project .", @@ -50,6 +51,7 @@ "@0x/typescript-typings": "^3.0.8", "@0x/utils": "^3.0.1", "@0x/web3-wrapper": "^3.2.4", + "babel-runtime": "^6.26.0", "bowser": "^1.9.4", "copy-to-clipboard": "^3.0.8", "ethereum-types": "^1.1.6", @@ -78,6 +80,12 @@ "@types/redux": "^3.6.0", "@types/styled-components": "4.0.1", "awesome-typescript-loader": "^5.2.1", + "babel-loader": "^7.1.5", + "babel-preset-env": "^1.7.0", + "babel-plugin-transform-runtime": "^6.23.0", + "babel-plugin-transform-es3-member-expression-literals": "^6.22.0", + "babel-plugin-transform-es3-property-literals": "^6.22.0", + "babel-plugin-transform-object-assign": "^6.22.0", "dotenv-cli": "^1.4.0", "enzyme": "^3.6.0", "enzyme-adapter-react-16": "^1.5.0", diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js index e74cf36d9..13d574de4 100644 --- a/packages/instant/webpack.config.js +++ b/packages/instant/webpack.config.js @@ -141,12 +141,25 @@ const generateConfig = (dischargeTarget, heapConfigOptions, rollbarConfigOptions }, { test: /\.js$/, - loader: 'source-map-loader', - exclude: [ - // instead of /\/node_modules\// - path.join(process.cwd(), 'node_modules'), - path.join(process.cwd(), '../..', 'node_modules'), - ], + use: [{ + loader: 'babel-loader', + options: { + "plugins": ["transform-runtime"], + 'presets': [ + ['env', { + 'targets': { + "chrome": 41 + }, + }], + ], + }, + }, { + loader: 'source-map-loader', + }], + exclude: function(modulePath) { + return /node_modules/.test(modulePath) && + /node_modules\/(core-js|lodash|react|websocket)/.test(modulePath); + }, }, ], }, diff --git a/packages/website/public/images/team/marcs.jpg b/packages/website/public/images/team/marcs.jpg Binary files differnew file mode 100644 index 000000000..fefc24156 --- /dev/null +++ b/packages/website/public/images/team/marcs.jpg diff --git a/packages/website/ts/pages/about/team.tsx b/packages/website/ts/pages/about/team.tsx index 466ba9f43..808fea049 100644 --- a/packages/website/ts/pages/about/team.tsx +++ b/packages/website/ts/pages/about/team.tsx @@ -152,6 +152,11 @@ const team: TeamMember[] = [ name: 'Brent Oshiro', title: 'community engagement lead', }, + { + imageUrl: '/images/team/marcs.jpg', + name: 'Marc Savino', + title: 'technical sourcer', + }, ]; const advisors: TeamMember[] = [ |
