Skip to content

Update to v0.15.0 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 22, 2022
Merged

Update to v0.15.0 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
80cf3e8
Migrated FFI to ES modules via 'lebab'
JordanMartinez Mar 22, 2022
7d71f6b
Removed '"use strict";' in FFI files
JordanMartinez Mar 22, 2022
c8a6783
Update to CI to use 'unstable' purescript
JordanMartinez Mar 22, 2022
05d0d2c
Add CI test: verify 'bower.json' file works via pulp
JordanMartinez Mar 22, 2022
f8fc362
Ignore spago-based tests (temporarily)
JordanMartinez Mar 22, 2022
b6b5f74
Update Bower dependencies to master or main
JordanMartinez Mar 22, 2022
8f80627
Update packages.dhall to 'prepare-0.15' package set
JordanMartinez Mar 22, 2022
ac19958
Removed unneeded 'psci-support' package
JordanMartinez Mar 22, 2022
7d29f59
Update .eslintrc.json to ES6
JordanMartinez Mar 22, 2022
53cc83d
Fix exporting of null
JordanMartinez Mar 22, 2022
21b1e1b
Added changelog entry
JordanMartinez Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"env": { "browser": true, "commonjs": true },
"env": { "browser": true },
"extends": "eslint:recommended",
"parserOptions": { "ecmaVersion": 5 },
"parserOptions": { "ecmaVersion": 6, "sourceType": "module" },
"rules": {
"block-scoped-var": "error",
"consistent-return": "error",
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- name: Set up PureScript toolchain
uses: purescript-contrib/setup-purescript@main
with:
purescript: "unstable"
purs-tidy: "latest"

- name: Cache PureScript dependencies
Expand Down Expand Up @@ -49,8 +50,17 @@ jobs:
- name: Build the project
run: npm run build

- name: Run tests
run: npm run test
# - name: Run tests
# run: npm run test

- name: Check formatting
run: purs-tidy check src test

- name: Verify Bower & Pulp
run: |
npm install bower pulp@16.0.0-0
npx bower install
npx pulp build -- --censor-lib --strict
if [ -d "test" ]; then
npx pulp test
fi
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Notable changes to this project are documented in this file. The format is based
## [Unreleased]

Breaking changes:
- Migrate FFI to ES modules (#44 by @JordanMartinez)

New features:

Expand Down
10 changes: 5 additions & 5 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"package.json"
],
"dependencies": {
"purescript-effect": "^3.0.0",
"purescript-functions": "^5.0.0",
"purescript-maybe": "^5.0.0",
"purescript-prelude": "^5.0.0"
"purescript-effect": "master",
"purescript-functions": "master",
"purescript-maybe": "master",
"purescript-prelude": "master"
},
"devDependencies": {
"purescript-assert": "^5.0.0"
"purescript-assert": "master"
}
}
2 changes: 1 addition & 1 deletion packages.dhall
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let upstream =
https://github.com/purescript/package-sets/releases/download/psc-0.14.3-20210722/packages.dhall sha256:1ceb43aa59436bf5601bac45f6f3781c4e1f0e4c2b8458105b018e5ed8c30f8c
https://raw.githubusercontent.com/purescript/package-sets/prepare-0.15/src/packages.dhall

in upstream
1 change: 0 additions & 1 deletion spago.dhall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
, "functions"
, "maybe"
, "prelude"
, "psci-support"
]
, packages = ./packages.dhall
, sources = [ "src/**/*.purs", "test/**/*.purs" ]
Expand Down
13 changes: 6 additions & 7 deletions src/Data/Nullable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
/* eslint-disable no-eq-null, eqeqeq */

"use strict";
const nullImpl = null;
export { nullImpl as null };
Comment on lines +3 to +4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be:

Suggested change
const nullImpl = null;
export { nullImpl as null };
export const nullImpl = null;

or is the workaround necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, null is exported as is in PureScript:

module Nullable (null) where

foreign import null :: forall a. Nullable a

So, if I changed it to export const nullImpl = null;, then the PureScript code needs to be changed, too:

module Nullable (null) where

null :: forall a. Nullable a
null = nullImpl

foreign import nullImpl :: forall a. Nullable a

So, the change I've made is the lesser diff.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course; I see. Thanks!


exports["null"] = null;

exports.nullable = function (a, r, f) {
export function nullable(a, r, f) {
return a == null ? r : f(a);
};
}

exports.notNull = function (x) {
export function notNull(x) {
return x;
};
}