Build: Cleanly separate src/ between src/core/ and src/cli/

Ref #1726.
qunitjs · Jul 15, 2024 · 580d94f · 580d94f
1 parent d395525
commit 580d94f
Show file tree

Hide file tree

Showing 72 changed files with 79 additions and 81 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -31,7 +31,7 @@ module.exports = function (grunt) {
       options: { process: preprocess },
 
       'src-css': {
-        src: 'src/qunit.css',
+        src: 'src/core/qunit.css',
         dest: 'qunit/qunit.css'
       }
     },

diff --git a/build/watch.js → build/dev.js b/build/watch.js → build/dev.js
@@ -88,7 +88,7 @@ async function startRollupWatch () {
 
 async function startCssWatch () {
   const baseDir = process.cwd();
-  const cssInputFile = path.resolve(baseDir, 'src/qunit.css');
+  const cssInputFile = path.resolve(baseDir, 'src/core/qunit.css');
   const cssOutputFile = path.resolve(baseDir, 'qunit/qunit.css');
 
   function copyCss () {

diff --git a/demos/q4000-qunit.html b/demos/q4000-qunit.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>q4000 on QUnit</title>
-  <link rel="stylesheet" href="../src/qunit.css">
+  <link rel="stylesheet" href="../src/core/qunit.css">
 </head>
 <body>
   <div id="qunit"></div>

diff --git a/package.json b/package.json
@@ -83,7 +83,7 @@
   "scripts": {
     "build": "rollup -c && grunt copy:src-css",
     "build-coverage": "rollup -c --environment BUILD_TARGET:coverage && grunt copy:src-css",
-    "build-dev": "node build/watch.js",
+    "build-dev": "node build/dev.js",
     "benchmark": "npm install --silent --no-audit --prefix test/benchmark/ && node test/benchmark/micro.js",
     "lint": "eslint --cache .",
     "lint-fix": "eslint --cache --fix .",

diff --git a/rollup.config.js b/rollup.config.js
@@ -9,7 +9,7 @@ const { replacements } = require('./build/dist-replace.js');
 const isCoverage = process.env.BUILD_TARGET === 'coverage';
 
 module.exports = {
-  input: 'src/qunit.js',
+  input: 'src/core/qunit.js',
   output: {
     file: 'qunit/qunit.js',
     sourcemap: isCoverage,

diff --git a/src/assert.js → src/core/assert.js b/src/assert.js → src/core/assert.js
@@ -1,8 +1,8 @@
 import dump from './dump.js';
 import equiv from './equiv.js';
-import config from './core/config.js';
-import { objectType, objectValues, objectValuesSubset, errorString } from './core/utilities.js';
-import { sourceFromStacktrace } from './core/stacktrace.js';
+import config from './config.js';
+import { objectType, objectValues, objectValuesSubset, errorString } from './utilities.js';
+import { sourceFromStacktrace } from './stacktrace.js';
 import { clearTimeout } from './globals.js';
 
 class Assert {

diff --git a/src/browser/browser-runner.js → src/core/browser/browser-runner.js b/src/browser/browser-runner.js → src/core/browser/browser-runner.js
diff --git a/src/browser/fixture.js → src/core/browser/fixture.js b/src/browser/fixture.js → src/core/browser/fixture.js
diff --git a/src/browser/urlparams.js → src/core/browser/urlparams.js b/src/browser/urlparams.js → src/core/browser/urlparams.js
diff --git a/src/callbacks.js → src/core/callbacks.js b/src/callbacks.js → src/core/callbacks.js
@@ -1,4 +1,4 @@
-import config from './core/config.js';
+import config from './config.js';
 import Promise from './promise.js';
 
 export function createRegisterCallbackFunction (key) {

diff --git a/src/core/config.js b/src/core/config.js
@@ -1,5 +1,5 @@
-import { globalThis, process, sessionStorage } from '../globals.js';
-import { urlParams } from '../urlparams.js';
+import { globalThis, process, sessionStorage } from './globals.js';
+import { urlParams } from './urlparams.js';
 import { extend } from './utilities.js';
 
 /**

diff --git a/src/core.js → src/core/core.js b/src/core.js → src/core/core.js
@@ -7,16 +7,16 @@ import Assert from './assert.js';
 import Test, { test, pushFailure } from './test.js';
 import reporters from './reporters.js';
 
-import config from './core/config.js';
-import hooks from './core/hooks.js';
-import { objectType, is, performance } from './core/utilities.js';
+import config from './config.js';
+import hooks from './hooks.js';
+import { objectType, is, performance } from './utilities.js';
 import { createRegisterCallbackFunction, runLoggingCallbacks } from './callbacks.js';
-import { sourceFromStacktrace } from './core/stacktrace.js';
-import ProcessingQueue from './core/processing-queue.js';
+import { sourceFromStacktrace } from './stacktrace.js';
+import ProcessingQueue from './processing-queue.js';
 
 import { urlParams } from './urlparams.js';
 import { on, emit } from './events.js';
-import onUncaughtException from './core/on-uncaught-exception.js';
+import onUncaughtException from './on-uncaught-exception.js';
 import diff from './diff.js';
 import version from './version.js';
 

diff --git a/src/diff.js → src/core/diff.js b/src/diff.js → src/core/diff.js
@@ -1,5 +1,5 @@
 /* eslint-disable indent */
-import { escapeText } from './core/utilities.js';
+import { escapeText } from './utilities.js';
 
 /*
  * This file is a modified version of google-diff-match-patch's JavaScript implementation

diff --git a/src/dump.js → src/core/dump.js b/src/dump.js → src/core/dump.js
@@ -28,8 +28,8 @@
 // POSSIBILITY OF SUCH DAMAGE.
 // -------
 
-import config from './core/config.js';
-import { inArray, is } from './core/utilities.js';
+import config from './config.js';
+import { inArray, is } from './utilities.js';
 
 export default (function () {
   function quote (str) {

diff --git a/src/equiv.js → src/core/equiv.js b/src/equiv.js → src/core/equiv.js
@@ -1,4 +1,4 @@
-import { objectType } from './core/utilities.js';
+import { objectType } from './utilities.js';
 import { StringSet } from './globals.js';
 
 const BOXABLE_TYPES = new StringSet(['boolean', 'number', 'string']);

diff --git a/src/events.js → src/core/events.js b/src/events.js → src/core/events.js
@@ -1,5 +1,5 @@
-import { inArray } from './core/utilities.js';
-import config from './core/config.js';
+import { inArray } from './utilities.js';
+import config from './config.js';
 
 const SUPPORTED_EVENTS = [
   'error',

diff --git a/src/export.js → src/core/export.js b/src/export.js → src/core/export.js
diff --git a/src/globals.js → src/core/globals.js b/src/globals.js → src/core/globals.js
diff --git a/src/logger.js → src/core/logger.js b/src/logger.js → src/core/logger.js
diff --git a/src/module.js → src/core/module.js b/src/module.js → src/core/module.js
@@ -1,6 +1,6 @@
-import config from './core/config.js';
+import config from './config.js';
 import SuiteReport from './reports/suite.js';
-import { extend, generateHash, isAsyncFunction } from './core/utilities.js';
+import { extend, generateHash, isAsyncFunction } from './utilities.js';
 
 const moduleStack = [];
 

diff --git a/src/core/on-uncaught-exception.js b/src/core/on-uncaught-exception.js
@@ -1,8 +1,8 @@
 import config from './config.js';
-import { runSuite } from '../module.js';
+import { runSuite } from './module.js';
 import { sourceFromStacktrace } from './stacktrace.js';
 import { errorString } from './utilities.js';
-import { emit } from '../events.js';
+import { emit } from './events.js';
 
 /**
  * Handle a global error that should result in a failed test run.

diff --git a/src/core/processing-queue.js b/src/core/processing-queue.js
@@ -1,11 +1,10 @@
 import config from './config.js';
 import { extend, generateHash, performance } from './utilities.js';
-import { runLoggingCallbacks } from '../callbacks.js';
-
-import Promise from '../promise.js';
-import { runSuite } from '../module.js';
-import { emit } from '../events.js';
-import { setTimeout } from '../globals.js';
+import { runLoggingCallbacks } from './callbacks.js';
+import Promise from './promise.js';
+import { runSuite } from './module.js';
+import { emit } from './events.js';
+import { setTimeout } from './globals.js';
 
 /**
  * Creates a seeded "sample" generator which is used for randomizing tests.

diff --git a/src/core/promise.js b/src/core/promise.js
@@ -0,0 +1,3 @@
+import _Promise from '../../lib/promise-polyfill.js';
+
+export default _Promise;
diff --git a/src/qunit.css → src/core/qunit.css b/src/qunit.css → src/core/qunit.css
diff --git a/src/qunit.js → src/core/qunit.js b/src/qunit.js → src/core/qunit.js
diff --git a/src/reporters.js → src/core/reporters.js b/src/reporters.js → src/core/reporters.js
diff --git a/src/reporters/ConsoleReporter.js → src/core/reporters/ConsoleReporter.js b/src/reporters/ConsoleReporter.js → src/core/reporters/ConsoleReporter.js
diff --git a/src/reporters/HtmlReporter.js → src/core/reporters/HtmlReporter.js b/src/reporters/HtmlReporter.js → src/core/reporters/HtmlReporter.js
@@ -1,4 +1,4 @@
-import { extend, errorString, escapeText } from '../core/utilities.js';
+import { extend, errorString, escapeText } from '../utilities.js';
 import diff from '../diff.js';
 import dump from '../dump.js';
 import { window, document, navigator, StringMap } from '../globals.js';

diff --git a/src/reporters/PerfReporter.js → src/core/reporters/PerfReporter.js b/src/reporters/PerfReporter.js → src/core/reporters/PerfReporter.js
diff --git a/src/reporters/TapReporter.js → src/core/reporters/TapReporter.js b/src/reporters/TapReporter.js → src/core/reporters/TapReporter.js
@@ -1,6 +1,7 @@
 import kleur from 'kleur';
-import { errorString } from '../core/utilities.js';
+import { errorString } from '../utilities.js';
 import { console } from '../globals.js';
+
 const hasOwn = Object.prototype.hasOwnProperty;
 
 /**

diff --git a/src/reports/suite.js → src/core/reports/suite.js b/src/reports/suite.js → src/core/reports/suite.js
@@ -1,4 +1,4 @@
-import { performance } from '../core/utilities.js';
+import { performance } from '../utilities.js';
 
 export default class SuiteReport {
   constructor (name, parentSuite) {

diff --git a/src/reports/test.js → src/core/reports/test.js b/src/reports/test.js → src/core/reports/test.js
@@ -1,4 +1,4 @@
-import { extend, performance } from '../core/utilities.js';
+import { extend, performance } from '../utilities.js';
 
 export default class TestReport {
   constructor (name, suite, options) {

diff --git a/src/test.js → src/core/test.js b/src/test.js → src/core/test.js
@@ -3,8 +3,7 @@ import { emit } from './events.js';
 import Assert from './assert.js';
 import Logger from './logger.js';
 import Promise from './promise.js';
-
-import config from './core/config.js';
+import config from './config.js';
 import {
   diff,
   errorString,
@@ -13,11 +12,10 @@ import {
   hasOwn,
   inArray,
   performance
-} from './core/utilities.js';
+} from './utilities.js';
 import { runLoggingCallbacks } from './callbacks.js';
-import { extractStacktrace, sourceFromStacktrace } from './core/stacktrace.js';
+import { extractStacktrace, sourceFromStacktrace } from './stacktrace.js';
 import dump from './dump.js';
-
 import TestReport from './reports/test.js';
 
 export default function Test (settings) {

diff --git a/src/urlparams.js → src/core/urlparams.js b/src/urlparams.js → src/core/urlparams.js
diff --git a/src/core/utilities.js b/src/core/utilities.js
@@ -1,4 +1,4 @@
-import { window } from '../globals.js';
+import { window } from './globals.js';
 
 export const toString = Object.prototype.toString;
 export const hasOwn = Object.prototype.hasOwnProperty;

diff --git a/src/version.js → src/core/version.js b/src/version.js → src/core/version.js
diff --git a/src/promise.js b/src/promise.js
diff --git a/test/browser-runner/amd.html b/test/browser-runner/amd.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>amd</title>
-  <link rel="stylesheet" href="../../src/qunit.css">
+  <link rel="stylesheet" href="../../src/core/qunit.css">
   <script src="../../qunit/qunit.js"></script>
   <script src="../../node_modules/requirejs/require.js"></script>
 </head>

diff --git a/test/browser-runner/autostart.html b/test/browser-runner/autostart.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>autostart</title>
-  <link rel="stylesheet" href="../../src/qunit.css">
+  <link rel="stylesheet" href="../../src/core/qunit.css">
 </head>
 <body>
   <div id="qunit"></div>

diff --git a/test/browser-runner/config-fixture-null.html b/test/browser-runner/config-fixture-null.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>config-fixture-null</title>
-  <link rel="stylesheet" href="../../src/qunit.css">
+  <link rel="stylesheet" href="../../src/core/qunit.css">
   <script src="../../qunit/qunit.js"></script>
   <script src="config-fixture-null.js"></script>
 </head>

diff --git a/test/browser-runner/config-fixture-string.html b/test/browser-runner/config-fixture-string.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>config-fixture-string</title>
-  <link rel="stylesheet" href="../../src/qunit.css">
+  <link rel="stylesheet" href="../../src/core/qunit.css">
   <script src="../../qunit/qunit.js"></script>
   <script src="config-fixture-string.js"></script>
 </head>

diff --git a/test/browser-runner/headless.html b/test/browser-runner/headless.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>headless</title>
-  <link rel="stylesheet" href="../../src/qunit.css">
+  <link rel="stylesheet" href="../../src/core/qunit.css">
   <script src="../../qunit/qunit.js"></script>
   <script src="../main/assert.js"></script>
   <script src="../main/deepEqual.js"></script>

diff --git a/test/browser-runner/window-onerror-preexisting-handler.html b/test/browser-runner/window-onerror-preexisting-handler.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="UTF-8">
 	<title>window.onerror with pre-existing handler</title>
-	<link rel="stylesheet" href="../../src/qunit.css">
+	<link rel="stylesheet" href="../../src/core/qunit.css">
 	<script>
 		/* exported onerrorCallingContext */
 		var onerrorReturnValue, onerrorCallingContext;

diff --git a/test/browser-runner/window-onerror.html b/test/browser-runner/window-onerror.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="UTF-8">
 	<title>window-onerror (no pre-existing handler)</title>
-	<link rel="stylesheet" href="../../src/qunit.css">
+	<link rel="stylesheet" href="../../src/core/qunit.css">
 	<script src="../../qunit/qunit.js"></script>
 	<script src="./window-onerror.js"></script>
 </head>

diff --git a/test/dynamic-import.html b/test/dynamic-import.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>QUnit</title>
-  <link rel="stylesheet" href="../src/qunit.css">
+  <link rel="stylesheet" href="../src/core/qunit.css">
 </head>
 <body>
   <div id="qunit"></div>

diff --git a/test/events-filters.html b/test/events-filters.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>events-filters</title>
-  <link rel="stylesheet" href="../src/qunit.css">
+  <link rel="stylesheet" href="../src/core/qunit.css">
   <script src="../qunit/qunit.js"></script>
   <script src="events-filters.js"></script>
 </head>

diff --git a/test/events-in-test.html b/test/events-in-test.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>events-in-test</title>
-  <link rel="stylesheet" href="../src/qunit.css">
+  <link rel="stylesheet" href="../src/core/qunit.css">
   <script src="../qunit/qunit.js"></script>
   <script src="events-in-test.js"></script>
 </head>

diff --git a/test/index-es5.html b/test/index-es5.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>index-es5</title>
-  <link rel="stylesheet" href="../src/qunit.css">
+  <link rel="stylesheet" href="../src/core/qunit.css">
   <script src="../qunit/qunit.js"></script>
   <script>
     // For main/module.js

diff --git a/test/index-xhtml.xhtml b/test/index-xhtml.xhtml
@@ -4,7 +4,7 @@
 <head>
   <meta charset="UTF-8" />
   <title>index-xhtml</title>
-  <link rel="stylesheet" href="../src/qunit.css" />
+  <link rel="stylesheet" href="../src/core/qunit.css" />
   <script src="../qunit/qunit.js"></script>
   <script>
     // For main/module.js

diff --git a/test/index.html b/test/index.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>QUnit Main Test Suite</title>
-  <link rel="stylesheet" href="../src/qunit.css">
+  <link rel="stylesheet" href="../src/core/qunit.css">
   <script src="../qunit/qunit.js"></script>
   <script>
     // For main/module.js

diff --git a/test/logs.html b/test/logs.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>logs</title>
-  <link rel="stylesheet" href="../src/qunit.css">
+  <link rel="stylesheet" href="../src/core/qunit.css">
   <script src="../qunit/qunit.js"></script>
   <script src="logs.js"></script>
 </head>

diff --git a/test/module-skip.html b/test/module-skip.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8">
     <title>module-skip</title>
-    <link rel="stylesheet" href="../src/qunit.css">
+    <link rel="stylesheet" href="../src/core/qunit.css">
     <script src="../qunit/qunit.js"></script>
     <script src="module-skip.js"></script>
   </head>

diff --git a/test/module-todo.html b/test/module-todo.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8">
     <title>module-todo</title>
-    <link rel="stylesheet" href="../src/qunit.css">
+    <link rel="stylesheet" href="../src/core/qunit.css">
     <script src="../qunit/qunit.js"></script>
     <script src="module-todo.js"></script>
   </head>

diff --git a/test/only-each.html b/test/only-each.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>only-each</title>
-  <link rel="stylesheet" href="../src/qunit.css">
+  <link rel="stylesheet" href="../src/core/qunit.css">
   <script src="../qunit/qunit.js"></script>
   <script src="./only-each.js"></script>
 </head>

diff --git a/test/overload.html b/test/overload.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8">
     <title>overload</title>
-    <link rel="stylesheet" href="../src/qunit.css">
+    <link rel="stylesheet" href="../src/core/qunit.css">
     <script>
     var _globalError;
     window.onerror = function (error) {

diff --git a/test/performance-mark.html b/test/performance-mark.html
@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="UTF-8">
 		<title>performance-mark</title>
-		<link rel="stylesheet" href="../src/qunit.css">
+		<link rel="stylesheet" href="../src/core/qunit.css">
 		<script src="../qunit/qunit.js"></script>
 		<script src="performance-mark.js"></script>
 	</head>