From 9cabf9b950308965d8904f239a2991e497c7ecbb Mon Sep 17 00:00:00 2001 From: Hugo Alliaume Date: Sun, 7 Apr 2019 11:30:43 +0200 Subject: [PATCH] Add JSX integration for Vue.js --- fixtures/vuejs-jsx/App.css | 8 +++ fixtures/vuejs-jsx/App.jsx | 20 ++++++ fixtures/vuejs-jsx/App.less | 3 + fixtures/vuejs-jsx/App.scss | 4 ++ fixtures/vuejs-jsx/assets/logo.png | Bin 0 -> 6849 bytes fixtures/vuejs-jsx/components/Hello.css | 17 +++++ fixtures/vuejs-jsx/components/Hello.jsx | 33 +++++++++ fixtures/vuejs-jsx/main.js | 8 +++ index.js | 19 +++++- lib/WebpackConfig.js | 14 +++- lib/features.js | 8 +++ lib/loaders/babel.js | 5 ++ package.json | 2 + test/WebpackConfig.js | 21 ++++++ test/functional.js | 75 +++++++++++++++++++++ test/loaders/babel.js | 18 +++++ yarn.lock | 86 ++++++++++++++++++++++++ 17 files changed, 338 insertions(+), 3 deletions(-) create mode 100644 fixtures/vuejs-jsx/App.css create mode 100644 fixtures/vuejs-jsx/App.jsx create mode 100644 fixtures/vuejs-jsx/App.less create mode 100644 fixtures/vuejs-jsx/App.scss create mode 100644 fixtures/vuejs-jsx/assets/logo.png create mode 100644 fixtures/vuejs-jsx/components/Hello.css create mode 100644 fixtures/vuejs-jsx/components/Hello.jsx create mode 100644 fixtures/vuejs-jsx/main.js diff --git a/fixtures/vuejs-jsx/App.css b/fixtures/vuejs-jsx/App.css new file mode 100644 index 00000000..bc719469 --- /dev/null +++ b/fixtures/vuejs-jsx/App.css @@ -0,0 +1,8 @@ +#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; +} diff --git a/fixtures/vuejs-jsx/App.jsx b/fixtures/vuejs-jsx/App.jsx new file mode 100644 index 00000000..1fa1817a --- /dev/null +++ b/fixtures/vuejs-jsx/App.jsx @@ -0,0 +1,20 @@ +import './App.css'; +import './App.scss'; +import './App.less'; +import Hello from './components/Hello'; + +class TestClassSyntax { + +} + +export default { + name: 'app', + render() { + return ( +
+ + +
+ ); + }, +}; diff --git a/fixtures/vuejs-jsx/App.less b/fixtures/vuejs-jsx/App.less new file mode 100644 index 00000000..b388ea23 --- /dev/null +++ b/fixtures/vuejs-jsx/App.less @@ -0,0 +1,3 @@ +#app { + margin-top: 40px; +} diff --git a/fixtures/vuejs-jsx/App.scss b/fixtures/vuejs-jsx/App.scss new file mode 100644 index 00000000..35f925ce --- /dev/null +++ b/fixtures/vuejs-jsx/App.scss @@ -0,0 +1,4 @@ +#app { + display: flex; + color: #2c3e90; +} diff --git a/fixtures/vuejs-jsx/assets/logo.png b/fixtures/vuejs-jsx/assets/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43 GIT binary patch literal 6849 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 +

{this.msg}

+

Essential Links

+ +

Ecosystem

