Merge branch 'feat/add-and-restructure-templates' of https://github.c…

…om/nuxt/cli into feat/add-and-restructure-templates

src/utils/templates/api.ts

@@ -1,6 +1,6 @@
-import { applySuffix } from '.'
-import { resolve } from 'pathe'
 import type { Template } from '.'
+import { resolve } from 'pathe'
+import { applySuffix } from '.'
 
 const httpMethods = [
   'connect',

src/utils/templates/app.ts

@@ -1,9 +1,9 @@
-import { resolve } from 'pathe'
 import type { Template } from '.'
+import { resolve } from 'pathe'
 
 const app: Template = ({ args, nuxtOptions }) => ({
   path: resolve(nuxtOptions.srcDir, 'app.vue'),
-  contents: args['pages']
+  contents: args.pages
     ? `
 <script setup lang="ts"></script>
 

src/utils/templates/component.ts

@@ -1,6 +1,6 @@
 import type { Template } from '.'
-import { applySuffix } from '.'
 import { resolve } from 'pathe'
+import { applySuffix } from '.'
 
 const component: Template = ({ name, args, nuxtOptions }) => ({
   path: resolve(nuxtOptions.srcDir, `components/${name}${applySuffix(

src/utils/templates/composable.ts

@@ -1,6 +1,6 @@
+import type { Template } from '.'
 import { resolve } from 'pathe'
 import { camelCase, upperFirst } from 'scule'
-import type { Template } from '.'
 
 const composable: Template = ({ name, nuxtOptions }) => {
   const nameWithoutUsePrefix = name.replace(/^use-?/, '')

src/utils/templates/error.ts

@@ -1,5 +1,5 @@
-import { resolve } from 'pathe'
 import type { Template } from '.'
+import { resolve } from 'pathe'
 
 const error: Template = ({ nuxtOptions }) => ({
   path: resolve(nuxtOptions.srcDir, 'error.vue'),

src/utils/templates/index.ts

@@ -1,3 +1,4 @@
+import type { NuxtOptions } from '@nuxt/schema'
 import { api } from './api'
 import { app } from './app'
 import { component } from './component'
@@ -9,7 +10,6 @@ import { middleware } from './middleware'
 import { page } from './page'
 import { plugin } from './plugin'
 import { serverMiddleware } from './server-middleware'
-import type { NuxtOptions } from '@nuxt/schema'
 
 interface TemplateOptions {
   name: string

src/utils/templates/layer.ts

@@ -1,5 +1,5 @@
-import { resolve } from "pathe"
-import { Template } from "."
+import type { Template } from '.'
+import { resolve } from 'pathe'
 
 const layer: Template = ({ name, nuxtOptions }) => {
   return {
@@ -10,4 +10,4 @@ export default defineNuxtConfig({})
   }
 }
 
-export { layer }
+export { layer }

src/utils/templates/layout.ts

@@ -1,5 +1,5 @@
-import { resolve } from 'pathe'
 import type { Template } from '.'
+import { resolve } from 'pathe'
 
 const layout: Template = ({ name, nuxtOptions }) => ({
   path: resolve(nuxtOptions.srcDir, nuxtOptions.dir.layouts, `${name}.vue`),

src/utils/templates/middleware.ts

@@ -1,5 +1,5 @@
-import { resolve } from 'pathe'
 import type { Template } from '.'
+import { resolve } from 'pathe'
 import { applySuffix } from '.'
 
 const middleware: Template = ({ name, args, nuxtOptions }) => ({

src/utils/templates/page.ts

@@ -1,5 +1,5 @@
-import { resolve } from 'pathe'
 import type { Template } from '.'
+import { resolve } from 'pathe'
 
 const page: Template = ({ name, nuxtOptions }) => ({
   path: resolve(nuxtOptions.srcDir, nuxtOptions.dir.pages, `${name}.vue`),

src/utils/templates/plugin.ts

@@ -1,6 +1,6 @@
 import type { Template } from '.'
-import { applySuffix } from '.'
 import { resolve } from 'pathe'
+import { applySuffix } from '.'
 
 const plugin: Template = ({ name, args, nuxtOptions }) => ({
   path: resolve(nuxtOptions.srcDir, nuxtOptions.dir.plugins, `${name}${applySuffix(args, ['client', 'server'], 'mode')}.ts`),

src/utils/templates/server-middleware.ts

@@ -1,5 +1,5 @@
-import { resolve } from 'pathe'
 import type { Template } from '.'
+import { resolve } from 'pathe'
 
 const serverMiddleware: Template = ({ name, nuxtOptions }) => ({
   path: nuxtOptions.future.compatibilityVersion === 3