some minor fixed and refactoring

Author: beatfactor

lib/setup.js

@@ -1,8 +1,7 @@
 const path = require('path');
 const fs = require('fs');
-const vite = require('./vite.js');
 const getPort = require('get-port');
-
+const vite = require('./vite.js');
 const vite_dev_server = {
   port: process.argv.includes('--test-worker') ? null : 5173
 };
@@ -13,18 +12,21 @@ try {
   //
 }
 
-
 const projectJsConfigFile = path.join(process.cwd(), 'vite.config.js');
 const projectTsConfigFile = path.join(process.cwd(), 'vite.config.ts');
 
-const hasProjectJsConfigFile = () => {
+const hasProjectConfigFile = () => {
   try {
     if (fs.statSync(projectJsConfigFile).isFile()) {
       return projectJsConfigFile;
     }
   } catch (err) {
-    if (fs.statSync(projectTsConfigFile).isFile()) {
-      return projectTsConfigFile;
+    try {
+      if (fs.statSync(projectTsConfigFile).isFile()) {
+        return projectTsConfigFile;
+      }
+    } catch (err) {
+      // nothing
     }
 
     return false;
@@ -35,18 +37,26 @@ module.exports = async function() {
   const viteConfig = {
     port: vite_dev_server.port
   };
-  
+
   if (!viteConfig.port) {
     viteConfig.port = await getPort();
   }
-  const projectConfigFile = hasProjectJsConfigFile();
-  viteConfig.configFile = projectConfigFile ? projectConfigFile : path.join(__dirname, '../vite.config.js');
-  
+
+  const projectConfigFile = hasProjectConfigFile();
+
+  let viteConfigFile = path.join(__dirname, '../vite.config.js');
+  if (projectConfigFile) {
+    viteConfigFile = projectConfigFile;
+  }
+  viteConfig.configFile = viteConfigFile;
+
   const viteServer = await vite.start(viteConfig);
-  const nightwatchPlugin = viteServer.middlewares.stack.find(item => item.route === '/_nightwatch');
+  const nightwatchPlugin = viteServer.middlewares.stack.find(item => {
+    return item.route === '/_nightwatch';
+  });
 
   if (!nightwatchPlugin) {
-    const error = new Error('Missing vite-plugin-nightwatch in '+ projectConfigFile);
+    const error = new Error('Missing vite-plugin-nightwatch in ' + projectConfigFile);
     const code = `:
     
     import nightwatchPlugin from 'vite-plugin-nightwatch'
@@ -60,12 +70,13 @@ module.exports = async function() {
       ]
     };
     `;
-    error.help = ['Please ensure that "vite-nightwatch-plugin" is loaded in your Vite config file ' + code];
+    error.help = ['Please ensure that "vite-plugin-nightwatch" is loaded in your Vite config file ' + code];
+    error.link = 'https://nightwatchjs.org/guide/component-testing/vite-plugin.html';
+
     throw error;
-  } 
+  }
+
   global.viteServer = viteServer;
 
   return viteServer;
 };
-
-  

nightwatch/globals.js

@@ -1,9 +1,10 @@
-const http = require('../lib/setup.js');
 const setup = require('../lib/setup.js');
+const http = require('http');
 
 let viteServer;
+
 const isWorker = process.argv.includes('--test-worker');
-const startViteServer = async (settings = {}) =>{
+const startViteServer = async function (settings = {}) {
   settings.vite_dev_server = Object.assign({
     start_vite: true,
     port: 5173
@@ -13,11 +14,14 @@ const startViteServer = async (settings = {}) =>{
   if (settings.vite_dev_server.start_vite) {
     viteServer = await setup();
 
+    // This will make sure the launch Url is set correctly when mounting the Vue component
     settings.vite_dev_server.port = vite_port = viteServer.config.server.port;
   } else {
-    vite_port = settings.vite_dev_server.port; 
+    vite_port = settings.vite_dev_server.port;
+
     try {
       const enabled = await makeViteRequest(vite_port);
+
       if (!enabled) {
         const error = new Error('Missing vite-plugin-nightwatch');
         const code = `:
@@ -34,18 +38,21 @@ const startViteServer = async (settings = {}) =>{
     };
     `;
         error.help = ['Please ensure that "vite-plugin-nightwatch" is loaded in your Vite config file ' + code];
+        error.link = 'https://nightwatchjs.org/guide/component-testing/vite-plugin.html';
+
         throw error;
       }
 
       return true;
     } catch (err) {
-      const error = new Error('vite dev server is not running: \n  ' + err.message);
+      const error = new Error('Vite dev server is not running: \n   ' + err.message);
       error.help = [`You can configure Nightwatch to start Vite automatically by adding this to your nightwatch.conf.js: 
       vite_dev_server: {
         start_vite: true,
         port: 5173 
       }
       `];
+      error.link = 'https://nightwatchjs.org/guide/component-testing/vite-plugin.html';
       throw error;
     } 
   }