Merge pull request #2 from klntsky/klntsky/updates-for-v0.15

Updates for purs v0.15

jest.config.js → jest.config.mjs

@@ -1,13 +1,13 @@
 // For a detailed explanation regarding each configuration property, visit:
 // https://jestjs.io/docs/en/configuration.html
 
-module.exports = {
+export default {
   // An array of directory names to be searched recursively up from the requiring module's location
   moduleDirectories: ["node_modules", "output"],
 
   // The test environment that will be used for testing
   testEnvironment: "node",
 
   // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
-  testPathIgnorePatterns: ["/node_modules/", "/bower_components/"]
+  testPathIgnorePatterns: ["/node_modules/", "/bower_components/", "/\.spago/"]
 };

package.json

@@ -1,14 +1,27 @@
 {
   "license": "BSD-3-Clause",
+  "type": "module",
   "scripts": {
     "build": "spago build -u '--strict --stash +RTS -N2 -RTS'",
-    "test": "spago build && jest"
+    "test": "spago build && NODE_OPTIONS=--experimental-vm-modules jest"
   },
   "devDependencies": {
-    "jest": "^23.6.0",
+    "jest": "^25.1.0",
     "markdown-it-imsize": "^2.0.1"
   },
   "dependencies": {
     "markdown-it": "^9.0.1"
+  },
+  "jest": {
+    "moduleDirectories": [
+      "node_modules",
+      "output"
+    ],
+    "testEnvironment": "node",
+    "testPathIgnorePatterns": [
+      "/node_modules/",
+      "/bower_components/",
+      "/\\.spago/"
+    ]
   }
 }

packages.dhall

@@ -1,12 +1,13 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.4-20211005/packages.dhall sha256:2ec351f17be14b3f6421fbba36f4f01d1681e5c7f46e0c981465c4cf222de5be
+      https://github.com/purescript/package-sets/releases/download/psc-0.15.0-20220507/packages.dhall
+        sha256:cf54330f3bc1b25a093b69bff8489180c954b43668c81288901a2ec29a08cc64
 
 let extra =
       { jest =
-          { dependencies = [ "effect", "aff", "aff-promise" ]
-          , repo = "https://github.com/nonbili/purescript-jest.git"
-          , version = "v0.5.0"
-          }
+        { dependencies = [ "effect", "aff", "aff-promise" ]
+        , repo = "https://github.com/nonbili/purescript-jest.git"
+        , version = "018543987af27db6a3842048b6b3f5ec47609087"
+        }
       }
 
 in  upstream // extra

src/MarkdownIt.js

@@ -1,26 +1,26 @@
-var MarkdownIt = require("markdown-it");
+import MarkdownIt from "markdown-it";
 
-exports.renderString_ = function(input) {
+export function renderString_(input) {
   var md = new MarkdownIt();
   return md.render(input);
 };
 
-exports.newMarkdownIt_ = function(preset, opts) {
+export function newMarkdownIt_(preset, opts) {
   if (opts.highlight) {
     const fn = opts.highlight;
     opts.highlight = (str, lang) => fn(str)(lang);
   }
   return new MarkdownIt(preset, opts);
 };
 
-exports.render_ = function(md, input) {
+export function render_(md, input) {
   return md.render(input);
 };
 
-exports.renderInline_ = function(md, input) {
+export function renderInline_(md, input) {
   return md.renderInline(input);
 };
 
-exports.use_ = function(plugin, md) {
+export function use_(plugin, md) {
   return md.use(plugin);
 };

test/Main.purs

@@ -8,8 +8,7 @@ import Data.Tuple (Tuple(..))
 import Effect (Effect)
 import Effect.Class (liftEffect)
 import Jest (expectToEqual, test)
-import MarkdownIt (Preset(..), html, linkify, highlight, newMarkdownIt, render, renderString, use)
-import Node.Globals as Globals
+import MarkdownIt (Preset(..), html, linkify, highlight, newMarkdownIt, render, renderString)
 
 cases :: Array (Tuple String String)
 cases =
@@ -74,12 +73,3 @@ main = do
       output = "<pre>js - alert()\n</pre>\n"
     html <- liftEffect $ render md input
     expectToEqual html output
-
-  test "use markdown-it-imsize" $ do
-    md <- liftEffect $ (newMarkdownIt Default $ linkify := true) >>=
-      use (Globals.unsafeRequire "markdown-it-imsize")
-    let
-      input = "![](src =32x32)"
-      output = "<p><img src=\"src\" alt=\"\" width=\"32\" height=\"32\"></p>\n"
-    html <- liftEffect $ render md input
-    expectToEqual html output

test/main.test.js

@@ -1,3 +1,3 @@
-const Test = require("Test.Main");
+import { main } from "Test.Main";
 
-Test.main();
+main();