purescript-contrib · srghma · Oct 10, 2024 · Oct 12, 2024 · Oct 14, 2024 · Oct 14, 2024
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,31 +9,29 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Set up PureScript toolchain
+      - name: Set up a PureScript toolchain
         uses: purescript-contrib/setup-purescript@main
         with:
-          purescript: "unstable"
+          purescript: "latest"
           purs-tidy: "latest"
+          spago: "unstable"
 
       - name: Cache PureScript dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
-          key: ${{ runner.os }}-spago-${{ hashFiles('**/*.dhall') }}
+          key: ${{ runner.os }}-spago-${{ hashFiles('**/spago.lock') }}
           path: |
             .spago
             output
 
       - name: Set up Node toolchain
-        uses: actions/setup-node@v2
-        with:
-          node-version: "12.x"
+        uses: actions/setup-node@v4
 
       - name: Cache NPM dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -44,25 +42,20 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
+      - uses: browser-actions/setup-chrome@v1
+        id: setup-chrome
+
       - name: Install NPM dependencies
         run: npm install
 
-      - name: Build the project
-        run: npm run build
+      - name: Build source
+        run: spago build --censor-stats --strict --ensure-ranges --pedantic-packages
 
       - name: Run tests
-        run: npm run test
-
-      - name: Check formatting
         run: |
-          npx eslint src
-          purs-tidy check src
+          ${{ steps.setup-chrome.outputs.chrome-path }} --version
+          npm run build
+          npx mocha-headless-chrome --file dist/index.html --args disable-web-security --args no-sandbox --timeout 9999999 --executablePath ${{ steps.setup-chrome.outputs.chrome-path }}
 
-      - name: Verify Bower & Pulp
-        run: |
-          npm install bower [email protected]
-          npx bower install
-          npx pulp build -- --censor-lib --strict
-          if [ -d "test" ]; then
-            npx pulp test
-          fi
+      - name: Verify formatting
+        run: purs-tidy check src test
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ bower_components
 node_modules
 package-lock.json
 *.lock
+dist/*
diff --git a/bower.json b/bower.json
diff --git a/browser/index.html b/browser/index.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Mocha Tests</title>
+  <link rel="stylesheet" href="node_modules/mocha/mocha.css" />
+  <script type="module" src="node_modules/mocha/mocha.js"></script>
+</head>
+
+<body>
+  <div id="mocha"></div>
+  <script type="module" src="./index.js"></script>
+</body>
+
+</html>
diff --git a/browser/index.js b/browser/index.js
@@ -0,0 +1,14 @@
+/* global mocha, describe, it */
+//
+// cannot import commonjs, added
+// <script type="module" src="node_modules/mocha/mocha.js"></script>
+//
+// import mocha from "mocha"
+// import mocha from "mocha/browser-entry.js"
+// import "mocha"
+
+import { main } from 'PureScript/Test.Main/index.js'
+
+mocha.setup("bdd");
+main();
+mocha.run();
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,8 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+
+
+export default [
+  {languageOptions: { globals: globals.browser }},
+  pluginJs.configs.recommended,
+];
diff --git a/package.json b/package.json
@@ -1,9 +1,25 @@
 {
   "private": true,
+  "browserslist": "defaults, not ie <= 11",
   "scripts": {
-    "build": "eslint src && spago build --purs-args '--censor-lib --strict'"
+    "test:watch": "watchexec -e purs,js,yaml,rb -- spago bundle --outfile output/bundle.js --module Test.Main && mocha output/bundle.js",
+    "clean": "rm -rfd output output-es .spago dist",
+    "build": "rm -rdf dist && eslint src && spago build --censor-stats --strict --ensure-ranges --pedantic-packages && vite build",
+    "format": "purs-tidy format-in-place src test",
+    "check": "purs-tidy check src test",
+    "test": "spago test",
+    "update-docs": "spago docs --format markdown",
+    "production:build": "spago build && purs-backend-es build && vite build",
+    "production:preview": "vite preview --open",
+    "dev:vite": "vite dev --open",
+    "dev:spago": "watchexec -e purs,js,yaml -- spago build"
   },
   "devDependencies": {
-    "eslint": "^7.6.0"
+    "@eslint/js": "^9.12.0",
+    "eslint": "^9.12.0",
+    "globals": "^15.11.0",
+    "mocha": "^10.7.3",
+    "mocha-headless-chrome": "^4.0.0",
+    "vite": "^5.4.0"
   }
 }
