From 1d0a60ca6c52bb65dabfc1b38e825b0e29505053 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 15:05:35 -0500 Subject: [PATCH 1/9] Migrated FFI to ES modules via 'lebab' --- src/Web/Storage/Event/StorageEvent.js | 20 ++++++++++---------- src/Web/Storage/Storage.js | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Web/Storage/Event/StorageEvent.js b/src/Web/Storage/Event/StorageEvent.js index fd2ccf1..517eec9 100644 --- a/src/Web/Storage/Event/StorageEvent.js +++ b/src/Web/Storage/Event/StorageEvent.js @@ -1,21 +1,21 @@ "use strict"; -exports._key = function (storage) { +export function _key(storage) { return storage.key; -}; +} -exports._oldValue = function (storage) { +export function _oldValue(storage) { return storage.oldValue; -}; +} -exports._newValue = function (storage) { +export function _newValue(storage) { return storage.newValue; -}; +} -exports.url = function (storage) { +export function url(storage) { return storage.url; -}; +} -exports._storageArea = function (storage) { +export function _storageArea(storage) { return storage.storageArea; -}; +} diff --git a/src/Web/Storage/Storage.js b/src/Web/Storage/Storage.js index 8d51753..72f5d2e 100644 --- a/src/Web/Storage/Storage.js +++ b/src/Web/Storage/Storage.js @@ -1,28 +1,28 @@ "use strict"; -exports.length = function (storage) { +export function length(storage) { return function () { return storage.length; }; -}; +} -exports._key = function (index) { +export function _key(index) { return function (storage) { return function () { return storage.key(index); }; }; -}; +} -exports._getItem = function (key) { +export function _getItem(key) { return function (storage) { return function () { return storage.getItem(key); }; }; -}; +} -exports.setItem = function (key) { +export function setItem(key) { return function (value) { return function (storage) { return function () { @@ -30,18 +30,18 @@ exports.setItem = function (key) { }; }; }; -}; +} -exports.removeItem = function (key) { +export function removeItem(key) { return function (storage) { return function () { storage.removeItem(key); }; }; -}; +} -exports.clear = function (storage) { +export function clear(storage) { return function () { storage.clear(); }; -}; +} From 257fd80c3755a5d4298aba315b97eeed8b826f2a Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 15:05:35 -0500 Subject: [PATCH 2/9] Removed '"use strict";' in FFI files --- src/Web/Storage/Event/StorageEvent.js | 2 -- src/Web/Storage/Storage.js | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/Web/Storage/Event/StorageEvent.js b/src/Web/Storage/Event/StorageEvent.js index 517eec9..91aea14 100644 --- a/src/Web/Storage/Event/StorageEvent.js +++ b/src/Web/Storage/Event/StorageEvent.js @@ -1,5 +1,3 @@ -"use strict"; - export function _key(storage) { return storage.key; } diff --git a/src/Web/Storage/Storage.js b/src/Web/Storage/Storage.js index 72f5d2e..16f9c3a 100644 --- a/src/Web/Storage/Storage.js +++ b/src/Web/Storage/Storage.js @@ -1,5 +1,3 @@ -"use strict"; - export function length(storage) { return function () { return storage.length; From fe42aa865628ba7e57006b29e69e7225559c32ef Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 15:05:35 -0500 Subject: [PATCH 3/9] 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 063845e..f5a96fe 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 32e02eed56104e570e1ce4a7b19df026554376cc Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 15:05:35 -0500 Subject: [PATCH 4/9] Update Bower dependencies to master or main --- bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index d959908..a4ac44f 100644 --- a/bower.json +++ b/bower.json @@ -15,7 +15,7 @@ "package.json" ], "dependencies": { - "purescript-nullable": "^5.0.0", - "purescript-web-events": "^3.0.0" + "purescript-nullable": "main", + "purescript-web-events": "master" } } From fc7813bf6da5d20ae2f59162a1968b3b109ef9fe Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 15:05:35 -0500 Subject: [PATCH 5/9] Update pulp to 16.0.0-0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c67b54..18136bd 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ }, "devDependencies": { "eslint": "^7.15.0", - "pulp": "^15.0.0", + "pulp": "16.0.0-0", "purescript-psa": "^0.8.0", "rimraf": "^3.0.2" } From ba3ab3735218c98442a7adcbf5446d3700e1a5c7 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 15:05:36 -0500 Subject: [PATCH 6/9] Update psa to 0.8.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 18136bd..4ea39f9 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "devDependencies": { "eslint": "^7.15.0", "pulp": "16.0.0-0", - "purescript-psa": "^0.8.0", + "purescript-psa": "^0.8.2", "rimraf": "^3.0.2" } } From 52503a57d0e35c2998491ae7636bee8f5bcc4d20 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 15:38:09 -0500 Subject: [PATCH 7/9] Update .eslintrc.json to ES6 --- .eslintrc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index cb9c786..3a97d05 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,10 +1,10 @@ { "parserOptions": { - "ecmaVersion": 5 + "ecmaVersion": 6, + "sourceType": "module" }, "extends": "eslint:recommended", "env": { - "commonjs": true, "browser": true }, "rules": { From 5b33151ea1fdf910a1c15b2fcf42d1b99a0ecbeb Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 15:39:03 -0500 Subject: [PATCH 8/9] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a37aff..482d00c 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 (#17 by @JordanMartinez) New features: From 2f7325d5b783d5ef108c053b9e6e153fea1e1c62 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 15:39:33 -0500 Subject: [PATCH 9/9] Update CI to use node 14 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5a96fe..06ed895 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,9 @@ jobs: with: purescript: "unstable" - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v2 with: - node-version: "10" + node-version: "14" - name: Install dependencies run: |