diff --git a/index.js b/index.js
index a916eab..51782b8 100644
--- a/index.js
+++ b/index.js
@@ -21,50 +21,66 @@ module.exports = (api, options) => {
   api.registerCommand('ssr:build', {
     description: 'build for production (SSR)',
   }, async (args) => {
-    const webpack = require('webpack')
     const rimraf = require('rimraf')
-    const formatStats = require('@vue/cli-service/lib/commands/build/formatStats')
-
-    const options = service.projectOptions
-
     rimraf.sync(api.resolve(config.distPath))
 
     const { getWebpackConfigs } = require('./lib/webpack')
-    const [clientConfig, serverConfig] = getWebpackConfigs(service)
-
-    const compiler = webpack([clientConfig, serverConfig])
-    const onCompilationComplete = (err, stats) => {
-      if (err) {
-        // eslint-disable-next-line
-        console.error(err.stack || err)
-        if (err.details) {
-          // eslint-disable-next-line
-          console.error(err.details)
+    const [clientConfigLegacy, clientConfigModern, serverConfig] = getWebpackConfigs(service)
+
+    const compile = ({ webpackConfigs, watch, service }) => {
+      Object.keys(require.cache)
+        .filter(key => key.includes('@vue/cli-plugin-babel'))
+        .forEach(key => delete require.cache[key])
+
+      const webpack = require('webpack')
+      const formatStats = require('@vue/cli-service/lib/commands/build/formatStats')
+
+      const options = service.projectOptions
+
+      const compiler = webpack(webpackConfigs)
+      return new Promise((resolve) => {
+        const onCompilationComplete = (err, stats) => {
+          if (err) {
+            // eslint-disable-next-line
+            console.error(err.stack || err)
+            if (err.details) {
+              // eslint-disable-next-line
+              console.error(err.details)
+            }
+            return resolve()
+          }
+
+          if (stats.hasErrors()) {
+            stats.toJson().errors.forEach(err => console.error(err))
+            process.exitCode = 1
+          }
+
+          if (stats.hasWarnings()) {
+            stats.toJson().warnings.forEach(warn => console.warn(warn))
+          }
+
+          try {
+            // eslint-disable-next-line
+            console.log(formatStats(stats, options.outputDir, api));
+          } catch (e) {
+          }
+          resolve()
         }
-        return
-      }
-
-      if (stats.hasErrors()) {
-        stats.toJson().errors.forEach(err => console.error(err))
-        process.exitCode = 1
-      }
-
-      if (stats.hasWarnings()) {
-        stats.toJson().warnings.forEach(warn => console.warn(warn))
-      }
-
-      try {
-        // eslint-disable-next-line
-        console.log(formatStats(stats, options.outputDir, api));
-      } catch (e) {
-      }
-    }
 
-    if (args.watch) {
-      compiler.watch({}, onCompilationComplete)
-    } else {
-      compiler.run(onCompilationComplete)
+        if (watch) {
+          compiler.watch({}, onCompilationComplete)
+        } else {
+          compiler.run(onCompilationComplete)
+        }
+      })
     }
+
+    process.env.VUE_CLI_MODERN_MODE = true
+    await compile({ webpackConfigs: [clientConfigLegacy, serverConfig], watch: args.watch, service })
+    process.env.VUE_CLI_MODERN_BUILD = true
+    // Modern build depends on files from legacy build, that's why these
+    // compilations cannot run parallely
+    await compile({ webpackConfigs: [clientConfigModern], watch: args.watch, service })
   })
 
   api.registerCommand('ssr:serve', {
diff --git a/lib/app.js b/lib/app.js
index d19e816..59c1f39 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -123,6 +123,11 @@ module.exports = (app, options) => {
       renderer.renderToString(context, (err, renderedHtml) => {
         let html = renderedHtml
 
+        // Unfortunately, both vue template renderer *and*
+        // vue-cli ModernModePlugin inject script tags into the html, so
+        // the former ones are now being removed again
+        html = html.replace(/<script src="[^"]+" defer><\/script>/g, '')
+
         if (err || context.httpCode === 500) {
           console.error(`error during render url : ${req.url}`)
 
diff --git a/lib/dev-server.js b/lib/dev-server.js
index 80dfe0e..5dd0146 100644
--- a/lib/dev-server.js
+++ b/lib/dev-server.js
@@ -15,12 +15,12 @@ module.exports.setupDevServer = ({ server, templatePath, onUpdate }) => new Prom
   // Read file in real or virtual file systems
   const readFile = (fs, file) => {
     try {
-      return fs.readFileSync(path.join(clientConfig.output.path, file), 'utf-8')
+      return fs.readFileSync(path.join(clientConfigLegacy.output.path, file), 'utf-8')
     } catch (e) {}
   }
 
   const { getWebpackConfigs } = require('./webpack')
-  const [clientConfig, serverConfig] = getWebpackConfigs(service)
+  const [clientConfigLegacy, _, serverConfig] = getWebpackConfigs(service)
 
   let serverBundle
   let template
@@ -43,15 +43,15 @@ module.exports.setupDevServer = ({ server, templatePath, onUpdate }) => new Prom
   }
 
   // modify client config to work with hot middleware
-  clientConfig.entry.app = ['webpack-hot-middleware/client', ...clientConfig.entry.app]
-  clientConfig.plugins.push(
+  clientConfigLegacy.entry.app = ['webpack-hot-middleware/client', ...clientConfigLegacy.entry.app]
+  clientConfigLegacy.plugins.push(
     new webpack.HotModuleReplacementPlugin(),
   )
 
   // dev middleware
-  const clientCompiler = webpack(clientConfig)
+  const clientCompiler = webpack(clientConfigLegacy)
   const devMiddleware = require('webpack-dev-middleware')(clientCompiler, {
-    publicPath: clientConfig.output.publicPath,
+    publicPath: clientConfigLegacy.output.publicPath,
     noInfo: true,
     stats: 'none',
     logLevel: 'error',
@@ -72,7 +72,7 @@ module.exports.setupDevServer = ({ server, templatePath, onUpdate }) => new Prom
     if (stats.hasErrors()) return
 
     //  Fix dev server render error when a custom path is used for the server-renderer bundles
-    const ssrPlugin = (clientConfig.plugins.find((p) => (p.__pluginName || p.constructor.name) === 'ssr') || {}).options || {}
+    const ssrPlugin = (clientConfigLegacy.plugins.find((p) => (p.__pluginName || p.constructor.name) === 'ssr') || {}).options || {}
 
     clientManifest = JSON.parse(readFile(
       devMiddleware.fileSystem,
diff --git a/lib/webpack.js b/lib/webpack.js
index 2e4993d..e2e6d3d 100644
--- a/lib/webpack.js
+++ b/lib/webpack.js
@@ -12,6 +12,8 @@ exports.chainWebpack = (webpackConfig) => {
   if (!target) return
   const isClient = target === 'client'
   const isProd = process.env.NODE_ENV === 'production'
+  const modernMode = !!process.env.VUE_CLI_MODERN_MODE
+  const modernBuild = !!process.env.VUE_CLI_MODERN_BUILD
 
   // Remove unneeded plugins
   webpackConfig.plugins.delete('hmr')
@@ -70,7 +72,6 @@ exports.chainWebpack = (webpackConfig) => {
 
   if (isClient) {
     webpackConfig.plugin('ssr').use(VueSSRClientPlugin)
-    webpackConfig.plugin('loader').use(WebpackBar, [{ name: 'Client', color: 'green' }])
 
     webpackConfig.devtool(!isProd ? '#cheap-module-source-map' : undefined)
 
@@ -78,6 +79,30 @@ exports.chainWebpack = (webpackConfig) => {
       options.optimizeSSR = false
       return options
     })
+
+    if (modernMode) {
+      const ModernModePlugin = require('@vue/cli-service/lib/webpack/ModernModePlugin')
+      const targetDir = webpackConfig.output.get('path')
+      if (!modernBuild) {
+        webpackConfig.plugin('loader').use(WebpackBar, [{ name: 'Client (legacy)', color: 'green' }])
+
+        webpackConfig.plugin('modern-mode-legacy').use(ModernModePlugin, [{
+          isModernBuild: false,
+          targetDir,
+
+        }])
+      } else {
+        webpackConfig.plugin('loader').use(WebpackBar, [{ name: 'Client (modern)', color: 'lightgreen' }])
+
+        webpackConfig.plugin('modern-mode-modern').use(ModernModePlugin, [{
+          isModernBuild: true,
+          targetDir,
+          jsDirectory: 'js',
+        }])
+      }
+    } else {
+      webpackConfig.plugin('loader').use(WebpackBar, [{ name: 'Client', color: 'green' }])
+    }
   } else {
     webpackConfig.plugin('ssr').use(VueSSRServerPlugin)
     webpackConfig.plugin('loader').use(WebpackBar, [{ name: 'Server', color: 'orange' }])
@@ -89,20 +114,16 @@ exports.chainWebpack = (webpackConfig) => {
 
     webpackConfig.node.clear()
 
-    if (!isClient) {
-      webpackConfig.module.rule('vue').use('cache-loader').tap(options => {
-        // Change cache directory for server-side
-        options.cacheIdentifier += '-server'
-        options.cacheDirectory += '-server'
-        return options
-      })
-    }
+    webpackConfig.module.rule('vue').use('cache-loader').tap(options => {
+      // Change cache directory for server-side
+      options.cacheIdentifier += '-server'
+      options.cacheDirectory += '-server'
+      return options
+    })
 
     webpackConfig.module.rule('vue').use('vue-loader').tap(options => {
-      if (!isClient) {
-        options.cacheIdentifier += '-server'
-        options.cacheDirectory += '-server'
-      }
+      options.cacheIdentifier += '-server'
+      options.cacheDirectory += '-server'
       options.optimizeSSR = !isClient
       return options
     })
@@ -112,8 +133,14 @@ exports.chainWebpack = (webpackConfig) => {
 exports.getWebpackConfigs = (service) => {
   process.env.VUE_CLI_MODE = service.mode
   process.env.VUE_CLI_SSR_TARGET = 'client'
-  const clientConfig = service.resolveWebpackConfig()
+  process.env.VUE_CLI_MODERN_MODE = true
+  delete process.env.VUE_CLI_MODERN_BUILD
+  const clientConfigLegacy = service.resolveWebpackConfig()
+  process.env.VUE_CLI_MODERN_BUILD = true
+  const clientConfigModern = service.resolveWebpackConfig()
+  delete process.env.VUE_CLI_MODERN_MODE
+  delete process.env.VUE_CLI_MODERN_BUILD
   process.env.VUE_CLI_SSR_TARGET = 'server'
   const serverConfig = service.resolveWebpackConfig()
-  return [clientConfig, serverConfig]
+  return [clientConfigLegacy, clientConfigModern, serverConfig]
 }