Merge branch 'master' into typescript

Author: weaverryan

fixtures/vuejs/App.vue

@@ -0,0 +1,50 @@
+<template>
+  <div id="app">
+    <img src="./assets/logo.png">
+    <hello></hello>
+  </div>
+</template>
+
+<script>
+import Hello from './components/Hello'
+
+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="sass">
+#app
+  color: #2c3e90
+</style>
+
+<style lang="less">
+#app {
+  margin-top: 40px;
+}
+</style>

fixtures/vuejs/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="http://vuejs-templates.github.io/webpack/" target="_blank">Docs for This Template</a></li>
+    </ul>
+    <h2>Ecosystem</h2>
+    <ul>
+      <li><a href="http://router.vuejs.org/" target="_blank">vue-router</a></li>
+      <li><a href="http://vuex.vuejs.org/" target="_blank">vuex</a></li>
+      <li><a href="http://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>
+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/components/Hello.vue

@@ -0,0 +1,8 @@
+import Vue from 'vue'
+import App from './App'
+
+new Vue({
+  el: '#app',
+  template: '<App/>',
+  components: { App }
+})

fixtures/vuejs/main.js

@@ -330,7 +330,8 @@ module.exports = {
     },
 
     /**
-     * If enabled, the react preset is added to Babel:
+     * If enabled, the react preset is added to Babel.
+     *
      * https://babeljs.io/docs/plugins/preset-react/
      *
      * @returns {exports}
@@ -356,6 +357,26 @@ module.exports = {
      */
     enableTypeScriptLoader(callback) {
         webpackConfig.enableTypeScriptLoader(callback);
+    }
+
+    /**
+     * If enabled, the Vue.js loader is enabled.
+     *
+     * https://github.com/vuejs/vue-loader
+     *
+     *     Encore.enableVueLoader();
+     *
+     *     // or configure the vue-loader options
+     *     // https://vue-loader.vuejs.org/en/configurations/advanced.html
+     *     Encore.enableVueLoader(function(options) {
+     *          options.preLoaders = { ... }
+     *     });
+     *
+     * @param {function} vueLoaderOptionsCallback
+     * @returns {exports}
+     */
+    enableVueLoader(vueLoaderOptionsCallback = () => {}) {
+        webpackConfig.enableVueLoader(vueLoaderOptionsCallback);
 
         return this;
     },

index.js

