diff --git a/packages/@vue/cli-plugin-router/__tests__/routerGenerator.spec.js b/packages/@vue/cli-plugin-router/__tests__/routerGenerator.spec.js index b9121c2a3b..0e8a165f06 100644 --- a/packages/@vue/cli-plugin-router/__tests__/routerGenerator.spec.js +++ b/packages/@vue/cli-plugin-router/__tests__/routerGenerator.spec.js @@ -9,8 +9,8 @@ test('base', async () => { expect(files['src/router/index.js']).toBeTruthy() expect(files['src/router/index.js']).not.toMatch('history') - expect(files['src/views/About.vue']).toBeTruthy() - expect(files['src/views/Home.vue']).toBeTruthy() + expect(files['src/views/AboutView.vue']).toBeTruthy() + expect(files['src/views/HomeView.vue']).toBeTruthy() expect(files['src/App.vue']).toMatch('Home') expect(files['src/App.vue']).not.toMatch(' <%# END_REPLACE %> diff --git a/packages/@vue/cli-plugin-typescript/generator/template/src/views/Home.vue b/packages/@vue/cli-plugin-typescript/generator/template/src/views/HomeView.vue similarity index 91% rename from packages/@vue/cli-plugin-typescript/generator/template/src/views/Home.vue rename to packages/@vue/cli-plugin-typescript/generator/template/src/views/HomeView.vue index 758e910ec5..7d61ef30dd 100644 --- a/packages/@vue/cli-plugin-typescript/generator/template/src/views/Home.vue +++ b/packages/@vue/cli-plugin-typescript/generator/template/src/views/HomeView.vue @@ -1,5 +1,5 @@ --- -extend: '@vue/cli-plugin-router/generator/template/src/views/Home.vue' +extend: '@vue/cli-plugin-router/generator/template/src/views/HomeView.vue' when: "rootOptions.plugins && rootOptions.plugins['@vue/cli-plugin-router']" replace: - !!js/regexp /Welcome to Your Vue\.js App/ @@ -17,7 +17,7 @@ import Vue from 'vue'; import HelloWorld from '@/components/HelloWorld.vue'; // @ is an alias to /src export default Vue.extend({ - name: 'Home', + name: 'HomeView', components: { HelloWorld, }, @@ -31,7 +31,7 @@ import HelloWorld from '@/components/HelloWorld.vue'; // @ is an alias to /src HelloWorld, }, }) -export default class Home extends Vue {} +export default class HomeView extends Vue {} <%_ } _%> <%# END_REPLACE %> diff --git a/packages/@vue/cli-ui-addon-webpack/.eslintrc.js b/packages/@vue/cli-ui-addon-webpack/.eslintrc.js index ab7c1dc63a..4a2b4dd2c5 100644 --- a/packages/@vue/cli-ui-addon-webpack/.eslintrc.js +++ b/packages/@vue/cli-ui-addon-webpack/.eslintrc.js @@ -15,5 +15,8 @@ module.exports = { babelOptions: { cwd: __dirname } + }, + rules: { + 'vue/multi-word-component-names': 'warn' } } diff --git a/packages/@vue/cli-ui-addon-widgets/.eslintrc.js b/packages/@vue/cli-ui-addon-widgets/.eslintrc.js index e6df3ac965..5ca8071ca2 100644 --- a/packages/@vue/cli-ui-addon-widgets/.eslintrc.js +++ b/packages/@vue/cli-ui-addon-widgets/.eslintrc.js @@ -9,7 +9,8 @@ module.exports = { ], rules: { 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off', - 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off' + 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off', + 'vue/multi-word-component-names': 'warn' }, parserOptions: { parser: '@babel/eslint-parser', diff --git a/packages/@vue/cli-ui/.eslintrc.js b/packages/@vue/cli-ui/.eslintrc.js index 3c45b98389..e2094b68ec 100644 --- a/packages/@vue/cli-ui/.eslintrc.js +++ b/packages/@vue/cli-ui/.eslintrc.js @@ -19,7 +19,8 @@ module.exports = { 'vue/html-self-closing': 'error', 'vue/no-use-v-if-with-v-for': 'warn', 'vue/no-unused-vars': 'warn', - 'vue/return-in-computed-property': 'warn' + 'vue/return-in-computed-property': 'warn', + 'vue/multi-word-component-names': 'warn' }, parserOptions: {