From 5207a28d07a32855d487c70133396cb8174444b1 Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 20 Jun 2017 00:02:05 +0200 Subject: [PATCH 1/7] Allow to add vues loader --- index.js | 13 +++++++++++++ lib/WebpackConfig.js | 7 +++++++ lib/config-generator.js | 10 ++++++++++ lib/loader-features.js | 5 +++++ test/WebpackConfig.js | 18 ++++++++++++++++++ 5 files changed, 53 insertions(+) diff --git a/index.js b/index.js index 2d1bbd56..9f0336aa 100644 --- a/index.js +++ b/index.js @@ -341,6 +341,19 @@ module.exports = { return this; }, + /** + * If enabled, the vue-loader is added: + * https://vue-loader.vuejs.org/en/ + * + * @param {object} options see https://vue-loader.vuejs.org/en/configurations/advanced.html + * @return {exports} + */ + enableVueLoader(options = {}) { + webpackConfig.enableVueLoader(options); + + return this; + }, + /** * If enabled, the output directory is emptied between * each build (to remove old files). diff --git a/lib/WebpackConfig.js b/lib/WebpackConfig.js index abb8bffd..27c7ef22 100644 --- a/lib/WebpackConfig.js +++ b/lib/WebpackConfig.js @@ -45,6 +45,8 @@ class WebpackConfig { resolve_url_loader: true }; this.useLessLoader = false; + this.useVueLoader = false; + this.vueOptions = {}; this.cleanupOutput = false; this.sharedCommonsEntryName = null; this.providedVariables = {}; @@ -222,6 +224,11 @@ class WebpackConfig { this.useReact = true; } + enableVueLoader(options) { + this.useVueLoader = true; + this.vueOptions = options; + } + cleanupOutputBeforeBuild() { this.cleanupOutput = true; } diff --git a/lib/config-generator.js b/lib/config-generator.js index 20358be5..b8ee4da4 100644 --- a/lib/config-generator.js +++ b/lib/config-generator.js @@ -154,6 +154,16 @@ class ConfigGenerator { }); } + if (this.webpackConfig.useVueLoader) { + loaderFeatures.ensureLoaderPackagesExist('vue'); + + rules.push({ + test: /\.vue/, + loader: 'vue-loader', + options: this.webpackConfig.vueOptions + }); + } + this.webpackConfig.loaders.forEach((loader) => { rules.push(loader); }); diff --git a/lib/loader-features.js b/lib/loader-features.js index d3a3f74c..a50be594 100644 --- a/lib/loader-features.js +++ b/lib/loader-features.js @@ -35,6 +35,11 @@ const loaderFeatures = { method: 'enableReactPreset()', packages: ['babel-preset-react'], description: 'process React JS files' + }, + vue: { + method: 'enableVueLoader()', + packages: ['vue-loader'], + description: 'load VUE files' } }; diff --git a/test/WebpackConfig.js b/test/WebpackConfig.js index 642cbc1a..65266a0a 100644 --- a/test/WebpackConfig.js +++ b/test/WebpackConfig.js @@ -291,6 +291,24 @@ describe('WebpackConfig object', () => { }); }); + describe('enableVueLoader', () => { + it('Call with no config', () => { + const config = createConfig(); + config.enableVueLoader(); + + expect(config.useVueLoader).to.be.true; + }); + + it('Pass config', () => { + const config = createConfig(); + config.enableVueLoader({ extractCSS: true }); + + expect(config.useVueLoader).to.be.true; + expect(config.vueOptions.extractCSS).to.be.true; + }); + + }); + describe('addLoader', () => { it('Adds a new loader', () => { const config = createConfig(); From cf2c1a7168215bdb78b03667cf8537e967154ab9 Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 20 Jun 2017 21:42:26 +0200 Subject: [PATCH 2/7] Add vue-template-compiler dependency --- lib/loader-features.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/loader-features.js b/lib/loader-features.js index a50be594..9010a5a9 100644 --- a/lib/loader-features.js +++ b/lib/loader-features.js @@ -38,7 +38,7 @@ const loaderFeatures = { }, vue: { method: 'enableVueLoader()', - packages: ['vue-loader'], + packages: ['vue-loader', 'vue-template-compiler'], description: 'load VUE files' } }; From 4094a73c20fb81ef07f15247b97abac3ac6581bc Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 20 Jun 2017 22:06:29 +0200 Subject: [PATCH 3/7] Fix unit test --- test/WebpackConfig.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/WebpackConfig.js b/test/WebpackConfig.js index 65266a0a..cf41f84f 100644 --- a/test/WebpackConfig.js +++ b/test/WebpackConfig.js @@ -306,7 +306,19 @@ describe('WebpackConfig object', () => { expect(config.useVueLoader).to.be.true; expect(config.vueOptions.extractCSS).to.be.true; }); + }); + + describe('addPlugin', () => { + it('extends the current registered plugins', () => { + const config = createConfig(); + const nbOfPlugins = config.plugins.length; + expect(nbOfPlugins).to.equal(0); + + config.addPlugin(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/)); + + expect(config.plugins.length).to.equal(1); + }); }); describe('addLoader', () => { From 0d5cdd52b1404076c7086e4c0ed70aa53b30f6fe Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Thu, 15 Jun 2017 06:33:41 -0400 Subject: [PATCH 4/7] Completing vue-loader support --- fixtures/vuejs/App.vue | 50 ++++++++++++ fixtures/vuejs/assets/logo.png | Bin 0 -> 6849 bytes fixtures/vuejs/components/Hello.vue | 53 +++++++++++++ fixtures/vuejs/main.js | 8 ++ index.js | 16 ++-- lib/WebpackConfig.js | 8 +- lib/config-generator.js | 33 +++----- lib/loader-features.js | 4 +- lib/loaders/css.js | 5 +- lib/loaders/extract-text.js | 29 +++++++ lib/loaders/less.js | 5 +- lib/loaders/sass.js | 10 ++- lib/loaders/vue.js | 105 +++++++++++++++++++++++++ lib/test/assert.js | 4 - lib/test/setup.js | 11 ++- package.json | 3 + test/WebpackConfig.js | 4 +- test/functional.js | 81 ++++++++++++++++++- test/loaders/sass.js | 18 +++++ test/loaders/vue.js | 55 +++++++++++++ yarn.lock | 117 ++++++++++++++++++++++++++-- 21 files changed, 561 insertions(+), 58 deletions(-) create mode 100644 fixtures/vuejs/App.vue create mode 100644 fixtures/vuejs/assets/logo.png create mode 100644 fixtures/vuejs/components/Hello.vue create mode 100644 fixtures/vuejs/main.js create mode 100644 lib/loaders/extract-text.js create mode 100644 lib/loaders/vue.js create mode 100644 test/loaders/vue.js diff --git a/fixtures/vuejs/App.vue b/fixtures/vuejs/App.vue new file mode 100644 index 00000000..41f16123 --- /dev/null +++ b/fixtures/vuejs/App.vue @@ -0,0 +1,50 @@ + + + + + + + + + + + diff --git a/fixtures/vuejs/assets/logo.png b/fixtures/vuejs/assets/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43 GIT binary patch literal 6849 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 +
+

{{ msg }}

+

Essential Links

+ +

Ecosystem

+ +
+ + + + + + diff --git a/fixtures/vuejs/main.js b/fixtures/vuejs/main.js new file mode 100644 index 00000000..8845066e --- /dev/null +++ b/fixtures/vuejs/main.js @@ -0,0 +1,8 @@ +import Vue from 'vue' +import App from './App' + +new Vue({ + el: '#app', + template: '', + components: { App } +}) diff --git a/index.js b/index.js index 9f0336aa..68e187ef 100644 --- a/index.js +++ b/index.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} @@ -342,14 +343,15 @@ module.exports = { }, /** - * If enabled, the vue-loader is added: - * https://vue-loader.vuejs.org/en/ + * If enabled, the Vue.js loader is enabled. * - * @param {object} options see https://vue-loader.vuejs.org/en/configurations/advanced.html - * @return {exports} + * https://github.com/vuejs/vue-loader + * + * @param {object} vueLoaderOptions: https://vue-loader.vuejs.org/en/configurations/advanced.html + * @returns {exports} */ - enableVueLoader(options = {}) { - webpackConfig.enableVueLoader(options); + enableVueLoader(vueLoaderOptions = {}) { + webpackConfig.enableVueLoader(vueLoaderOptions); return this; }, diff --git a/lib/WebpackConfig.js b/lib/WebpackConfig.js index 27c7ef22..45c2bba3 100644 --- a/lib/WebpackConfig.js +++ b/lib/WebpackConfig.js @@ -45,13 +45,13 @@ class WebpackConfig { resolve_url_loader: true }; this.useLessLoader = false; - this.useVueLoader = false; - this.vueOptions = {}; this.cleanupOutput = false; this.sharedCommonsEntryName = null; this.providedVariables = {}; this.babelConfigurationCallback = function() {}; this.useReact = false; + this.useVueLoader = false; + this.vueLoaderOptions = {}; this.loaders = []; } @@ -224,9 +224,9 @@ class WebpackConfig { this.useReact = true; } - enableVueLoader(options) { + enableVueLoader(vueLoaderOptions = {}) { this.useVueLoader = true; - this.vueOptions = options; + this.vueLoaderOptions = vueLoaderOptions; } cleanupOutputBeforeBuild() { diff --git a/lib/config-generator.js b/lib/config-generator.js index b8ee4da4..fc8cac61 100644 --- a/lib/config-generator.js +++ b/lib/config-generator.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'); @@ -26,6 +27,7 @@ const cssLoaderUtil = require('./loaders/css'); const sassLoaderUtil = require('./loaders/sass'); const lessLoaderUtil = require('./loaders/less'); const babelLoaderUtil = require('./loaders/babel'); +const vueLoaderUtil = require('./loaders/vue'); class ConfigGenerator { /** @@ -68,7 +70,10 @@ class ConfigGenerator { config.stats = this.buildStatsConfig(); config.resolve = { - extensions: ['.js', '.jsx'] + extensions: ['.js', '.jsx', '.vue'], + alias: { + 'vue$': 'vue/dist/vue.esm.js', + } }; return config; @@ -111,10 +116,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)$/, @@ -137,30 +139,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) { - loaderFeatures.ensureLoaderPackagesExist('vue'); - rules.push({ - test: /\.vue/, - loader: 'vue-loader', - options: this.webpackConfig.vueOptions + test: /\.vue$/, + use: vueLoaderUtil.getLoaders(this.webpackConfig, this.webpackConfig.vueLoaderOptions) }); } @@ -387,10 +380,6 @@ class ConfigGenerator { https: this.webpackConfig.useDevServerInHttps() }; } - - getSourceMapOption() { - return this.webpackConfig.useSourceMaps ? '?sourceMap' : ''; - } } /** diff --git a/lib/loader-features.js b/lib/loader-features.js index 9010a5a9..3023688e 100644 --- a/lib/loader-features.js +++ b/lib/loader-features.js @@ -38,7 +38,9 @@ const loaderFeatures = { }, vue: { method: 'enableVueLoader()', - packages: ['vue-loader', 'vue-template-compiler'], + // 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' } }; diff --git a/lib/loaders/css.js b/lib/loaders/css.js index 22f6d338..002e2e46 100644 --- a/lib/loaders/css.js +++ b/lib/loaders/css.js @@ -13,10 +13,11 @@ const loaderFeatures = require('../loader-features'); /** * @param {WebpackConfig} webpackConfig + * @param {bool} ignorePostCssLoader If true, postcss-loader will never be added * @return {Array} of loaders to use for CSS files */ module.exports = { - getLoaders(webpackConfig) { + getLoaders(webpackConfig, skipPostCssLoader) { const cssLoaders = [ { loader: 'css-loader', @@ -27,7 +28,7 @@ module.exports = { }, ]; - if (webpackConfig.usePostCssLoader) { + if (webpackConfig.usePostCssLoader && !skipPostCssLoader) { loaderFeatures.ensureLoaderPackagesExist('postcss'); cssLoaders.push({ diff --git a/lib/loaders/extract-text.js b/lib/loaders/extract-text.js new file mode 100644 index 00000000..99c9b595 --- /dev/null +++ b/lib/loaders/extract-text.js @@ -0,0 +1,29 @@ +/* + * This file is part of the Symfony package. + * + * (c) Fabien Potencier + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +'use strict'; + +const ExtractTextPlugin = require('extract-text-webpack-plugin'); + +/** + * Wraps style loaders with the ExtractTextPlugin. + * + * @param {WebpackConfig} webpackConfig + * @param {Array} loaders An array of some style loaders + * @param {bool} useVueStyleLoader + * @return {Array} + */ +module.exports = { + extract(webpackConfig, loaders, useVueStyleLoader = false) { + return ExtractTextPlugin.extract({ + fallback: (useVueStyleLoader ? 'vue-style-loader' : 'style-loader') + (webpackConfig.useSourceMaps ? '?sourceMap' : ''), + use: loaders + }); + } +}; diff --git a/lib/loaders/less.js b/lib/loaders/less.js index 58f653a3..1324f1a7 100644 --- a/lib/loaders/less.js +++ b/lib/loaders/less.js @@ -14,14 +14,15 @@ const cssLoader = require('./css'); /** * @param {WebpackConfig} webpackConfig + * @param {bool} ignorePostCssLoader If true, postcss-loader will never be added * @return {Array} of loaders to use for Less files */ module.exports = { - getLoaders(webpackConfig) { + getLoaders(webpackConfig, ignorePostCssLoader = false) { loaderFeatures.ensureLoaderPackagesExist('less'); return [ - ...cssLoader.getLoaders(webpackConfig), + ...cssLoader.getLoaders(webpackConfig, ignorePostCssLoader), { loader: 'less-loader', options: { diff --git a/lib/loaders/sass.js b/lib/loaders/sass.js index b4d6fd5b..ea6da9b6 100644 --- a/lib/loaders/sass.js +++ b/lib/loaders/sass.js @@ -14,13 +14,15 @@ const cssLoader = require('./css'); /** * @param {WebpackConfig} webpackConfig + * @param {Object} sassOption Options to pass to the loader + * @param {bool} ignorePostCssLoader If true, postcss-loader will never be added * @return {Array} of loaders to use for Sass files */ module.exports = { - getLoaders(webpackConfig) { + getLoaders(webpackConfig, sassOptions = {}, ignorePostCssLoader = false) { loaderFeatures.ensureLoaderPackagesExist('sass'); - const sassLoaders = [...cssLoader.getLoaders(webpackConfig)]; + const sassLoaders = [...cssLoader.getLoaders(webpackConfig, ignorePostCssLoader)]; if (true === webpackConfig.sassOptions.resolve_url_loader) { // responsible for resolving SASS url() paths // without this, all url() paths must be relative to the @@ -35,10 +37,10 @@ module.exports = { sassLoaders.push({ loader: 'sass-loader', - options: { + options: Object.assign(sassOptions, { // needed by the resolve-url-loader sourceMap: (true === webpackConfig.sassOptions.resolve_url_loader) || webpackConfig.useSourceMaps - } + }), }); return sassLoaders; diff --git a/lib/loaders/vue.js b/lib/loaders/vue.js new file mode 100644 index 00000000..3efb2ccf --- /dev/null +++ b/lib/loaders/vue.js @@ -0,0 +1,105 @@ +/* + * This file is part of the Symfony package. + * + * (c) Fabien Potencier + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +'use strict'; + +const loaderFeatures = require('../loader-features'); +const cssLoaderUtil = require('./css'); +const sassLoaderUtil = require('./sass'); +const lessLoaderUtil = require('./less'); +const babelLoaderUtil = require('./babel'); +const extractText = require('./extract-text'); + +/** + * @param {WebpackConfig} webpackConfig + * @return {Array} of loaders to use for Vue files + */ +module.exports = { + getLoaders(webpackConfig, vueLoaderOptions) { + loaderFeatures.ensureLoaderPackagesExist('vue'); + + /* + * The vue-loader passes the contents of