From dba008846b33a332ee967b6446a4bc9ab634c077 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Wed, 11 May 2022 15:53:23 -0500 Subject: [PATCH 1/5] Migrated FFI to ES modules via 'lebab' --- src/React/Basic.js | 59 +++++++++++++++++++++-------------- src/React/Basic/StrictMode.js | 5 ++- 2 files changed, 38 insertions(+), 26 deletions(-) diff --git a/src/React/Basic.js b/src/React/Basic.js index 3cb0263..f0287c8 100644 --- a/src/React/Basic.js +++ b/src/React/Basic.js @@ -1,28 +1,41 @@ "use strict"; -const React = require("react"); +import React from "react"; const createElement = React.createElement; const Fragment = React.Fragment; -exports.empty = null; - -exports.keyed = (key) => (child) => - createElement(Fragment, { key: key }, child); - -exports.element = (component) => (props) => - Array.isArray(props.children) - ? createElement.apply(null, [component, props].concat(props.children)) - : createElement(component, props); - -exports.elementKeyed = (component) => (props) => - createElement(component, props); - -exports.fragment = (children) => - createElement.apply(null, [Fragment, null].concat(children)); - -exports.createContext = (defaultValue) => () => - React.createContext(defaultValue); - -exports.contextProvider = (context) => context.Provider; - -exports.contextConsumer = (context) => context.Consumer; +export var empty = null; + +export function keyed(key) { + return (child) => + createElement(Fragment, { key: key }, child); +} + +export function element(component) { + return (props) => + Array.isArray(props.children) + ? createElement.apply(null, [component, props].concat(props.children)) + : createElement(component, props); +} + +export function elementKeyed(component) { + return (props) => + createElement(component, props); +} + +export function fragment(children) { + return createElement.apply(null, [Fragment, null].concat(children)); +} + +export function createContext(defaultValue) { + return () => + React.createContext(defaultValue); +} + +export function contextProvider(context) { + return context.Provider; +} + +export function contextConsumer(context) { + return context.Consumer; +} diff --git a/src/React/Basic/StrictMode.js b/src/React/Basic/StrictMode.js index c0b58ae..68185f9 100644 --- a/src/React/Basic/StrictMode.js +++ b/src/React/Basic/StrictMode.js @@ -1,5 +1,4 @@ "use strict"; -const React = require("react"); - -exports.strictMode_ = React.StrictMode; +import React from "react"; +export var strictMode_ = React.StrictMode; From 63608806ead42a225ef3b75618ce1b5e82ca990f Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Wed, 11 May 2022 15:53:23 -0500 Subject: [PATCH 2/5] Replaced 'export var' with 'export const' --- src/React/Basic.js | 2 +- src/React/Basic/StrictMode.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/React/Basic.js b/src/React/Basic.js index f0287c8..889a6c3 100644 --- a/src/React/Basic.js +++ b/src/React/Basic.js @@ -4,7 +4,7 @@ import React from "react"; const createElement = React.createElement; const Fragment = React.Fragment; -export var empty = null; +export const empty = null; export function keyed(key) { return (child) => diff --git a/src/React/Basic/StrictMode.js b/src/React/Basic/StrictMode.js index 68185f9..c7297f5 100644 --- a/src/React/Basic/StrictMode.js +++ b/src/React/Basic/StrictMode.js @@ -1,4 +1,4 @@ "use strict"; import React from "react"; -export var strictMode_ = React.StrictMode; +export const strictMode_ = React.StrictMode; From bf16829e81649d3673b397bcbb4ea8e16045535a Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Wed, 11 May 2022 15:53:23 -0500 Subject: [PATCH 3/5] Removed '"use strict";' in FFI files --- src/React/Basic.js | 2 -- src/React/Basic/StrictMode.js | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/React/Basic.js b/src/React/Basic.js index 889a6c3..264d3b3 100644 --- a/src/React/Basic.js +++ b/src/React/Basic.js @@ -1,5 +1,3 @@ -"use strict"; - import React from "react"; const createElement = React.createElement; const Fragment = React.Fragment; diff --git a/src/React/Basic/StrictMode.js b/src/React/Basic/StrictMode.js index c7297f5..f4fad04 100644 --- a/src/React/Basic/StrictMode.js +++ b/src/React/Basic/StrictMode.js @@ -1,4 +1,2 @@ -"use strict"; - import React from "react"; export const strictMode_ = React.StrictMode; From ad2942f1ed9e48d56de13d7ca73603522c4cc339 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Wed, 11 May 2022 15:54:34 -0500 Subject: [PATCH 4/5] Update deps --- bower.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/bower.json b/bower.json index a218435..5e5e946 100644 --- a/bower.json +++ b/bower.json @@ -1,21 +1,21 @@ { - "name": "purescript-react-basic", - "license": [ - "Apache-2.0" - ], - "repository": { - "type": "git", - "url": "https://github.com/lumihq/purescript-react-basic" - }, - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "output" - ], - "dependencies": { - "purescript-effect": "^v3.0.0", - "purescript-prelude": "^v5.0.0", - "purescript-record": "^v3.0.0" - } + "name": "purescript-react-basic", + "license": [ + "Apache-2.0" + ], + "repository": { + "type": "git", + "url": "https://github.com/lumihq/purescript-react-basic" + }, + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "output" + ], + "dependencies": { + "purescript-effect": "^4.0.0", + "purescript-prelude": "^6.0.0", + "purescript-record": "^4.0.0" + } } From 5da7fa8f13098214c9efbb3de97e65cffdffdd0a Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Wed, 11 May 2022 15:54:40 -0500 Subject: [PATCH 5/5] Update package set --- packages.dhall | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages.dhall b/packages.dhall index d24232f..1b799e2 100644 --- a/packages.dhall +++ b/packages.dhall @@ -105,6 +105,7 @@ in upstream ------------------------------- -} let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.14.0/packages.dhall sha256:710b53c085a18aa1263474659daa0ae15b7a4f453158c4f60ab448a6b3ed494e + https://github.com/purescript/package-sets/releases/download/psc-0.15.0-20220510/packages.dhall + sha256:0b0d4db1f2f0acd3b37fa53220644ac6f64cf9b5d0226fd097c0593df563d5be in upstream