fix: livereload & hmr

Author: jakobrosenberg

lib/plugins/nollup/index.js

@@ -1,5 +1,6 @@
 
 const devServer = require('nollup/lib/dev-server')
+const hmr = require('rollup-plugin-hot')
 
 module.exports.default = {
   dependencies: { 'rollup': () => require('../rollup') },
@@ -9,18 +10,40 @@ module.exports.default = {
       event: 'start',
       condition: 'development',
       // Nollup needs the Rollup config, so make sure Rollup compiles its config
-      action: app => app.config.rollup.compileConfig = true
+
+      action: (app, params) => {
+        app.merge({
+          config: {
+            rollup: { compileConfig: true },
+            nollup: {
+              port: params.port || app.config.roxi.port,
+              contentBase: app.config.roxi.staticDir,
+              hot: true,
+              publicPath: 'build',
+              historyApiFallback: '/__index.html',
+            }
+          }
+        })
+      }
     },
     {
       name: 'start nollup server',
       event: 'after:bundle',
       condition: 'development',
       action: async (app, params, ctx) => {
+        const { staticDir } = app.config.roxi
+
         //start the nollup dev server
         devServer({
           port: params.port || app.config.roxi.port,
           contentBase: app.config.roxi.staticDir,
-          config: app.config.rollup,
+          config: {
+            ...app.config.rollup,
+            plugins: [
+              ...app.config.rollup.plugins.filter(plugin => plugin.name !== 'hot'),
+              hmr({ inMemory: true, public: staticDir, compatNollup: true })
+            ]
+          },
           hot: true,
           publicPath: 'build',
           historyApiFallback: '/__index.html',

lib/plugins/rollup/rollup.template.js

@@ -32,7 +32,7 @@ module.exports = function rollup(app, params) {
       },
       commonjs: {},
       terser: production && {}, // minify
-      livereload: !production && !isNollup && distDir,
+      livereload: !production && buildDir,
       _mainJsTransform: {
         transform: (code, id) => {
           if (id.match(/[/\\]src[/\\]main.js$/)) {
@@ -45,7 +45,8 @@ module.exports = function rollup(app, params) {
         }
       },
 
-      hmr: production && { inMemory: true, public: staticDir }
+      //hmr doesn't seem to have an effect outside of nollup
+      // hmr: !production && { inMemory: true, public: staticDir, compatModuleHot: true,}
     },
     watch: {
       clearScreen: false,