Merge pull request #32 from Swordlash/ps-15-starter-kit

#31 upgrade for purs-v0.15

.github/workflows/ci.yml

@@ -1,14 +1,14 @@
-name: Node CI
+name: ci
+
+# Run the workflow on any pushes or PRs.
+on: [push, pull_request]
 
-on:
-  pull_request:
-  push:
 jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v13
-      with:
-        nix_path: nixpkgs=channel:nixos-unstable
-    - run: nix-build   - run: ./test.bash
+      - uses: actions/checkout@v2
+      - uses: cachix/install-nix-action@v12
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - run: ./test.bash

bower.json

@@ -12,17 +12,17 @@
     "output"
   ],
   "dependencies": {
-    "purescript-prelude": "^5.0.1",
-    "purescript-record": "^3.0.0",
-    "purescript-functions": "^5.0.0",
-    "purescript-node-http": "^6.0.0",
-    "purescript-aff-promise": "^3.0.0",
-    "purescript-node-buffer": "^7.0.1",
-    "purescript-node-fs-aff": "^7.0.0"
+    "purescript-prelude": "^6.0.0",
+    "purescript-record": "^4.0.0",
+    "purescript-functions": "^6.0.0",
+    "purescript-node-http": "^8.0.0",
+    "purescript-aff-promise": "^4.0.0",
+    "purescript-node-buffer": "^8.0.0",
+    "purescript-node-fs-aff": "^9.0.0"
   },
   "devDependencies": {
-    "purescript-milkis": "^8.0.0",
-    "purescript-test-unit": "^16.0.0",
-    "purescript-node-process": "^8.2.0"
+    "purescript-milkis": "^9.0.0",
+    "purescript-test-unit": "^17.0.0",
+    "purescript-node-process": "^10.0.0"
   }
 }

package.json

@@ -12,7 +12,7 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "pulp": "^15.0.0",
-    "puppeteer": "9.0.0"
+    "pulp": "^16.0.1",
+    "puppeteer": "14.1.0"
   }
 }

shell.nix

@@ -4,17 +4,20 @@ let
     (pkgs.fetchFromGitHub {
       owner = "justinwoo";
       repo = "easy-purescript-nix";
-      rev = "5716cd791c999b3246b4fe173276b42c50afdd8d";
-      sha256 = "1r9lx4xhr42znmwb2x2pzah920klbjbjcivp2f0pnka7djvd2adq";
-    }) {
-    inherit pkgs;
-  };
+      rev = "0ad5775c1e80cdd952527db2da969982e39ff592";
+      sha256 = "0x53ads5v8zqsk4r1mfpzf5913byifdpv5shnvxpgw634ifyj1kg";
+    })
+    {
+      inherit pkgs;
+    };
 in
 pkgs.mkShell {
   buildInputs = [
     easy-ps.purs
+    easy-ps.psc-package
     pkgs.nodejs
-    pkgs.yarn
+    pkgs.nodePackages.pulp
     pkgs.nodePackages.bower
+    pkgs.nodePackages.yarn
   ];
 }

src/Toppoki.js

@@ -1,171 +1,170 @@
-var puppeteer = require("puppeteer");
+import puppeteer from "puppeteer";
+export {puppeteer};
 
-exports.puppeteer = puppeteer;
-
-exports._launch = function(options) {
+export function _launch(options) {
   return function() {
     return puppeteer.launch(options);
   };
-};
+}
 
-exports._launchChromeAWS = function(chromium, options) {
+export function _launchChromeAWS(chromium, options) {
   return function() {
     return chromium.puppeteer.launch(options);
   };
-};
+}
 
-exports._newPage = function(browser) {
+export function _newPage(browser) {
   return function() {
     return browser.newPage();
   };
-};
+}
 
-exports._goto = function(url, page) {
+export function _goto(url, page) {
   return function() {
     return page.goto(url);
   };
-};
+}
 
-exports._close = function(browser) {
+export function _close(browser) {
   return function() {
     return browser.close();
   };
-};
+}
 
-exports._content = function(page) {
+export function _content(page) {
   return function() {
     return page.content();
   };
-};
+}
 
-exports._screenshot = function(options, page) {
+export function _screenshot(options, page) {
   return function() {
     return page.screenshot(options);
   };
-};
+}
 