diff --git a/packages.dhall b/packages.dhall
diff --git a/run_tests.sh b/run_tests.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -e
+
+npm run build
+
+mocha-headless-chrome --file dist/index.html --out output/test-output-headless.txt --args disable-web-security --args no-sandbox --executablePath chromium --visible --timeout 9999999
+
+# or open to debug
+#
+# chromium --disable-web-security --no-sandbox --disable-gpu --args --allow-file-access-from-files --user-data-dir=/tmp/chrome_dev_test dist/index.html
diff --git a/spago.dhall b/spago.dhall
diff --git a/spago.yaml b/spago.yaml
@@ -0,0 +1,26 @@
+package:
+  name: affjax-web
+  description: An asynchronous AJAX library built using Aff that runs on the browser.
+  publish:
+    license: Apache-2.0
+    version: 2.0.0
+    location:
+      githubOwner: purescript-contrib
+      githubRepo: purescript-affjax-web
+  dependencies:
+    - aff: ">=8.0.0 <9.0.0"
+    - affjax: ">=13.0.0 <14.0.0"
+    - either: ">=6.1.0 <7.0.0"
+    - maybe: ">=6.0.0 <7.0.0"
+    - prelude: ">=6.0.1 <7.0.0"
+  test:
+    main: Test.Main
+    dependencies:
+      - console
+      - effect
+      - exceptions
+      - spec
+      - spec-mocha
+      - transformers
+      - unsafe-coerce
+workspace: {}
diff --git a/test/Test/Main.purs b/test/Test/Main.purs
@@ -0,0 +1,38 @@
+module Test.Main where
+
+import Prelude
+
+import Affjax.ResponseFormat as ResponseFormat
+import Affjax.Web as AX
+import Control.Monad.Error.Class (throwError)
+import Data.Either (Either(..))
+import Effect (Effect)
+import Effect.Aff (Aff)
+import Effect.Class (class MonadEffect)
+import Effect.Class.Console (log)
+import Effect.Exception (error)
+import Test.Spec (it)
+import Test.Spec.Assertions (fail)
+import Test.Spec.Mocha (runMocha)
+import Unsafe.Coerce (unsafeCoerce)
+
+logAny' :: forall a m. MonadEffect m => a -> m Unit
+logAny' = log <<< unsafeCoerce
+
+assertRight :: forall a b. Either a b -> Aff b
+assertRight = case _ of
+  Left y -> logAny' y *> throwError (error "Expected a Right value")
+  Right y -> pure y
+
+assertLeft :: forall a b. Either a b -> Aff a
+assertLeft x = case x of
+  Right y -> logAny' y *> throwError (error "Expected a Left value")
+  Left y -> pure y
+
+main :: Effect Unit
+main = runMocha do
+  it "Testing invalid url" do
+    res <- AX.get ResponseFormat.string "/фіва шхххх"
+    assertLeft res >>= case _ of
+      AX.RequestFailedError -> pure unit
+      other -> logAny' other *> fail "Expected a RequestFailedError"
diff --git a/vite.config.js b/vite.config.js
@@ -0,0 +1,41 @@
+import * as path from "node:path";
+// import * as fs from 'node:fs'
+// import * as yaml from 'js-yaml'
+
+// Read and parse the YAML file
+// const spagoYamlFilePath = path.resolve(__dirname, 'spago.yaml');
+// const spagoYamlFileContent = fs.readFileSync(spagoYamlFilePath, 'utf8');
+// const data = yaml.load(spagoYamlFileContent);
+
+export default {
+  // Why base is empty?
+  //
+  // if undefined - it outputs
+  //
+  //   <script type="module" crossorigin src="/assets/index-gxVfuqPj.js"></script>
+  //   <link rel="stylesheet" crossorigin href="/assets/index-CyNfkOrK.css" />
+  //
+  // if "" - changes to relative paths
+  //
+  //   <script type="module" crossorigin src="./assets/index-gxVfuqPj.js"></script>
+  //   <link rel="stylesheet" crossorigin href="./assets/index-CyNfkOrK.css" />
+  // base: `/${data.package.publish.location.githubRepo}/`,
+  base: ``,
+
+  root: path.resolve(__dirname, "browser"),
+  build: {
+    outDir: path.resolve(__dirname, "dist"),
+    minify: false, // for debug
+    emptyOutDir: true, // prevent `outDir .../dist is not inside project root and will not be emptied.`
+  },
+  // mode: 'development', // still be minimified, option used if You want to `vite dev` (with a watching)
+  resolve: {
+    alias: {
+      // PureScript: process.env.NODE_ENV === "production"
+      //   ? path.resolve(__dirname, "output-es")
+      //   : path.resolve(__dirname, "output"),
+      node_modules: path.resolve(__dirname, "node_modules"),
+      PureScript: path.resolve(__dirname, "output"),
+    },
+  }
+};
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,4 @@ bower_components @@
     node_modules
     package-lock.json
     *.lock
+    dist/*