From 6cbaa15aadac851fcc3b67b2817095804fe016e9 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 11 Mar 2022 14:15:14 -0800 Subject: [PATCH 1/7] Migrated FFI to ES modules via 'lebab' --- src/Effect/Exception.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Effect/Exception.js b/src/Effect/Exception.js index a5aa8c4..49b0431 100644 --- a/src/Effect/Exception.js +++ b/src/Effect/Exception.js @@ -1,36 +1,36 @@ "use strict"; -exports.showErrorImpl = function (err) { +export function showErrorImpl(err) { return err.stack || err.toString(); -}; +} -exports.error = function (msg) { +export function error(msg) { return new Error(msg); -}; +} -exports.message = function (e) { +export function message(e) { return e.message; -}; +} -exports.name = function (e) { +export function name(e) { return e.name || "Error"; -}; +} -exports.stackImpl = function (just) { +export function stackImpl(just) { return function (nothing) { return function (e) { return e.stack ? just(e.stack) : nothing; }; }; -}; +} -exports.throwException = function (e) { +export function throwException(e) { return function () { throw e; }; -}; +} -exports.catchException = function (c) { +export function catchException(c) { return function (t) { return function () { try { @@ -44,4 +44,4 @@ exports.catchException = function (c) { } }; }; -}; +} From a3e8fafb2d9c97e2badf4af7269dae851c7accad Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 11 Mar 2022 14:15:14 -0800 Subject: [PATCH 2/7] Removed '"use strict";' in FFI files --- src/Effect/Exception.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Effect/Exception.js b/src/Effect/Exception.js index 49b0431..40c0eee 100644 --- a/src/Effect/Exception.js +++ b/src/Effect/Exception.js @@ -1,5 +1,3 @@ -"use strict"; - export function showErrorImpl(err) { return err.stack || err.toString(); } From f98e95fe67add5e2f7adfd5e48059bd51d355182 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 11 Mar 2022 14:15:14 -0800 Subject: [PATCH 3/7] Update to CI to use 'unstable' purescript --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43d2897..b6ebf3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,8 @@ jobs: - uses: actions/checkout@v2 - uses: purescript-contrib/setup-purescript@main + with: + purescript: "unstable" - uses: actions/setup-node@v1 with: From 1c5c262328cba5661598c5d68228abe682be5940 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 11 Mar 2022 14:15:14 -0800 Subject: [PATCH 4/7] Update pulp to 16.0.0-0 and psa to 0.8.2 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1c67b54..4ea39f9 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ }, "devDependencies": { "eslint": "^7.15.0", - "pulp": "^15.0.0", - "purescript-psa": "^0.8.0", + "pulp": "16.0.0-0", + "purescript-psa": "^0.8.2", "rimraf": "^3.0.2" } } From 0cc918d60615daabb6a5c7679310829c628b2a22 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 11 Mar 2022 14:59:20 -0800 Subject: [PATCH 5/7] Update Bower dependencies to master --- bower.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index f9e0321..a3e7994 100644 --- a/bower.json +++ b/bower.json @@ -16,9 +16,9 @@ "package.json" ], "dependencies": { - "purescript-effect": "^3.0.0", - "purescript-either": "^5.0.0", - "purescript-maybe": "^5.0.0", - "purescript-prelude": "^5.0.0" + "purescript-effect": "master", + "purescript-either": "master", + "purescript-maybe": "master", + "purescript-prelude": "master" } } From 40c0cfef21b7e7fec942bd9acdab3702f20b0f9e Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 14 Mar 2022 12:09:18 -0700 Subject: [PATCH 6/7] Update .eslintrc.json to ES6 --- .eslintrc.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 84cef4f..1c6afb9 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,11 +1,9 @@ { "parserOptions": { - "ecmaVersion": 5 + "ecmaVersion": 6, + "sourceType": "module" }, "extends": "eslint:recommended", - "env": { - "commonjs": true - }, "rules": { "strict": [2, "global"], "block-scoped-var": 2, From 8c09a6dd3b9876a92859d9fb637a6b319a917386 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 14 Mar 2022 12:10:15 -0700 Subject: [PATCH 7/7] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e2fbd2..92480b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Notable changes to this project are documented in this file. The format is based ## [Unreleased] Breaking changes: +- Migrate FFI to ES modules (#41 by @JordanMartinez) New features: