@nebula.js/cli-serve 2.2.0 → 2.3.0

package/lib/fixtures.js

@@ -0,0 +1,36 @@
+/**
+ * Manages loading and delivering fixtures.
+ *
+ * Fixtures are transpiled and included when Nebula serve is starting. Fixtures in the specified `--fixturePath` with the extension `.fix.js` are included.
+ */
+window.serveFixtures = {
+  get(key = '') {
+    const k = key.startsWith('./') ? key : `./${key}`;
+    let context;
+    try {
+      // see: https://webpack.js.org/guides/dependency-management/#requirecontext
+      context = require.context('fixtures', true, /\.fix\.js$/);
+    } catch (_) {
+      throw new Error('Specified "--fixturePath" does not exist');
+    }
+
+    if (context.keys().includes(k)) {
+      return context(k).default;
+    }
+
+    console.groupCollapsed(`No fixture found at "${k}"`);
+    if (context.keys().length === 0) {
+      console.info('No fixtures available.');
+    } else {
+      console.info('Fixtures available:');
+      console.info(context.keys());
+      console.info('Is the fixture you are looking for not in the list?');
+    }
+    console.info(
+      'Specify "--fixturePath" to Nebula serve to specify their loction. Note that the fixture\'s file name must end with ".fix.js".'
+    );
+    console.groupEnd();
+
+    throw new Error(`No fixture found at "${k}"`);
+  },
+};

package/lib/init-config.js

@@ -62,9 +62,10 @@ const options = {
   webIntegrationId: {
     type: 'string',
   },
-  ACCEPT_EULA: {
-    type: 'boolean',
-    default: false,
+  fixturePath: {
+    type: 'string',
+    default: 'test/component',
+    description: 'Path to a folder that will be used as basis when locating fixtures',
   },
 };
 

package/lib/serve.js

@@ -10,7 +10,6 @@ const build = require('@nebula.js/cli-build');
 const initConfig = require('./init-config');
 
 const webpackServe = require('./webpack.serve');
-const useEngine = require('./engine');
 
 const initiateWatch = async ({ snPath, snName, host }) => {
   // TODO - timeout
@@ -103,11 +102,6 @@ module.exports = async (argv) => {
   }
 
   const serveConfig = extend(true, {}, defaultServeConfig, argv);
-
-  let stopEngine = () => {};
-  if (serveConfig.ACCEPT_EULA) {
-    stopEngine = await useEngine(serveConfig);
-  }
   const host = serveConfig.host || 'localhost';
   const port = serveConfig.port || (await portfinder.getPortPromise({ host }));
   const enigmaConfig = serveConfig.enigma;
@@ -169,7 +163,6 @@ module.exports = async (argv) => {
   });
 
   const close = async () => {
-    await stopEngine();
     if (watcher) {
       watcher.close();
     }

package/lib/webpack.build.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 const babelPath = require.resolve('babel-loader');
 const babelPresetEnvPath = require.resolve('@babel/preset-env');
@@ -22,6 +23,7 @@ const cfg = ({ srcDir, distDir, dev = false, serveConfig = {} }) => {
       eRender: [path.resolve(srcDir, 'eRender')],
       eDev: [path.resolve(srcDir, 'eDev')],
       eHub: [path.resolve(srcDir, 'eHub')],
+      fixtures: [path.resolve(__dirname, './fixtures.js')],
     },
     devtool: dev ? 'eval-cheap-module-source-map' : false,
     output: {
@@ -36,7 +38,7 @@ const cfg = ({ srcDir, distDir, dev = false, serveConfig = {} }) => {
         '@nebula.js/conversion': path.resolve(__dirname, '../../../apis/conversion/src'),
         '@nebula.js/locale/all.json$': path.resolve(__dirname, '../../../apis/locale/all.json'),
         '@nebula.js/locale': path.resolve(__dirname, '../../../apis/locale/src'),
-        fixtures: path.resolve(__dirname, '../../../test/component'),
+        fixtures: path.resolve(process.cwd(), serveConfig.fixturePath || ''),
       },
       extensions: ['.dev.js', '.js', '.jsx'],
     },
@@ -91,7 +93,8 @@ const cfg = ({ srcDir, distDir, dev = false, serveConfig = {} }) => {
       new HtmlWebpackPlugin({
         template: path.resolve(srcDir, 'eRender.html'),
         filename: 'eRender.html',
-        chunks: ['eRender'],
+        // Include fixture only when running Nebula serve
+        chunks: dev ? ['eRender', 'fixtures'] : ['eRender'],
         favicon,
         scripts: serveConfig.scripts,
         stylesheets: serveConfig.stylesheets,
@@ -108,7 +111,17 @@ const cfg = ({ srcDir, distDir, dev = false, serveConfig = {} }) => {
         chunks: ['eHub'],
         favicon,
       }),
+      new CopyWebpackPlugin({
+        patterns: ['stardust.js', 'stardust.js.map'].map((filename) => ({
+          from: path.resolve(__dirname, `../../../apis/stardust/dist/${filename}`),
+          to: distDir,
+        })),
+      }),
     ],
+    externals: {
+      // Ensure dependency is shared for rendering, fixtures and elsewhere.
+      '@nebula.js/stardust': 'stardust',
+    },
   };
 
   return config;

package/lib/webpack.prod.js

@@ -11,7 +11,9 @@ const cfg = ({ srcDir = path.resolve(__dirname, '../dist'), serveConfig = {} })
 
   const config = {
     mode: 'development',
-    entry: path.resolve(__dirname, './sn.js'),
+    entry: {
+      fixtures: [path.resolve(__dirname, './fixtures.js')],
+    },
     devtool: false,
     infrastructureLogging: {
       level: 'error',
@@ -44,7 +46,7 @@ const cfg = ({ srcDir = path.resolve(__dirname, '../dist'), serveConfig = {} })
     },
     resolve: {
       alias: {
-        fixtures: path.resolve(process.cwd(), 'test/component'),
+        fixtures: path.resolve(process.cwd(), serveConfig.fixturePath),
       },
     },
     plugins: [
@@ -54,13 +56,19 @@ const cfg = ({ srcDir = path.resolve(__dirname, '../dist'), serveConfig = {} })
         inject: 'head',
         scripts: serveConfig.scripts,
         stylesheets: serveConfig.stylesheets,
+        chunks: ['fixtures'],
       }),
       new HtmlWebpackPlugin({
         template: path.resolve(srcDir, 'eDev.html'),
         filename: 'eDev.html',
         inject: 'head',
+        chunks: [],
       }),
     ],
+    externals: {
+      // Ensure dependency is shared for rendering, fixtures and elsewhere.
+      '@nebula.js/stardust': 'stardust',
+    },
   };
 
   return config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nebula.js/cli-serve",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "",
   "license": "MIT",
   "author": "QlikTech International AB",
