diff options
author | Brandon Millman <brandon.millman@gmail.com> | 2018-11-20 01:32:39 +0800 |
---|---|---|
committer | Brandon Millman <brandon.millman@gmail.com> | 2018-11-20 01:32:39 +0800 |
commit | 3d6711bd38c3cb801d00a73a6386c4bb16359811 (patch) | |
tree | 411ffc816f673c69d50fcf0a9f0ae3c4defa4ea9 /packages/instant | |
parent | 004e197863e4df942d21f9e4ed629c08eeadad56 (diff) | |
parent | 99541f89f7676f6b0d8a923ad377fa901a74f504 (diff) | |
download | dexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.tar dexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.tar.gz dexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.tar.bz2 dexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.tar.lz dexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.tar.xz dexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.tar.zst dexon-sol-tools-3d6711bd38c3cb801d00a73a6386c4bb16359811.zip |
Merge branch 'development' into feature/instant/icons
* development: (37 commits)
Add 0x-order-utils.py library to developers home
Fixes to CONTRIBUTING.md
Improve our CONTRIBUTING.md instructions
fix(order_utils.py): publish docs to S3, not RTD (#1264)
fix: make instant package private
feat: refer to map file in postpublish configs
feat: add new bundle name to bundle watch
fix: tslint ignore rule in wrong place
Update blog post feature
Fix disclaimer on mobile
Add smart contract docs to Developer Home
Add Apache license link
Fix capitalization in title
Remove excess semi-colon
Point directly to README for docs link
Update icons
Update LICENSE
Fix disclaimer
Add blogpost URL
Add disclaimer
...
Diffstat (limited to 'packages/instant')
-rw-r--r-- | packages/instant/.dogfood.discharge.json | 2 | ||||
-rw-r--r-- | packages/instant/.gitignore | 5 | ||||
-rw-r--r-- | packages/instant/.npmignore | 5 | ||||
-rw-r--r-- | packages/instant/.staging.discharge.json | 2 | ||||
-rw-r--r-- | packages/instant/package.json | 8 | ||||
-rw-r--r-- | packages/instant/public/index.html | 2 | ||||
-rw-r--r-- | packages/instant/webpack.config.js | 9 |
7 files changed, 21 insertions, 12 deletions
diff --git a/packages/instant/.dogfood.discharge.json b/packages/instant/.dogfood.discharge.json index 9ade97d01..ca36b3861 100644 --- a/packages/instant/.dogfood.discharge.json +++ b/packages/instant/.dogfood.discharge.json @@ -1,6 +1,6 @@ { "domain": "0x-instant-dogfood", - "build_command": "yarn build:umd:prod", + "build_command": "WEBPACK_OUTPUT_PATH=public yarn build:umd:prod", "upload_directory": "public", "index_key": "index.html", "error_key": "index.html", diff --git a/packages/instant/.gitignore b/packages/instant/.gitignore index e1ce60fa2..a99cea187 100644 --- a/packages/instant/.gitignore +++ b/packages/instant/.gitignore @@ -1,2 +1,3 @@ -public/main.bundle.js -public/main.bundle.js.map
\ No newline at end of file +public/instant.js +public/instant.js.map +umd/*
\ No newline at end of file diff --git a/packages/instant/.npmignore b/packages/instant/.npmignore new file mode 100644 index 000000000..579d65af0 --- /dev/null +++ b/packages/instant/.npmignore @@ -0,0 +1,5 @@ +.* +* +*/ +!lib/src/**/* +!umd/**/*
\ No newline at end of file diff --git a/packages/instant/.staging.discharge.json b/packages/instant/.staging.discharge.json index 1026b9986..c917a650b 100644 --- a/packages/instant/.staging.discharge.json +++ b/packages/instant/.staging.discharge.json @@ -1,6 +1,6 @@ { "domain": "0x-instant-staging", - "build_command": "yarn build:umd:prod", + "build_command": "WEBPACK_OUTPUT_PATH=public yarn build:umd:prod", "upload_directory": "public", "index_key": "index.html", "error_key": "index.html", diff --git a/packages/instant/package.json b/packages/instant/package.json index 669272cb1..03964b5e2 100644 --- a/packages/instant/package.json +++ b/packages/instant/package.json @@ -1,11 +1,11 @@ { "name": "@0x/instant", - "version": "0.0.7", + "version": "1.0.0", "engines": { "node": ">=6.12" }, - "private": true, "description": "0x Instant React Component", + "private": true, "main": "lib/src/index.js", "types": "lib/src/index.d.ts", "scripts": { @@ -29,8 +29,8 @@ "config": { "postpublish": { "assets": [ - "packages/instant/public/index.js", - "packages/instant/public/index.min.js" + "packages/instant/umd/instant.js", + "packages/instant/umd/instant.js.map" ] } }, diff --git a/packages/instant/public/index.html b/packages/instant/public/index.html index f6c809e33..253cbb194 100644 --- a/packages/instant/public/index.html +++ b/packages/instant/public/index.html @@ -6,7 +6,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>0x Instant Dev Environment</title> <link rel="stylesheet" href="/external.css"> - <script type="text/javascript" src="/main.bundle.js" charset="utf-8"></script> + <script type="text/javascript" src="/instant.js" charset="utf-8"></script> <script type="text/javascript" src="https://unpkg.com/jsuri@1.3.1/Uri.js" charset="utf-8"></script> <script type="text/javascript" src="https://unpkg.com/bignumber.js@4.1.0/bignumber.js" charset="utf-8"></script> <style> diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js index 3c5cafc1d..fae303712 100644 --- a/packages/instant/webpack.config.js +++ b/packages/instant/webpack.config.js @@ -2,11 +2,14 @@ const path = require('path'); const ip = require('ip'); // The common js bundle (not this one) is built using tsc. // The umd bundle (this one) has a different entrypoint. +const outputPath = process.env.WEBPACK_OUTPUT_PATH || 'umd'; const config = { - entry: './src/index.umd.ts', + entry: { + instant: './src/index.umd.ts', + }, output: { - filename: '[name].bundle.js', - path: path.resolve(__dirname, 'public'), + filename: '[name].js', + path: path.resolve(__dirname, outputPath), library: 'zeroExInstant', libraryTarget: 'umd', }, |