From 6799e6a59e5a0c11183d853f17e66db71c873e2d Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinkle@fastmail.com>
Date: Tue, 27 Aug 2024 01:14:50 +0100
Subject: [PATCH] Build: Fold core.js into qunit.js

---
 src/core/core.js  | 69 ---------------------------------------------
 src/core/qunit.js | 72 +++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 70 insertions(+), 71 deletions(-)
 delete mode 100644 src/core/core.js

diff --git a/src/core/core.js b/src/core/core.js
deleted file mode 100644
index 76307966e..000000000
--- a/src/core/core.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import Assert from './assert.js';
-import { createRegisterCallbackFunction } from './callbacks.js';
-import config from './config.js';
-import diff from './diff.js';
-import dump from './dump.js';
-import equiv from './equiv.js';
-import { on } from './events.js';
-import { window } from './globals.js';
-import hooks from './hooks.js';
-import { module, unnamedModule } from './module.js';
-import onUncaughtException from './on-uncaught-exception.js';
-import ProcessingQueue from './processing-queue.js';
-import reporters from './reporters.js';
-import { stack } from './stacktrace.js';
-import { start } from './start.js';
-import { urlParams } from './urlparams.js';
-import { test, pushFailure } from './test.js';
-import { objectType, is } from './utilities.js';
-import version from './version.js';
-
-config.currentModule = unnamedModule;
-config._pq = new ProcessingQueue();
-
-const QUnit = {
-
-  // Figure out if we're running the tests from a server or not
-  isLocal: (window && window.location && window.location.protocol === 'file:'),
-
-  // Expose the current QUnit version
-  version,
-
-  config,
-  stack,
-  urlParams,
-
-  diff,
-  dump,
-  equiv,
-  reporters,
-  hooks,
-  is,
-  on,
-  objectType,
-  onUncaughtException,
-  pushFailure,
-
-  begin: createRegisterCallbackFunction('begin'),
-  done: createRegisterCallbackFunction('done'),
-  log: createRegisterCallbackFunction('log'),
-  moduleDone: createRegisterCallbackFunction('moduleDone'),
-  moduleStart: createRegisterCallbackFunction('moduleStart'),
-  testDone: createRegisterCallbackFunction('testDone'),
-  testStart: createRegisterCallbackFunction('testStart'),
-
-  assert: Assert.prototype,
-  module,
-  start,
-  test,
-
-  // alias other test flavors for easy access
-  todo: test.todo,
-  skip: test.skip,
-  only: test.only
-};
-
-// Inject the exported QUnit API for use by reporters in start()
-config._QUnit = QUnit;
-
-export default QUnit;
diff --git a/src/core/qunit.js b/src/core/qunit.js
index 47c8bf869..17db97cab 100644
--- a/src/core/qunit.js
+++ b/src/core/qunit.js
@@ -1,8 +1,76 @@
-import QUnit from './core.js';
-import { initBrowser } from './browser/browser-runner.js';
+// Imports that define the QUnit API
+import Assert from './assert.js';
+import { createRegisterCallbackFunction } from './callbacks.js';
+import config from './config.js';
+import diff from './diff.js';
+import dump from './dump.js';
+import equiv from './equiv.js';
+import { on } from './events.js';
 import { window, document } from './globals.js';
+import hooks from './hooks.js';
+import { module, unnamedModule } from './module.js';
+import onUncaughtException from './on-uncaught-exception.js';
+import ProcessingQueue from './processing-queue.js';
+import reporters from './reporters.js';
+import { stack } from './stacktrace.js';
+import { start } from './start.js';
+import { urlParams } from './urlparams.js';
+import { test, pushFailure } from './test.js';
+import { objectType, is } from './utilities.js';
+import version from './version.js';
+
+// Imports that help with init
+import { initBrowser } from './browser/browser-runner.js';
 import exportQUnit from './export.js';
 
+config.currentModule = unnamedModule;
+config._pq = new ProcessingQueue();
+
+const QUnit = {
+
+  // Figure out if we're running the tests from a server or not
+  isLocal: (window && window.location && window.location.protocol === 'file:'),
+
+  // Expose the current QUnit version
+  version,
+
+  config,
+  stack,
+  urlParams,
+
+  diff,
+  dump,
+  equiv,
+  reporters,
+  hooks,
+  is,
+  on,
+  objectType,
+  onUncaughtException,
+  pushFailure,
+
+  begin: createRegisterCallbackFunction('begin'),
+  done: createRegisterCallbackFunction('done'),
+  log: createRegisterCallbackFunction('log'),
+  moduleDone: createRegisterCallbackFunction('moduleDone'),
+  moduleStart: createRegisterCallbackFunction('moduleStart'),
+  testDone: createRegisterCallbackFunction('testDone'),
+  testStart: createRegisterCallbackFunction('testStart'),
+
+  assert: Assert.prototype,
+  module,
+  start,
+  test,
+
+  // alias other test flavors for easy access
+  todo: test.todo,
+  skip: test.skip,
+  only: test.only
+};
+
+// Inject the exported QUnit API for use by reporters in start()
+config._QUnit = QUnit;
+
 exportQUnit(QUnit);
 
 if (window && document) {