feat: migrate to spago@next

srghma · srghma · commit 0e57c8653907 · 2024-10-11T10:44:23.000+07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,8 +27,17 @@ jobs:
             .spago
             output
 
+      - name: Setup node and npm
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+          cache-dependency-path: "**/package-lock.json"
+
+      - name: Install NPM dependencies
+        run: npm install
+
       - name: Build source
-        run: spago build --censor-stats --strict --pedantic-packages
+        run: spago build --censor-stats --strict --ensure-ranges --pedantic-packages
 
       - name: Run tests
         run: spago test --offline --censor-stats --strict --pedantic-packages -- --censor-codes=UserDefinedWarning
diff --git a/bower.json b/bower.json
@@ -10,16 +10,5 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/purescript-contrib/purescript-affjax-node.git"
-  },
-  "ignore": [
-    "**/.*",
-    "bower_components",
-    "node_modules",
-    "output",
-    "test",
-    "tmp",
-    "bower.json",
-    "gulpfile.js",
-    "package.json"
-  ]
+  }
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "build": "eslint src && spago build --censor-stats --strict --pedantic-packages",
+    "build": "eslint src && spago build --censor-stats --strict --ensure-ranges --pedantic-packages",
     "test": "spago test --offline"
   },
   "devDependencies": {
diff --git a/spago.yaml b/spago.yaml
@@ -1,17 +1,18 @@
 package:
   name: affjax-node
+  description: An asynchronous AJAX library built using Aff that runs on Node.js.
   publish:
     license: Apache-2.0
     version: 1.0.0
     location:
       githubOwner: purescript-contrib
       githubRepo: purescript-affjax-node
   dependencies:
-    - aff
-    - affjax
-    - either
-    - maybe
-    - prelude
+    - 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:
diff --git a/src/Affjax/Node.js b/src/Affjax/Node.js
@@ -1,16 +1,16 @@
 import XHR from "xhr2";
-import urllib from "url";
+import { URL, format } from "node:url";
 
 export const driver = {
   newXHR: function () {
     return new XHR();
   },
   fixupUrl: function (url, xhr) {
     if (xhr.nodejsBaseUrl === null) {
-      var u = urllib.parse(url);
+      var u = new URL(url);
       u.protocol = u.protocol || "http:";
       u.hostname = u.hostname || "localhost";
-      return urllib.format(u);
+      return format(u);
     } else {
       return url || "/";
     }
diff --git a/test/Test/Main.js b/test/Test/Main.js
@@ -1,8 +1,8 @@
 import express from "express";
 import bodyParser from "body-parser";
 
-import { fileURLToPath } from 'url'
-import { dirname } from 'path'
+import { fileURLToPath } from 'node:url'
+import { dirname } from 'node:path'
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 export function logAny(a) {
@@ -16,24 +16,24 @@ export function startServer(errback, callback) {
   var app = express();
 
   // Always make req.body available as a String
-  app.use(bodyParser.text(function() { return true; }));
+  app.use(bodyParser.text(function () { return true; }));
 
   app.use(express.static(__dirname));
 
-  app.get('/', function (req, res) {
+  app.get('/', function (_req, res) {
     res.send('<html><script src="tmp/test.js"></script></html>');
   });
 
-  app.get('/arrayview', function(req, res) {
+  app.get('/arrayview', function (_req, res) {
     res.send('TODO');
   });
 
-  app.get('/not-json', function(req, res) {
-    res.header({'content-type': 'text/plain'});
+  app.get('/not-json', function (_req, res) {
+    res.header({ 'content-type': 'text/plain' });
     res.send('This is not JSON');
   });
 
-  app.all('/mirror', function(req, res) {
+  app.all('/mirror', function (req, res) {
     res.json({
       headers: req.headers,
       body: req.body,
@@ -42,13 +42,13 @@ export function startServer(errback, callback) {
     });
   });
 
-  app.get('/slow', function(req, res) {
+  app.get('/slow', function (_req, res) {
     var date = Date.now();
     var currentDate = null;
     do {
       currentDate = Date.now();
     } while (currentDate - date < 2000);
-    res.header({'content-type': 'text/plain'});
+    res.header({ 'content-type': 'text/plain' });
     res.send('I hope I am not late!');
   });
 
@@ -59,7 +59,7 @@ export function startServer(errback, callback) {
     errback(error);
   });
 
-  return function (cancelError, onCancelerError, onCancelerSuccess) {
+  return function (_cancelError, _onCancelerError, onCancelerSuccess) {
     onCancelerSuccess();
   };
 }
@@ -70,7 +70,7 @@ export function stopServer(server) {
       if (err) errback(err);
       else callback();
     });
-    return function (cancelError, onCancelerError, onCancelerSuccess) {
+    return function (_cancelError, _onCancelerError, onCancelerSuccess) {
       onCancelerSuccess();
     };
   };
diff --git a/test/Test/Main.purs b/test/Test/Main.purs
@@ -100,10 +100,14 @@ main = void $ runAff (either (\e -> logShow e *> throwException e) (const $ log
       assertEq (Just "PUT") (J.toString =<< FO.lookup "method" =<< J.toObject res.body)
       assertEq (Just content) (J.toString =<< FO.lookup "body" =<< J.toObject res.body)
 
-    A.log "Testing CORS, HTTPS"
-    AN.get ResponseFormat.json "https://cors-test.appspot.com/test" >>= assertRight >>= \res -> do
-      assertEq ok200 res.status
-
     A.log "Testing cancellation"
     forkAff (AN.post_ mirror (Just (RequestBody.string "do it now"))) >>= killFiber (error "Pull the cord!")
     assertMsg "Should have been canceled" true
+
+    A.log "Testing CORS, HTTPS"
+    -- IF error `Unexpected token '<', "\n<html><hea"... is not valid JSON` THEN
+    -- Error: Server Error
+    -- The service you requested is not available yet.
+    -- Please try again in 30 seconds.
+    AN.get ResponseFormat.json "https://cors-test.appspot.com/test" >>= assertRight >>= \res -> do
+      assertEq ok200 res.status

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"private": true,`
`3`	`3`	`"scripts": {`
`4`		`- "build": "eslint src && spago build --censor-stats --strict --pedantic-packages",`
	`4`	`+ "build": "eslint src && spago build --censor-stats --strict --ensure-ranges --pedantic-packages",`
`5`	`5`	`"test": "spago test --offline"`
`6`	`6`	`},`
`7`	`7`	`"devDependencies": {`