@@ -50,6 +50,8 @@ class WebpackConfig {
         this.providedVariables = {};
         this.babelConfigurationCallback = function() {};
         this.useReact = false;
+        this.useVueLoader = false;
+        this.vueLoaderOptionsCallback = () => {};
         this.loaders = [];
         this.useTypeScriptLoader = false;
         this.tsConfigurationCallback = function() {};
@@ -234,6 +236,16 @@ class WebpackConfig {
         this.tsConfigurationCallback = callback;
     }
 
+    enableVueLoader(vueLoaderOptionsCallback = () => {}) {
+        this.useVueLoader = true;
+
+        if (typeof vueLoaderOptionsCallback !== 'function') {
+            throw new Error('Argument 1 to enableVueLoader() must be a callback function.');
+        }
+
+        this.vueLoaderOptionsCallback = vueLoaderOptionsCallback;
+    }
+
     cleanupOutputBeforeBuild() {
         this.cleanupOutput = true;
     }
@@ -256,6 +268,7 @@ class WebpackConfig {
         this.autoProvideVariables({
             $: 'jquery',
             jQuery: 'jquery',
+            'window.jQuery': 'jquery',
         });
     }
 

lib/WebpackConfig.js

@@ -11,6 +11,7 @@
 
 const webpack = require('webpack');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const extractText = require('./loaders/extract-text');
 const ManifestPlugin = require('./webpack/webpack-manifest-plugin');
 const DeleteUnusedEntriesJSPlugin = require('./webpack/delete-unused-entries-js-plugin');
 const AssetOutputDisplayPlugin = require('./friendly-errors/asset-output-display-plugin');
@@ -21,12 +22,15 @@ const missingLoaderTransformer = require('./friendly-errors/transformers/missing
 const missingLoaderFormatter = require('./friendly-errors/formatters/missing-loader');
 const missingPostCssConfigTransformer = require('./friendly-errors/transformers/missing-postcss-config');
 const missingPostCssConfigFormatter = require('./friendly-errors/formatters/missing-postcss-config');
+const vueUnactivatedLoaderTransformer = require('./friendly-errors/transformers/vue-unactivated-loader-error');
+const vueUnactivatedLoaderFormatter = require('./friendly-errors/formatters/vue-unactivated-loader-error');
 const pathUtil = require('./config/path-util');
 const cssLoaderUtil = require('./loaders/css');
 const sassLoaderUtil = require('./loaders/sass');
 const lessLoaderUtil = require('./loaders/less');
 const babelLoaderUtil = require('./loaders/babel');
 const tsLoaderUtil = require('./loaders/typescript');
+const vueLoaderUtil = require('./loaders/vue');
 
 class ConfigGenerator {
     /**
@@ -68,12 +72,15 @@ class ConfigGenerator {
 
         config.stats = this.buildStatsConfig();
 
-        let extensions = ['.js', '.jsx', '.ts', '.tsx'];
-
         config.resolve = {
-            extensions: extensions
+            extensions: ['.js', '.jsx', '.vue', '.ts', '.tsx'];
+            alias: {}
         };
 
+        if (this.webpackConfig.useVueLoader) {
+            config.resolve.alias['vue$'] = 'vue/dist/vue.esm.js';
+        }
+
         return config;
     }
 
@@ -114,10 +121,7 @@ class ConfigGenerator {
             },
             {
                 test: /\.css$/,
-                use: ExtractTextPlugin.extract({
-                    fallback: 'style-loader' + this.getSourceMapOption(),
-                    use: cssLoaderUtil.getLoaders(this.webpackConfig)
-                })
+                use: extractText.extract(this.webpackConfig, cssLoaderUtil.getLoaders(this.webpackConfig, false))
             },
             {
                 test: /\.(png|jpg|jpeg|gif|ico|svg)$/,
@@ -140,20 +144,21 @@ class ConfigGenerator {
         if (this.webpackConfig.useSassLoader) {
             rules.push({
                 test: /\.s[ac]ss$/,
-                use: ExtractTextPlugin.extract({
-                    fallback: 'style-loader' + this.getSourceMapOption(),
-                    use: sassLoaderUtil.getLoaders(this.webpackConfig)
-                })
+                use: extractText.extract(this.webpackConfig, sassLoaderUtil.getLoaders(this.webpackConfig))
             });
         }
 
         if (this.webpackConfig.useLessLoader) {
             rules.push({
                 test: /\.less/,
-                use: ExtractTextPlugin.extract({
-                    fallback: 'style-loader' + this.getSourceMapOption(),
-                    use: lessLoaderUtil.getLoaders(this.webpackConfig)
-                })
+                use: extractText.extract(this.webpackConfig, lessLoaderUtil.getLoaders(this.webpackConfig))
+            });
+        }
+
+        if (this.webpackConfig.useVueLoader) {
+            rules.push({
+                test: /\.vue$/,
+                use: vueLoaderUtil.getLoaders(this.webpackConfig, this.webpackConfig.vueLoaderOptionsCallback)
             });
         }
 
@@ -324,11 +329,13 @@ class ConfigGenerator {
             clearConsole: false,
             additionalTransformers: [
                 missingLoaderTransformer,
-                missingPostCssConfigTransformer
+                missingPostCssConfigTransformer,
+                vueUnactivatedLoaderTransformer
             ],
             additionalFormatters: [
                 missingLoaderFormatter,
-                missingPostCssConfigFormatter
+                missingPostCssConfigFormatter,
+                vueUnactivatedLoaderFormatter
             ],
             compilationSuccessInfo: {
                 messages: []
@@ -388,10 +395,6 @@ class ConfigGenerator {
             https: this.webpackConfig.useDevServerInHttps()
         };
     }
-
-    getSourceMapOption() {
-        return this.webpackConfig.useSourceMaps ? '?sourceMap' : '';
-    }
 }
 
 /**

lib/config-generator.js

@@ -0,0 +1,42 @@
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+'use strict';
+
+const chalk = require('chalk');
+
+function formatErrors(errors) {
+    if (errors.length === 0) {
+        return [];
+    }
+
+    let messages = [];
+    // there will be an error for *every* file, but showing
+    // the error over and over again is not helpful
+
+    messages.push(
+        chalk.red('Vue processing failed:')
+    );
+    messages.push('');
+    for (let error of errors) {
+        messages.push(` * ${error.message}`);
+    }
+
+    messages.push('');
+
+    return messages;
+}
+
+function format(errors) {
+    return formatErrors(errors.filter((e) => (
+        e.type === 'vue-unactivated-loader-error'
+    )));
+}
+
+module.exports = format;

lib/friendly-errors/formatters/vue-unactivated-loader-error.js

@@ -0,0 +1,39 @@
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+'use strict';
+
+const TYPE = 'vue-unactivated-loader-error';
+
+function isVueUnactivatedLoaderError(e) {
+    if (e.name !== 'ModuleBuildError') {
+        return false;
+    }
+
+    if (e.message.indexOf('Cannot process lang=') === -1) {
+        return false;
+    }
+
+    return true;
+}
+
+function transform(error) {
+    if (!isVueUnactivatedLoaderError(error)) {
+        return error;
+    }
+
+    error = Object.assign({}, error);
+
+    error.type = TYPE;
+    error.severity = 900;
+
+    return error;
+}
+
+module.exports = transform;

lib/friendly-errors/transformers/vue-unactivated-loader-error.js

@@ -40,6 +40,13 @@ const loaderFeatures = {
         method: 'enableTypeScriptLoader()',
         packages: ['typescript', 'ts-loader'],
         description: 'process TypeScript files'
+    },
+    vue: {
+        method: 'enableVueLoader()',
+        // vue is needed so the end-user can do things
+        // vue-template-compiler is a peer dep of vue-loader
+        packages: ['vue', 'vue-loader', 'vue-template-compiler'],
+        description: 'load VUE files'
     }
 };