Merge remote-tracking branch 'origin/main' into refactor/bundling

Author: adhamfarrag

pnpm-lock.yaml

@@ -1,8 +1,8 @@
 import { ThemeIcon, QuickPickItem, window } from 'vscode';
-import { newTerminal, projectRootDirectory, jiti, detectPackageManagerByName } from '../../utils';
+import { newTerminal, projectRootDirectory, detectPackageManagerByName } from '../../utils';
 import { nuxtDev, nuxtBuild, nuxtGenerate, nuxtCleanUp, nuxtAnalyze, nuxtInfo } from './commonCommands';
 import { handleModuleCommand, handleAddCommand, handleDevtoolsCommand } from './multiStepCommands';
-import { cliCommands } from '../../nuxtCLI';
+import { tryImportNuxi } from '../../nuxi';
 
 const pm = detectPackageManagerByName();
 const runCommand = pm ? pm.runCommand : 'npx';
@@ -38,7 +38,12 @@ const shouldDirectlyRun = (command: any) => directlyExecutableCommands.includes(
 const shouldIndirectlyRun = (command: any) => indirectlyExecutableCommands.includes(command);
 
 const showCLICommands = async () => {
-    const commands = Object.keys(await cliCommands);
+    const nuxi = await tryImportNuxi()
+    if (!nuxi) {
+        console.log('nuxi not found')
+        return
+    }
+    const commands = Object.keys(nuxi.main.subCommands);
 
     const options = {
         placeHolder: 'Select a command',

src/commands/NuxtCLI/commonCommands.ts src/commands/Nuxi/commonCommands.tssrc/commands/NuxtCLI/commonCommands.ts renamed to src/commands/Nuxi/commonCommands.ts

@@ -7,7 +7,7 @@ import { createMiddleware, directCreateMiddleware } from './Middleware'
 import { createNitroAPI, directCreateNitroAPI, createNitroRoute, directCreateNitroRoute, createNitroPlugin, createNitroMiddleware, createNitroUtil } from './Nitro'
 import { projectStructure, appConfig, nuxtIgnore, nuxtRC } from './Structure'
 import { openDocumentation, openModules } from './externalLinks'
-import { nuxtDev, nuxtBuild, nuxtGenerate, nuxtCleanUp, nuxtAnalyze, nuxtInfo, showCLICommands } from './NuxtCLI'
+import { nuxtDev, nuxtBuild, nuxtGenerate, nuxtCleanUp, nuxtAnalyze, nuxtInfo, showCLICommands } from './Nuxi'
 import { createStore, directCreateStore } from './Store'
 import { installDependencies, searchAndInstallDependencies } from './InstallDependencies'
 import { openSettings } from '../utils/navigation'

src/commands/NuxtCLI/index.ts src/commands/Nuxi/index.tssrc/commands/NuxtCLI/index.ts renamed to src/commands/Nuxi/index.ts

@@ -6,7 +6,6 @@ import codelens from './codelens'
 import { statusBars, activateStatusBarIcons } from './statusBar'
 import { activateIntellisense } from './intellisense'
 import { filesWatcher } from './watchers'
-import { checkCLIInstallation } from './nuxtCLI';
 
 const commandList = [
     { command: 'nuxtr.createPage', function: nuxtrCommands.createPage },
@@ -87,13 +86,9 @@ export async function activateExtension(context: ExtensionContext) {
     // activate intellisense
     activateIntellisense(context)
 
-    // check nuxt cli installation
-    await checkCLIInstallation()
-
     // activate codelens
     codelens.activateCodelenses(context)
 
-
     commandList.forEach(({ command, function: commandFunction }) => {
         context.subscriptions.push(commands.registerCommand(command, commandFunction));
     });

src/commands/NuxtCLI/multiStepCommands.ts src/commands/Nuxi/multiStepCommands.tssrc/commands/NuxtCLI/multiStepCommands.ts renamed to src/commands/Nuxi/multiStepCommands.ts

@@ -0,0 +1,6 @@
+import { window } from 'vscode'
+import { tryImport, isNuxiInstalled, newTerminal } from '../utils'
+
+export async function tryImportNuxi() {
+    return (await tryImport('nuxi') || await tryImport('nuxi-edge')) as undefined | typeof import('nuxi-edge')
+}

src/commands/index.ts

@@ -114,4 +114,13 @@ export const runCommand = async (args: {
 };
 
 
-export const jiti = require("jiti")(__filename, { esmResolve: true, interopDefault: true });
+const _jiti = require("jiti")(projectRootDirectory(), { esmResolve: true, interopDefault: true });
+
+export async function tryImport (path: string): Promise<undefined | unknown> {
+    try {
+        return _jiti(path)
+    } catch (error) {
+        return undefined;
+    }
+}
+

src/extension.ts

@@ -1,4 +1,4 @@
-import { getNonce, getUri, projectRootDirectory, openExternalLink, getConfiguration, newTerminal, runCommand, projectSrcDirectory, jiti } from './global'
+import { getNonce, getUri, projectRootDirectory, openExternalLink, getConfiguration, newTerminal, runCommand, projectSrcDirectory, tryImport } from './global'
 
 import {
     addNuxtModule,
@@ -44,7 +44,7 @@ export {
     openExternalLink,
     getProjectDependencies,
     getProjectScripts,
-    jiti,
+    tryImport,
     getNuxtVersion,
     isNuxtTwo,
     hasSrcDir,