From de9b313b651f97795f221d2f978182bd77b0fb11 Mon Sep 17 00:00:00 2001 From: F Date: Fri, 26 Nov 2021 15:53:58 +1100 Subject: [PATCH 1/2] Use es6/es2015 target for ESM output es5 does not support class constructors and hence lead to issues. --- CHANGELOG.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44d9d30377..b93bbf2a64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- `TypeError` issue related to constructors using js-waku in a JS project + ([#323](https://github.com/status-im/js-waku/issues/323)). + ## [0.14.1] - 2021-10-22 ### Fixed diff --git a/package.json b/package.json index fc2f667d76..69c677c598 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "build": "run-s build:**", "build:main": "tsc -p tsconfig.json", "build:dev": "tsc -p tsconfig.dev.json", - "build:esm": "tsc --module es2015 --target es5 --outDir build/esm", + "build:esm": "tsc --module es2015 --target es2015 --outDir build/esm", "build:umd": "webpack --config webpack.config.js", "build:umd:min": "webpack --config webpack.config.min.js", "build:umd:bundle": "webpack --config webpack.config.bundle.js", From 8909164f6d81d722195cfa6c0a78d62793a9de75 Mon Sep 17 00:00:00 2001 From: F Date: Fri, 26 Nov 2021 15:54:54 +1100 Subject: [PATCH 2/2] Use ESM in JavaScript examples As it is what JS projects would use when using the js-waku npm package. --- CHANGELOG.md | 4 ++++ examples/min-react-js-chat/package-lock.json | 11 +++++++---- examples/min-react-js-chat/package.json | 2 +- examples/store-reactjs-chat/package-lock.json | 11 +++++++---- examples/store-reactjs-chat/package.json | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b93bbf2a64..4e82d1f0ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Examples: JS examples uses local ESM folder to replicate behaviour of js-waku publish package. + ### Fixed - `TypeError` issue related to constructors using js-waku in a JS project diff --git a/examples/min-react-js-chat/package-lock.json b/examples/min-react-js-chat/package-lock.json index 5aacd78ae0..bba7a81807 100644 --- a/examples/min-react-js-chat/package-lock.json +++ b/examples/min-react-js-chat/package-lock.json @@ -11,7 +11,7 @@ "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", - "js-waku": "../../build/main", + "js-waku": "../../build/esm", "protons": "^2.0.1", "react": "^17.0.2", "react-dom": "^17.0.2", @@ -19,7 +19,10 @@ "web-vitals": "^1.0.1" } }, - "../../build/main": {}, + "../../build/esm": {}, + "../../build/main": { + "extraneous": true + }, "node_modules/@babel/code-frame": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", @@ -12157,7 +12160,7 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/js-waku": { - "resolved": "../../build/main", + "resolved": "../../build/esm", "link": true }, "node_modules/js-yaml": { @@ -30850,7 +30853,7 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "js-waku": { - "version": "file:../../build/main" + "version": "file:../../build/esm" }, "js-yaml": { "version": "3.14.1", diff --git a/examples/min-react-js-chat/package.json b/examples/min-react-js-chat/package.json index 26cb12d87b..6000399b7f 100644 --- a/examples/min-react-js-chat/package.json +++ b/examples/min-react-js-chat/package.json @@ -6,7 +6,7 @@ "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", - "js-waku": "../../build/main", + "js-waku": "../../build/esm", "protons": "^2.0.1", "react": "^17.0.2", "react-dom": "^17.0.2", diff --git a/examples/store-reactjs-chat/package-lock.json b/examples/store-reactjs-chat/package-lock.json index 42c61d2ef2..f3900e0268 100644 --- a/examples/store-reactjs-chat/package-lock.json +++ b/examples/store-reactjs-chat/package-lock.json @@ -11,7 +11,7 @@ "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^11.2.7", "@testing-library/user-event": "^12.8.3", - "js-waku": "../../build/main", + "js-waku": "../../build/esm", "protons": "^2.0.1", "react": "^17.0.2", "react-dom": "^17.0.2", @@ -19,7 +19,10 @@ "web-vitals": "^1.1.2" } }, - "../../build/main": {}, + "../../build/esm": {}, + "../../build/main": { + "extraneous": true + }, "node_modules/@babel/code-frame": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", @@ -12158,7 +12161,7 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/js-waku": { - "resolved": "../../build/main", + "resolved": "../../build/esm", "link": true }, "node_modules/js-yaml": { @@ -30857,7 +30860,7 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "js-waku": { - "version": "file:../../build/main" + "version": "file:../../build/esm" }, "js-yaml": { "version": "3.14.1", diff --git a/examples/store-reactjs-chat/package.json b/examples/store-reactjs-chat/package.json index 3283a720d9..323a636625 100644 --- a/examples/store-reactjs-chat/package.json +++ b/examples/store-reactjs-chat/package.json @@ -6,7 +6,7 @@ "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^11.2.7", "@testing-library/user-event": "^12.8.3", - "js-waku": "../../build/main", + "js-waku": "../../build/esm", "protons": "^2.0.1", "react": "^17.0.2", "react-dom": "^17.0.2",