feat(vue): update generated file setup for apps

packages/vue/src/generators/application/__snapshots__/application.spec.ts.snap

@@ -177,20 +177,7 @@ exports[`application generator should set up project correctly with given option
 "
 `;
 
-exports[`application generator should set up project correctly with given options 5`] = `
-"import { describe, it, expect } from 'vitest';
-
-import { mount } from '@vue/test-utils';
-import App from '../App.vue';
-
-describe('App', () => {
-  it('renders properly', () => {
-    const wrapper = mount(App, {});
-    expect(wrapper.text()).toContain('Welcome test 👋');
-  });
-});
-"
-`;
+exports[`application generator should set up project correctly with given options 5`] = `null`;
 
 exports[`application generator should set up project correctly with given options 6`] = `
 [
@@ -200,21 +187,21 @@ exports[`application generator should set up project correctly with given option
   ".prettierrc",
   "nx.json",
   "package.json",
-  "test-e2e/.eslintrc.json",
-  "test-e2e/cypress.config.ts",
-  "test-e2e/project.json",
-  "test-e2e/src/e2e/app.cy.ts",
-  "test-e2e/src/fixtures/example.json",
-  "test-e2e/src/support/app.po.ts",
-  "test-e2e/src/support/commands.ts",
-  "test-e2e/src/support/e2e.ts",
-  "test-e2e/tsconfig.json",
+  "packages/vue/test-e2e/.eslintrc.json",
+  "packages/vue/test-e2e/cypress.config.ts",
+  "packages/vue/test-e2e/project.json",
+  "packages/vue/test-e2e/src/e2e/app.cy.ts",
+  "packages/vue/test-e2e/src/fixtures/example.json",
+  "packages/vue/test-e2e/src/support/app.po.ts",
+  "packages/vue/test-e2e/src/support/commands.ts",
+  "packages/vue/test-e2e/src/support/e2e.ts",
+  "packages/vue/test-e2e/tsconfig.json",
   "test/.eslintrc.json",
   "test/index.html",
   "test/project.json",
-  "test/src/__tests__/App.spec.ts",
-  "test/src/App.vue",
-  "test/src/components/NxWelcome.vue",
+  "test/src/app/App.spec.ts",
+  "test/src/app/App.vue",
+  "test/src/app/NxWelcome.vue",
   "test/src/main.ts",
   "test/src/styles.css",
   "test/tsconfig.app.json",

packages/vue/src/generators/application/files/common/src/__tests__/App.spec.ts.template → packages/vue/src/generators/application/files/common/src/app/App.spec.ts.template

@@ -2,7 +2,7 @@
 import { describe, it, expect } from 'vitest'
 <% } %>
 import { mount } from '@vue/test-utils'
