Skip to content

Commit bde12d6

Browse files
Update to PureScript v0.15.0 (#44)
1 parent 2753609 commit bde12d6

File tree

7 files changed

+27
-18
lines changed

7 files changed

+27
-18
lines changed

.eslintrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"env": { "browser": true, "commonjs": true },
2+
"env": { "browser": true },
33
"extends": "eslint:recommended",
4-
"parserOptions": { "ecmaVersion": 5 },
4+
"parserOptions": { "ecmaVersion": 6, "sourceType": "module" },
55
"rules": {
66
"block-scoped-var": "error",
77
"consistent-return": "error",

.github/workflows/ci.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
- name: Set up PureScript toolchain
1717
uses: purescript-contrib/setup-purescript@main
1818
with:
19+
purescript: "unstable"
1920
purs-tidy: "latest"
2021

2122
- name: Cache PureScript dependencies
@@ -49,8 +50,17 @@ jobs:
4950
- name: Build the project
5051
run: npm run build
5152

52-
- name: Run tests
53-
run: npm run test
53+
# - name: Run tests
54+
# run: npm run test
5455

5556
- name: Check formatting
5657
run: purs-tidy check src test
58+
59+
- name: Verify Bower & Pulp
60+
run: |
61+
npm install bower pulp@16.0.0-0
62+
npx bower install
63+
npx pulp build -- --censor-lib --strict
64+
if [ -d "test" ]; then
65+
npx pulp test
66+
fi

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+
- Migrate FFI to ES modules (#44 by @JordanMartinez)
89

910
New features:
1011

bower.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
"package.json"
1919
],
2020
"dependencies": {
21-
"purescript-effect": "^3.0.0",
22-
"purescript-functions": "^5.0.0",
23-
"purescript-maybe": "^5.0.0",
24-
"purescript-prelude": "^5.0.0"
21+
"purescript-effect": "master",
22+
"purescript-functions": "master",
23+
"purescript-maybe": "master",
24+
"purescript-prelude": "master"
2525
},
2626
"devDependencies": {
27-
"purescript-assert": "^5.0.0"
27+
"purescript-assert": "master"
2828
}
2929
}

packages.dhall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
let upstream =
2-
https://github.com/purescript/package-sets/releases/download/psc-0.14.3-20210722/packages.dhall sha256:1ceb43aa59436bf5601bac45f6f3781c4e1f0e4c2b8458105b018e5ed8c30f8c
2+
https://raw.githubusercontent.com/purescript/package-sets/prepare-0.15/src/packages.dhall
33

44
in upstream

spago.dhall

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
, "functions"
66
, "maybe"
77
, "prelude"
8-
, "psci-support"
98
]
109
, packages = ./packages.dhall
1110
, sources = [ "src/**/*.purs", "test/**/*.purs" ]

src/Data/Nullable.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
/* eslint-disable no-eq-null, eqeqeq */
22

3-
"use strict";
3+
const nullImpl = null;
4+
export { nullImpl as null };
45

5-
exports["null"] = null;
6-
7-
exports.nullable = function (a, r, f) {
6+
export function nullable(a, r, f) {
87
return a == null ? r : f(a);
9-
};
8+
}
109

11-
exports.notNull = function (x) {
10+
export function notNull(x) {
1211
return x;
13-
};
12+
}

0 commit comments

Comments
 (0)