Merge pull request #23 from mrloop/esm-only

chore: esm only

.github/workflows/ci.yml

@@ -6,6 +6,7 @@ on:
     # filtering branches here prevents duplicate builds from pull_request and push
     branches:
       - main
+      - master
       - "v*"
     # always run CI for tags
     tags:
@@ -25,7 +26,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4 
+        uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
         with:
           version: ${{ env.PNPM_VERSION }}

index.d.ts → main.d.ts

@@ -23,4 +23,8 @@
  * });
 
  */
-declare function retry(name: string, callback: (assert: Object) => void | Promise<void>, maxRuns?: number): void;
+declare function retry(
+  name: string,
+  callback: (assert: Object) => void | Promise<void>,
+  maxRuns?: number,
+): void;

package.json

@@ -15,12 +15,8 @@
   },
   "license": "ISC",
   "author": "mrloop",
-  "exports": {
-    "require": "./index.js",
-    "import": "./main.js",
-    "default": "./main.js"
-  },
-  "main": "index.js",
+  "type": "module",
+  "exports": "./main.js",
   "module": "main.js",
   "types": "./index.d.ts",
   "scripts": {
@@ -30,9 +26,6 @@
     "dev": "qunit --watch",
     "lint": "eslint index.js"
   },
-  "dependencies": {
-    "esm": "^3.2.25"
-  },
   "devDependencies": {
     "@release-it-plugins/lerna-changelog": "^7.0.0",
     "dotenv": "^8.2.0",

test/retry-only.js

@@ -1,44 +1,60 @@
-const setup = require('../index.js')
-const QUnit = require('qunit')
-
-const retry = setup(QUnit.test)
-
-QUnit.module('retry.only', function () {
-  const calls = []
-
-  retry.only('count only retries', function (assert, currentRun) {
-    calls.push(['only', currentRun])
-
-    assert.equal(currentRun, 2)
-  })
-
-  retry('count non-only retries', function (assert, currentRun) {
-    calls.push(['non-only', currentRun])
-
-    assert.equal(currentRun, 2)
-  })
-
-  QUnit.test('verify calls', function (assert) {
-    assert.deepEqual(calls, [['only', 1], ['only', 2]])
-  })
-})
-
-QUnit.module('retry.only.each', function () {
-  const calls = []
-
-  retry.only.each('count only retries', ['A', 'B'], function (assert, data, currentRun) {
-    calls.push(['only', data, currentRun])
-
-    assert.equal(currentRun, 2)
-  })
-
-  retry.each('count non-only retries', ['A', 'B'], function (assert, data, currentRun) {
-    calls.push(['non-only', data, currentRun])
-
-    assert.equal(currentRun, 2)
-  })
-
-  QUnit.test('verify calls', function (assert) {
-    assert.deepEqual(calls, [['only', 'A', 1], ['only', 'A', 2], ['only', 'B', 1], ['only', 'B', 2]])
-  })
-})
+import setup from "qunit-retry";
+import QUnit from "qunit";
+
+const retry = setup(QUnit.test);
+
+QUnit.module("retry.only", function () {
+  const calls = [];
+
+  retry.only("count only retries", function (assert, currentRun) {
+    calls.push(["only", currentRun]);
+
+    assert.equal(currentRun, 2);
+  });
+
+  retry("count non-only retries", function (assert, currentRun) {
+    calls.push(["non-only", currentRun]);
+
+    assert.equal(currentRun, 2);
+  });
+
+  QUnit.test("verify calls", function (assert) {
+    assert.deepEqual(calls, [
+      ["only", 1],
+      ["only", 2],
+    ]);
+  });
+});
+
+QUnit.module("retry.only.each", function () {
+  const calls = [];
+
+  retry.only.each(
+    "count only retries",
+    ["A", "B"],
+    function (assert, data, currentRun) {
+      calls.push(["only", data, currentRun]);
+
+      assert.equal(currentRun, 2);
+    },
+  );
+
+  retry.each(
+    "count non-only retries",
+    ["A", "B"],
+    function (assert, data, currentRun) {
+      calls.push(["non-only", data, currentRun]);
+
+      assert.equal(currentRun, 2);
+    },
+  );
+
+  QUnit.test("verify calls", function (assert) {
+    assert.deepEqual(calls, [
+      ["only", "A", 1],
+      ["only", "A", 2],
+      ["only", "B", 1],
+      ["only", "B", 2],
+    ]);
+  });
+});