-import App from '../App.vue';
+import App from './App.vue';
 
 describe('App', () => {
   it('renders properly', () => {

packages/vue/src/generators/application/files/common/src/App.vue.template → packages/vue/src/generators/application/files/common/src/app/App.vue.template

@@ -1,8 +1,9 @@
 <script setup lang="ts">
 <% if (routing) { %>
 import { RouterLink, RouterView } from 'vue-router';
+<% } else { %>
+import NxWelcome from './NxWelcome.vue';
 <% } %>
-import NxWelcome from './components/NxWelcome.vue';
 </script>
 
 <template>

packages/vue/src/generators/application/files/common/src/main.ts.template

@@ -6,7 +6,7 @@ import router from './router';
 <% } %>
 
 import { createApp } from 'vue';
-import App from './App.vue';
+import App from './app/App.vue';
 
 const app = createApp(App);
 <% if (routing) { %>

packages/vue/src/generators/application/files/routing/src/views/HomeView.vue.template

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import NxWelcome from '../components/NxWelcome.vue'
+import NxWelcome from '../app/NxWelcome.vue'
 </script>
 
 <template>

packages/vue/src/generators/component/__snapshots__/component.spec.ts.snap

@@ -26,7 +26,7 @@ div {
 
 exports[`component should generate files with jest 2`] = `
 "import { mount } from '@vue/test-utils';
-import Hello from '../hello.vue';
+import Hello from './hello.vue';
 
 describe('Hello', () => {
   it('renders properly', () => {
@@ -60,7 +60,7 @@ exports[`component should generate files with vitest 2`] = `
 "import { describe, it, expect } from 'vitest';
 
 import { mount } from '@vue/test-utils';
-import Hello from '../hello.vue';
+import Hello from './hello.vue';
 
 describe('Hello', () => {
   it('renders properly', () => {

packages/vue/src/generators/component/component.spec.ts

@@ -1,4 +1,4 @@
-import { logger, readJson, Tree } from '@nx/devkit';
+import { logger, Tree } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import { componentGenerator } from './component';
 import { createLib } from '../../utils/test-utils';
@@ -30,17 +30,14 @@ describe('component', () => {
       appTree.exists('my-lib/src/components/hello/hello.vue')
     ).toBeTruthy();
     expect(
-      appTree.exists('my-lib/src/components/hello/__tests__/hello.spec.ts')
+      appTree.exists('my-lib/src/components/hello/hello.spec.ts')
     ).toBeTruthy();
 
     expect(
       appTree.read('my-lib/src/components/hello/hello.vue', 'utf-8')
     ).toMatchSnapshot();
     expect(
-      appTree.read(
-        'my-lib/src/components/hello/__tests__/hello.spec.ts',
-        'utf-8'
-      )
+      appTree.read('my-lib/src/components/hello/hello.spec.ts', 'utf-8')
     ).toMatchSnapshot();
   });
 
@@ -55,10 +52,7 @@ describe('component', () => {
       appTree.read('my-lib/src/components/hello/hello.vue', 'utf-8')
     ).toMatchSnapshot();
     expect(
-      appTree.read(
-        'my-lib/src/components/hello/__tests__/hello.spec.ts',
-        'utf-8'
-      )
+      appTree.read('my-lib/src/components/hello/hello.spec.ts', 'utf-8')
     ).toMatchSnapshot();
   });
 
@@ -114,7 +108,7 @@ describe('component', () => {
         appTree.exists('my-lib/src/components/hello/Hello.vue')
       ).toBeTruthy();
       expect(
-        appTree.exists('my-lib/src/components/hello/__tests__/Hello.spec.ts')
+        appTree.exists('my-lib/src/components/hello/Hello.spec.ts')
       ).toBeTruthy();
     });
   });
@@ -131,9 +125,7 @@ describe('component', () => {
         appTree.exists('my-lib/src/components/HelloWorld/HelloWorld.vue')
       ).toBeTruthy();
       expect(
-        appTree.exists(
-          'my-lib/src/components/HelloWorld/__tests__/HelloWorld.spec.ts'
-        )
+        appTree.exists('my-lib/src/components/HelloWorld/HelloWorld.spec.ts')
       ).toBeTruthy();
     });
   });

packages/vue/src/generators/component/files/__tests__/__fileName__.spec.ts__tmpl__ → packages/vue/src/generators/component/files/__fileName__.spec.ts__tmpl__

@@ -3,7 +3,7 @@ import { describe, it, expect } from 'vitest'
 <% } %>
 
 import { mount } from '@vue/test-utils'
-import <%= className %> from '../<%= fileName %>.vue';
+import <%= className %> from './<%= fileName %>.vue';
 
 describe('<%= className %>', () => {
   it('renders properly', () => {

packages/vue/src/generators/library/library.spec.ts

@@ -163,9 +163,7 @@ describe('lib', () => {
     expect(tree.exists('my-lib/package.json')).toBeFalsy();
     expect(tree.exists('my-lib/src/index.ts')).toBeTruthy();
     expect(tree.exists('my-lib/src/components/my-lib.vue')).toBeTruthy();
-    expect(
-      tree.exists('my-lib/src/components/__tests__/my-lib.spec.ts')
-    ).toBeTruthy();
+    expect(tree.exists('my-lib/src/components/my-lib.spec.ts')).toBeTruthy();
     const eslintJson = readJson(tree, 'my-lib/.eslintrc.json');
     expect(eslintJson).toMatchSnapshot();
   });
@@ -206,9 +204,7 @@ describe('lib', () => {
         tree.exists('my-dir/my-lib/src/components/my-dir-my-lib.vue')
       ).toBeTruthy();
       expect(
-        tree.exists(
-          'my-dir/my-lib/src/components/__tests__/my-dir-my-lib.spec.ts'
-        )
+        tree.exists('my-dir/my-lib/src/components/my-dir-my-lib.spec.ts')
       ).toBeTruthy();
     });