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, diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 063845e..06ed895 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,12 @@ jobs: - uses: actions/checkout@v2 - uses: purescript-contrib/setup-purescript@main + with: + purescript: "unstable" - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v2 with: - node-version: "10" + node-version: "14" - name: Install dependencies run: | 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: 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" } } 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" } } diff --git a/src/Node/Path.js b/src/Node/Path.js index dfbc453..908c0d9 100644 --- a/src/Node/Path.js +++ b/src/Node/Path.js @@ -1,45 +1,30 @@ -"use strict"; +import path from "path"; +export const normalize = path.normalize; -var path = require("path"); - -exports.normalize = path.normalize; - -exports.concat = function (segments) { +export function concat(segments) { return path.join.apply(this, segments); -}; +} -exports.resolve = function (from) { - return function (to) { - return function () { - return path.resolve.apply(this, from.concat([to])); - }; - }; -}; +export function resolve(from) { + return to => () => path.resolve.apply(this, from.concat([to])); +} -exports.relative = function (from) { - return function (to) { - return path.relative(from, to); - }; -}; +export function relative(from) { + return to => path.relative(from, to); +} -exports.dirname = function (p) { +export function dirname(p) { return path.normalize(path.dirname(p)); -}; - -exports.basename = path.basename; - -exports.basenameWithoutExt = function (p) { - return function (ext) { - return path.basename(p, ext); - }; -}; - -exports.extname = path.extname; - -exports.sep = path.sep; +} -exports.delimiter = path.delimiter; +export const basename = path.basename; -exports.parse = path.parse; +export function basenameWithoutExt(p) { + return ext => path.basename(p, ext); +} -exports.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;