@zohodesk/react-cli 1.1.11-exp.3 → 1.1.11-exp.4

package/packages/client_build_tool/lib/shared/server/configWebpackDevMiddleware.js

@@ -10,6 +10,8 @@ var _webpack = require("webpack");
 
 var _webpackDevMiddleware = _interopRequireDefault(require("webpack-dev-middleware"));
 
+var _statsConfig = require("../bundler/webpack/statsConfig");
+
 var _webpackConfig = _interopRequireDefault(require("../bundler/webpack/webpackConfig"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -19,7 +21,7 @@ function webpackDevMiddlewareConfig(options) {
     publicPath
   } = options;
   return {
-    stats: 'minimal',
+    stats: (0, _statsConfig.statsConfig)(options),
     index: 'index.html',
     publicPath,
     headers: {
@@ -30,8 +32,7 @@ function webpackDevMiddlewareConfig(options) {
 
 function configWebpackDevMiddleware(app, options) {
   const config = (0, _webpackConfig.default)(options);
-  const compiler = (0, _webpack.webpack)(config); // console.log("mode", mode)
-
+  const compiler = (0, _webpack.webpack)(config);
   const devMiddleware = (0, _webpackDevMiddleware.default)(compiler, webpackDevMiddlewareConfig(options));
   app.use(devMiddleware);
   return {

package/packages/client_build_tool/lib/shared/server/{corsHandleing.js → corsHandling.js}

@@ -3,25 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.corsHandleing = corsHandleing;
+exports.corsHandling = corsHandling;
 
-var _express = _interopRequireDefault(require("express"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function corsHandleing(app, options) {
-  const {
-    contextURL,
-    context
-  } = options;
+// eslint-disable-next-line no-unused-vars
+function corsHandling(app, options) {
   app.use((req, res, next) => {
-    //console.log('origin', req.get('origin'));
+    // console.log('origin', req.get('origin'));
     res.setHeader('Access-Control-Allow-Origin', req.get('origin') || '*'); // res.setHeader('Access-Control-Allow-Origin', req.get('origin'));
 
     res.setHeader('Access-Control-Allow-Private-Network', true);
     res.setHeader('Access-Control-Allow-Credentials', true);
     next();
-  }).use(`${contextURL}/fonts`, _express.default.static(`${context}/fonts`));
+  });
   app.options('/*', (req, res) => {
     res.send('Ok');
   });

package/packages/client_build_tool/lib/shared/server/getIp.js

@@ -10,12 +10,12 @@ var _os = _interopRequireDefault(require("os"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function getIp() {
-  let ifaces = _os.default.networkInterfaces();
+  const ifaces = _os.default.networkInterfaces();
 
   let ips = [];
   Object.keys(ifaces).forEach(ifname => {
-    let a = ifaces[ifname].map(iface => {
-      if ('IPv4' !== iface.family || iface.internal !== false) {
+    const a = ifaces[ifname].map(iface => {
+      if (iface.family !== 'IPv4' || iface.internal !== false) {
         return null;
       }
 

package/packages/client_build_tool/lib/shared/server/httpsOptions.js

@@ -3,31 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.httpsOptions = httpsOptions;
 exports.httpsOptionsWithUserFriendlyError = httpsOptionsWithUserFriendlyError;
 
-var _buildToolLoggers = require("../../buildToolLoggers");
+var _logger = require("../../logger");
 
-var _constants = require("../constants");
+var _requireLocalOrGlobal = require("../utils/requireLocalOrGlobal");
 
-// import fs from 'fs';
-// import path from 'path';
-// export const httpsOptions = {
-//   key: fs.readFileSync(path.join(__dirname, './cert/Tsicsezwild-22-23.key')),
-//   cert: fs.readFileSync(path.join(__dirname, './cert/Tsicsezwild-22-23.crt'))
-// };
-function httpsOptions(options) {
-  const {
-    httpsCerts
-  } = options.server; // eslint-disable-next-line global-require, import/no-dynamic-require
-
-  const certificate = require(require.resolve(httpsCerts, {
-    paths: [process.cwd()]
-  })); // TODO: in future we may do some version based check. certificate.version
-
-
-  return certificate.httpsOptions;
-}
+const defaultCertNpm = '@zohodesk-private/client_dev_cert';
 
 function httpsOptionsWithUserFriendlyError(options) {
   const {
@@ -35,18 +17,29 @@ function httpsOptionsWithUserFriendlyError(options) {
   } = options.server;
 
   if (typeof httpsCerts === 'string' && httpsCerts) {
-    try {
-      const certificate = httpsOptions(options);
-      return certificate;
-    } catch (error) {
-      if (error.msg.indexOf('Error: Cannot find module') !== -1) {
-        (0, _buildToolLoggers.errorLogger)(`You have given ${_constants.BASE_CONFIG_KEY}.server.httpsCerts as "${httpsCerts}.
-        But it seems that file path have some problem";`);
-      }
-
-      (0, _buildToolLoggers.errorLogger)(error);
-      process.exit(0);
+    const certificate = (0, _requireLocalOrGlobal.requireAllPossible)(httpsCerts);
+
+    if (certificate.local) {
+      (0, _logger.verboseLogger)(`Local '${httpsCerts}' package taken as HTTPS certificate`);
+      return certificate.local.httpsOptions;
     }
+
+    if (certificate.global) {
+      (0, _logger.messageLogger)(`Global '${httpsCerts}' package taken as HTTPS certificate`);
+      return certificate.global.httpsOptions;
+    }
+
+    (0, _logger.errorLogger)(`
+        You have given 'server.httpsCerts' as "${httpsCerts}".
+        But it seems that file path have some problem;`);
+    process.exit(0);
+  }
+
+  const globalCertificate = (0, _requireLocalOrGlobal.requireGlobal)(defaultCertNpm);
+
+  if (globalCertificate) {
+    (0, _logger.messageLogger)(`Global '${defaultCertNpm}' package taken as HTTPS certificate`);
+    return globalCertificate.httpsOptions;
   }
 
   return null;

package/packages/client_build_tool/lib/shared/server/initialHTMLHandling.js

@@ -5,11 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.initialHTMLHandling = initialHTMLHandling;
 
-var _buildToolLoggers = require("../../buildToolLoggers");
+var _logger = require("../../logger");
 
+/* eslint-disable no-use-before-define */
 function initialHTMLHandling(compiler, app, options) {
   const {
-    contextURL
+    contextURL,
+    enableMockReplace
   } = options;
   const {
     i18nChunkSplit
@@ -17,50 +19,81 @@ function initialHTMLHandling(compiler, app, options) {
   const {
     rtlSplit
   } = options.css.plugins;
-  let initalHTML;
+  const {
+    httpsUrl,
+    httpUrl
+  } = options.serverExtras;
+  let initialHTML;
   compiler.hooks.afterCompile.tap('ReactCLI', compilation => {
     const indexHtml = compilation.assets['index.html']; // compiler.outputFileSystem.readFileSync("build/index.html");
 
     if (indexHtml) {
-      initalHTML = indexHtml.source();
+      initialHTML = indexHtml.source();
     }
   });
+  compiler.hooks.compile.tap('ReactCLI', () => {
+    (0, _logger.messageLogger)('Webpack re-building .......');
+  });
   app.use(`${contextURL}/*`, (req, res) => {
-    // // app.use(`/desk/*`, (req, res) => {
-    // const { rtlSplit } = options.css.plugins;
-    let newHTML = initalHTML;
+    const newHTML = modifyInitialHTML({
+      initialHTML,
+      options,
+      enableMockReplace,
+      req
+    });
+    res.send(newHTML);
+  });
+
+  function modifyInitialHTML({
+    initialHTML,
+    enableMockReplace,
+    req
+  }) {
+    let newHTML = enableMockReplace && initialHTML ? mockReplace(initialHTML, req.query) : initialHTML;
+
+    if (req.protocol === 'http') {
+      newHTML = newHTML.replaceAll(httpsUrl, httpUrl);
+    }
+
+    return newHTML;
+  }
+
+  function mockReplace(inputHTML, query) {
+    const {
+      dir,
+      locale
+    } = query || {};
+    let newHTML = inputHTML;
 
     if (i18nChunkSplit.chunkSplitEnable) {
-      // eslint-disable-next-line no-use-before-define
-      newHTML = replaceWithRandomLocale(newHTML, i18nChunkSplit.templateLabel);
+      newHTML = replaceWithRandomLocale(newHTML, i18nChunkSplit.templateLabel, locale);
     }
 
     if (rtlSplit.enableRTLSplit) {
-      // eslint-disable-next-line no-use-before-define
-      newHTML = replaceWithRandomDir(newHTML, rtlSplit.templateLabel);
+      newHTML = replaceWithRandomDir(newHTML, rtlSplit.templateLabel, dir);
     }
 
-    res.send(newHTML);
-  });
+    return newHTML;
+  }
 
-  function replaceWithRandomLocale(initalHTML, templateLabel) {
+  function replaceWithRandomLocale(initialHTML, templateLabel, queryLocale) {
     const locales = ['ar_EG', 'da_DK', 'de_DE', 'en_US', 'es_AR', 'es_ES', 'fr_FR', 'hi_IN', 'in_ID', 'it_IT', 'iw_IL', 'ja_JP', 'nl_NL', 'pl_PL', 'pt_BR', 'pt_PT', 'ro_RO', 'ru_RU', 'sv_SE', 'ta_IN', 'te_IN', 'tr_TR', 'zh_CN', 'zh_TW']; // app.use(`/desk/*`, (req, res) => {
     // const locale = 'ta_IN';
 
-    const locale = locales[Math.floor(Math.random() * locales.length)];
-    console.log({
+    const locale = queryLocale || locales[Math.floor(Math.random() * locales.length)];
+    (0, _logger.verboseLogger)({
       locale
     });
-    return initalHTML.replaceAll(templateLabel, locale);
+    return initialHTML.replaceAll(templateLabel, locale);
   }
 
-  function replaceWithRandomDir(initalHTML, templateLabel) {
+  function replaceWithRandomDir(initialHTML, templateLabel, queryDir) {
     const dirs = ['ltr', 'rtl']; // const dir = 'rtl';
 
-    const dir = dirs[Math.floor(Math.random() * dirs.length)];
-    console.log({
+    const dir = queryDir || dirs[Math.floor(Math.random() * dirs.length)];
+    (0, _logger.verboseLogger)({
       dir
     });
-    return initalHTML.replaceAll(templateLabel, dir);
+    return initialHTML.replaceAll(templateLabel, dir);
   }
 }

package/packages/client_build_tool/lib/shared/server/mockApiHandler.js

@@ -0,0 +1,60 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleMockApi = handleMockApi;
+exports.mockApiHandler = mockApiHandler;
+
+var _fs = require("fs");
+
+var _httpProxyMiddleware = require("http-proxy-middleware");
+
+var _constants = require("../constants");
+
+var _logger = require("../../logger");
+
+function mockApiHandler(app, options) {
+  const {
+    enable,
+    separateSeverPort,
+    mockEntryFile,
+    mockPrefix
+  } = options.mockServer;
+
+  if (!enable) {
+    return;
+  }
+
+  if (separateSeverPort) {
+    app.use(mockPrefix, (0, _httpProxyMiddleware.createProxyMiddleware)({
+      // eslint-disable-next-line no-useless-concat
+      target: 'ht' + `tp://localhost:${separateSeverPort}`,
+      changeOrigin: true
+    }));
+    (0, _logger.messageLogger)(`Please make sure you run mock Server separately in specified port (${separateSeverPort})`);
+    (0, _logger.messageLogger)(`If not running already you can run "cbt mock:server --mock_port=${separateSeverPort}"`);
+  } else {
+    // eslint-disable-next-line no-use-before-define
+    handleMockApi(mockEntryFile, app);
+  }
+}
+
+function handleMockApi(mockEntryFile, app) {
+  const entryFilePath = (0, _constants.joinWithAppPath)(mockEntryFile); // eslint-disable-next-line no-use-before-define
+
+  const mockFunc = safeRequire(entryFilePath);
+  console.log(mockFunc);
+  mockFunc?.mockApi?.(app);
+} // function handleMockApi(params) {
+// }
+
+
+function safeRequire(entryFilePath) {
+  if (!(0, _fs.existsSync)(entryFilePath)) {
+    return null;
+  } // eslint-disable-next-line import/no-dynamic-require, global-require
+
+
+  return require(entryFilePath);
+}

package/packages/client_build_tool/lib/shared/server/mockServer.js

@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+"use strict";
+
+var _readOptions = require("../../schemas/readOptions");
+
+var _corsHandling = require("./corsHandling");
+
+var _getServerURL = require("./getServerURL");
+
+var _initExpressApp = require("./initExpressApp");
+
+var _mockApiHandler = require("./mockApiHandler");
+
+var _startHttpServer = require("./startHttpServer");
+
+function getMockServerExtras(options) {
+  const {
+    separateSeverPort
+  } = options.mockServer;
+  const httpPort = Number(separateSeverPort);
+  const httpUrl = (0, _getServerURL.getServerUrl)({
+    domain: 'localhost',
+    port: httpPort,
+    protocol: 'http'
+  });
+  return {
+    httpPort,
+    httpUrl,
+    isHttps: false
+  };
+}
+
+const options = (0, _readOptions.getOptions)();
+const {
+  mockEntryFile
+} = options.mockServer;
+options.serverExtras = getMockServerExtras(options);
+const app = (0, _initExpressApp.initExpressApp)();
+(0, _corsHandling.corsHandling)(app, options);
+(0, _startHttpServer.startHttpServer)(app, options);
+(0, _mockApiHandler.handleMockApi)(mockEntryFile, app);

package/packages/client_build_tool/lib/shared/server/serveContextFiles.js

@@ -15,6 +15,7 @@ function serveContextFiles(app, options) {
     contextURL,
     contextFolderPath
   } = options;
+  app.use(`${contextURL}/fonts`, _express.default.static(`${context}/fonts`));
 
   if (contextURL) {
     app.use(contextURL, _express.default.static(contextFolderPath));

package/packages/client_build_tool/lib/shared/server/serverBywebpackDevMiddleware.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.run = run;
 
-var _corsHandleing = require("./corsHandleing");
+var _corsHandling = require("./corsHandling");
 
 var _initExpressApp = require("./initExpressApp");
 
@@ -19,22 +19,18 @@ var _initialHTMLHandling = require("./initialHTMLHandling");
 
 var _startHttpServer = require("./startHttpServer");
 
-// import c from './bundler/webpack/webpack.dev.config.js'
-// import { spawnSyncIO } from '../commands-utlis/spanSync';
+var _mockApiHandler = require("./mockApiHandler");
+
 // import { startHttpServer } from './startHttpServer';
 function run(options) {
   const app = (0, _initExpressApp.initExpressApp)();
-  (0, _corsHandleing.corsHandleing)(app, options);
+  (0, _corsHandling.corsHandling)(app, options);
+  (0, _mockApiHandler.mockApiHandler)(app, options);
   const {
     compiler
   } = (0, _configWebpackDevMiddleware.configWebpackDevMiddleware)(app, options);
   (0, _serveContextFiles.serveContextFiles)(app, options);
   (0, _startHttpsServer.startHttpsServer)(app, options);
   (0, _startHttpServer.startHttpServer)(app, options);
-  (0, _initialHTMLHandling.initialHTMLHandling)(compiler, app, options); // return spawnSyncIO('webpack', [
-  //   'serve',
-  //   '--config',
-  //   require.resolve('../bundler/webpack/webpack.dev.config.js')
-  // ]);
-  // startHttpServer(app, options);
+  (0, _initialHTMLHandling.initialHTMLHandling)(compiler, app, options);
 }

package/packages/client_build_tool/lib/shared/server/startHttpServer.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.startHttpServer = startHttpServer;
 
-var _buildToolLoggers = require("../../buildToolLoggers");
+var _logger = require("../../logger");
 
 function startHttpServer(app, options) {
   const {
@@ -20,7 +20,7 @@ function startHttpServer(app, options) {
       throw err;
     }
 
-    (0, _buildToolLoggers.messageLogger)(`Listening at ${httpUrl}`);
+    (0, _logger.messageLogger)(`Listening at ${httpUrl}`);
   });
   return app;
 }

package/packages/client_build_tool/lib/shared/server/startHttpsServer.js

@@ -7,7 +7,7 @@ exports.startHttpsServer = startHttpsServer;
 
 var _https = _interopRequireDefault(require("https"));
 
-var _buildToolLoggers = require("../../buildToolLoggers");
+var _logger = require("../../logger");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -21,6 +21,10 @@ function startHttpsServer(app, options) {
     httpsUrl
   } = serverExtras;
 
+  if (!httpsOptions) {
+    return null;
+  }
+
   const httpsServer = _https.default.createServer(httpsOptions, app);
 
   httpsServer.listen(httpsPort, err => {
@@ -28,7 +32,7 @@ function startHttpsServer(app, options) {
       throw err;
     }
 
-    (0, _buildToolLoggers.messageLogger)(`Listening at ${httpsUrl}`);
+    (0, _logger.messageLogger)(`Listening at ${httpsUrl}`);
   });
   return httpsServer;
 }

package/packages/client_build_tool/lib/shared/server/unwanted/websocketMockSetup.js

@@ -5,17 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.websocketMockSetup = websocketMockSetup;
 
-var _path = _interopRequireDefault(require("path"));
-
 var _ws = _interopRequireDefault(require("ws"));
 
-var _utils = require("../../../src/utils");
+var _logger = require("../../../logger");
+
+var _constants = require("../../constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function websocketMockSetup(app, httpsServer) {
   app.use('/wms/*', (req, res) => {
-    res.sendFile(_path.default.join(__dirname, '..', '..', 'templates', 'wms', 'index.html'));
+    res.sendFile((0, _constants.getTemplatePath)('wms', 'index.html'));
   });
   const wss = new _ws.default.Server({
     server: httpsServer
@@ -27,20 +27,20 @@ function websocketMockSetup(app, httpsServer) {
       wsPool = wsPool.filter(ws1 => ws1 !== ws);
     });
     ws.on('message', message => {
-      (0, _utils.log)('received: %s', message);
+      (0, _logger.messageLogger)('received: %s', message);
     });
     ws.send('something');
   });
   app.post('/wmsmockapi', (req, res) => {
     wsPool.forEach(ws => {
-      let {
+      const {
         body
       } = req;
 
       try {
         ws.send(JSON.stringify(body));
       } catch (e) {
-        (0, _utils.log)(e, body);
+        (0, _logger.messageLogger)(e, body);
       }
     });
     res.send('success');

package/packages/client_build_tool/lib/shared/server/urlConcat.js

@@ -5,19 +5,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.urlConcat = urlConcat;
 
-/**
- *
- * @param {String} url
- * @param {String} path
+/* eslint-disable no-use-before-define */
+
+/**
+ *
+ * @param {String} url
+ * @param {String} path
  */
-function removeLastSlash(url) {
-  return url.replace(/\/+$/, '');
+function urlConcat(url, path) {
+  const slashRemovedUrl = removeLastSlash(url);
+  const slashRemovedPath = removeFrontSlash(path);
+
+  if (slashRemovedUrl === '') {
+    return path;
+  }
+
+  return `${slashRemovedUrl}/${slashRemovedPath}`;
 }
 
-function urlConcat(url, path) {
-  url = removeLastSlash(url);
-  path = removeFrontSlash(path);
-  return `${url}/${path}`;
+function removeLastSlash(url) {
+  return url.replace(/\/+$/, '');
 }
 
 function removeFrontSlash(url) {

package/packages/client_build_tool/lib/shared/utils/requireLocalOrGlobal.js

@@ -0,0 +1,81 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.globalNodeModules = void 0;
+exports.requireAllPossible = requireAllPossible;
+exports.requireGlobal = requireGlobal;
+exports.requireInFolder = requireInFolder;
+exports.requireLocal = requireLocal;
+exports.requireLocalOrGlobal = requireLocalOrGlobal;
+
+var _child_process = require("child_process");
+
+var _path = _interopRequireDefault(require("path"));
+
+var _constants = require("../constants");
+
+var _logger = require("../../logger");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const globalNodeModules = _path.default.join(`${(0, _child_process.execSync)('npm config get prefix')}`.trim(), 'lib');
+
+exports.globalNodeModules = globalNodeModules;
+
+function requireLocalOrGlobal(moduleName, opts = {}) {
+  let {
+    global = true
+  } = opts;
+  const {
+    local = true
+  } = opts;
+  const isRelativePath = moduleName[0] === '.'; // NOTE: if starts with . then it only mean local
+
+  if (isRelativePath) {
+    global = false;
+  }
+
+  const paths = [local && _constants.appPath, global && globalNodeModules].filter(Boolean); // eslint-disable-next-line no-use-before-define
+
+  return requireInFolder(moduleName, paths);
+}
+
+function requireInFolder(moduleName, paths) {
+  try {
+    const moduleResolvePath = require.resolve(moduleName, {
+      paths
+    }); // eslint-disable-next-line import/no-dynamic-require, global-require
+
+
+    return require(moduleResolvePath);
+  } catch (error) {
+    // NOTE: since we return null we can check out side
+    (0, _logger.verboseLogger)('Re validate: ', error);
+    return null;
+  }
+}
+
+function requireLocal(moduleName) {
+  return requireInFolder(moduleName, [_constants.appPath]);
+}
+
+function requireGlobal(moduleName) {
+  const isRelativePath = moduleName[0] === '.'; // NOTE: if starts with . then it only mean local
+
+  if (isRelativePath) {
+    return null;
+  }
+
+  return requireInFolder(moduleName, [globalNodeModules]);
+}
+
+function requireAllPossible(moduleName) {
+  const localP = requireLocal(moduleName);
+  const globalP = localP ? null : requireGlobal(moduleName);
+  return {
+    local: localP,
+    global: globalP
+  };
+}

package/packages/client_build_tool/lib/shared/utils/versionPrint.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.versionPrint = versionPrint;
+
+var _child_process = require("child_process");
+
+var _logger = require("../../logger");
+
+var _package = _interopRequireDefault(require("../../../package.json"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function versionPrint(logger = _logger.messageLogger) {
+  logger(`Client Build Tool Version : ${_package.default.version}`);
+  logger(`Node Js Version : ${process.version}`);
+  logger(`Npm Version : ${(0, _child_process.execSync)('npm --version')}`);
+}