vovk 0.2.3-beta.111 → 0.2.3-beta.112

package/cli/index.js

@@ -7,7 +7,7 @@ const getAvailablePort = require('./lib/getAvailablePort');
 const getVars = require('./getVars');
 const parseCommandLineArgs = require('./lib/parseCommandLineArgs');
 
-const { command, flags, nextArgs } = parseCommandLineArgs();
+const { command, flags, restArgs } = parseCommandLineArgs();
 const {
   config = path.join(process.cwd(), 'vovk.config.js'), // Path to vovk.config.js
   project = process.cwd(), // Path to Next.js project
@@ -36,7 +36,7 @@ if (command === 'dev') {
           command: `node ${__dirname}/server.js`,
           name: 'Vovk',
         },
-        { command: `cd ${project} && npx next dev ${nextArgs}`, name: 'Next' },
+        { command: `cd ${project} && npx next dev ${restArgs}`, name: 'Next' },
       ],
       env
     ).catch((e) => console.error(e));
@@ -57,7 +57,7 @@ if (command === 'dev') {
           command: `node ${__dirname}/server.js --once`,
           name: 'Vovk',
         },
-        { command: `cd ${project} && npx next build ${nextArgs}`, name: 'Next' },
+        { command: `cd ${project} && npx next build ${restArgs}`, name: 'Next' },
       ],
       env
     ).catch((e) => console.error(e));

package/cli/lib/parseCommandLineArgs.js

@@ -33,9 +33,9 @@ function parseCommandLineArgs() {
     }
   }
 
-  const nextArgs = unparsedArgs.join(' ');
+  const restArgs = unparsedArgs.join(' ');
 
-  return { command, flags, nextArgs };
+  return { command, flags, restArgs };
 }
 
 module.exports = parseCommandLineArgs;

package/cli/server.js

@@ -2,17 +2,14 @@
 const http = require('http');
 const fs = require('fs/promises');
 const path = require('path');
-const yargs = require('yargs/yargs');
-const { hideBin } = require('yargs/helpers');
+const parseCommandLineArgs = require('./lib/parseCommandLineArgs');
 const generateClient = require('./generateClient');
 const getVars = require('./getVars');
 const isEqual = require('./lib/isEqual');
 
-/** @type {{ once?: boolean; config: string }} */
-// @ts-expect-error yargs
-const argv = yargs(hideBin(process.argv)).argv;
+const { flags } = parseCommandLineArgs();
 
-const once = argv.once ?? false;
+const { once, config } = /** @type {{ once?: boolean; config: string }} */ (flags);
 
 const metadataPath = path.join(__dirname, '../../../.vovk.json');
 
@@ -43,7 +40,7 @@ let vars;
 const startPinging = () => {
   clearInterval(pingInterval);
   pingInterval = setInterval(() => {
-    vars = vars ?? getVars(argv.config);
+    vars = vars ?? getVars(config);
     let prefix = vars.VOVK_PREFIX;
     prefix = prefix.startsWith('http://')
       ? prefix
@@ -75,7 +72,7 @@ const server = http.createServer((req, res) => {
         /** @type {{ metadata?: import('../src') }} */
         const { metadata } = JSON.parse(body); // Parse the JSON data
         const metadataWritten = metadata ? await writeMetadata(metadata) : { written: false, path: metadataPath };
-        vars = vars ?? getVars(argv.config);
+        vars = vars ?? getVars(config);
         const codeWritten = await generateClient(vars);
         res.writeHead(200, { 'Content-Type': 'text/plain' });
         res.end('JSON data received and file created');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk",
-  "version": "0.2.3-beta.111",
+  "version": "0.2.3-beta.112",
   "description": "Structural add-on for Next.js",
   "bin": "./cli/index.js",
   "scripts": {