diff --git a/.eslintrc.json b/.eslintrc.json index 84cef4f..7b219e5 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,10 +1,11 @@ { "parserOptions": { - "ecmaVersion": 5 + "ecmaVersion": 6, + "sourceType": "module" }, "extends": "eslint:recommended", "env": { - "commonjs": true + "node": true }, "rules": { "strict": [2, "global"], 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 59608a7..6f7a526 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 (#11 by @JordanMartinez, @thomashoneyman, @sigma-andex) New features: diff --git a/bower.json b/bower.json index b05283d..5ef22bb 100644 --- a/bower.json +++ b/bower.json @@ -12,19 +12,19 @@ "output" ], "dependencies": { - "purescript-effect": "^3.0.0", - "purescript-either": "^5.0.0", - "purescript-exceptions": "^5.0.0", - "purescript-foreign": "^6.0.0", - "purescript-maybe": "^5.0.0", - "purescript-node-buffer": "^7.0.0", - "purescript-node-fs": "^6.0.0", - "purescript-nullable": "^5.0.0", - "purescript-options": "^6.0.0", - "purescript-prelude": "^5.0.0", - "purescript-transformers": "^5.0.0" + "purescript-effect": "master", + "purescript-either": "master", + "purescript-exceptions": "master", + "purescript-foreign": "master", + "purescript-maybe": "master", + "purescript-node-buffer": "master", + "purescript-node-fs": "master", + "purescript-nullable": "main", + "purescript-options": "main", + "purescript-prelude": "master", + "purescript-transformers": "master" }, "devDependencies": { - "purescript-console": "^5.0.0" + "purescript-console": "master" } } diff --git a/package.json b/package.json index 63f9f51..c08ce8f 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/Net.js b/src/Node/Net.js index 56d964d..867534b 100644 --- a/src/Node/Net.js +++ b/src/Node/Net.js @@ -1,9 +1,4 @@ -"use strict"; - -var net = require("net"); - -exports.isIP = net.isIP; - -exports.isIPv4 = net.isIPv4; - -exports.isIPv6 = net.isIPv6; +import net from "net"; +export const isIP = net.isIP; +export const isIPv4 = net.isIPv4; +export const isIPv6 = net.isIPv6; diff --git a/src/Node/Net/Server.js b/src/Node/Net/Server.js index 8357db1..69e6f7e 100644 --- a/src/Node/Net/Server.js +++ b/src/Node/Net/Server.js @@ -1,29 +1,27 @@ -"use strict"; +import net from "net"; -var net = require("net"); - -exports.addressImpl = function (server) { +export function addressImpl(server) { return server.address(); -}; +} -exports.closeImpl = function (server, callback) { +export function closeImpl(server, callback) { server.close(callback); -}; +} -exports.createServerImpl = net.createServer; +export const createServerImpl = net.createServer; -exports.getConnectionsImpl = function (server, callback) { +export function getConnectionsImpl(server, callback) { server.getConnections(callback); -}; +} -exports.listenImpl = function (server, options, callback) { +export function listenImpl(server, options, callback) { server.listen(options, callback); -}; +} -exports.listeningImpl = function (socket) { +export function listeningImpl(socket) { return socket.listening; -}; +} -exports.onImpl = function (event, server, callback) { +export function onImpl(event, server, callback) { server.on(event, callback); -}; +} diff --git a/src/Node/Net/Socket.js b/src/Node/Net/Socket.js index 6f16f29..a35fa7c 100644 --- a/src/Node/Net/Socket.js +++ b/src/Node/Net/Socket.js @@ -1,54 +1,52 @@ -"use strict"; +import net from "net"; -var net = require("net"); - -exports.bufferSizeImpl = function (socket) { +export function bufferSizeImpl(socket) { return socket.bufferSize; -}; +} -exports.bytesReadImpl = function (socket) { +export function bytesReadImpl(socket) { return socket.bytesRead; -}; +} -exports.bytesWrittenImpl = function (socket) { +export function bytesWrittenImpl(socket) { return socket.bytesWritten; -}; +} -exports.connectImpl = function (socket, options, callback) { +export function connectImpl(socket, options, callback) { socket.connect(options, callback); -}; +} -exports.connectingImpl = function (socket) { +export function connectingImpl(socket) { return socket.connecting; -}; +} -exports.createConnectionImpl = net.createConnection; +export const createConnectionImpl = net.createConnection; -exports.destroyImpl = function (socket, err) { +export function destroyImpl(socket, err) { socket.destroy(err); -}; +} -exports.destroyedImpl = function (socket) { +export function destroyedImpl(socket) { return socket.destroyed; -}; +} -exports.endImpl = function (socket, buffer, callback) { +export function endImpl(socket, buffer, callback) { socket.end(buffer, null, callback); -}; +} -exports.endStringImpl = function (socket, str, encoding, callback) { +export function endStringImpl(socket, str, encoding, callback) { socket.end(str, encoding, callback); -}; +} -exports.localAddressImpl = function (socket) { +export function localAddressImpl(socket) { return socket.localAddress; -}; +} -exports.localPortImpl = function (socket) { +export function localPortImpl(socket) { return socket.localPort; -}; +} -exports.onDataImpl = function (socket, callbackBuffer, callbackString) { +export function onDataImpl(socket, callbackBuffer, callbackString) { socket.on("data", function (data) { if (typeof data === "string") { callbackString(data); @@ -56,56 +54,56 @@ exports.onDataImpl = function (socket, callbackBuffer, callbackString) { callbackBuffer(data); } }); -}; +} -exports.onImpl = function (event, socket, callback) { +export function onImpl(event, socket, callback) { socket.on(event, callback); -}; +} -exports.pauseImpl = function (socket) { +export function pauseImpl(socket) { socket.pause(); -}; +} -exports.pendingImpl = function (socket) { +export function pendingImpl(socket) { return socket.pending; -}; +} -exports.remoteAddressImpl = function (socket) { +export function remoteAddressImpl(socket) { return socket.remoteAddress; -}; +} -exports.remoteFamilyImpl = function (socket) { +export function remoteFamilyImpl(socket) { return socket.remoteFamily; -}; +} -exports.remotePortImpl = function (socket) { +export function remotePortImpl(socket) { return socket.remotePort; -}; +} -exports.resumeImpl = function (socket) { +export function resumeImpl(socket) { socket.resume(); -}; +} -exports.setEncodingImpl = function (socket, encoding) { +export function setEncodingImpl(socket, encoding) { socket.setEncoding(encoding); -}; +} -exports.setKeepAliveImpl = function (socket, enable, initialDelay) { +export function setKeepAliveImpl(socket, enable, initialDelay) { socket.setKeepAlive(enable, initialDelay); -}; +} -exports.setNoDelayImpl = function (socket, noDelay) { +export function setNoDelayImpl(socket, noDelay) { socket.setNoDelay(noDelay); -}; +} -exports.setTimeoutImpl = function (socket, timeout, callback) { +export function setTimeoutImpl(socket, timeout, callback) { socket.setTimeout(timeout, callback); -}; +} -exports.writeImpl = function (socket, buffer, callback) { +export function writeImpl(socket, buffer, callback) { return socket.write(buffer, null, callback); -}; +} -exports.writeStringImpl = function (socket, str, encoding, callback) { +export function writeStringImpl(socket, str, encoding, callback) { return socket.write(str, encoding, callback); -}; +}