@@ -18,7 +18,6 @@
     "command.js",
     "data",
     "dist",
-    "docker-compose.yml",
     "lib"
   ],
   "scripts": {
@@ -28,7 +27,7 @@
     "prepublishOnly": "rm -rf dist && yarn run build"
   },
   "dependencies": {
-    "@nebula.js/cli-build": "^2.2.0",
+    "@nebula.js/cli-build": "^2.3.0",
     "body-parser": "1.19.0",
     "chalk": "4.1.2",
     "chokidar": "3.5.2",
@@ -37,34 +36,36 @@
     "extend": "3.0.2",
     "html-webpack-plugin": "5.5.0",
     "portfinder": "1.0.28",
-    "puppeteer": "10.4.0",
+    "puppeteer": "12.0.1",
     "regenerator-runtime": "0.13.9",
     "source-map-loader": "3.0.0",
-    "webpack": "5.64.0",
-    "webpack-dev-server": "4.5.0",
-    "ws": "8.2.3",
-    "yargs": "17.2.1"
+    "webpack": "5.64.4",
+    "webpack-dev-server": "4.6.0",
+    "ws": "8.3.0",
+    "yargs": "17.3.0"
   },
   "devDependencies": {
     "@babel/core": "7.16.0",
-    "@babel/preset-env": "7.16.0",
+    "@babel/preset-env": "7.16.4",
     "@babel/preset-react": "7.16.0",
     "@material-ui/core": "4.12.3",
-    "@nebula.js/nucleus": "^2.2.0",
-    "@nebula.js/snapshooter": "^2.2.0",
-    "@nebula.js/stardust": "^2.2.0",
-    "@nebula.js/ui": "^2.2.0",
+    "@nebula.js/enigma-mocker": "^2.3.0",
+    "@nebula.js/nucleus": "^2.3.0",
+    "@nebula.js/snapshooter": "^2.3.0",
+    "@nebula.js/stardust": "^2.3.0",
+    "@nebula.js/ui": "^2.3.0",
     "autosuggest-highlight": "3.2.0",
     "babel-loader": "8.2.3",
+    "copy-webpack-plugin": "^10.0.0",
     "d3-require": "1.2.4",
     "enigma.js": "2.7.3",
     "eslint-import-resolver-alias": "1.1.2",
     "eslint-import-resolver-webpack": "0.13.2",
     "monaco-editor": "0.30.1",
-    "monaco-editor-webpack-plugin": "4.2.0",
+    "monaco-editor-webpack-plugin": "6.0.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "webpack-cli": "4.9.1"
   },
