From b54c292437f6b61580cb0e5be0f672fd120cf936 Mon Sep 17 00:00:00 2001 From: Nicholas Wolverson Date: Sat, 12 Feb 2022 11:25:10 +0000 Subject: [PATCH 01/11] ESM conversion --- src/Node/Path.js | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/src/Node/Path.js b/src/Node/Path.js index dfbc453..836fd05 100644 --- a/src/Node/Path.js +++ b/src/Node/Path.js @@ -1,45 +1,40 @@ "use strict"; -var path = require("path"); +import path from "path"; +export var normalize = path.normalize; -exports.normalize = path.normalize; - -exports.concat = function (segments) { +export function concat(segments) { return path.join.apply(this, segments); -}; +} -exports.resolve = function (from) { +export function resolve(from) { return function (to) { return function () { return path.resolve.apply(this, from.concat([to])); }; }; -}; +} -exports.relative = function (from) { +export function relative(from) { return function (to) { return path.relative(from, to); }; -}; +} -exports.dirname = function (p) { +export function dirname(p) { return path.normalize(path.dirname(p)); -}; +} -exports.basename = path.basename; +export var basename = path.basename; -exports.basenameWithoutExt = function (p) { +export function basenameWithoutExt(p) { return function (ext) { return path.basename(p, ext); }; -}; - -exports.extname = path.extname; - -exports.sep = path.sep; - -exports.delimiter = path.delimiter; - -exports.parse = path.parse; +} -exports.isAbsolute = path.isAbsolute; +export var extname = path.extname; +export var sep = path.sep; +export var delimiter = path.delimiter; +export var parse = path.parse; +export var isAbsolute = path.isAbsolute; From fb8e9e78de9df739f7ff32d01c93ccd1e7f89a35 Mon Sep 17 00:00:00 2001 From: Nicholas Wolverson Date: Sat, 12 Feb 2022 11:26:54 +0000 Subject: [PATCH 02/11] Arrow/lest transformation --- src/Node/Path.js | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/src/Node/Path.js b/src/Node/Path.js index 836fd05..9da75de 100644 --- a/src/Node/Path.js +++ b/src/Node/Path.js @@ -1,40 +1,34 @@ "use strict"; import path from "path"; -export var normalize = path.normalize; +export const normalize = path.normalize; export function concat(segments) { return path.join.apply(this, segments); } export function resolve(from) { - return function (to) { - return function () { - return path.resolve.apply(this, from.concat([to])); - }; - }; + return to => (function() { + return path.resolve.apply(this, from.concat([to])); + }); } export function relative(from) { - return function (to) { - return path.relative(from, to); - }; + return to => path.relative(from, to); } export function dirname(p) { return path.normalize(path.dirname(p)); } -export var basename = path.basename; +export const basename = path.basename; export function basenameWithoutExt(p) { - return function (ext) { - return path.basename(p, ext); - }; + return ext => path.basename(p, ext); } -export var extname = path.extname; -export var sep = path.sep; -export var delimiter = path.delimiter; -export var parse = path.parse; -export var isAbsolute = path.isAbsolute; +export const extname = path.extname; +export const sep = path.sep; +export const delimiter = path.delimiter; +export const parse = path.parse; +export const isAbsolute = path.isAbsolute; From 2a328e78425739600a81044808460b8180932ab7 Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Sat, 19 Mar 2022 19:24:49 +0000 Subject: [PATCH 03/11] 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 7395a8c15405755c29c5847a15b5037cc1999084 Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Sat, 19 Mar 2022 19:24:50 +0000 Subject: [PATCH 04/11] Update Bower dependencies to master or main --- bower.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index b0f9b20..a77be7b 100644 --- a/bower.json +++ b/bower.json @@ -20,10 +20,10 @@ "package.json" ], "dependencies": { - "purescript-effect": "^3.0.0" + "purescript-effect": "master" }, "devDependencies": { - "purescript-assert": "^5.0.0", - "purescript-console": "^5.0.0" + "purescript-assert": "master", + "purescript-console": "master" } } From e4c0cf31c2612298ceef01193a79ff020f7b3b30 Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Sat, 19 Mar 2022 19:24:50 +0000 Subject: [PATCH 05/11] 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 fd4391e..a1d6811 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,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 ac88c5418848fa25d276f3f3f33cb54318fcd247 Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Tue, 22 Mar 2022 14:41:49 +0000 Subject: [PATCH 06/11] Removed '"use strict";' in FFI files --- src/Node/Path.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Node/Path.js b/src/Node/Path.js index 9da75de..a04f69f 100644 --- a/src/Node/Path.js +++ b/src/Node/Path.js @@ -1,5 +1,3 @@ -"use strict"; - import path from "path"; export const normalize = path.normalize; From 85306d47ecbc62bb85bd10c9032fa016a24c3260 Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Tue, 22 Mar 2022 14:41:49 +0000 Subject: [PATCH 07/11] 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 c78f987c0f45637efc07cbc8e7fa6dafc9bfea0e Mon Sep 17 00:00:00 2001 From: sigma-andex <77549848+sigma-andex@users.noreply.github.com> Date: Tue, 22 Mar 2022 15:05:05 +0000 Subject: [PATCH 08/11] Update .github/workflows/ci.yml Co-authored-by: Thomas Honeyman --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5a96fe..e861bb3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,9 @@ jobs: with: purescript: "unstable" - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v2 with: + node-version: "14" node-version: "10" - name: Install dependencies From 8cb285d08edffb5d5c4226bfb4bb60e989a47dc7 Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Tue, 22 Mar 2022 15:07:02 +0000 Subject: [PATCH 09/11] Fix duplicate entry in ci.yml --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e861bb3..06ed895 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,6 @@ jobs: - uses: actions/setup-node@v2 with: node-version: "14" - node-version: "10" - name: Install dependencies run: | From bf26149e458509da070287b2153f8ad82cb81a9c Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Tue, 22 Mar 2022 15:30:58 +0000 Subject: [PATCH 10/11] Fix resolve with arrow syntax --- src/Node/Path.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Node/Path.js b/src/Node/Path.js index a04f69f..908c0d9 100644 --- a/src/Node/Path.js +++ b/src/Node/Path.js @@ -6,9 +6,7 @@ export function concat(segments) { } export function resolve(from) { - return to => (function() { - return path.resolve.apply(this, from.concat([to])); - }); + return to => () => path.resolve.apply(this, from.concat([to])); } export function relative(from) { From cb10e1c9894507ea0e5a65fe4164c0ad6293436e Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Tue, 22 Mar 2022 15:40:06 +0000 Subject: [PATCH 11/11] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b82f69..b50ff55 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: +- Update project and deps to PureScript v0.15.0 (#22 by @nwolverson, @JordanMartinez, @sigma-andex) New features: