refactor: toward server HMR

packages/build/src/build/.babelrc.js

@@ -3,9 +3,8 @@ const {
 } = process.env;
 
 module.exports = (api) => {
-  api.cache(false);
-  return {
-    plugins: [
+  api.cache(true);
+  const plugins = [
     '@babel/plugin-proposal-class-properties',
     '@babel/plugin-proposal-private-methods',
     '@babel/plugin-syntax-jsx',
@@ -14,7 +13,9 @@ module.exports = (api) => {
       {
         config: LATUS_WEBPACK_CONFIG,
       },
-      ]
     ],
+  ];
+  return {
+    plugins,
   };
 };

packages/core/.gitignore

@@ -3,3 +3,4 @@
 !/.*
 !src/**/*.js
 !/test/**/*.js
+!/virtual.js

packages/core/package.json

@@ -16,12 +16,15 @@
     "client.js.map",
     "index.js",
     "index.js.map",
+    "loader.js",
+    "loader.js.map",
     "server.js",
     "server.js.map",
     "start.js",
     "start.js.map",
     "test.js",
-    "test.js.map"
+    "test.js.map",
+    "virtual.js"
   ],
   "dependencies": {
     "@neutrinojs/copy": "^9.4.0",
@@ -29,6 +32,7 @@
     "autoprefixer": "^9.8.6",
     "debug": "4.3.1",
     "js-yaml": "3.14.0",
+    "loader-utils": "^2.0.0",
     "lodash.flatten": "^4.4.0",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",

packages/core/src/build.js

@@ -1,4 +1,4 @@
-import {LatusPlugin} from './latus-plugin';
+import Latus from './latus';
 
 const {
   LATUS_ESLINT_DEFAULTS = require.resolve('@latus/build/build/.eslint.defaults.js'),
@@ -31,6 +31,8 @@ export default (latus) => (neutrino) => {
     .use(EnvironmentPlugin, [{
       SIDE: 'server',
     }]);
+  const node = r('@neutrinojs/node');
+  node()(neutrino);
   const defaults = Object.keys(latus.originalConfig)
     .map((plugin) => {
       const config = {};
@@ -54,37 +56,43 @@ export default (latus) => (neutrino) => {
       ]),
   );
   neutrino.config
-    .plugin('latus')
-    .use(LatusPlugin(
-      neutrino,
-      () => config,
-      (plugin, modulesObject) => {
-        plugin.writeModule('/%/latus/server/virtual', [
+    .entry('index')
+    .add('@latus/core/virtual');
+  const babelOptions = neutrino.config.module
+    .rules.store.get('compile')
+    .uses.store.get('babel')
+    .store.get('options');
+  r('@babel/register')({
+    plugins: babelOptions.plugins,
+    presets: babelOptions.presets,
+  });
+  const paths = Object.keys(config)
+    .map((path) => Latus.runtimePath(path))
+    .filter((path) => !!path);
+  const pathMap = paths.map((path) => `'${path}': require('${path}')`).join(', ');
+  const source = [
     'global.$$latus = {',
     `  config: ${JSON.stringify(config)},`,
-          `  modules: ${modulesObject},`,
+    `  modules: {${pathMap}},`,
     '};',
     'if (module.hot) {',
-          '  Object.keys(global.$$latus.modules).forEach((key) => {',
-          '    module.hot.accept(key, () => {',
-          "      console.log('kesy!');",
-          '    });',
-          '  });',
-          '}',
-        ].join('\n'));
-      },
-    ));
-  neutrino.config
-    .entry('index')
-    .add('/%/latus/server/virtual');
-  const nodeExternals = r('webpack-node-externals');
-  neutrino.config.externals(nodeExternals());
+  ];
+  paths.forEach((key) => {
+    source.push(`    module.hot.accept('${key}', () => {`);
+    source.push(`      console.log('${key}!');`);
+    source.push('    });');
+  });
+  source.push('}');
+  neutrino.config.module
+    .rule('@latus/core/virtual')
+    .test(r.resolve('@latus/core/virtual'))
+    .use('virtual')
+    .loader(`${__dirname}/src/loader`)
+    .options({
+      source: source.join('\n'),
+    });
   const mocha = r('@neutrinojs/mocha');
   mocha()(neutrino);
-  const node = r('@neutrinojs/node');
-  node({
-    hot: false,
-  })(neutrino);
   if (process.env.LATUS_LINTING) {
     return;
   }
@@ -96,12 +104,21 @@ export default (latus) => (neutrino) => {
       .entry('index')
       .prepend('dotenv/config');
   }
+  // Why no worky?
+  // if (process.argv.find((arg) => '--hot' === arg)) {
+  //   const entries = neutrino.config.entryPoints.store.get('index').store;
+  //   entries.delete(`${r.resolve('webpack/hot/poll')}?1000`);
+  //   const entriesArray = Array.from(entries);
+  //   entriesArray.unshift('webpack/hot/signal');
+  //   // eslint-disable-next-line no-param-reassign
+  //   neutrino.config.entryPoints.store.get('index').store = new Set(entriesArray);
+  // }
   if (process.argv.find((arg) => '--start-server' === arg)) {
     neutrino.config
       .plugin('start-server')
       .tap((args) => {
         const options = args[0];
-        options.signal = true;
+        // options.signal = true;
         const inspectArg = process.argv.find((arg) => -1 !== arg.indexOf('--inspect'));
         if (inspectArg) {
           options.nodeArgs.push(inspectArg);
@@ -118,4 +135,8 @@ export default (latus) => (neutrino) => {
   else {
     neutrino.config.plugins.delete('start-server');
   }
+  const nodeExternals = r('webpack-node-externals');
+  neutrino.config.externals(nodeExternals({
+    allowlist: /@latus\/core\/virtual/,
+  }));
 };

packages/core/src/loader.js

@@ -0,0 +1,6 @@
+const {getOptions} = require('loader-utils');
+
+module.exports = function LatusLoader() {
+  const {source} = getOptions(this);
+  return source;
+};