-  "gitHead": "774fb035b462f8011bfc3c517ee620920f3ee94c"
+  "gitHead": "db408ff3d6013a4558dbb9be24ae1188c1e78d44"
 }

package/dist/eRender.js.LICENSE.txt

@@ -1,51 +0,0 @@
-/*
-object-assign
-(c) Sindre Sorhus
-@license MIT
-*/
-
-/*! javascript-number-formatter - v1.1.11 - http://mottie.github.com/javascript-number-formatter/ * © ecava */
-
-/**
- * A better abstraction over CSS.
- *
- * @copyright Oleg Isonen (Slobodskoi) / Isonen 2014-present
- * @website https://github.com/cssinjs/jss
- * @license MIT
- */
-
-/** @license React v0.20.2
- * scheduler.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/** @license React v17.0.2
- * react-dom.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/** @license React v17.0.2
- * react-is.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-/** @license React v17.0.2
- * react.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */

package/docker-compose.yml

@@ -1,13 +0,0 @@
-version: '3.1'
-
-services:
-  engine:
-    image: qlikcore/engine:${ENGINE_VERSION:-12.972.0}
-    # restart: always
-    command: |
-      -S AcceptEULA=${ACCEPT_EULA:-no}
-      -S DocumentDirectory=/apps
-    ports:
-      - ${ENGINE_PORT:-9076}:9076
-    volumes:
-      - ${APPS_PATH:-./data/apps}:/apps

package/lib/engine.js

@@ -1,49 +0,0 @@
-const path = require('path');
-const { spawn } = require('child_process');
-
-const execCmd = (cmd, cmdArgs = [], opts) =>
-  new Promise((resolve, reject) => {
-    const child = spawn(cmd, cmdArgs, opts);
-    const res = {
-      exitCode: null,
-      out: '',
-      err: '',
-    };
-    child.on('error', reject);
-    child.stdout.on('data', (chunk) => {
-      res.out += chunk.toString();
-    });
-    child.stderr.on('data', (chunk) => {
-      res.err += chunk.toString();
-    });
-    child.on('exit', (exitCode) => {
-      res.exitCode = exitCode;
-      if (exitCode === 0) {
-        resolve(res);
-      } else {
-        reject(res);
-      }
-    });
-  });
-
-const useEngine = ({ ACCEPT_EULA = false, cwd = path.resolve(__dirname, '../'), files }) => {
-  if (ACCEPT_EULA !== true) {
-    throw new Error('Need to accept EULA in order to start engine container');
-  }
-  console.error('Starting engine container...');
-  const f = (files || []).reduce((acc, curr) => [...acc, '-f', curr], []);
-  process.env.ACCEPT_EULA = 'yes';
-  const stopEngine = async () => {
-    console.error('Stopping engine container...');
-    try {
-      await execCmd('docker-compose', [...f, 'down', '--remove-orphans'], {
-        cwd,
-      });
-    } catch (err) {
-      console.error(err);
-    }
-  };
-  return execCmd('docker-compose', [...f, 'up', '-d', '--build'], { cwd }).then(() => stopEngine);
-};
-
-module.exports = useEngine;

package/lib/sn.js

@@ -1 +0,0 @@
-// dummy entrypoint