@nebula.js/cli-serve 3.0.0-rc.2 → 3.0.0-rc.3

package/dist/eRender.js.LICENSE.txt

@@ -48,7 +48,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-/** @license MUI v5.8.7
+/** @license MUI v5.10.3
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/lib/init-config.js

@@ -67,6 +67,11 @@ const options = {
     default: 'test/component',
     description: 'Path to a folder that will be used as basis when locating fixtures',
   },
+  mfe: {
+    type: 'boolean',
+    default: false,
+    describe: 'Serves bundle to use in micro frontend',
+  },
 };
 
 module.exports = (yargs) =>

package/lib/serve.js

@@ -47,7 +47,7 @@ const initiateWatch = async ({ snPath, snName, host }) => {
   const cache = {};
 
   return {
-    addRoutes(app) {
+    addRoutes(app, options) {
       app.get('/pkg/:name', async (req, res) => {
         const { name } = req.params;
         await done;
@@ -77,6 +77,7 @@ const initiateWatch = async ({ snPath, snName, host }) => {
 
         if (fs.existsSync(file)) {
           const f = fs.readFileSync(file);
+          res.set(options.headers);
           res.send(f);
         } else {
           res.sendStatus('404');
@@ -130,14 +131,14 @@ module.exports = async (argv) => {
   if (runFromDirectory) {
     if (serveConfig.build !== false) {
       watcher = await build({
-        watch: true,
+        watch: serveConfig.mfe ? 'systemjs' : 'umd',
         config: serveConfig.config,
         cwd: context,
       });
     }
     try {
       const externalPkg = require(path.resolve(context, 'package.json')); // eslint-disable-line global-require
-      const externalEntry = externalPkg.main;
+      const externalEntry = serveConfig.mfe ? externalPkg.systemjs : externalPkg.main;
       snName = externalPkg.name;
       snPath = path.resolve(context, externalEntry);
     } catch (e) {
@@ -156,7 +157,7 @@ module.exports = async (argv) => {
     snName: serveConfig.type || snName,
     snUrl,
     dev: process.env.MONO === 'true',
-    open: serveConfig.open !== false,
+    open: serveConfig.open !== false && !serveConfig.mfe,
     entryWatcher: ww,
     watcher,
     serveConfig,

package/lib/webpack.serve.js

@@ -2,6 +2,8 @@
 const path = require('path');
 const chalk = require('chalk');
 const express = require('express');
+const fs = require('fs');
+const homedir = require('os').homedir();
 
 const webpack = require('webpack');
 const WebpackDevServer = require('webpack-dev-server');
@@ -9,6 +11,9 @@ const WebpackDevServer = require('webpack-dev-server');
 const snapshooterFn = require('./snapshot-server');
 const snapshotRouter = require('./snapshot-router');
 
+const httpsKeyPath = path.join(homedir, '.certs/key.pem');
+const httpsCertPath = path.join(homedir, '.certs/cert.pem');
+
 module.exports = async ({
   host,
   port,
@@ -25,18 +30,29 @@ module.exports = async ({
 }) => {
   let config;
   let contentBase;
+  const HTTPS = serveConfig.mfe;
+  const url = `${HTTPS ? 'https' : 'http'}://${host}:${port}`;
+
+  if (HTTPS) {
+    if (!fs.existsSync(httpsKeyPath)) {
+      throw new Error(`Failed to start using HTTPS. Missing key cert at path ${httpsKeyPath}`);
+    }
+    if (!fs.existsSync(httpsCertPath)) {
+      throw new Error(`Failed to start using HTTPS. Missing cert at path ${httpsCertPath}`);
+    }
+  }
 
   const snapshotRoute = '/njs';
 
-  const snapshooter = snapshooterFn({ snapshotUrl: `http://${host}:${port}/eRender.html` });
+  const snapshooter = snapshooterFn({ snapshotUrl: `${url}/eRender.html` });
 
   (serveConfig.snapshots || []).forEach((s) => {
     snapshooter.storeSnapshot(s);
   });
 
   const snapRouter = snapshotRouter({
-    base: `http://${host}:${port}${snapshotRoute}`,
-    snapshotUrl: `http://${host}:${port}/eRender.html`,
+    base: `${url}${snapshotRoute}`,
+    snapshotUrl: `${url}/eRender.html`,
     snapshooter,
   });
 
@@ -80,7 +96,8 @@ module.exports = async ({
     historyApiFallback: {
       index: '/eHub.html',
     },
-    static: {
+    // Disable nebula serve dev env when in MFE mode
+    static: !serveConfig.mfe && {
       directory: contentBase,
       watch: {
         ignored: /node_modules/,
@@ -91,7 +108,7 @@ module.exports = async ({
       app.use(snapshotRoute, snapRouter);
 
       if (entryWatcher) {
-        entryWatcher.addRoutes(app);
+        entryWatcher.addRoutes(app, devServer.options);
       }
 
       app.get('/themes', (req, res) => {
@@ -122,6 +139,7 @@ module.exports = async ({
       });
 
       app.get('/info', (req, res) => {
+        res.set(devServer.options.headers);
         res.json({
           enigma: enigmaConfig,
           webIntegrationId,
@@ -148,17 +166,31 @@ module.exports = async ({
     proxy: [
       {
         context: '/render',
-        target: `http://${host}:${port}/eRender.html`,
+        target: `${url}/eRender.html`,
         ignorePath: true,
         logLevel: 'error',
       },
       {
         context: '/dev',
-        target: `http://${host}:${port}/eDev.html`,
+        target: `${url}/eDev.html`,
         ignorePath: true,
         logLevel: 'error',
       },
     ],
+    server: HTTPS
+      ? {
+          type: 'https',
+          options: {
+            key: httpsKeyPath,
+            cert: httpsCertPath,
+          },
+        }
+      : {},
+    headers: {
+      'Access-Control-Allow-Credentials': 'true',
+      'Access-Control-Allow-Origin': '*',
+      'Access-Control-Allow-Headers': 'x-qlik-xrfkey,qlik-csrf-token',
+    },
   };
 
   const compiler = webpack(config);
@@ -192,8 +224,25 @@ module.exports = async ({
     compiler.hooks.done.tap('nebula serve', (stats) => {
       if (!initiated) {
         initiated = true;
-        const url = `http://${host}:${port}`;
-        console.log(`Development server running at ${chalk.green(url)}`);
+
+        console.log(`     _  _________  __  ____   ___
+    / |/ / __/ _ )/ / / / /  / _ |
+   /    / _// _  / /_/ / /__/ __ |
+  /_/|_/___/____/\\____/____/_/ |_|
+    / __/ __/ _ \\ | / / __/
+   _\\ \\/ _// , _/ |/ / _/
+  /___/___/_/|_||___/___/
+         `);
+
+        if (serveConfig.mfe) {
+          const bundleUrl = `${url}/pkg/${snName}`;
+          console.log('Development server running in MFE mode');
+          console.log(`Bundle served at ${chalk.green(bundleUrl)}`);
+          console.log('');
+          console.log('Use the bundle when overriding the import map');
+        } else {
+          console.log(`Development server running at ${chalk.green(url)}`);
+        }
 
         resolve({
           context: '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nebula.js/cli-serve",
-  "version": "3.0.0-rc.2",
+  "version": "3.0.0-rc.3",
   "description": "",
   "license": "MIT",
   "author": "QlikTech International AB",
@@ -27,7 +27,7 @@
     "prepublishOnly": "rm -rf dist && yarn run build"
   },
   "dependencies": {
-    "@nebula.js/cli-build": "^3.0.0-rc.2",
+    "@nebula.js/cli-build": "^3.0.0-rc.3",
     "body-parser": "1.20.0",
     "chalk": "4.1.2",
     "chokidar": "3.5.3",
@@ -35,25 +35,25 @@
     "express": "4.18.1",
     "extend": "3.0.2",
     "html-webpack-plugin": "5.5.0",
-    "portfinder": "1.0.29",
+    "portfinder": "1.0.32",
     "puppeteer": "14.4.1",
     "regenerator-runtime": "0.13.9",
     "source-map-loader": "4.0.0",
     "webpack": "5.74.0",
-    "webpack-dev-server": "4.9.3",
+    "webpack-dev-server": "4.10.1",
     "ws": "8.8.1",
     "yargs": "17.5.1"
   },
   "devDependencies": {
-    "@babel/core": "7.18.10",
+    "@babel/core": "7.18.13",
     "@babel/preset-env": "7.18.10",
     "@babel/preset-react": "7.18.6",
-    "@mui/material": "^5.9.3",
-    "@nebula.js/enigma-mocker": "^3.0.0-rc.2",
-    "@nebula.js/nucleus": "^3.0.0-rc.2",
-    "@nebula.js/snapshooter": "^3.0.0-rc.2",
-    "@nebula.js/stardust": "^3.0.0-rc.2",
-    "@nebula.js/ui": "^3.0.0-rc.2",
+    "@mui/material": "^5.10.3",
+    "@nebula.js/enigma-mocker": "^3.0.0-rc.3",
+    "@nebula.js/nucleus": "^3.0.0-rc.3",
+    "@nebula.js/snapshooter": "^3.0.0-rc.3",
+    "@nebula.js/stardust": "^3.0.0-rc.3",
+    "@nebula.js/ui": "^3.0.0-rc.3",
     "autosuggest-highlight": "3.3.4",
     "babel-loader": "8.2.5",
     "d3-require": "1.3.0",
@@ -67,5 +67,5 @@
     "react-dom": "18.2.0",
     "webpack-cli": "4.10.0"
   },
-  "gitHead": "898b5acf0ecf16f2e988a9c01a06f681e0d5bf5e"
+  "gitHead": "6ffc4105c1f52e785a67e1c87bd64ff2f0351b52"
 }