diff options
| author | Steve Klebanoff <steve.klebanoff@gmail.com> | 2018-11-20 01:47:58 +0800 |
|---|---|---|
| committer | Steve Klebanoff <steve.klebanoff@gmail.com> | 2018-11-20 01:47:58 +0800 |
| commit | 0648e270fe398c42804a7b27423faf60543e6072 (patch) | |
| tree | 669803a2aea30bc9a545e3f8ae1c27dd8614b6b8 /packages/instant | |
| parent | 3f0d94c83872ae80d6377fd4f712efa4c174a284 (diff) | |
| parent | 99541f89f7676f6b0d8a923ad377fa901a74f504 (diff) | |
| download | dexon-0x-contracts-0648e270fe398c42804a7b27423faf60543e6072.tar.gz dexon-0x-contracts-0648e270fe398c42804a7b27423faf60543e6072.tar.zst dexon-0x-contracts-0648e270fe398c42804a7b27423faf60543e6072.zip | |
Merge branch 'development' into feature/instant/heap
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 | 10 |
7 files changed, 22 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 6caa3902b..bddc88d18 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 6a4953bcc..ce4f1672e 100644 --- a/packages/instant/webpack.config.js +++ b/packages/instant/webpack.config.js @@ -10,11 +10,15 @@ const GIT_SHA = childProcess .execSync('git rev-parse HEAD') .toString() .trim(); + +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', }, |