@zohodesk/react-cli 1.1.11-exp.5 → 1.1.11-exp.6

package/packages/client_build_tool/lib/shared/bundler/webpack/splitChunksConfig.js

@@ -5,124 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.splitChunksConfig = splitChunksConfig;
 
-var _checkIsPatternsMatchFilename = require("./loaderConfigs/checkIsPatternsMatchFilename");
-
-const CSS_MODULE_TYPE = 'css/mini-extract';
-
-function getFilenameFromModule(webpackModule) {
-  const {
-    userRequest
-  } = webpackModule;
-
-  if (webpackModule.type === CSS_MODULE_TYPE) {
-    const {
-      _identifier: identifier = ''
-    } = webpackModule;
-    return identifier.slice(identifier.lastIndexOf('!') + 1);
-  }
-
-  return userRequest;
-}
-
 function splitChunksConfig(options) {
-  // const { customChunks } = options;
-  const {
-    vendorPatterns,
-    customChunks
-  } = options;
-
-  const isVendor = function isVendor(module) {
-    const userRequest = getFilenameFromModule(module);
-    const excludeList = ['script-loader', 'raw-loader'];
-
-    if (userRequest && excludeList.some(s => userRequest.includes(s))) {
-      console.log({
-        userRequest
-      });
-    }
-
-    const patterns = ['node_modules', '!**/node_modules/react/', '!**/node_modules/react-dom/', '!*.css', '!**/publicPathConfig.js', ...(0, _checkIsPatternsMatchFilename.modifyAsExclude)(excludeList), ...vendorPatterns];
-    return userRequest && (0, _checkIsPatternsMatchFilename.checkIsPatternsMatchFilename)(patterns, userRequest);
-  };
-
-  const isReact = module => {
-    const userRequest = getFilenameFromModule(module);
-    const reactBundle = ['**/node_modules/react/', '**/node_modules/react-dom/'];
-    return userRequest && (0, _checkIsPatternsMatchFilename.checkIsPatternsMatchFilename)(reactBundle, userRequest);
-  };
-
-  const defaultChunks = {
-    'react.vendor': {
-      name: 'react.vendor',
-      chunks: 'all',
-      minChunks: 1,
-      test: isReact,
-      enforce: true,
-      // priority: 10
-      priority: 0
-    },
-    vendor: {
-      name: 'vendor',
-      chunks: 'all',
-      // chunks: 'initial',
-      minChunks: 1,
-      test: isVendor,
-      // priority: 19,
-      priority: 0
-    }
-  };
-  const customChunksConfig = customChunks.reverse().map((obj, index) => ({
-    name: obj.name,
-    patterns: obj.patterns,
-    minChunks: obj.minChunks || obj.size || 2,
-    priority: obj.priority || 10 * (index + 2),
-    enforce: obj.enforce || true,
-    maxSize: obj.maxSize,
-    // || 0,
-    minSize: obj.minSize,
-    // || 20000,
-    chunks: obj.chunks || 'all'
-  })).reduce((chunksConfig, {
-    name,
-    patterns,
-    minChunks,
-    priority,
-    enforce,
-    minSize,
-    maxSize,
-    chunks = 'all'
-  }) => {
-    const obj = {
-      name,
-      test: m => {
-        const userRequest = getFilenameFromModule(m);
-        return userRequest && (0, _checkIsPatternsMatchFilename.checkIsPatternsMatchFilename)(patterns, userRequest);
-      },
-      chunks,
-      enforce,
-      minChunks,
-      priority
-    };
-
-    if (minSize !== undefined) {
-      obj.minSize = minSize;
-    }
-
-    if (maxSize !== undefined) {
-      obj.maxSize = maxSize;
-    } // eslint-disable-next-line no-param-reassign
-
-
-    chunksConfig[name] = obj;
-    return chunksConfig;
-  }, {});
   return {
-    minSize: 12000,
-    cacheGroups: {
-      default: false,
-      vendors: false,
-      ...defaultChunks,
-      ...customChunksConfig
-    }
+    chunks: 'all'
   };
 }

