@elliemae/pui-cli 7.0.0-beta.1 → 7.0.0-beta.2

package/lib/cli-commands/utils.js

@@ -117,11 +117,19 @@ const copyDir = async (src, dest) => {
   );
 };
 
+const updateManifestWithVersionInfo = async (dest) => {
+  const manifestFile = path.join(dest, 'manifest.json');
+  let manifestData = await readFile(manifestFile, 'utf8');
+  manifestData = manifestData.replace(/latest\//g, `${getAppVersion()}/`);
+  await writeFile(manifestFile, manifestData);
+};
+
 exports.copyBuildAssetsToVersionedFolder = async () => {
   const appVersion = getAppVersion();
   const isVersionedApp = isAppLoaderEnabled() && appVersion !== LATEST_VERSION;
   if (!isVersionedApp) return;
   const src = path.resolve(process.cwd(), 'build/public/latest');
   const dest = path.resolve(process.cwd(), `build/public/${appVersion}`);
-  copyDir(src, dest);
+  await copyDir(src, dest);
+  await updateManifestWithVersionInfo(dest);
 };

package/lib/server/index.js

@@ -1,26 +1,11 @@
 /* eslint consistent-return:0 import/order:0 */
-
 const express = require('express');
-const cors = require('cors');
-const { resolve } = require('path');
-const expressPinoLogger = require('express-pino-logger');
-const { csp } = require('./csp');
 const logger = require('./logger');
-const argv = require('./argv');
-const port = require('./port');
-const setup = require('./middlewares/frontendMiddleware');
-const { loadRoutes } = require('./util');
-const { getAssetPath } = require('../webpack/helpers');
-
-const pino = expressPinoLogger({
-  transport: {
-    target: 'pino-pretty',
-    options: {
-      colorize: true,
-    },
-  },
-});
-pino.logger.level = 'warn';
+const {
+  setupDefaultMiddlewares,
+  setupAdditionalMiddlewars,
+} = require('./middlewares');
+const { loadRoutes, port, host } = require('./util');
 
 // const corsOptions = {
 //   origin: '*',
@@ -37,33 +22,16 @@ pino.logger.level = 'warn';
 //   maxAge: 3600,
 // };
 const app = express();
-app.use(pino);
-app.use(cors());
-app.options('*', cors());
-csp(app);
-app.use(express.urlencoded({ extended: false }));
-app.use(express.text({ type: 'text/plain' }));
-app.use(express.json({ type: 'application/json' }));
-app.use(express.json({ type: 'application/csp-report' }));
-
+setupDefaultMiddlewares(app);
 // load all custom routes from the application
 loadRoutes(app);
-
 // In production we need to pass these values in instead of relying on webpack
-setup(app, {
-  outputPath: resolve(process.cwd(), 'build/public'),
-  publicPath: getAssetPath(),
-});
-
-// get the intended host and port number, use localhost and port 3000 if not provided
-const customHost = argv.host || process.env.HOST;
-const host = customHost || null; // Let http.Server use its default IPv6/4 host
-const prettyHost = customHost || 'localhost';
+setupAdditionalMiddlewars(app);
 
 // Start your app.
 app.listen(port, host, async (err) => {
   if (err) {
     return logger.error(err.message);
   }
-  logger.appStarted(port, prettyHost);
+  logger.appStarted(port, host || 'localhost');
 });

package/lib/server/middlewares/addProdMiddlewares.js

@@ -1,25 +1,26 @@
-const path = require('path');
 const compression = require('compression');
 const expressStaticGzip = require('express-static-gzip');
 const { sendFileWithCSPNonce } = require('../csp');
+const { getPaths } = require('../webpack/helpers');
 
-module.exports = function addProdMiddlewares(app, options) {
-  const publicPath = options.publicPath || '/';
-  const outputPath =
-    options.outputPath || path.resolve(process.cwd(), 'build/public');
+const paths = getPaths();
 
+module.exports = function addProdMiddlewares(
+  app,
+  { buildPath = paths.buildPath, mountPath = paths.mountPath },
+) {
   // compression middleware compresses your server responses which makes them
   // smaller (applies also to assets). You can read more about that technique
   // and other good practices on official Express.js docs http://mxs.is/googmy
   app.use(compression());
 
-  app.get(publicPath, (req, res) => {
-    sendFileWithCSPNonce({ outputPath, res });
+  app.get(mountPath, (req, res) => {
+    sendFileWithCSPNonce({ buildPath, res });
   });
 
   app.use(
-    publicPath,
-    expressStaticGzip(outputPath, {
+    mountPath,
+    expressStaticGzip(buildPath, {
       index: false,
       enableBrotli: true,
       orderPreference: ['br'],
@@ -27,5 +28,5 @@ module.exports = function addProdMiddlewares(app, options) {
   );
   app.use(expressStaticGzip('cdn'));
 
-  app.get('*', (req, res) => sendFileWithCSPNonce({ outputPath, res }));
+  app.get('*', (req, res) => sendFileWithCSPNonce({ buildPath, res }));
 };

package/lib/server/middlewares/index.js

@@ -0,0 +1,37 @@
+const express = require('express');
+const cors = require('cors');
+const expressPinoLogger = require('express-pino-logger');
+const { csp } = require('./csp');
+const addProdMiddlewares = require('./addProdMiddlewares');
+const addDevMiddlewares = require('./addDevMiddlewares');
+const webpackConfig = require('../../webpack/webpack.dev.babel');
+
+exports.setupDefaultMiddlewares = (app) => {
+  const pino = expressPinoLogger({
+    transport: {
+      target: 'pino-pretty',
+      options: {
+        colorize: true,
+      },
+    },
+  });
+  pino.logger.level = 'warn';
+  app.use(pino);
+  app.use(cors());
+  app.options('*', cors());
+  csp(app);
+  app.use(express.urlencoded({ extended: false }));
+  app.use(express.text({ type: 'text/plain' }));
+  app.use(express.json({ type: 'application/json' }));
+  app.use(express.json({ type: 'application/csp-report' }));
+};
+
+exports.setupAdditionalMiddlewars = (app, options) => {
+  const isProd = process.env.NODE_ENV === 'production';
+  if (isProd) {
+    addProdMiddlewares(app, options);
+  } else {
+    addDevMiddlewares(app, webpackConfig);
+  }
+  return app;
+};

package/lib/server/util/index.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const path = require('path');
+const argv = require('minimist')(process.argv.slice(2));
 
 const getCWD = () => process.cwd();
 
@@ -25,7 +26,7 @@ const getFilesMatching = (filePattern) => {
 const getServerRouteFiles = getFilesMatching(allJS);
 const getServiceEndpoints = getFilesMatching(serviceEndpoints);
 
-const loadRoutes = (app) => {
+exports.loadRoutes = (app) => {
   const routeFiles = getServerRouteFiles(path.join(getCWD(), 'server/routes'));
   routeFiles.push(...getServiceEndpoints(path.join(getCWD(), 'app')));
   routeFiles.push(...getServiceEndpoints(path.join(getCWD(), 'lib')));
@@ -41,7 +42,11 @@ const loadRoutes = (app) => {
   });
 };
 
-module.exports = {
-  getCWD,
-  loadRoutes,
-};
+exports.port = parseInt(
+  argv.port || process.env.port || process.env.PORT || '3000',
+  10,
+);
+
+exports.host = argv.host || process.env.HOST;
+
+exports.getCWD = getCWD;

package/lib/testing/jest.config.js

@@ -1,9 +1,11 @@
 const path = require('path');
 const normalizePath = require('normalize-path');
-const { getAppConfig, getAssetPath } = require('../webpack/helpers');
+const { getAppConfig, getPaths } = require('../webpack/helpers');
 const swcrcConfig = require('../transpile/swcrc.config.js');
 const { findMonoRepoRoot } = require('../monorepo/utils');
 
+const { mountPath } = getPaths();
+
 let isReactModule = true;
 try {
   /* eslint-disable global-require, import/no-unresolved */
@@ -89,7 +91,7 @@ const jestConfig = {
     APP_CONFIG: getAppConfig(),
     __webpack_public_path__: '/',
   },
-  testURL: `http://localhost:3111${getAssetPath()}`,
+  testURL: `http://localhost:3111${mountPath}`,
   testEnvironment: 'jsdom',
 };
 

package/lib/webpack/helpers.js

@@ -150,8 +150,6 @@ const getENCWLoaderFileName = () => {
   )[0];
 };
 
-const getAssetPath = () => (process.env.ASSET_PATH || '/').replace(/\/?$/, '/');
-
 const getAppVersion = () => {
   if (!process.env.APP_VERSION) return LATEST_VERSION;
   const match = process.env.APP_VERSION.match(/^v?(\d+\.\d+)\..*$/);
@@ -166,7 +164,7 @@ const getPaths = (latestVersion = true) => {
   return {
     appVersion: version,
     buildPath: path.resolve(process.cwd(), `build/public/`),
-    // base path for all assets
+    mountPath: (process.env.MOUNT_PATH || '/').replace(/\/?$/, '/'),
     publicPath,
     userMonScriptPath: `latest/js/${getUserMonitoringFileName()}`,
     appLoaderScriptPath: `latest/js/${getAppLoaderFileName()}`,
@@ -231,7 +229,6 @@ exports.excludeNodeModulesExcept = excludeNodeModulesExcept;
 exports.getLibraryName = getLibraryName;
 exports.getAppConfig = getAppConfig;
 exports.mapToFolder = mapToFolder;
-exports.getAssetPath = getAssetPath;
 exports.isApp = isApp;
 exports.getAlias = getAlias;
 exports.getAppVersion = getAppVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/pui-cli",
-  "version": "7.0.0-beta.1",
+  "version": "7.0.0-beta.2",
   "private": false,
   "description": "ICE MT UI Platform CLI",
   "sideEffects": false,

package/lib/server/argv.js

@@ -1 +0,0 @@
-module.exports = require('minimist')(process.argv.slice(2));

package/lib/server/middlewares/frontendMiddleware.js

@@ -1,16 +0,0 @@
-/* eslint-disable global-require */
-
-module.exports = (app, options) => {
-  const isProd = process.env.NODE_ENV === 'production';
-
-  if (isProd) {
-    const addProdMiddlewares = require('./addProdMiddlewares');
-    addProdMiddlewares(app, options);
-  } else {
-    const webpackConfig = require('../../webpack/webpack.dev.babel');
-    const addDevMiddlewares = require('./addDevMiddlewares');
-    addDevMiddlewares(app, webpackConfig);
-  }
-
-  return app;
-};

package/lib/server/port.js

@@ -1,6 +0,0 @@
-const argv = require('./argv');
-
-module.exports = parseInt(
-  argv.port || process.env.port || process.env.PORT || '3000',
-  10,
-);