Skip to content

Commit 62f401e

Browse files
authored
Update to PureScript v0.15.0 (#11)
* Add support for es modules * Replaced 'export var' with 'export const' * Removed '"use strict";' in FFI files * Update to CI to use 'unstable' purescript * Update Bower dependencies to master or main * Update pulp to 16.0.0-0 * Update psa to 0.8.2 * Update Bower dependencies to master or main * Update eslintrc * Update ci.yml to v2 * Update changelog
1 parent e25a2c5 commit 62f401e

File tree

8 files changed

+92
-97
lines changed

8 files changed

+92
-97
lines changed

.eslintrc.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"parserOptions": {
3-
"ecmaVersion": 5
3+
"ecmaVersion": 6,
4+
"sourceType": "module"
45
},
56
"extends": "eslint:recommended",
67
"env": {
7-
"commonjs": true
8+
"node": true
89
},
910
"rules": {
1011
"strict": [2, "global"],

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ jobs:
1313
- uses: actions/checkout@v2
1414

1515
- uses: purescript-contrib/setup-purescript@main
16+
with:
17+
purescript: "unstable"
1618

17-
- uses: actions/setup-node@v1
19+
- uses: actions/setup-node@v2
1820
with:
19-
node-version: "10"
21+
node-version: "14"
2022

2123
- name: Install dependencies
2224
run: |

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Notable changes to this project are documented in this file. The format is based
55
## [Unreleased]
66

77
Breaking changes:
8+
- Update project and deps to PureScript v0.15.0 (#11 by @JordanMartinez, @thomashoneyman, @sigma-andex)
89

910
New features:
1011

bower.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
"output"
1313
],
1414
"dependencies": {
15-
"purescript-effect": "^3.0.0",
16-
"purescript-either": "^5.0.0",
17-
"purescript-exceptions": "^5.0.0",
18-
"purescript-foreign": "^6.0.0",
19-
"purescript-maybe": "^5.0.0",
20-
"purescript-node-buffer": "^7.0.0",
21-
"purescript-node-fs": "^6.0.0",
22-
"purescript-nullable": "^5.0.0",
23-
"purescript-options": "^6.0.0",
24-
"purescript-prelude": "^5.0.0",
25-
"purescript-transformers": "^5.0.0"
15+
"purescript-effect": "master",
16+
"purescript-either": "master",
17+
"purescript-exceptions": "master",
18+
"purescript-foreign": "master",
19+
"purescript-maybe": "master",
20+
"purescript-node-buffer": "master",
21+
"purescript-node-fs": "master",
22+
"purescript-nullable": "main",
23+
"purescript-options": "main",
24+
"purescript-prelude": "master",
25+
"purescript-transformers": "master"
2626
},
2727
"devDependencies": {
28-
"purescript-console": "^5.0.0"
28+
"purescript-console": "master"
2929
}
3030
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
},
88
"devDependencies": {
99
"eslint": "^7.15.0",
10-
"pulp": "^15.0.0",
11-
"purescript-psa": "^0.8.0",
10+
"pulp": "16.0.0-0",
11+
"purescript-psa": "^0.8.2",
1212
"rimraf": "^3.0.2"
1313
}
1414
}

src/Node/Net.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
"use strict";
2-
3-
var net = require("net");
4-
5-
exports.isIP = net.isIP;
6-
7-
exports.isIPv4 = net.isIPv4;
8-
9-
exports.isIPv6 = net.isIPv6;
1+
import net from "net";
2+
export const isIP = net.isIP;
3+
export const isIPv4 = net.isIPv4;
4+
export const isIPv6 = net.isIPv6;

src/Node/Net/Server.js

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
1-
"use strict";
1+
import net from "net";
22

3-
var net = require("net");
4-
5-
exports.addressImpl = function (server) {
3+
export function addressImpl(server) {
64
return server.address();
7-
};
5+
}
86

9-
exports.closeImpl = function (server, callback) {
7+
export function closeImpl(server, callback) {
108
server.close(callback);
11-
};
9+
}
1210

13-
exports.createServerImpl = net.createServer;
11+
export const createServerImpl = net.createServer;
1412

15-
exports.getConnectionsImpl = function (server, callback) {
13+
export function getConnectionsImpl(server, callback) {
1614
server.getConnections(callback);
17-
};
15+
}
1816

19-
exports.listenImpl = function (server, options, callback) {
17+
export function listenImpl(server, options, callback) {
2018
server.listen(options, callback);
21-
};
19+
}
2220

23-
exports.listeningImpl = function (socket) {
21+
export function listeningImpl(socket) {
2422
return socket.listening;
25-
};
23+
}
2624

27-
exports.onImpl = function (event, server, callback) {
25+
export function onImpl(event, server, callback) {
2826
server.on(event, callback);
29-
};
27+
}

src/Node/Net/Socket.js

Lines changed: 52 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,109 @@
1-
"use strict";
1+
import net from "net";
22

