From 243207393beb79397459667ea0631c2685cf1e18 Mon Sep 17 00:00:00 2001 From: Matthew Russell Date: Tue, 24 May 2022 16:20:29 -0700 Subject: [PATCH 1/3] Add publishing helpers --- .gitignore | 1 + tools/publish-shell.nix | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 tools/publish-shell.nix diff --git a/.gitignore b/.gitignore index b69201a..b0a6692 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /.spago/ .direnv *.swp +/generated-docs diff --git a/tools/publish-shell.nix b/tools/publish-shell.nix new file mode 100644 index 0000000..38ec253 --- /dev/null +++ b/tools/publish-shell.nix @@ -0,0 +1,32 @@ +# Universal shell for PureScript repos +{ pkgs ? import (builtins.fetchGit { + # https://github.com/NixOS/nixpkgs/releases/tag/21.11 + url = "https://github.com/nixos/nixpkgs/"; + ref = "refs/tags/21.11"; + rev = "a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31"; + }) {} +}: +let + easy-ps-src = builtins.fetchGit { + url = "https://github.com/justinwoo/easy-purescript-nix.git"; + ref = "master"; + rev = "0ad5775c1e80cdd952527db2da969982e39ff592"; + }; + easy-ps = import easy-ps-src { inherit pkgs; }; +in +pkgs.mkShell { + nativeBuildInputs = [ + easy-ps.purs-0_15_0 + easy-ps.spago + easy-ps.pulp-16_0_0-0 + easy-ps.psc-package + easy-ps.purs-tidy + pkgs.nodejs-16_x + pkgs.nodePackages.bower + ]; + LC_ALL = "C.UTF-8"; # https://github.com/purescript/spago/issues/507 + # https://github.com/purescript/spago#install-autocompletions-for-bash + shellHook = '' + source <(spago --bash-completion-script `which spago`) + ''; +} From 3105e5f23829a73cdc6e28f1f388c5776fe3d14e Mon Sep 17 00:00:00 2001 From: Matt Russell Date: Fri, 17 Jun 2022 21:13:58 -0700 Subject: [PATCH 2/3] Add basic test and fix import issue with react server dom (#39) --- .github/workflows/ci.yml | 3 +++ package.json | 3 ++- src/React/Basic/DOM/Server.js | 2 +- test.dhall | 6 ++++++ test/Main.purs | 18 ++++++++++++++++++ 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 test.dhall create mode 100644 test/Main.purs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4eaa8b6..1914e72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,3 +51,6 @@ jobs: - name: Build the project run: npm run build + + - name: Test the project + run: npm run test diff --git a/package.json b/package.json index a7cebb6..879061e 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "build": "run-s build:*", "build:spago": "spago build", "build:pulp": "pulp build -o output-pulp", - "clean": "rm -rf .spago bower_components output output-pulp node_modules .pulp-cache .psci_modules" + "clean": "rm -rf .spago bower_components output output-pulp node_modules .pulp-cache .psci_modules", + "test": "spago -x test.dhall test" } } diff --git a/src/React/Basic/DOM/Server.js b/src/React/Basic/DOM/Server.js index 140c3e9..62b5750 100644 --- a/src/React/Basic/DOM/Server.js +++ b/src/React/Basic/DOM/Server.js @@ -1,3 +1,3 @@ -import ReactDOMServer from "react-dom/server"; +import ReactDOMServer from "react-dom/server.js"; export var renderToString = ReactDOMServer.renderToString; export var renderToStaticMarkup = ReactDOMServer.renderToStaticMarkup; diff --git a/test.dhall b/test.dhall new file mode 100644 index 0000000..d7128cb --- /dev/null +++ b/test.dhall @@ -0,0 +1,6 @@ +let conf = ./spago.dhall + +in conf // { + sources = conf.sources # [ "test/**/*.purs" ], + dependencies = conf.dependencies # [ "effect", "spec", "aff" ] +} diff --git a/test/Main.purs b/test/Main.purs new file mode 100644 index 0000000..90799fe --- /dev/null +++ b/test/Main.purs @@ -0,0 +1,18 @@ +module Test.Main where + +import Prelude + +import Effect (Effect) +import Effect.Aff (launchAff_) +import React.Basic.DOM.Server (renderToString) +import Test.Spec (describe, it) +import Test.Spec.Assertions (shouldEqual) +import Test.Spec.Reporter.Console (consoleReporter) +import Test.Spec.Runner (runSpec) + +main :: Effect Unit +main = launchAff_ $ runSpec [consoleReporter] do + describe "react-basic-dom-spec" do + describe "react-basic-dom-server" do + it "imports properly" do + renderToString mempty `shouldEqual` "" From 53dfc605a1dd91dbc12df160b445156e6a6626af Mon Sep 17 00:00:00 2001 From: Matthew Russell Date: Fri, 17 Jun 2022 21:25:02 -0700 Subject: [PATCH 3/3] =?UTF-8?q?v5.0.0=20=E2=86=92=20v5.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit