From 17c56d93c8da7ffcd739bb21c185577ad03b2a8b Mon Sep 17 00:00:00 2001 From: Denys Zadorozhnyi Date: Fri, 16 Oct 2020 15:20:43 +0300 Subject: [PATCH 1/3] disable wasm-opt; --- .gitignore | 3 ++- bindings/ergo-lib-wasm/Cargo.toml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7b40e81c7..88edcf554 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ xcuserdata/ .gradle/ build/ - +# ts lsp server logs +.log/ diff --git a/bindings/ergo-lib-wasm/Cargo.toml b/bindings/ergo-lib-wasm/Cargo.toml index 213b3f7fc..95495ac9f 100644 --- a/bindings/ergo-lib-wasm/Cargo.toml +++ b/bindings/ergo-lib-wasm/Cargo.toml @@ -45,4 +45,5 @@ default-features = false features = ["std"] [package.metadata.wasm-pack.profile.release] -wasm-opt = ["-O", "--enable-mutable-globals"] +# wasm-opt = ["-O", "--enable-mutable-globals"] +wasm-opt = false From 187b3e09e40867b3cfc64e4a624f5e29c0bca56c Mon Sep 17 00:00:00 2001 From: Denys Zadorozhnyi Date: Fri, 16 Oct 2020 15:21:05 +0300 Subject: [PATCH 2/3] move chai do devDependencies; --- bindings/ergo-lib-wasm/package.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bindings/ergo-lib-wasm/package.json b/bindings/ergo-lib-wasm/package.json index 0a17e5175..bfb94f2e8 100644 --- a/bindings/ergo-lib-wasm/package.json +++ b/bindings/ergo-lib-wasm/package.json @@ -18,9 +18,8 @@ "text-encoder": "0.0.4", "webpack": "^4.11.1", "webpack-cli": "^3.1.1", - "webpack-dev-server": "^3.1.0" - }, - "dependencies": { + "webpack-dev-server": "^3.1.0", "chai": "^4.2.0" - } + }, + "dependencies": {} } From e9a963700eac4a25ca916b7a8db69d78812e2083 Mon Sep 17 00:00:00 2001 From: Denys Zadorozhnyi Date: Fri, 16 Oct 2020 17:19:55 +0300 Subject: [PATCH 3/3] bump WASM bindings version to 0.2.1; add npm scripts to build and publish; --- bindings/ergo-lib-wasm/Cargo.toml | 2 +- bindings/ergo-lib-wasm/LICENSE | 121 ++++++++++++++++++ bindings/ergo-lib-wasm/package.json | 6 +- .../ergo-lib-wasm/scripts/publish_helper.js | 19 +++ 4 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 bindings/ergo-lib-wasm/LICENSE create mode 100644 bindings/ergo-lib-wasm/scripts/publish_helper.js diff --git a/bindings/ergo-lib-wasm/Cargo.toml b/bindings/ergo-lib-wasm/Cargo.toml index 95495ac9f..8e8708a65 100644 --- a/bindings/ergo-lib-wasm/Cargo.toml +++ b/bindings/ergo-lib-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ergo-lib-wasm" -version = "0.1.0" +version = "0.2.1" license = "CC0-1.0" authors = ["Denys Zadorozhnyi "] edition = "2018" diff --git a/bindings/ergo-lib-wasm/LICENSE b/bindings/ergo-lib-wasm/LICENSE new file mode 100644 index 000000000..0e259d42c --- /dev/null +++ b/bindings/ergo-lib-wasm/LICENSE @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/bindings/ergo-lib-wasm/package.json b/bindings/ergo-lib-wasm/package.json index bfb94f2e8..77903850f 100644 --- a/bindings/ergo-lib-wasm/package.json +++ b/bindings/ergo-lib-wasm/package.json @@ -3,7 +3,11 @@ "build": "webpack", "serve": "wasm-pack build --target browser && webpack-dev-server", "test": "wasm-pack build --target nodejs && mocha --require @babel/register --require @babel/polyfill 'tests/test*.js'", - "doc": "jsdoc -c jsdoc.json pkg/ergo_wallet_wasm.js README.md -d docs" + "doc": "jsdoc -c jsdoc.json pkg/ergo_wallet_wasm.js README.md -d docs", + "build-nodejs": "rm -rf ./pkg && wasm-pack build --target nodejs", + "build-browser": "rm -rf ./pkg && wasm-pack build --target browser --release", + "publish-nodejs": "npm run build-nodejs && node ./scripts/publish_helper -nodejs && cd pkg && npm publish", + "publish-browser": "npm run build-browser && node ./scripts/publish_helper -browser && cd pkg && npm publish" }, "devDependencies": { "@babel/core": "^7.6.4", diff --git a/bindings/ergo-lib-wasm/scripts/publish_helper.js b/bindings/ergo-lib-wasm/scripts/publish_helper.js new file mode 100644 index 000000000..c26fdccba --- /dev/null +++ b/bindings/ergo-lib-wasm/scripts/publish_helper.js @@ -0,0 +1,19 @@ +const fs = require('fs'); +const oldPkg = require('../pkg/package.json'); + +// based on https://raw.githubusercontent.com/Emurgo/cardano-serialization-lib/master/scripts/publish-helper.js + +if (oldPkg.name === 'ergo-lib-wasm') { + oldPkg.name = oldPkg.name + process.argv.slice(2)[0]; +} + +if (process.argv.slice(2)[0] === '-browser') { + // due to a bug in wasm-pack, this file is missing from browser builds + const missingFile = 'ergo_lib_wasm_bg.js'; + if (oldPkg.files.find(entry => entry === missingFile) == null) { + oldPkg.files.push(missingFile); + } +} + +console.log(oldPkg); +fs.writeFileSync('./pkg/package.json', JSON.stringify(oldPkg, null, 2));