+ + + ); + }, +}; diff --git a/fixtures/vuejs-jsx/main.js b/fixtures/vuejs-jsx/main.js new file mode 100644 index 00000000..8845066e --- /dev/null +++ b/fixtures/vuejs-jsx/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 4749101b..c0045379 100644 --- a/index.js +++ b/index.js @@ -936,11 +936,26 @@ class Encore { * options.preLoaders = { ... } * }); * + * // or configure Encore-specific options + * Encore.enableVueLoader(() => {}, { + * // set optional Encore-specific options, for instance: + * + * // enable JSX usage in Vue components + * // https://vuejs.org/v2/guide/render-function.html#JSX + * useJsx: true + * }) + * + * Supported options: + * * {boolean} useJsx (default=false) + * Configure Babel to use the preset "@vue/babel-preset-jsx", + * in order to enable JSX usage in Vue components. + * * @param {function} vueLoaderOptionsCallback + * @param {object} encoreOptions * @returns {Encore} */ - enableVueLoader(vueLoaderOptionsCallback = () => {}) { - webpackConfig.enableVueLoader(vueLoaderOptionsCallback); + enableVueLoader(vueLoaderOptionsCallback = () => {}, encoreOptions = {}) { + webpackConfig.enableVueLoader(vueLoaderOptionsCallback, encoreOptions); return this; } diff --git a/lib/WebpackConfig.js b/lib/WebpackConfig.js index e7849897..9d4b5d7a 100644 --- a/lib/WebpackConfig.js +++ b/lib/WebpackConfig.js @@ -88,6 +88,9 @@ class WebpackConfig { useBuiltIns: false, corejs: null, }; + this.vueOptions = { + useJsx: false, + }; // Features/Loaders options callbacks this.postCssLoaderOptionsCallback = () => {}; @@ -602,7 +605,7 @@ class WebpackConfig { forkedTypeScriptTypesCheckOptionsCallback; } - enableVueLoader(vueLoaderOptionsCallback = () => {}) { + enableVueLoader(vueLoaderOptionsCallback = () => {}, vueOptions = {}) { this.useVueLoader = true; if (typeof vueLoaderOptionsCallback !== 'function') { @@ -610,6 +613,15 @@ class WebpackConfig { } this.vueLoaderOptionsCallback = vueLoaderOptionsCallback; + + // Check allowed keys + for (const key of Object.keys(vueOptions)) { + if (!(key in this.vueOptions)) { + throw new Error(`"${key}" is not a valid key for enableVueLoader(). Valid keys: ${Object.keys(this.vueOptions).join(', ')}.`); + } + } + + this.vueOptions = vueOptions; } enableEslintLoader(eslintLoaderOptionsOrCallback = () => {}) { diff --git a/lib/features.js b/lib/features.js index a165c908..7043bd7b 100644 --- a/lib/features.js +++ b/lib/features.js @@ -89,6 +89,14 @@ const features = { ], description: 'load VUE files' }, + 'vue-jsx': { + method: 'enableVueLoader()', + packages: [ + { name: '@vue/babel-preset-jsx' }, + { name: '@vue/babel-helper-vue-jsx-merge-props' } + ], + description: 'use Vue with JSX support' + }, eslint: { method: 'enableEslintLoader()', // eslint is needed so the end-user can do things diff --git a/lib/loaders/babel.js b/lib/loaders/babel.js index a2e40cae..8fd0d1fb 100644 --- a/lib/loaders/babel.js +++ b/lib/loaders/babel.js @@ -72,6 +72,11 @@ module.exports = { } } + if (webpackConfig.useVueLoader && webpackConfig.vueOptions.useJsx) { + loaderFeatures.ensurePackagesExistAndAreCorrectVersion('vue-jsx'); + babelConfig.presets.push('@vue/babel-preset-jsx'); + } + babelConfig = applyOptionsCallback(webpackConfig.babelConfigurationCallback, babelConfig); } diff --git a/package.json b/package.json index 166efcb4..557e022f 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,8 @@ "devDependencies": { "@babel/plugin-transform-react-jsx": "^7.0.0", "@babel/preset-react": "^7.0.0", + "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0-beta.3", + "@vue/babel-preset-jsx": "^1.0.0-beta.3", "autoprefixer": "^8.5.0", "babel-eslint": "^10.0.1", "chai": "^3.5.0", diff --git a/test/WebpackConfig.js b/test/WebpackConfig.js index e10e73f0..1fc1b4b1 100644 --- a/test/WebpackConfig.js +++ b/test/WebpackConfig.js @@ -876,6 +876,27 @@ describe('WebpackConfig object', () => { expect(config.useVueLoader).to.be.true; expect(config.vueLoaderOptionsCallback).to.equal(callback); }); + + it('Should validate Encore-specific options', () => { + const config = createConfig(); + + expect(() => { + config.enableVueLoader(() => {}, { + notExisting: false, + }); + }).to.throw('"notExisting" is not a valid key for enableVueLoader(). Valid keys: useJsx.'); + }); + + it('Should set Encore-specific options', () => { + const config = createConfig(); + config.enableVueLoader(() => {}, { + useJsx: true, + }); + + expect(config.vueOptions).to.deep.equal({ + useJsx: true, + }); + }); }); diff --git a/test/functional.js b/test/functional.js index e7833ad0..078b2b32 100644 --- a/test/functional.js +++ b/test/functional.js @@ -1445,6 +1445,81 @@ module.exports = { }, true); }); + it('Vue.js is compiled correctly with JSX support', (done) => { + const appDir = testSetup.createTestAppDir(); + + fs.writeFileSync( + path.join(appDir, 'postcss.config.js'), + ` +module.exports = { + plugins: [ + require('autoprefixer')() + ] +} ` + ); + + const config = testSetup.createWebpackConfig(appDir, 'www/build', 'dev'); + config.enableSingleRuntimeChunk(); + config.setPublicPath('/build'); + config.addEntry('main', './vuejs-jsx/main'); + config.enableVueLoader(() => {}, { + useJsx: true, + }); + config.enableSassLoader(); + config.enableLessLoader(); + config.configureBabel(function(config) { + expect(config.presets[0][0]).to.equal('@babel/preset-env'); + config.presets[0][1].targets = { + chrome: 52 + }; + }); + + testSetup.runWebpack(config, (webpackAssert) => { + expect(config.outputPath).to.be.a.directory().with.deep.files([ + 'main.js', + 'main.css', + 'images/logo.82b9c7a5.png', + 'manifest.json', + 'entrypoints.json', + 'runtime.js', + ]); + + // test that our custom babel config is used + webpackAssert.assertOutputFileContains( + 'main.js', + 'class TestClassSyntax' + ); + + // test that global styles are working correctly + webpackAssert.assertOutputFileContains( + 'main.css', + '#app {' + ); + + // test that CSS Modules (for scoped styles) is used + webpackAssert.assertOutputFileContains( + 'main.css', + '.h1_' // `.h1` is transformed to `.h1_[a-zA-Z0-9]` + ); + + testSetup.requestTestPage( + path.join(config.getContext(), 'www'), + [ + 'build/runtime.js', + 'build/main.js' + ], + (browser) => { + // assert that the vue.js app rendered + browser.assert.text('#app h1', 'Welcome to Your Vue.js App'); + // make sure the styles are not inlined + browser.assert.elements('style', 0); + + done(); + } + ); + }); + }); + it('configureUrlLoader() allows to use the URL loader for images/fonts', (done) => { const config = createWebpackConfig('web/build', 'dev'); config.setPublicPath('/build'); diff --git a/test/loaders/babel.js b/test/loaders/babel.js index 1f5e4c0f..6a022300 100644 --- a/test/loaders/babel.js +++ b/test/loaders/babel.js @@ -126,4 +126,22 @@ describe('loaders/babel', () => { const actualLoaders = babelLoader.getLoaders(config); expect(actualLoaders[0].options).to.deep.equal({ 'foo': true }); }); + + it('getLoaders() with Vue and JSX support', () => { + const config = createConfig(); + config.enableVueLoader(() => {}, { + useJsx: true, + }); + + config.configureBabel(function(babelConfig) { + babelConfig.presets.push('foo'); + }); + + const actualLoaders = babelLoader.getLoaders(config); + + expect(actualLoaders[0].options.presets).to.deep.include.members([ + '@vue/babel-preset-jsx', + 'foo' + ]); + }); }); diff --git a/yarn.lock b/yarn.lock index 4deec35c..0ad32a24 100644 --- a/yarn.lock +++ b/yarn.lock @@ -345,6 +345,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-syntax-jsx@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7" + integrity sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-object-rest-spread@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e" @@ -792,6 +799,70 @@ "@types/uglify-js" "*" source-map "^0.6.0" +"@vue/babel-helper-vue-jsx-merge-props@^1.0.0-beta.3": + version "1.0.0-beta.3" + resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0-beta.3.tgz#e4c2e7125b3e0d2a9d493e457850b2abb0fd3cad" + integrity sha512-cbFQnd3dDPsfWuxbWW2phynX2zsckwC4GfAkcE1QH1lZL2ZAD2V97xY3BmvTowMkjeFObRKQt1P3KKA6AoB0hQ== + +"@vue/babel-plugin-transform-vue-jsx@^1.0.0-beta.3": + version "1.0.0-beta.3" + resolved "https://registry.yarnpkg.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.0.0-beta.3.tgz#a1a44e801d8ed615e49f145ef1b3eaca2c16e2e6" + integrity sha512-yn+j2B/2aEagaxXrMSK3qcAJnlidfXg9v+qmytqrjUXc4zfi8QVC/b4zCev1FDmTip06/cs/csENA4law6Xhpg== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/plugin-syntax-jsx" "^7.2.0" + "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.3" + html-tags "^2.0.0" + lodash.kebabcase "^4.1.1" + svg-tags "^1.0.0" + +"@vue/babel-preset-jsx@^1.0.0-beta.3": + version "1.0.0-beta.3" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.0.0-beta.3.tgz#15c584bd62c0286a80f0196749ae38cde5cd703b" + integrity sha512-qMKGRorTI/0nE83nLEM7MyQiBZUqc62sZyjkBdVaaU7S61MHI8RKHPtbLMMZlWXb2NCJ0fQci8xJWUK5JE+TFA== + dependencies: + "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.3" + "@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.3" + "@vue/babel-sugar-functional-vue" "^1.0.0-beta.3" + "@vue/babel-sugar-inject-h" "^1.0.0-beta.3" + "@vue/babel-sugar-v-model" "^1.0.0-beta.3" + "@vue/babel-sugar-v-on" "^1.0.0-beta.3" + +"@vue/babel-sugar-functional-vue@^1.0.0-beta.3": + version "1.0.0-beta.3" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.0.0-beta.3.tgz#41a855786971dacbbe8044858eefe98de089bf12" + integrity sha512-CBIa0sQWn3vfBS2asfTgv0WwdyKvNTKtE/cCfulZ7MiewLBh0RlvvSmdK9BIMTiHErdeZNSGUGlU6JuSHLyYkQ== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@vue/babel-sugar-inject-h@^1.0.0-beta.3": + version "1.0.0-beta.3" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.0.0-beta.3.tgz#be1d00b74a1a89fed35a9b1415a738c36f125966" + integrity sha512-HKMBMmFfdK9GBp3rX2bHIwILBdgc5F3ahmCB72keJxzaAQrgDAnD+ho70exUge+inAGlNF34WsQcGPElTf9QZg== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@vue/babel-sugar-v-model@^1.0.0-beta.3": + version "1.0.0-beta.3" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.0.0-beta.3.tgz#ea935b0e08bf58c125a1349b819156059590993c" + integrity sha512-et39eTEh7zW4wfZoSl9Jf0/n2r9OTT8U02LtSbXsjgYcqaDQFusN0+n7tw4bnOqvnnSVjEp7bVsQCWwykC3Wgg== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.3" + "@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.3" + camelcase "^5.0.0" + html-tags "^2.0.0" + svg-tags "^1.0.0" + +"@vue/babel-sugar-v-on@^1.0.0-beta.3": + version "1.0.0-beta.3" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.0.0-beta.3.tgz#2f5fedb43883f603fe76010f253b85c7465855fe" + integrity sha512-F+GapxCiy50jf2Q2B4exw+KYBzlGdeKMAMW1Dbvb0Oa59SA0CH6tsUOIAsXb0A05jwwg/of0LaVeo+4aLefVxQ== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + "@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.3" + camelcase "^5.0.0" + "@vue/component-compiler-utils@^1.2.1": version "1.3.1" resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-1.3.1.tgz#686f0b913d59590ae327b2a1cb4b6d9b931bbe0e" @@ -4072,6 +4143,11 @@ html-entities@^1.2.0: resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8= +html-tags@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b" + integrity sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos= + htmlparser2@~3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe" @@ -4979,6 +5055,11 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= +lodash.kebabcase@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" + integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY= + lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" @@ -7920,6 +8001,11 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" +svg-tags@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" + integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= + svgo@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.1.1.tgz#12384b03335bcecd85cfa5f4e3375fed671cb985"