diff --git a/.eslintrc.json b/.eslintrc.json index 17f167d..240b092 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 d3b2ff0..362269d 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: +- Migrate FFI to ES modules (#28 by @JordanMartinez) New features: diff --git a/bower.json b/bower.json index c055e0b..d8b9c9b 100644 --- a/bower.json +++ b/bower.json @@ -16,11 +16,11 @@ "url": "https://github.com/purescript-contrib/purescript-react-dom.git" }, "dependencies": { - "purescript-effect": "^3.0.0", - "purescript-react": "^9.0.0", - "purescript-web-dom": "^5.0.0" + "purescript-effect": "master", + "purescript-react": "main", + "purescript-web-dom": "master" }, "devDependencies": { - "purescript-console": "^5.0.0" + "purescript-console": "master" } } diff --git a/package.json b/package.json index d913a47..2382bdb 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ }, "devDependencies": { "eslint": "^7.6.0", - "purescript-psa": "^0.8.0" + "purescript-psa": "^0.8.2" }, "peerDependencies": { "react-dom": "^16.0.0" 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/spago.dhall b/spago.dhall index 5f90df3..1294aae 100644 --- a/spago.dhall +++ b/spago.dhall @@ -6,7 +6,6 @@ , "maybe" , "nullable" , "prelude" - , "psci-support" , "react" , "web-dom" ] diff --git a/src/ReactDOM.js b/src/ReactDOM.js index 1bd7f0a..87b77bc 100644 --- a/src/ReactDOM.js +++ b/src/ReactDOM.js @@ -1,18 +1,15 @@ -"use strict"; +import ReactDOM from "react-dom"; +import ReactDOMServer from "react-dom/server"; -var ReactDOM = require("react-dom"); -var ReactDOMServer = require("react-dom/server"); - -exports.renderImpl = function (element, container) { +export function renderImpl(element, container) { return ReactDOM.render(element, container); -}; +} -exports.hydrateImpl = function (element, container) { +export function hydrateImpl(element, container) { return ReactDOM.hydrate(element, container); -}; - -exports.unmountComponentAtNodeImpl = ReactDOM.unmountComponentAtNode; -exports.findDOMNodeImpl = ReactDOM.findDOMNode; +} -exports.renderToStringImpl = ReactDOMServer.renderToString; -exports.renderToStaticMarkupImpl = ReactDOMServer.renderToStaticMarkup; +export const unmountComponentAtNodeImpl = ReactDOM.unmountComponentAtNode; +export const findDOMNodeImpl = ReactDOM.findDOMNode; +export const renderToStringImpl = ReactDOMServer.renderToString; +export const renderToStaticMarkupImpl = ReactDOMServer.renderToStaticMarkup;