various test fixes

Author: weaverryan

fixtures/vuejs-typescript/App.vue renamed to fixtures/vuejs2-typescript/App.vue

@@ -0,0 +1,45 @@
+<template>
+  <div id="app">
+    <img src="./assets/logo.png">
+    <hello></hello>
+  </div>
+</template>
+
+<script lang="ts">
+import Hello from './components/Hello.vue'
+
+class TestClassSyntax {
+
+}
+
+export default {
+  name: 'app',
+  components: {
+    Hello
+  }
+}
+</script>
+
+<style>
+#app {
+  font-family: 'Avenir', Helvetica, Arial, sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  text-align: center;
+  color: #2c3e50;
+  margin-top: 60px;
+}
+</style>
+
+<style lang="scss">
+#app {
+  display: flex;
+  color: #2c3e90;
+}
+</style>
+
+<style lang="less">
+#app {
+  margin-top: 40px;
+}
+</style>

fixtures/vuejs-typescript/assets/logo.png renamed to fixtures/vuejs2-typescript/assets/logo.png

@@ -0,0 +1,53 @@
+<template>
+  <div class="hello">
+    <h1>{{ msg }}</h1>
+    <h2>Essential Links</h2>
+    <ul>
+      <li><a href="https://vuejs.org" target="_blank">Core Docs</a></li>
+      <li><a href="https://forum.vuejs.org" target="_blank">Forum</a></li>
+      <li><a href="https://gitter.im/vuejs/vue" target="_blank">Gitter Chat</a></li>
+      <li><a href="https://twitter.com/vuejs" target="_blank">Twitter</a></li>
+      <br>
+      <li><a href="https://vuejs-templates.github.io/webpack/" target="_blank">Docs for This Template</a></li>
+    </ul>
+    <h2>Ecosystem</h2>
+    <ul>
+      <li><a href="https://router.vuejs.org/" target="_blank">vue-router</a></li>
+      <li><a href="https://vuex.vuejs.org/" target="_blank">vuex</a></li>
+      <li><a href="https://vue-loader.vuejs.org/" target="_blank">vue-loader</a></li>
+      <li><a href="https://github.com/vuejs/awesome-vue" target="_blank">awesome-vue</a></li>
+    </ul>
+  </div>
+</template>
+
+<script lang="ts">
+  export default {
+  name: 'hello',
+  data () {
+    return {
+      msg: 'Welcome to Your Vue.js App'
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+h1, h2 {
+  font-weight: normal;
+}
+
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+
+li {
+  display: inline-block;
+  margin: 0 10px;
+}
+
+a {
+  color: #42b983;
+}
+</style>

fixtures/vuejs-typescript/components/Hello.vue renamed to fixtures/vuejs2-typescript/components/Hello.vue

@@ -0,0 +1,12 @@
+{
+    "compilerOptions": {
+        "target": "es6",
+        "strict": true,
+        "module": "es2015",
+        "moduleResolution": "node",
+        "allowSyntheticDefaultImports": true
+    },
+    "include": [
+        "./**/*.ts"
+    ]
+}

fixtures/vuejs-typescript/main_v2.ts renamed to fixtures/vuejs2-typescript/main.ts

@@ -23,18 +23,7 @@ module.exports = function(plugins, webpackConfig) {
         return;
     }
 
-    const vueVersion = getVueVersion(webpackConfig);
-    let VueLoaderPlugin;
-    switch (vueVersion) {
-        case 2:
-            VueLoaderPlugin = require('vue-loader/lib/plugin'); // eslint-disable-line
-            break;
-        case 3:
-            ({ VueLoaderPlugin } = require('vue-loader'));
-            break;
-        default:
-            throw new Error(`Invalid vue version ${vueVersion}`);
-    }
+    const { VueLoaderPlugin } = require('vue-loader');
 
     plugins.push({
         plugin: new VueLoaderPlugin(),

fixtures/vuejs-typescript/tsconfig.json renamed to fixtures/vuejs2-typescript/tsconfig.json

@@ -10,7 +10,14 @@
 'use strict';
 
 const expect = require('chai').expect;
-const transform = require('../../../lib/friendly-errors/transformers/missing-loader');
+const transformFactory = require('../../../lib/friendly-errors/transformers/missing-loader');
+const RuntimeConfig = require('../../../lib/config/RuntimeConfig');
+const WebpackConfig = require('../../../lib/WebpackConfig');
+
+const runtimeConfig = new RuntimeConfig();
+runtimeConfig.context = __dirname;
+runtimeConfig.babelRcFileExists = false;
+const transform = transformFactory(new WebpackConfig(runtimeConfig));
 
 describe('transform/missing-loader', () => {
 

fixtures/vuejs3-typescript/App.vue

@@ -1686,10 +1686,9 @@ module.exports = {
             );
 
             const config = testSetup.createWebpackConfig(appDir, 'www/build', 'dev');
-            const vueVersion = getVueVersion(config);
             config.enableSingleRuntimeChunk();
             config.setPublicPath('/build');
-            config.addEntry('main', `./vuejs-typescript/main_v${vueVersion}`);
+            config.addEntry('main', `./vuejs-typescript${getVueVersion(config)}/main`);
             config.enableVueLoader();
             config.enableSassLoader();
             config.enableLessLoader();
@@ -1704,13 +1703,6 @@ module.exports = {
                 ];
             });
 
-            // to avoid typescript breaking on the "invalid" file, delete it.
-            if (vueVersion === 3) {
-                fs.unlinkSync(path.join(config.getContext(), 'vuejs-typescript', 'main_v2.ts'));
-            } else {
-                fs.unlinkSync(path.join(config.getContext(), 'vuejs-typescript', 'main_v3.ts'));
-            }
-
             testSetup.runWebpack(config, (webpackAssert) => {
                 expect(config.outputPath).to.be.a.directory().with.deep.files([
                     'main.js',