@zohodesk/react-cli 1.1.0 → 1.1.2-9.exp.3

package/bin/cli.js

@@ -1,15 +1,19 @@
 #!/usr/bin/env node
 
 const path = require('path');
-const { existsSync } = require('fs');
-const { spawnSync: _spawnSync, spawn } = require('child_process');
-const { getOptions } = require('../lib/utils/index.js');
+const { spawnSync: _spawnSync, execSync } = require('child_process');
+const getOptions = require('../lib/utils/getOptions.js').default;
 
-const { log } = require('../lib/utils');
+const { log } = require('../lib/utils/log.js');
 const { getCliPath } = require('../lib/servers/getCliPath.js');
+const { runPreProcess } = require('../lib/common/runPreProcess.js');
 //initPreCommitHook();
 
-const options = getOptions();
+const [, , option] = process.argv;
+const args = process.argv.slice(3);
+const appPath = process.cwd();
+
+const options = getOptions({ start: true, build: true, docs: true }[option]);
 
 function spawnSync(...args) {
   const result = _spawnSync(...args);
@@ -20,7 +24,6 @@ function spawnSync(...args) {
 }
 
 const { esLint: esLintOptions } = options || {};
-const { preprocess } = options;
 const {
   ignoreFilePaths: esLintIgnorePaths,
   fix: esLintFix,
@@ -28,10 +31,6 @@ const {
   reportPath: reportPath
 } = esLintOptions || {};
 
-const [, , option] = process.argv;
-const args = process.argv.slice(3);
-const appPath = process.cwd();
-
 const webpack = getCliPath('webpack');
 
 const nodemon = getCliPath('nodemon');
@@ -39,49 +38,10 @@ const babel = getCliPath('babel');
 const propertyToJson = getCliPath('propertyToJson');
 const esLint = getCliPath('eslint');
 
-const preprocesserPath = preprocess.runner
-  ? path.join(process.cwd(), preprocess.runner)
-  : '';
-const preprocessCli = preprocess.stopNodemon ? 'node' : nodemon;
-if (preprocesserPath && existsSync(preprocesserPath)) {
-  // eslint-disable-next-line default-case
-  switch (option) {
-    case 'start':
-    case 'docs':
-      spawn(preprocessCli, [preprocesserPath], {
-        stdio: 'inherit',
-        cwd: path.parse(preprocesserPath).dir
-      });
-      // NOTE:  it's ok if  we  not  close this  here
-      // Because when  node server stops this program willbe closed So this  nodemon  will be killed  as well
-      break;
-    case 'nowatchstart':
-    case 'devbuild':
-    case 'build:library:es':
-    case 'build:component:es':
-    case 'build:library:cmjs':
-    case 'build:component:cmjs':
-      spawnSync('node', [preprocesserPath], {
-        stdio: 'inherit',
-        cwd: preprocesserPath.slice(0, preprocesserPath.lastIndexOf('/') + 1)
-      });
-      break;
-  }
-}
+runPreProcess({ options, option, nodemon, spawnSync });
 
 let result;
 switch (option) {
-  case 'preprocessor':
-    if (preprocesserPath && existsSync(preprocesserPath)) {
-      result = spawnSync(preprocessCli, [preprocesserPath], {
-        stdio: 'inherit',
-        cwd: preprocesserPath.slice(0, preprocesserPath.lastIndexOf('/') + 1)
-      });
-      process.exit(result.status);
-    } else {
-      console.error(`preProcessor not exists ${preprocesserPath}`);
-    }
-    break;
   case 'lint-setup': {
     result = spawnSync(
       'node',
@@ -126,6 +86,14 @@ switch (option) {
     );
     process.exit(result.status);
     break;
+  case 'selectorReplacer':
+    result = spawnSync(
+      'node',
+      [require.resolve('../lib/utils/selectorReplacer.js')].concat(args),
+      { stdio: 'inherit' }
+    );
+    process.exit(result.status);
+    break;
   case 'valuereplacer':
     result = spawnSync(
       'node',
@@ -262,7 +230,7 @@ switch (option) {
         require.resolve('../lib/servers/mockserver.js'),
         '--delay',
         '2500ms',
-        'watch',
+        '--watch',
         `${appPath + path.sep}mockapi`
       ].concat(args),
       { stdio: 'inherit' }
@@ -332,6 +300,8 @@ switch (option) {
         'src',
         '-d',
         'lib',
+        '--extensions',
+        '.js,.ts,.tsx',
         `--presets=${require.resolve('../lib/babel/cmjs-plugins-presets.js')}`,
         '--copy-files'
       ].concat(args),
@@ -348,6 +318,8 @@ switch (option) {
         'src',
         '--out-dir',
         'es',
+        '--extensions',
+        '.js,.ts,.tsx',
         `--presets=${require.resolve('../lib/babel/es-plugins-presets.js')}`,
         '--copy-files'
       ].concat(args),
@@ -469,8 +441,9 @@ switch (option) {
   case '--v':
   case '-v':
     log(`@zohodesk/react-cli v${require('../package.json').version}`);
+    log(`Node Js Version : ${process.version}`);
+    log(`Npm Version : ${execSync('npm --version')}`);
     break;
-
   default:
     log(`react-cli > Unknown option "${option}"`);
     log('react-cli app <appName>');

package/docs/CustomChunks.md

@@ -4,23 +4,26 @@ In react-cli we provide options to create custom chunks.
 This Custom Chunk Option is array of Object
 that Object keys are
 
-- `pattern` regex pattern as string
-- `name` chunk name
-- `size` is count which is minmum chunk dublicated or need in chunks
+- `pattern` **{ String | Function | Array<String> }** regex pattern as string and custom logic to split chunks can be defined using function
+- `name` **{ String }** chunk name
+- `size` **{ Number }** is count which is minimum chunk duplicated or need in chunks
 
 > Since 0.0.1-exp.164.1
 
 extra features in custom chunks :-
 for more details [SplitChunkPlugin](https://webpack.js.org/plugins/split-chunks-plugin/) webpack
 
-- `minChunks`: `minChunks` is alies of `size` default value is `2`,
-- `rules`: `rules` is same as `pattern` with some easy hooks
+- `minChunks`: `minChunks` is alias of `size` default value is `2`,
+- `rules`: `rules` is same as `pattern` with some easy hooks **(removed after v1.1.5)**
   - use `/` for both windows and linux we will replace internally
   - for `.*` we need to use `*`
   - we can consider rules as regex when the `rules-string` has any of these `*`, `^`, `$`. So if you want regex then kindly use `*` in your `rules-string` for force regex
 - `chunks`: by this option we can specify , default value is `all`,
 - `priority`: priority default value is `-10 * (index + 2)`,
-- `enforce`: enforce default value is true,
-- `maxSize`: maxSize, default value is 0,
-- `minSize`: minSize, default value is 20000,
-  includeDepenency: includeDepenency default value is false
+- `enforce`: enforce default value is `true`,
+- `maxSize`: maxSize, default value is `0`,
+- `minSize`: minSize, default value is `20000`,
+- `reuseExistingChunk` If the current chunk contains modules already split out from the main bundle, it will be reused instead of a new one being generated. This can affect the resulting file name of the chunk.
+- `automaticNamePrefix` with this you can specify for chunks created through that specified config. default value `''`.
+- `cacheGroupName`: `cacheGroupName` is alias of `name`, But it won't work as chunk name, instead it will just work as key in cacheGroup.
+<!-- includeDependency: includeDependency default value is `false` -->

package/docs/MarkdownParser.md

@@ -0,0 +1,18 @@
+
+----> markdownParser <----
+
+1. Markdown parser allows us to write Documentation using Markdown language inside the Javascript file
+2. This will converts the snippets to HTML tag.
+3. We can implement this only inside the particular syntax which is metioned below.
+4. We can enable/disable this feature by `npm run docs --markdown_parser=true/false` default value will be `true`.
+5. Also we can enable/disable this feature by adding `enableMDParser` key inside the package.json under the `docs`.
+
+### syntax
+``` 
+/* MD:START 
+    # Hello World
+MD:END */
+```
+
+# v1.1.7 update: 
+* Markdown Parser feature implemented. 

package/docs/ReactLive.md

@@ -8,3 +8,11 @@
 
 # v1.1.0 update: 
 * ReactLive feature implemented. 
+
+# v1.1.2 update:
+
+* ReactLiveConverter filepath changed to 'reactLiveConverter.js' in docLoader file
+
+# v1.1.20 update:
+
+* enhancedReactLiveConverter.js added and imported in  docLoader file

package/docs/ValueReplacer.md

@@ -58,3 +58,30 @@ new option `valueReplacer` added for replace css property value while build runn
     font: zdf-rCallBar_1 !important;
   }
   ```
+
+
+If we need the exact word to be considered for replacement ( that is, if value is `text` and only if the value is `text` and not `text_cursor` or `cursortext` for example, the conversion happens ) we have to use `^` before the word and `$` after the word in the key. 
+
+# For Example : 
+{
+  valueReplacer: [
+      {
+        "props": [
+          "cursor",
+          "--label_cursor",
+          "--checkbox_cursor",
+          "--tag_cursor",
+          "--button_cursor",
+          "--textboxicon_icon_cursor",
+        ],
+        "values": {
+          "^default$": "var(--zdr-cursor-default)",
+          "^pointer$": "var(--zdr-cursor-pointer)",
+          "^text$": "var(--zdr-cursor-text)",
+          "^move$": "var(--zdr-cursor-move)",
+        }
+      }
+    ]
+}
+
+- Here we have added `^` before and `$` after default, pointer, text and move. Only if the exact words default, pointer, text and move are used, the values will be converted.

package/lib/babel/babel-option-utils/babel-preset-react-option.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = getReactPreset;
+
+function getReactPresetOptions() {
+  return {
+    runtime: 'classic',
+    // change it to 'automatic', when react version updated to 18.
+    useSpread: true
+  };
+}
+
+function getReactPreset({
+  disableES5Transpile
+}) {
+  const reactPreset = require.resolve('@babel/preset-react');
+
+  return disableES5Transpile ? [reactPreset, getReactPresetOptions()] : reactPreset;
+}

package/lib/babel/cmjs-plugins-presets.js

@@ -7,18 +7,47 @@ exports.default = void 0;
 
 var _utils = require("../utils");
 
-let {
+var _babelPresetReactOption = _interopRequireDefault(require("./babel-option-utils/babel-preset-react-option"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const {
   module: {
     mode
-  }
+  },
+  babelCustomizationForLibrary: {
+    babelPlugins
+  },
+  enableTypeScript,
+  alias
 } = (0, _utils.getOptions)();
-let isProd = mode.toLowerCase() === 'prod';
+const isProd = mode.toLowerCase() === 'prod';
+const defaultPlugins = [[require.resolve('babel-plugin-transform-define'), isProd ? {
+  __DOCS__: false
+} : {}], require.resolve('@babel/plugin-syntax-dynamic-import'), [require.resolve('babel-plugin-module-resolver'), {
+  "root": ["./"],
+  alias
+}]];
+const resolvedPlugins = [];
+babelPlugins.forEach(plugin => {
+  if (Array.isArray(plugin)) {
+    resolvedPlugins.push([require.resolve(plugin[0]), plugin[1]]);
+  } else {
+    resolvedPlugins.push(require.resolve(plugin));
+  }
+});
+const plugins = [...defaultPlugins, ...resolvedPlugins];
+const presets = [require.resolve('@babel/preset-env'), (0, _babelPresetReactOption.default)({
+  disableES5Transpile: false
+})];
+
+if (enableTypeScript) {
+  presets.push(require.resolve('@babel/preset-typescript'));
+}
 
 var _default = () => ({
-  presets: [require.resolve('@babel/preset-env'), require.resolve('@babel/preset-react')],
-  plugins: [[require.resolve('babel-plugin-transform-define'), isProd ? {
-    __DOCS__: false
-  } : {}]]
+  presets: presets,
+  plugins: plugins
 });
 
 exports.default = _default;

package/lib/babel/es-plugins-presets.js

@@ -7,28 +7,57 @@ exports.default = void 0;
 
 var _utils = require("../utils");
 
-let {
+var _babelPresetReactOption = _interopRequireDefault(require("./babel-option-utils/babel-preset-react-option"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const {
   module: {
     mode,
     disableES5Transpile
-  }
+  },
+  babelCustomizationForLibrary: {
+    babelPlugins
+  },
+  enableTypeScript,
+  alias
 } = (0, _utils.getOptions)();
-let isProd = mode.toLowerCase() === 'prod';
+const isProd = mode.toLowerCase() === 'prod';
+const defaultPlugins = [[require.resolve('babel-plugin-transform-define'), isProd ? {
+  __DOCS__: false
+} : {}], require.resolve('@babel/plugin-syntax-dynamic-import'), [require.resolve('babel-plugin-module-resolver'), {
+  'root': ['./'],
+  alias
+}]];
+const resolvedPlugins = [];
+babelPlugins.forEach(plugin => {
+  if (Array.isArray(plugin)) {
+    resolvedPlugins.push([require.resolve(plugin[0]), plugin[1]]);
+  } else {
+    resolvedPlugins.push(require.resolve(plugin));
+  }
+});
+const plugins = [...defaultPlugins, ...resolvedPlugins];
+const presets = [[require.resolve('@babel/preset-env'), disableES5Transpile ? {
+  modules: false,
+  useBuiltIns: 'usage',
+  corejs: 3,
+  targets: {
+    browsers: ['last 3 Chrome versions', 'last 3 Firefox versions', 'last 3 Edge versions', 'last 3 Safari versions']
+  }
+} : {
+  modules: false
+}], (0, _babelPresetReactOption.default)({
+  disableES5Transpile
+})];
+
+if (enableTypeScript) {
+  presets.push(require.resolve('@babel/preset-typescript'));
+}
 
 var _default = () => ({
-  presets: [[require.resolve('@babel/preset-env'), disableES5Transpile ? {
-    modules: false,
-    useBuiltIns: 'usage',
-    corejs: 3,
-    targets: {
-      browsers: ['last 3 Chrome versions', 'last 3 Firefox versions', 'last 3 Edge versions', 'last 3 Safari versions']
-    }
-  } : {
-    modules: false
-  }], require.resolve('@babel/preset-react')],
-  plugins: [[require.resolve('babel-plugin-transform-define'), isProd ? {
-    __DOCS__: false
-  } : {}], require.resolve('@babel/plugin-syntax-dynamic-import')]
+  presets: presets,
+  plugins: plugins
 });
 
 exports.default = _default;

package/lib/common/runPreProcess.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.runPreProcess = runPreProcess;
+
+var _path = _interopRequireWildcard(require("path"));
+
+var _fs = require("fs");
+
+var _child_process = require("child_process");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function runPreProcess({
+  options,
+  option,
+  nodemon,
+  spawnSync
+}) {
+  const {
+    preprocess
+  } = options;
+  const preprocessorPath = preprocess.runner ? _path.default.join(process.cwd(), preprocess.runner) : '';
+  const preprocessCli = preprocess.stopNodemon ? 'node' : nodemon;
+
+  if (preprocessorPath && (0, _fs.existsSync)(preprocessorPath)) {
+    const preprocessorDirPath = (0, _path.dirname)(preprocessorPath);
+    const watchOptions = preprocessCli === nodemon ? ['--watch', preprocessorDirPath] : []; // eslint-disable-next-line default-case
+
+    switch (option) {
+      case 'start':
+      case 'docs':
+        (0, _child_process.spawn)(preprocessCli, [preprocessorPath, ...watchOptions], {
+          stdio: 'inherit',
+          cwd: preprocessorDirPath
+        }); // NOTE:  it's ok if we not close this here
+        // Because when node server stops this program will be closed So this  nodemon  will be killed  as well
+
+        break;
+
+      case 'nowatchstart':
+      case 'devbuild':
+      case 'build:library:es':
+      case 'build:component:es':
+      case 'build:library:cmjs':
+      case 'build:component:cmjs':
+        spawnSync('node', [preprocessorPath], {
+          stdio: 'inherit',
+          cwd: preprocessorPath.slice(0, preprocessorPath.lastIndexOf('/') + 1)
+        });
+        break;
+
+      case 'preprocessor':
+        {
+          const result = spawnSync(preprocessCli, [preprocessorPath, ...watchOptions], {
+            stdio: 'inherit',
+            cwd: preprocessorDirPath
+          });
+          process.exit(result.status);
+          break;
+        }
+    }
+  } else if (option === 'preprocess') {
+    console.error(`preProcessor not exists ${preprocessorPath}`);
+    process.exit(0);
+  }
+}

package/lib/common/splitChunks.js

@@ -15,35 +15,53 @@ var _testPattern = require("./testPattern");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-let isWindows = _os.default.platform().toLowerCase() === 'win32';
-let ps = _path.default.sep;
-let options = (0, _utils.getOptions)();
-let {
+const isWindows = _os.default.platform().toLowerCase() === 'win32';
+const ps = _path.default.sep;
+const options = (0, _utils.getOptions)();
+const {
   app: {
     vendorExclude,
     customChunks,
-    vendorInclude
+    vendorInclude,
+    customChunksBaseConfig
   }
 } = options;
+const reactBundleIncludeList = ['react', 'react-dom', 'react-redux', 'react-transition-group', 'scheduler', 'prop-types'];
+const vendorExcludeList = ['script-loader', 'raw-loader', ...reactBundleIncludeList, ...vendorExclude.map(vendorPath => vendorPath.replace(/[/\\]/g, _path.default.sep))];
+const vendorIncludeList = [...vendorInclude].map(vendorPath => vendorPath.replace(/[/\\]/g, _path.default.sep));
 
-let isVendor = function isVendor(module) {
-  let {
+const isVendor = function isVendor(module) {
+  const {
     userRequest
   } = module;
-  let excludeList = ['script-loader', 'raw-loader', 'react', 'react-dom'];
-  excludeList = [...excludeList, ...vendorExclude];
-  return userRequest && (vendorInclude.some(item => userRequest.indexOf(item) !== -1) || userRequest.indexOf('node_modules') >= 0 && userRequest.endsWith('.css') === false && userRequest.endsWith('publicPathConfig.js') === false && excludeList.every(item => userRequest.indexOf(`node_modules${ps}${item}${ps}`) === -1));
+  return userRequest && (vendorIncludeList.some(item => userRequest.indexOf(item) !== -1) || userRequest.indexOf('node_modules') >= 0 && userRequest.endsWith('.css') === false && userRequest.endsWith('publicPathConfig.js') === false && vendorExcludeList.every(item => userRequest.indexOf(`node_modules${ps}${item}${ps}`) === -1));
 };
 
-let isReact = module => {
-  let {
+const isReact = module => {
+  const {
     userRequest
   } = module;
-  let reactBundle = ['react', 'react-dom'];
-  return userRequest && reactBundle.some(pkg => userRequest.indexOf(`node_modules${ps}${pkg}${ps}`) >= 0);
+  return userRequest && reactBundleIncludeList.some(pkg => userRequest.indexOf(`node_modules${ps}${pkg}${ps}`) >= 0);
 };
 
-let defaultChunks = {
+function rulesMatcher(pattern) {
+  if (typeof pattern === 'function') {
+    return pattern;
+  }
+
+  if (Array.isArray(pattern)) {
+    return ({
+      userRequest
+    }) => (0, _testPattern.testPattern)(userRequest, pattern);
+  }
+
+  return new RegExp(isWindows ? pattern.replace(/\//g, '\\') : pattern);
+}
+
+const baseSplitChunkConfig = Object.assign({
+  minSize: 15000
+}, customChunksBaseConfig);
+const specificCacheGroupConfig = {
   'react.vendor': {
     name: 'react.vendor',
     chunks: 'all',
@@ -63,45 +81,35 @@ let defaultChunks = {
     priority: -10
   }
 };
-let customChunksConfig = {};
+const customChunksConfig = {};
 customChunks.map((obj, index) => ({
   name: obj.name,
-  pattern: obj.pattern,
+  chunks: obj.chunks || 'all',
   minChunks: obj.minChunks || obj.size || 2,
-  rules: obj.rules,
-  // includeDepenency: obj.includeDepenency || false,
+  pattern: obj.pattern,
   priority: obj.priority || -10 * (index + 2),
-  enforce: obj.enforce || true,
-  maxSize: obj.maxSize,
-  // || 0,
+  enforce: obj.enforce,
   minSize: obj.minSize,
   // || 20000,
-  chunks: obj.chunks || 'all'
-})).map(({
+  maxSize: obj.maxSize,
+  // || 0,
+  reuseExistingChunk: obj.reuseExistingChunk,
+  cacheGroupName: obj.cacheGroupName || obj.name
+})).forEach(({
   name,
-  pattern,
+  chunks = 'all',
   minChunks,
-  rules,
+  pattern,
   priority,
-  // includeDepenency,
   enforce,
   minSize,
   maxSize,
-  chunks = 'all'
+  reuseExistingChunk,
+  cacheGroupName
 }) => {
-  let obj = {
-    name,
-    test: rules ? m => {
-      const {
-        userRequest
-      } = m;
-      return (0, _testPattern.testPattern)(userRequest, rules); // return (
-      //   pkgs.some(p => isRelated(userRequest, p)) ||
-      //   (includeDepenency && isDependency(m, pkgs))
-      // );
-    } : new RegExp(isWindows ? pattern.replace(/\//g, '\\') : pattern),
+  const obj = {
+    test: rulesMatcher(pattern),
     chunks,
-    enforce,
     minChunks,
     priority
   };
@@ -114,13 +122,25 @@ customChunks.map((obj, index) => ({
     obj.maxSize = maxSize;
   }
 
-  return customChunksConfig[name] = obj;
+  if (enforce !== false) {
+    obj.enforce = true;
+  }
+
+  if (name !== undefined) {
+    obj.name = name;
+  }
+
+  if (reuseExistingChunk !== undefined) {
+    obj.reuseExistingChunk = reuseExistingChunk;
+  }
+
+  customChunksConfig[cacheGroupName] = obj;
 });
-var _default = {
-  minSize: 12000,
+const splitChunkConfig = Object.assign({}, baseSplitChunkConfig, {
   cacheGroups: Object.assign({
     default: false,
     vendors: false
-  }, defaultChunks, customChunksConfig)
-};
+  }, specificCacheGroupConfig, customChunksConfig)
+});
+var _default = splitChunkConfig;
 exports.default = _default;

package/lib/common/testPattern.js

@@ -13,25 +13,25 @@ var _path = require("path");
 const isWindows = _path.sep !== '/'; // this function  will  return true if pattern matched
 
 function _testPattern(req, pattern) {
-  let modifyedPattern = pattern;
+  let modifiedPattern = pattern;
 
-  if (/[*.$^]/.test(modifyedPattern)) {
+  if (/[*.$^]/.test(modifiedPattern)) {
     if (isWindows) {
-      // modifyedPattern = pattern.replace(/\//g, ps.replace(/\\/g, '\\\\'));
-      modifyedPattern = modifyedPattern.replace(/\//g, '\\\\');
+      // modifiedPattern = pattern.replace(/\//g, ps.replace(/\\/g, '\\\\'));
+      modifiedPattern = modifiedPattern.replace(/\//g, '\\\\');
     }
 
-    modifyedPattern = modifyedPattern.replace(/\./g, '\\.').replace(/\*/g, '.*');
-    const re = new RegExp(modifyedPattern);
+    modifiedPattern = modifiedPattern.replace(/\./g, '\\.').replace(/\*/g, '.*');
+    const re = new RegExp(modifiedPattern);
     return re.test(req);
   }
 
   if (isWindows) {
-    // modifyedPattern = pattern.replace(/\//g, ps.replace(/\\/g, '\\\\'));
-    modifyedPattern = modifyedPattern.replace(/\//g, '\\');
+    // modifiedPattern = pattern.replace(/\//g, ps.replace(/\\/g, '\\\\'));
+    modifiedPattern = modifiedPattern.replace(/\//g, '\\');
   }
 
-  return req.indexOf(modifyedPattern) !== -1;
+  return req.indexOf(modifiedPattern) !== -1;
 }
 
 function testPattern(req, pattern) {