Add JSX integration for Vue.js

Kocal · weaverryan · commit 9cabf9b95030 · 2019-04-10T09:01:34.000-07:00
diff --git a/fixtures/vuejs-jsx/App.css 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
@@ -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 (
+      <div id="app">
+        <img src={require('./assets/logo.png')}/>
+        <Hello></Hello>
+      </div>
+    );
+  },
+};
diff --git a/fixtures/vuejs-jsx/App.less 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
@@ -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
diff --git a/fixtures/vuejs-jsx/components/Hello.css b/fixtures/vuejs-jsx/components/Hello.css
@@ -0,0 +1,17 @@
+.h1, .h2 {
+  font-weight: normal;
+}
+
+.ul {
+  list-style-type: none;
+  padding: 0;
+}
+
+.li {
+  display: inline-block;
+  margin: 0 10px;
+}
+
+.a {
+  color: #42b983;
+}
diff --git a/fixtures/vuejs-jsx/components/Hello.jsx b/fixtures/vuejs-jsx/components/Hello.jsx
@@ -0,0 +1,33 @@
+import styles from './Hello.css?module';
+
+export default {
+  name: 'hello',
+  data() {
+    return {
+      msg: 'Welcome to Your Vue.js App',
+    };
+  },
+  render() {
+    return (
+      <div class="hello">
+        <h1 class={styles.h1}>{this.msg}</h1>
+        <h2 class={styles.h2}>Essential Links</h2>
+        <ul class={styles.ul}>
+          <li class={styles.li}><a class={styles.a} href="https://vuejs.org" target="_blank">Core Docs</a></li>
+          <li class={styles.li}><a class={styles.a} href="https://forum.vuejs.org" target="_blank">Forum</a></li>
+          <li class={styles.li}><a class={styles.a} href="https://gitter.im/vuejs/vue" target="_blank">Gitter Chat</a></li>
+          <li class={styles.li}><a class={styles.a} href="https://twitter.com/vuejs" target="_blank">Twitter</a></li>
+          <br/>
+          <li class={styles.li}><a class={styles.a} href="http://vuejs-templates.github.io/webpack/" target="_blank">Docs for This Template</a></li>
+        </ul>
+        <h2 class={styles.h2}>Ecosystem</h2>
+        <ul class={styles.ul}>
+          <li class={styles.li}><a class={styles.a} href="http://router.vuejs.org/" target="_blank">vue-router</a></li>
+          <li class={styles.li}><a class={styles.a} href="http://vuex.vuejs.org/" target="_blank">vuex</a></li>
+          <li class={styles.li}><a class={styles.a} href="http://vue-loader.vuejs.org/" target="_blank">vue-loader</a></li>
+          <li class={styles.li}><a class={styles.a} href="https://github.com/vuejs/awesome-vue" target="_blank">awesome-vue</a></li>
+        </ul>
+      </div>
+    );
+  },
+};
diff --git a/fixtures/vuejs-jsx/main.js b/fixtures/vuejs-jsx/main.js
@@ -0,0 +1,8 @@
+import Vue from 'vue'
+import App from './App'
+
+new Vue({
+  el: '#app',
+  template: '<App/>',
+  components: { App }
+})
diff --git 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
@@ -88,6 +88,9 @@ class WebpackConfig {
             useBuiltIns: false,
             corejs: null,
         };
+        this.vueOptions = {
+            useJsx: false,
+        };
 
         // Features/Loaders options callbacks
         this.postCssLoaderOptionsCallback = () => {};
@@ -602,14 +605,23 @@ class WebpackConfig {
             forkedTypeScriptTypesCheckOptionsCallback;
     }
 
-    enableVueLoader(vueLoaderOptionsCallback = () => {}) {
+    enableVueLoader(vueLoaderOptionsCallback = () => {}, vueOptions = {}) {
         this.useVueLoader = true;
 
         if (typeof vueLoaderOptionsCallback !== 'function') {
             throw new Error('Argument 1 to enableVueLoader() must be a callback function.');
         }
 
         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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#app {`
	`2`	`+ margin-top: 40px;`
	`3`	`+}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +#app {
 +  display: flex;
 +  color: #2c3e90;
 +}