Merge remote-tracking branch 'origin/main' into create-projects-command

Author: adhamfarrag

package.json

@@ -898,6 +898,12 @@
                 "category": "Nuxtr",
                 "when": "nuxtr.isNuxtProject"
             },
+            {
+                "command": "nuxtr.errorLayout",
+                "title": "Create error.vue Layout",
+                "category": "Nuxtr",
+                "when": "nuxtr.isNuxtProject"
+            },
             {
                 "command": "nuxtr.installDependencies",
                 "title": "Install Dependencies",

src/commands/Structure.ts

@@ -1,19 +1,10 @@
 import { window } from 'vscode'
 import { mkdirSync, existsSync } from 'node:fs'
-import { isNuxtTwo, createFile, projectRootDirectory, projectSrcDirectory } from '../utils'
+import { isNuxtTwo, createFile, projectRootDirectory, projectSrcDirectory, generateVueFileTemplate } from '../utils'
 import { appConfigContent } from '../templates'
-import { generateVueFileTemplate } from '../utils/files'
 
 function promptDirectorySelection() {
-    let directories = [
-        'components',
-        'pages',
-        'assets',
-        'plugins',
-        'layouts',
-        'middleware',
-        'modules',
-    ]
+    let directories = ['components', 'pages', 'assets', 'plugins', 'layouts', 'middleware', 'modules',]
 
     let nuxtTwoDirectories = ['static', 'store',]
 
@@ -23,6 +14,8 @@ function promptDirectorySelection() {
         ? (directories = [...directories, ...nuxtTwoDirectories])
         : (directories = [...directories, ...nuxtThreeDirectories])
 
+    directories.sort()
+
     window
         .showQuickPick(directories, {
             canPickMany: true,
@@ -31,16 +24,24 @@ function promptDirectorySelection() {
         .then((selectedDirs) => {
             if (selectedDirs !== undefined && selectedDirs.length > 0) {
                 selectedDirs.forEach((dir) => {
-                    let path = `${projectSrcDirectory()}/${dir}`
-                    if (!existsSync(path)) {
-                        mkdirSync(path)
+                    let dirPath = `${projectSrcDirectory()}/${dir}`
+                    if (!existsSync(dirPath)) {
+                        mkdirSync(dirPath)
                     }
 
                     if (dir === 'pages') {
                         createFile({
                             fileName: `index.vue`,
                             content: generateVueFileTemplate('page'),
-                            fullPath: `${path}/index.vue`,
+                            fullPath: `${dirPath}/index.vue`,
+                        })
+                    }
+
+                    if (dir === 'layouts') {
+                        createFile({
+                            fileName: `default.vue`,
+                            content: generateVueFileTemplate('layout'),
+                            fullPath: `${dirPath}/default.vue`,
                         })
                     }
                 })
@@ -76,4 +77,12 @@ const nuxtRC = () => {
     })
 }
 
-export { projectStructure, appConfig, nuxtIgnore, nuxtRC }
+const errorLayout = () => {
+    createFile({
+        fileName: 'error.vue',
+        content: generateVueFileTemplate('page'),
+        fullPath: `${projectSrcDirectory()}/error.vue`,
+    })
+}
+
+export { projectStructure, appConfig, nuxtIgnore, nuxtRC, errorLayout }

src/commands/index.ts

@@ -5,7 +5,7 @@ import { createLayout, directCreateLayout } from './Layout'
 import { createPlugin, directCreatePlugin } from './Plugin'
 import { createMiddleware, directCreateMiddleware } from './Middleware'
 import { createNitroAPI, directCreateNitroAPI, createNitroRoute, directCreateNitroRoute, createNitroPlugin, createNitroMiddleware, createNitroUtil } from './Nitro'
-import { projectStructure, appConfig, nuxtIgnore, nuxtRC } from './Structure'
+import { projectStructure, appConfig, nuxtIgnore, nuxtRC, errorLayout } from './Structure'
 import { openDocumentation, openModules } from './externalLinks'
 import { nuxtDev, nuxtBuild, nuxtGenerate, nuxtCleanUp, nuxtAnalyze, nuxtInfo, nuxtModule, showCLICommands } from './Nuxi'
 import { createStore, directCreateStore } from './Store'
@@ -60,6 +60,7 @@ const commands = {
     appConfig,
     nuxtIgnore,
     nuxtRC,
+    errorLayout,
     installDependencies,
     upgradePackage,
     managePackageVersion,

src/extension.ts

@@ -36,6 +36,7 @@ const commandList = [
     { command: 'nuxtr.appConfig', function: nuxtrCommands.appConfig },
     { command: 'nuxtr.nuxtIgnore', function: nuxtrCommands.nuxtIgnore },
     { command: 'nuxtr.nuxtRC', function: nuxtrCommands.nuxtRC },
+    { command: 'nuxtr.errorLayout', function: nuxtrCommands.errorLayout },
     { command: 'nuxtr.installDependencies', function: nuxtrCommands.installDependencies },
     { command: 'nuxtr.openSettings', function: nuxtrCommands.openSettings },
     { command: 'nuxtr.configureCSS', function: nuxtrCommands.configureCSS },

src/utils/files.ts

@@ -7,7 +7,7 @@ let piniaConfig = nuxtrConfiguration().piniaFiles.defaultTemplate
 let eolConfiguration = vscodeConfiguration().files.eol
 let eol = eolConfiguration === 'auto' ? '\n' : eolConfiguration
 
-export function generateVueFileTemplate(type: string, template?: string) {
+export function generateVueFileTemplate(type: 'page' | 'layout', template?: string) {
     const userDefaultTemplate = template || (type === 'page'
         ? vueFilesConfig.pages.defaultTemplate
         : vueFilesConfig.layouts.defaultTemplate);