diff --git a/.eslintrc.json b/.eslintrc.json index d7cf0c8..839784c 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -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", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43f9f20..e16f413 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index ab4af48..678bfc4 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) New features: diff --git a/bower.json b/bower.json index e2656d0..5e881a8 100644 --- a/bower.json +++ b/bower.json @@ -14,11 +14,11 @@ "output" ], "dependencies": { - "purescript-functions": "^5.0.0", - "purescript-maybe": "^5.0.0" + "purescript-functions": "master", + "purescript-maybe": "master" }, "devDependencies": { - "purescript-assert": "^5.0.0", - "purescript-effect": "^3.0.0" + "purescript-assert": "master", + "purescript-effect": "master" } } diff --git a/packages.dhall b/packages.dhall index 7a6905b..582d6d3 100644 --- a/packages.dhall +++ b/packages.dhall @@ -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 diff --git a/src/JSURI.js b/src/JSURI.js index 8c7cd6b..80f96ab 100644 --- a/src/JSURI.js +++ b/src/JSURI.js @@ -1,5 +1,3 @@ -"use strict"; - // A helper which transforms the result ofencodeURIComponent to be compliant // with RFC3896, as described in the MDN documentation here: // @@ -10,7 +8,7 @@ function toRFC3896(input) { }); } -exports._encodeURIComponent = function encode(fail, succeed, input) { +export const _encodeURIComponent = function encode(fail, succeed, input) { try { return succeed(toRFC3896(encodeURIComponent(input))); } catch (err) { @@ -18,7 +16,7 @@ exports._encodeURIComponent = function encode(fail, succeed, input) { } }; -exports._encodeFormURLComponent = function encode(fail, succeed, input) { +export const _encodeFormURLComponent = function encode(fail, succeed, input) { try { return succeed(toRFC3896(encodeURIComponent(input)).replace(/%20/g, "+")); } catch (err) { @@ -34,8 +32,8 @@ function _decodeURIComponent(fail, succeed, input) { } } -exports._decodeURIComponent = _decodeURIComponent; +export {_decodeURIComponent}; -exports._decodeFormURLComponent = function encode(fail, succeed, input) { +export const _decodeFormURLComponent = function encode(fail, succeed, input) { return _decodeURIComponent(fail, succeed, input.replace(/\+/g, " ")); };