CLI: Move non-bin files from bin/ to src/cli/

Follows-up #1271.
qunitjs · Dec 27, 2018 · 9c99d33 · 9c99d33
1 parent b54e732
commit 9c99d33
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 12 deletions.
diff --git a/bin/qunit b/bin/qunit
@@ -3,8 +3,8 @@
 "use strict";
 
 const program = require( "commander" );
-const run = require( "./run" );
-const FindReporter = require( "./find-reporter" );
+const run = require( "../src/cli/run" );
+const FindReporter = require( "../src/cli/find-reporter" );
 const pkg = require( "../package.json" );
 
 const findReporter = FindReporter.findReporter;

diff --git a/src/cli/.eslintrc.json b/src/cli/.eslintrc.json
@@ -0,0 +1,5 @@
+{
+  "env": {
+    "node": true
+  }
+}
diff --git a/bin/find-reporter.js → src/cli/find-reporter.js b/bin/find-reporter.js → src/cli/find-reporter.js
@@ -4,7 +4,7 @@ const JSReporters = require( "js-reporters" );
 const path = require( "path" );
 const findup = require( "findup-sync" );
 const utils = require( "./utils" );
-const pkg = require( "../package.json" );
+const pkg = require( "../../package.json" );
 
 function findReporter( reporterName ) {
 	if ( !reporterName ) {

diff --git a/bin/require-from-cwd.js → src/cli/require-from-cwd.js b/bin/require-from-cwd.js → src/cli/require-from-cwd.js
diff --git a/bin/require-qunit.js → src/cli/require-qunit.js b/bin/require-qunit.js → src/cli/require-qunit.js
@@ -13,14 +13,14 @@ module.exports = function requireQUnit() {
 		try {
 
 			// Second, we use the globally installed QUnit
-			delete require.cache[ resolve.sync( "../qunit/qunit" ) ];
-			return require( "../qunit/qunit" );
+			delete require.cache[ resolve.sync( "../../qunit/qunit" ) ];
+			return require( "../../qunit/qunit" );
 		} catch ( e ) {
 			if ( e.code === "MODULE_NOT_FOUND" ) {
 
 				// Finally, we use the local development version of QUnit
-				delete require.cache[ resolve.sync( "../dist/qunit" ) ];
-				return require( "../dist/qunit" );
+				delete require.cache[ resolve.sync( "../../dist/qunit" ) ];
+				return require( "../../dist/qunit" );
 			}
 
 			throw e;

diff --git a/bin/run.js → src/cli/run.js b/bin/run.js → src/cli/run.js
diff --git a/bin/utils.js → src/cli/utils.js b/bin/utils.js → src/cli/utils.js
diff --git a/test/cli/custom-reporter.js b/test/cli/custom-reporter.js
@@ -2,7 +2,7 @@ const co = require( "co" );
 const JSReporters = require( "js-reporters" );
 const NPMReporter = require( "npm-reporter" );
 
-const findReporter = require( "../../bin/find-reporter" ).findReporter;
+const findReporter = require( "../../src/cli/find-reporter" ).findReporter;
 
 const expectedOutput = require( "./fixtures/expected/tap-outputs" );
 const execute = require( "./helpers/execute" );

diff --git a/test/cli/require-qunit-test.js b/test/cli/require-qunit-test.js
@@ -10,7 +10,7 @@ QUnit.module( "requireQUnit", function() {
 		const localQUnit = {
 			"@noCallThru": true
 		};
-		const requireQUnit = proxyquire( "../../bin/require-qunit", {
+		const requireQUnit = proxyquire( "../../src/require-qunit", {
 			"resolve": resolveStub,
 			"qunit": localQUnit
 		} );
@@ -22,7 +22,7 @@ QUnit.module( "requireQUnit", function() {
 		const globalQUnit = {
 			"@noCallThru": true
 		};
-		const requireQUnit = proxyquire( "../../bin/require-qunit", {
+		const requireQUnit = proxyquire( "../../src/require-qunit", {
 			"resolve": resolveStub,
 			"qunit": null,
 			"../qunit/qunit": globalQUnit
@@ -35,7 +35,7 @@ QUnit.module( "requireQUnit", function() {
 		const devQUnit = {
 			"@noCallThru": true
 		};
-		const requireQUnit = proxyquire( "../../bin/require-qunit", {
+		const requireQUnit = proxyquire( "../../src/require-qunit", {
 			"resolve": resolveStub,
 			"qunit": null,
 			"../qunit/qunit": null,
@@ -46,7 +46,7 @@ QUnit.module( "requireQUnit", function() {
 	} );
 
 	QUnit.test( "throws error if none of the modules are found", function( assert ) {
-		const requireQUnit = proxyquire( "../../bin/require-qunit", {
+		const requireQUnit = proxyquire( "../../src/require-qunit", {
 			"resolve": resolveStub,
 			"qunit": null,
 			"../qunit/qunit": null,