package/packages/client_build_tool/lib/shared/bundler/webpack/webpack.dev.config.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _readOptions = require("../../schemas/readOptions");
+
+var _webpackConfig = _interopRequireDefault(require("./webpackConfig"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const options = (0, _readOptions.getOptions)();
+const config = (0, _webpackConfig.default)(options);
+var _default = config;
+exports.default = _default;

package/packages/client_build_tool/lib/shared/bundler/webpack/webpackBuild.js

@@ -7,21 +7,18 @@ exports.default = webpackBuild;
 
 var _webpack = require("webpack");
 
-var _statsConfig = require("./statsConfig");
-
 var _webpackConfig = _interopRequireDefault(require("./webpackConfig"));
 
-var _logger = require("../../../logger");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function webpackBuild(options) {
   const config = (0, _webpackConfig.default)(options);
+  console.log('webpackBuild');
   (0, _webpack.webpack)(config, (err, stats) => {
     if (err || stats.hasErrors()) {
-      (0, _logger.errorLogger)('err', err);
-    }
+      // ...
+      console.log('err', err);
+    } // Done processing
 
-    (0, _logger.messageLogger)(stats.toString((0, _statsConfig.statsConfig)(options)));
   });
 }

package/packages/client_build_tool/lib/shared/bundler/webpack/webpackConfig.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = webpackConfigCreator;
 
-var _entryConfig = require("./entryConfig");
-
 var _outputConfig = require("./outputConfig");
 
 var _jsLoaders = require("./jsLoaders");
@@ -25,27 +23,27 @@ var _configHtmlTemplateLoader = require("./loaderConfigs/configHtmlTemplateLoade
 
 var _configWebWorkerLoader = require("./loaderConfigs/configWebWorkerLoader");
 
-var _statsConfig = require("./statsConfig");
-
-var _getSourceMapType = require("./getSourceMapType");
-
-var _modeUtils = require("./common/modeUtils");
-
-var _externals = require("./externals");
-
+// import { devServerConfig } from './devServerConfig';
 function webpackConfigCreator(options) {
   return {
-    entry: (0, _entryConfig.entryConfig)(options),
-    mode: (0, _modeUtils.getWebpackMode)(options),
+    mode: 'development',
     output: (0, _outputConfig.outputConfig)(options),
-    devtool: (0, _getSourceMapType.devtoolConfig)(options),
-    stats: (0, _statsConfig.statsConfig)(options),
+    devtool: 'cheap-source-map',
+    // stats: 'errors-only',
+    stats: {
+      children: false,
+      colors: true,
+      errorDetails: true // excludeAssets: /i18n/,
+      // excludeAssets: /./,
+      // warningsFilter: /\[mini-css-extract-plugin\]/
+
+    },
+    // devServer: devServerConfig(options),
     optimization: (0, _optimizationConfig.optimizationConfig)(options),
     module: {
       rules: [...(0, _jsLoaders.jsLoaders)(options), ...(0, _cssLoaders.cssLoaders)(options), (0, _configWebWorkerLoader.configWebWorkerLoader)(options), (0, _configHtmlTemplateLoader.configHtmlTemplateLoader)(options), ...(0, _assetLoaders.assetLoaders)(options)]
     },
     plugins: (0, _plugins.plugins)(options),
-    externals: (0, _externals.externals)(options),
     resolve: (0, _resolvers.moduleResolver)(options),
     resolveLoader: (0, _resolvers.loaderResolver)(options)
   };

package/packages/client_build_tool/lib/shared/commands-utlis/doBasicRequiermentCheck.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.doBasicRequiermentCheck = doBasicRequiermentCheck;
+
+function doBasicRequiermentCheck() {
+  const majorV = Number(process.version.slice(1, 4));
+
+  if (majorV >= 12 && majorV <= 18) {
+    return true;
+  }
+
+  throw `your node version not compactable with this cli please update node vesrion to 12 - 18, and your current version is ${process.version}`;
+}

package/packages/client_build_tool/lib/shared/{commands-utils → commands-utlis}/getCliPath.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getCliPath = getCliPath;
+exports.getCliPath = void 0;
 
 var _os = require("os");
 
@@ -11,8 +11,8 @@ var _fs = require("fs");
 
 var _path = require("path");
 
-var _constants = require("../constants");
-
+const appPath = process.cwd();
+const isNodeModuleUnderAppFolder = __dirname.indexOf(appPath) !== -1;
 const isWindows = (0, _os.platform)().toLowerCase() === 'win32';
 const suffixExt = isWindows ? '.cmd' : ''; // function searchForCommandPath(commandName) {
 //   let pathFolders = __dirname.split(sep);
@@ -28,12 +28,11 @@ const suffixExt = isWindows ? '.cmd' : ''; // function searchForCommandPath(comm
 // }
 
 function searchForCommandPath(libName) {
-  const commandPath = (0, _path.join)(_constants.cliNodeModulesPath, '.bin', libName); // TODO: need to check for windows machine reason command with ext added,
-  //  when we use global react-cli package (executable) working or not
+  const commandPath = (0, _path.join)(__dirname, '..', '..', '..', 'node_modules', '.bin', libName); // TODO: need to check for windows machine reason command with ext added,
+  //  when we  use  global react-cli package (executable) working or not 
 
   return (0, _fs.existsSync)(commandPath) ? commandPath : libName;
 }
 
-function getCliPath(commandName) {
-  return searchForCommandPath(commandName + suffixExt);
-}
+const getCliPath = !isNodeModuleUnderAppFolder ? commandName => searchForCommandPath(commandName + suffixExt) : commandName => commandName + suffixExt;
+exports.getCliPath = getCliPath;

package/packages/client_build_tool/lib/shared/{commands-utils → commands-utlis}/index.js

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "doBasicRequirementCheck", {
+Object.defineProperty(exports, "doBasicRequiermentCheck", {
   enumerable: true,
   get: function () {
-    return _doBasicRequirementCheck.doBasicRequirementCheck;
+    return _doBasicRequiermentCheck.doBasicRequiermentCheck;
   }
 });
 Object.defineProperty(exports, "readArgsFormCommandLine", {
@@ -26,4 +26,4 @@ var _readArgsFormCommandLine = require("./readArgsFormCommandLine");
 
 var _readOptionFormCommandLine = require("./readOptionFormCommandLine");
 
-var _doBasicRequirementCheck = require("./doBasicRequirementCheck");
+var _doBasicRequiermentCheck = require("./doBasicRequiermentCheck");

package/packages/client_build_tool/lib/shared/commands-utlis/spanSync.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.spawnIO = spawnIO;
+exports.spawnSyncIO = spawnSyncIO;
+
+var _getCliPath = require("./getCliPath");
+
+const {
+  spawnSync,
+  spawn
+} = require('child_process');
+
+function spawnSyncIO(commandName, args) {
+  const command = (0, _getCliPath.getCliPath)(commandName);
+  const result = spawnSync(command, args, {
+    stdio: 'inherit'
+  });
+
+  if (result.error || result.stderr) {
+    console.error(result.error || result.stderr);
+  } // console.log(result.output);
+
+
+  process.exit(result.status);
+}
+
+function spawnIO(commandName, args, cb) {
+  // const result =
+  spawn(commandName, args, {
+    stdio: 'inherit'
+  }, cb); // process.exit(result.status);
+}

package/packages/client_build_tool/lib/shared/constants.js

@@ -3,10 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.cliRootPath = exports.cliNodeModulesPath = exports.babelrcPath = exports.appPath = exports.CONFIG_ROOT = exports.BASE_CONFIG_KEY = void 0;
-exports.getTemplatePath = getTemplatePath;
-exports.joinWithAppPath = joinWithAppPath;
-exports.templatesPath = void 0;
+exports.cliRootPath = exports.cliNodemodulesPath = exports.babelrcPath = exports.appPath = exports.appInitialHTMLTemplatePath = exports.CONFIG_ROOT = exports.BASE_CONFIG_KEY = void 0;
 
 var _path = _interopRequireWildcard(require("path"));
 
@@ -23,23 +20,14 @@ exports.cliRootPath = cliRootPath;
 const CONFIG_ROOT = 'client-build-config';
 exports.CONFIG_ROOT = CONFIG_ROOT;
 
-const cliNodeModulesPath = _path.default.resolve(cliRootPath, 'node_modules');
+const cliNodemodulesPath = _path.default.resolve(cliRootPath, 'node_modules');
 
-exports.cliNodeModulesPath = cliNodeModulesPath;
+exports.cliNodemodulesPath = cliNodemodulesPath;
 const babelrcPath = (0, _path.join)(cliRootPath, '.babelrc');
 exports.babelrcPath = babelrcPath;
 const appPath = process.cwd();
 exports.appPath = appPath;
 
-function joinWithAppPath(filePath) {
-  // TODO: test in windows
-  return (0, _path.join)(appPath, filePath);
-}
+const appInitialHTMLTemplatePath = _path.default.join(process.cwd(), 'src', 'index.html');
 
-const templatesPath = (0, _path.join)(__dirname, '..', '..', 'templates');
-exports.templatesPath = templatesPath;
-
-function getTemplatePath(...filePath) {
-  // TODO: test in windows
-  return (0, _path.join)(templatesPath, ...filePath);
-}
+exports.appInitialHTMLTemplatePath = appInitialHTMLTemplatePath;

package/packages/client_build_tool/lib/shared/schemas/applyValuesToShema.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.applyValuesToShema = applyValuesToShema;
+
+function isObject(obj) {
+  return obj !== null && typeof obj === 'object' && !Array.isArray(obj);
+}
+
+function applyValuesToShema(schemas, customOptions, processEnv) {
+  const output = {};
+
+  function decideValue(schema, key, customOptions) {
+    const specificShema = schema[key];
+    const correspondingValue = customOptions && customOptions[key];
+
+    if (isObject(specificShema)) {
+      if (typeof specificShema.cli === 'string') {
+        var _ref, _processEnv$specificS;
+
+        return (_ref = (_processEnv$specificS = processEnv[specificShema.cli]) !== null && _processEnv$specificS !== void 0 ? _processEnv$specificS : correspondingValue) !== null && _ref !== void 0 ? _ref : specificShema.value;
+      }
+
+      return applyValuesToShema(specificShema, correspondingValue, processEnv);
+    }
+
+    return correspondingValue !== null && correspondingValue !== void 0 ? correspondingValue : schema[key];
+  } // console.log({schemas})
+
+
+  Object.keys(schemas).forEach(key => {
+    output[key] = decideValue(schemas, key, customOptions);
+  });
+  return output;
+}

package/packages/client_build_tool/lib/{schemas → shared/schemas}/cliArgsToObject.js

@@ -5,17 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.cliArgsToObject = cliArgsToObject;
 
-var _giveDefaultValue = require("./giveDefaultValue");
-
-/**
- * experimental argument parsing logic
- * @param {Array} cliArgs is when we use cli the options or args
- *
- * cliArgs:-
- *  `cbt start --port=2332 --mode=prod` in this command
- * ['--port=2332', '--mode=prod'] these are cliArgs
- * 
- * return {"port": 2332, "mode":"prod"}
+/**
+ * experimental argument parsing logic
+ * @param {Array} cliArgs is when we use cli the options or args
+ *
+ * cliArgs:-
+ *  `cbt start --port=2332 --mode=prod` in this command
+ * ['--port=2332', '--mode=prod'] these are cliArgs
+ * 
+ * retunr {"port": 2332, "mode":"prod"}
  */
 function cliArgsToObject(cliArgs) {
   const processEnv = {};
@@ -24,7 +22,7 @@ function cliArgsToObject(cliArgs) {
       const equIndex = option.indexOf('='); // equIndex = equIndex === -1 ? option.length : equIndex;
 
       let key = option.slice(2, equIndex);
-      let value = (0, _giveDefaultValue.giveDefaultValue)(option.slice(equIndex + 1));
+      let value = option.slice(equIndex + 1);
 
       if (equIndex === -1) {
         key = option.slice(2);

package/packages/client_build_tool/lib/shared/schemas/defaultConfigValues.js

@@ -0,0 +1,119 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _os = require("os");
+
+// import { join } from 'path';
+// import { cliRootPath } from '../constants';
+// import { getIp } from '../server/getIp';
+var _default = {
+  context: {
+    value: 'app',
+    cli: 'context'
+  },
+  enableChunkHash: {
+    value: true,
+    cli: 'enablehash'
+  },
+  output: {
+    value: 'build',
+    cli: 'output'
+  },
+  server: {
+    httpsCerts: {
+      value: '',
+      cli: 'https_certs'
+    },
+    host: {
+      value: (0, _os.hostname)(),
+      cli: 'host'
+    },
+    port: {
+      value: 9090,
+      cli: 'port'
+    },
+    domain: {
+      value: 'tsi',
+      cli: 'domain'
+    },
+    // domain: { value: null, cli: 'domain' },
+    mode: {
+      value: 'dev',
+      cli: 'mode'
+    },
+    disableContextURL: false,
+    hasMock: false,
+    mockPrefix: {
+      value: '/api',
+      cli: 'mock_prefix'
+    },
+    mockPort: {
+      value: 5000,
+      cli: 'mock_port'
+    }
+  },
+  css: {
+    selectorReplace: null,
+    classNameOptions: {
+      classNamePrefix: 'zd',
+      classNameBlob: false
+    },
+    plugins: {
+      rtlSplit: {
+        enableRTLSplit: false,
+        templateLabel: '{{--dir}}',
+        disableMinifySelector: false,
+        dirVarName: 'document.dir'
+      },
+      rtl: {
+        enable: false,
+        exclude: []
+      }
+    }
+  },
+  i18nChunkSplit: {
+    chunkSplitEnable: {
+      value: false,
+      cli: 'i18n_split'
+    },
+    disableDefault: false,
+    templateLabel: '{{--user-locale}}',
+    localeVarName: 'document.documentElement.lang',
+    jsonpFunc: 'console.log',
+    jsResource: null,
+    propertiesFolder: null
+  },
+  app: {
+    tpFolder: null,
+    moduleResolvePath: {
+      value: '',
+      cli: 'module_resolve_path'
+    },
+    htmlTemplate: {
+      inject: true
+    },
+    cdnMapping: {
+      isCdnEnabled: false,
+      variableName: '',
+      cssTemplate: '',
+      jsTemplate: '',
+      i18nTemplate: ''
+    },
+    serviceWorker: {
+      enableSw: false,
+      filePath: 'sw.js',
+      fileName: 'v1.js',
+      exitPath: '/',
+      replaceText: '//<!--AssetsFromBuild -->'
+    },
+    enableSMap: {
+      value: false,
+      cli: 'source_map_enable'
+    }
+  }
+};
+exports.default = _default;

package/packages/client_build_tool/lib/shared/schemas/deprecatedOptionsHandler.js

@@ -0,0 +1,65 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deprecatedOptionsHandler = deprecatedOptionsHandler;
+
+var _buildToolLoggers = require("../../buildToolLoggers");
+
+function selectn(obj, key) {
+  let temp = obj;
+  const keys = key.split('.');
+
+  for (let i = 0; i < keys.length; i++) {
+    const element = keys[i];
+    temp = temp && temp[element];
+  }
+
+  return temp;
+}
+
+function selectnu(obj, key, value) {
+  let temp = obj;
+  const keys = key.split('.');
+  let i = 0;
+
+  for (; i < keys.length - 1; i++) {
+    const element = keys[i];
+    temp = temp && temp[element];
+  }
+
+  temp[keys[i]] = value;
+}
+
+function deprecatedOptionsHandler(options) {
+  function checkAndupdateAndPrintWaring(oldKey, newkey) {
+    const oldVal = selectn(options, oldKey);
+    const newVal = selectn(options, newkey); // console.log({ oldVal, newVal });
+
+    if (oldVal !== undefined && newVal === undefined) {
+      selectnu(options, newkey, newVal);
+      (0, _buildToolLoggers.warnLogger)(`"${oldKey}" deprecated use "${newkey}" instead`);
+    }
+  } // return;
+
+
+  checkAndupdateAndPrintWaring('app.context', 'context'); // TODO handle deprecations  here
+  // we will finish this logic later when options are confirmed
+
+  if (selectn(options, 'app.hasRTL') === true) {
+    options.app.plugins.hasRTL = true;
+  }
+
+  if (selectn(options, 'docs.hasRTL') === true) {
+    options.docs.plugins.hasRTL = true;
+  }
+
+  if (selectn(options, 'app.rtlExclude.length') > 0) {
+    options.app.exclude.rtl = selectn(options, 'app.rtlExclude');
+  }
+
+  if (selectn(options, 'docs.rtlExclude.length') > 0) {
+    options.docs.exclude.rtl = selectn(options, 'docs.rtlExclude');
+  }
+}

package/packages/client_build_tool/lib/shared/schemas/getCWD.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCWD = getCWD;
+
+var _child_process = require("child_process");
+
+function getCWD() {
+  // require("child_process").
+  let cwd = process.cwd();
+
+  try {
+    let ress = (0, _child_process.execSync)('npm bin').toString();
+    let i = ress.lastIndexOf('node_modules');
+    cwd = i === -1 ? cwd : ress.slice(0, i);
+  } catch (error) {
+    console.log(error);
+  }
+
+  return cwd;
+}

package/packages/client_build_tool/lib/{schemas → shared/schemas}/getNpmVersion.js

@@ -7,15 +7,14 @@ exports.getNpmVersion = getNpmVersion;
 
 var _child_process = require("child_process");
 
-var _logger = require("../logger");
-
 function getNpmVersion() {
+  // require("child_process").
   let vers = '6';
 
   try {
     [vers] = (0, _child_process.execSync)('npm -v').toString().trim().split('.');
   } catch (error) {
-    (0, _logger.messageLogger)(error);
+    console.log(error);
   }
 
   return vers;