Skip to content

Commit 9ef37e5

Browse files
committed
feat: hiding Nuxt Devtools for Nuxt 2
1 parent 8e9e524 commit 9ef37e5

File tree

4 files changed

+24
-5
lines changed

4 files changed

+24
-5
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@
297297
},
298298
{
299299
"command": "nuxtr.directToggleDevTools",
300-
"when": "nuxtr.isNuxtProject"
300+
"when": "nuxtr.isNuxtProject && !nuxtr.isNuxtTwo"
301301
},
302302
{
303303
"command": "nuxtr.errorLayout",
@@ -937,7 +937,7 @@
937937
"command": "nuxtr.directToggleDevTools",
938938
"title": "Toggle DevTools",
939939
"category": "Nuxtr",
940-
"when": "nuxtr.isNuxtProject"
940+
"when": "nuxtr.isNuxtProject && !nuxtr.isNuxtTwo"
941941
},
942942
{
943943
"command": "nuxtr.directUpgradeNuxt",

src/commands/Devtools.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import {
1010
getInstallationCommand,
1111
runCommand,
1212
getNuxtVersion,
13+
isNuxtTwo,
1314
} from "../utils";
14-
import { updateDevtoolsStatusBar } from "../statusBar";
15+
import { updateDevtoolsStatusBar, hideDevtoolsStatusBar } from "../statusBar";
1516

1617
let mod: any;
1718
let nuxtConfigFile: string;
@@ -146,14 +147,23 @@ async function nuxtConfigWatcher() {
146147

147148
async function nuxtDevToolsHandler() {
148149
const isInstalled = await isDevtoolsInstalled();
150+
const nuxtTwo = isNuxtTwo();
149151
let isDevtoolsNative = false;
150152

151153
let nuxtVersion = getNuxtVersion();
152154
if (typeof nuxtVersion === 'string') {
153155
isDevtoolsNative = semver.gte(nuxtVersion, '3.8.0') ? true : false;
154156
}
155157

156-
if (!isInstalled && !isDevtoolsNative) {
158+
if (nuxtTwo) {
159+
updateDevtoolsStatusBar({
160+
command: '',
161+
tooltip: "Nuxt Devtools: Not supported for Nuxt 2",
162+
text: "$(nuxt-disabled)",
163+
color: new ThemeColor("activityBar.inactiveForeground"),
164+
});
165+
hideDevtoolsStatusBar()
166+
} else if (!isInstalled && !isDevtoolsNative) {
157167
await installDevtools();
158168
updateDevtoolsStatusBar({
159169
command: "nuxtr.directUpgradeNuxt",

src/index.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
import { ExtensionContext, commands } from 'vscode';
22
import { activateExtension, publicCommands } from './extension'
3-
import { isNuxtProject } from './utils';
3+
import { isNuxtProject , isNuxtTwo } from './utils';
44

55
export async function activate(context: ExtensionContext) {
66
const isNuxt = await isNuxtProject();
77

8+
89
commands.executeCommand('setContext', 'nuxtr.isNuxtProject', isNuxt);
910

11+
1012
if (isNuxt) {
13+
const nuxtTwo = isNuxtTwo();
14+
commands.executeCommand('setContext', 'nuxtr.isNuxtTwo', nuxtTwo);
15+
1116
await activateExtension(context);
1217
} else {
1318
publicCommands.forEach(({ command, function: commandFunction }) => {

src/statusBar/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,8 @@ export function updateDevtoolsStatusBar(statusBar: DevtoolsStatusBar) {
4444
statusBars.devToolsStatusBar.tooltip = statusBar.tooltip;
4545
statusBars.devToolsStatusBar.text = statusBar.text;
4646
statusBars.devToolsStatusBar.color = statusBar.color;
47+
}
48+
49+
export function hideDevtoolsStatusBar() {
50+
statusBars.devToolsStatusBar.hide()
4751
}

0 commit comments

Comments
 (0)