3-
var net = require("net");
4-
5-
exports.bufferSizeImpl = function (socket) {
3+
export function bufferSizeImpl(socket) {
64
return socket.bufferSize;
7-
};
5+
}
86

9-
exports.bytesReadImpl = function (socket) {
7+
export function bytesReadImpl(socket) {
108
return socket.bytesRead;
11-
};
9+
}
1210

13-
exports.bytesWrittenImpl = function (socket) {
11+
export function bytesWrittenImpl(socket) {
1412
return socket.bytesWritten;
15-
};
13+
}
1614

17-
exports.connectImpl = function (socket, options, callback) {
15+
export function connectImpl(socket, options, callback) {
1816
socket.connect(options, callback);
19-
};
17+
}
2018

21-
exports.connectingImpl = function (socket) {
19+
export function connectingImpl(socket) {
2220
return socket.connecting;
23-
};
21+
}
2422

25-
exports.createConnectionImpl = net.createConnection;
23+
export const createConnectionImpl = net.createConnection;
2624

27-
exports.destroyImpl = function (socket, err) {
25+
export function destroyImpl(socket, err) {
2826
socket.destroy(err);
29-
};
27+
}
3028

31-
exports.destroyedImpl = function (socket) {
29+
export function destroyedImpl(socket) {
3230
return socket.destroyed;
33-
};
31+
}
3432

35-
exports.endImpl = function (socket, buffer, callback) {
33+
export function endImpl(socket, buffer, callback) {
3634
socket.end(buffer, null, callback);
37-
};
35+
}
3836

39-
exports.endStringImpl = function (socket, str, encoding, callback) {
37+
export function endStringImpl(socket, str, encoding, callback) {
4038
socket.end(str, encoding, callback);
41-
};
39+
}
4240

43-
exports.localAddressImpl = function (socket) {
41+
export function localAddressImpl(socket) {
4442
return socket.localAddress;
45-
};
43+
}
4644

47-
exports.localPortImpl = function (socket) {
45+
export function localPortImpl(socket) {
4846
return socket.localPort;
49-
};
47+
}
5048

51-
exports.onDataImpl = function (socket, callbackBuffer, callbackString) {
49+
export function onDataImpl(socket, callbackBuffer, callbackString) {
5250
socket.on("data", function (data) {
5351
if (typeof data === "string") {
5452
callbackString(data);
5553
} else {
5654
callbackBuffer(data);
5755
}
5856
});
59-
};
57+
}
6058

61-
exports.onImpl = function (event, socket, callback) {
59+
export function onImpl(event, socket, callback) {
6260
socket.on(event, callback);
63-
};
61+
}
6462

65-
exports.pauseImpl = function (socket) {
63+
export function pauseImpl(socket) {
6664
socket.pause();
67-
};
65+
}
6866

69-
exports.pendingImpl = function (socket) {
67+
export function pendingImpl(socket) {
7068
return socket.pending;
71-
};
69+
}
7270

73-
exports.remoteAddressImpl = function (socket) {
71+
export function remoteAddressImpl(socket) {
7472
return socket.remoteAddress;
75-
};
73+
}
7674

77-
exports.remoteFamilyImpl = function (socket) {
75+
export function remoteFamilyImpl(socket) {
7876
return socket.remoteFamily;
79-
};
77+
}
8078

81-
exports.remotePortImpl = function (socket) {
79+
export function remotePortImpl(socket) {
8280
return socket.remotePort;
83-
};
81+
}
8482

85-
exports.resumeImpl = function (socket) {
83+
export function resumeImpl(socket) {
8684
socket.resume();
87-
};
85+
}
8886

89-
exports.setEncodingImpl = function (socket, encoding) {
87+
export function setEncodingImpl(socket, encoding) {
9088
socket.setEncoding(encoding);
91-
};
89+
}
9290

93-
exports.setKeepAliveImpl = function (socket, enable, initialDelay) {
91+
export function setKeepAliveImpl(socket, enable, initialDelay) {
9492
socket.setKeepAlive(enable, initialDelay);
95-
};
93+
}
9694

97-
exports.setNoDelayImpl = function (socket, noDelay) {
95+
export function setNoDelayImpl(socket, noDelay) {
9896
socket.setNoDelay(noDelay);
99-
};
97+
}
10098

101-
exports.setTimeoutImpl = function (socket, timeout, callback) {
99+
export function setTimeoutImpl(socket, timeout, callback) {
102100
socket.setTimeout(timeout, callback);
103-
};
101+
}
104102

105-
exports.writeImpl = function (socket, buffer, callback) {
103+
export function writeImpl(socket, buffer, callback) {
106104
return socket.write(buffer, null, callback);
107-
};
105+
}
108106

109-
exports.writeStringImpl = function (socket, str, encoding, callback) {
107+
export function writeStringImpl(socket, str, encoding, callback) {
110108
return socket.write(str, encoding, callback);
111-
};
109+
}

0 commit comments

Comments
 (0)