-exports._pdf = function(options, page) {
+export function _pdf(options, page) {
   return function() {
     return page.pdf(options);
   };
-};
+}
 
-exports._on = function(event, callback, page) {
+export function _on(event, callback, page) {
   return page.on(event, callback);
-};
+}
 
-exports._pageWaitForSelector = function(selector, options, page) {
+export function _pageWaitForSelector(selector, options, page) {
   return function() {
     return page.waitForSelector(selector, options);
   };
-};
+}
 
-exports._focus = function(selector, page) {
+export function _focus(selector, page) {
   return function() {
     return page.focus(selector);
   };
-};
+}
 
-exports._select = function(selector, string, page) {
+export function _select(selector, string, page) {
   return function() {
     return page.select(selector, string);
   };
-};
+}
 
-exports._type = function(selector, content, options, page) {
+export function _type(selector, content, options, page) {
   return function() {
     return page.type(selector, content, options);
   };
-};
+}
 
-exports._setViewport = function(viewport, page) {
+export function _setViewport(viewport, page) {
   return function() {
     return page.setViewport(viewport);
   };
-};
+}
 
-exports._click = function(selector, page) {
+export function _click(selector, page) {
   return function() {
     return page.click(selector);
   };
-};
+}
 
-exports._waitForNavigation = function(options, page) {
+export function _waitForNavigation(options, page) {
   return function() {
     return page.waitForNavigation(options);
   };
-};
+}
 
-exports._getLocationHref = function(page) {
+export function _getLocationHref(page) {
   return function() {
     return page.evaluate(function() {
       return window.location.href;
     });
   };
-};
+}
 
-exports._unsafeEvaluateOnNewDocument = function(string, page) {
+export function _unsafeEvaluateOnNewDocument(string, page) {
   return function() {
      return page.evaluateOnNewDocument(string);
   }
 }
 
-exports._unsafeEvaluateStringFunction = function(string, page) {
+export function _unsafeEvaluateStringFunction(string, page) {
   return function() {
     return page.evaluate(string);
   };
-};
+}
 
-exports._unsafePageEval = function(selector, fnStr, page) {
+export function _unsafePageEval(selector, fnStr, page) {
   return function() {
     return page.$eval(selector, eval(fnStr));
   };
-};
+}
 
-exports._unsafePageEvalAll = function(selector, fnStr, page) {
+export function _unsafePageEvalAll(selector, fnStr, page) {
   return function() {
     return page.$$eval(selector, eval(fnStr));
   };
-};
+}
 
-exports._keyboardDown = function(string, options, page) {
+export function _keyboardDown(string, options, page) {
   return function() {
     return page.keyboard.down(string, options);
   };
-};
+}
 
-exports._keyboardPress = function(key, options, page) {
+export function _keyboardPress(key, options, page) {
   return function() {
     return page.keyboard.press(key, options);
   };
-};
+}
 
-exports._keyboardSendCharacter = function(char, page) {
+export function _keyboardSendCharacter(char, page) {
   return function() {
     return page.keyboard.sendCharacter(char);
   };
-};
+}
 
-exports._keyboardType = function(text, options, page) {
+export function _keyboardType(text, options, page) {
   return function() {
     return page.keyboard.type(text, options);
   };
-};
+}
 
-exports._keyboardUp = function(string, options, page) {
+export function _keyboardUp(string, options, page) {
   return function() {
     return page.keyboard.up(string, options);
   };
-};
+}
 
-exports._setUserAgent = function(string, page) {
+export function _setUserAgent(string, page) {
   return function() {
     return page.setUserAgent(string);
   };
-};
+}
 
-exports._bringToFront = function(page) {
+export function _bringToFront(page) {
   return function() {
     return page.bringToFront();
   };
-};
+}

test.bash

@@ -1,8 +1,11 @@
-#!/usr/bin/env nix-shell
-#!nix-shell shell.nix -i bash
+#! /usr/bin/env nix-shell
+#! nix-shell shell.nix -i bash
+
+set -e
 
-yarn
 bower install
+yarn
+
+pulp build --include test
 
-yarn build
-node -e "require('./output/Test.Main').main()"
+node ./test/index.mjs

test/index.mjs

@@ -0,0 +1,3 @@
+import { main } from "../output/Test.Main/index.js";
+
+main();