moved to new node.js imports feature

izelnakri · Jun 25, 2023 · ab06527 · ab06527
1 parent 898f83d
commit ab06527
Show file tree

Hide file tree

Showing 19 changed files with 56 additions and 34 deletions.
diff --git a/package.json b/package.json
@@ -12,10 +12,21 @@
   "engines": {
     "node": ">=20.3.0"
   },
-  "main": "index.js",
   "bin": {
     "qunitx": "cli.js"
   },
+  "imports": {
+    "qunitx": {
+      "node": "./shims/nodejs.js",
+      "deno": "./shims/deno.js",
+      "default": "./index.js"
+    }
+  },
+  "exports": {
+    "node": "./shims/nodejs.js",
+    "deno": "./shims/deno.js",
+    "default": "./index.js"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/izelnakri/qunitx.git"

diff --git a/shims/deno.js b/shims/deno.js
@@ -0,0 +1,6 @@
+console.log('called');
+
+export const module = () => {};
+export const test = () => {
+  console.log('called test');
+};
diff --git a/test/commands/help-test.js b/test/commands/help-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 import fs from 'node:fs';
 import { promisify } from 'node:util';
 import { exec } from 'node:child_process';

diff --git a/test/commands/init-test.js b/test/commands/init-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 import assert from 'node:assert';
 import { promisify } from 'node:util';
 import { exec } from 'node:child_process';

diff --git a/test/flags/after-test.js b/test/flags/after-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 import { assertPassingTestCase, assertFailingTestCase, assertTAPResult } from '../helpers/assert-stdout.js';
 import shell from '../helpers/shell.js';
 

diff --git a/test/flags/before-test.js b/test/flags/before-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 import { assertPassingTestCase, assertFailingTestCase, assertTAPResult } from '../helpers/assert-stdout.js';
 import shell from '../helpers/shell.js';
 

diff --git a/test/flags/coverage-test.js b/test/flags/coverage-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 
 // test('todo', async (t) => {
 //   t.true(true);

diff --git a/test/flags/failfast-test.js b/test/flags/failfast-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 
 // test('todo', async (t) => {
 //   t.true(true);

diff --git a/test/flags/output-test.js b/test/flags/output-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 
 // test('todo', async (t) => {
 //   t.true(true);

diff --git a/test/flags/reporter-test.js b/test/flags/reporter-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 
 // test('todo', async (t) => {
 //   t.true(true);

diff --git a/test/flags/timeout-test.js b/test/flags/timeout-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 
 // test('todo', async (t) => {
 //   t.true(true);

diff --git a/test/flags/watch-test.js b/test/flags/watch-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 
 // test('todo', async (t) => {
 //   t.true(true);

diff --git a/test/index.js b/test/index.js
@@ -1,16 +1,22 @@
 import "./setup.js";
-import { tap } from 'node:test/reporters';
-import { run } from 'node:test';
+// import { tap } from 'node:test/reporters';
+// import { run } from 'node:test';
+
+// run({
+//   concurrency: true,
+//   files: [
+//     "./test/commands/index.js",
+//     "./test/flags/index.js",
+//     "./test/inputs/index.js",
+//     "./test/setup/index.js",
+//   ],
+//   // timeout: 20000
+// })
+//   .compose(tap)
+//   .pipe(process.stdout);
+
+import "./commands/index.js";
+import "./flags/index.js";
+import "./inputs/index.js";
+import "./setup/index.js";
 
-run({
-  concurrency: true,
-  files: [
-    "./test/commands/index.js",
-    "./test/flags/index.js",
-    "./test/inputs/index.js",
-    "./test/setup/index.js",
-  ],
-  // timeout: 20000
-})
-  .compose(tap)
-  .pipe(process.stdout);
diff --git a/test/inputs/advanced-htmls-test.js b/test/inputs/advanced-htmls-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 
 // runTestInsideHTMLFile
 

diff --git a/test/inputs/error-edge-cases-test.js b/test/inputs/error-edge-cases-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 
 // TODO: invalid extension, use --debug without browser
 // folder/file doesnt exist to watch

diff --git a/test/inputs/file-and-folder-test.js b/test/inputs/file-and-folder-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 
 module('File and Folder Combination Tests', function() {
   test('todo', async function(assert) {

diff --git a/test/inputs/file-test.js b/test/inputs/file-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 import { assertPassingTestCase, assertFailingTestCase, assertTAPResult } from '../helpers/assert-stdout.js';
 import shell from '../helpers/shell.js';
 

diff --git a/test/inputs/folder-test.js b/test/inputs/folder-test.js
@@ -1,4 +1,4 @@
-import { module, test } from '../../shims/nodejs.js';
+import { module, test } from 'qunitx';
 import { writeTestFolder } from '../helpers/fs-writers.js';
 import { assertPassingTestCase, assertFailingTestCase, assertTAPResult } from '../helpers/assert-stdout.js';
 import shell from '../helpers/shell.js';

diff --git a/test/setup/test-file-paths-test.js b/test/setup/test-file-paths-test.js
@@ -1,9 +1,8 @@
-import { describe, it } from 'node:test';
-import assert from 'node:assert';
+import { module, test } from 'qunitx';
 import setupTestFilePaths from '../../lib/setup/test-file-paths.js';
 
-describe('Setup | glob(*) input tests | test-file-paths tests', () => {
-  it('setupTestFilePaths() works correctly on different inputs', () => {
+module('Setup | glob(*) input tests | test-file-paths tests', () => {
+  test('setupTestFilePaths() works correctly on different inputs', (assert) => {
     let projectRoot = '/home/izelnakri/Github/qunitx';
 
     assert.deepEqual(setupTestFilePaths(projectRoot, [