@zohodesk/react-cli 1.1.22-exp.3 → 1.1.22-exp.5

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

@@ -13,17 +13,17 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const {
   module: {
-    mode,
-    alias
+    mode
   },
   babelCustomizationForLibrary: {
     babelPlugins
   },
-  enableTypeScript
+  enableTypeScript,
+  alias
 } = (0, _utils.getOptions)();
 const isProd = mode.toLowerCase() === 'prod';
 const defaultPlugins = [[require.resolve('babel-plugin-transform-define'), isProd ? {
-  __DaliasOCS__: false
+  __DOCS__: false
 } : {}], require.resolve('@babel/plugin-syntax-dynamic-import'), [require.resolve('babel-plugin-module-resolver'), {
   "root": ["./"],
   alias

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

@@ -19,12 +19,16 @@ const {
   babelCustomizationForLibrary: {
     babelPlugins
   },
-  enableTypeScript
+  enableTypeScript,
+  alias
 } = (0, _utils.getOptions)();
 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('../utils/addModulePathAlias')];
+} : {}], require.resolve('@babel/plugin-syntax-dynamic-import'), [require.resolve('babel-plugin-module-resolver'), {
+  "root": ["./"],
+  alias
+}]];
 const resolvedPlugins = [];
 babelPlugins.forEach(plugin => {
   resolvedPlugins.push(require.resolve(plugin));

package/lib/configs/libAlias.js

@@ -3,12 +3,45 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.aliasPathCreation = aliasPathCreation;
 exports.libAlias = exports.jestModuleNameMapper = void 0;
+
+var _utils = require("../utils");
+
+var _path = _interopRequireDefault(require("path"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 // the reason for alias at the time was code tree shaking
 // tree shaking was most compactable with ES module system
 // FIXME: But there is a posiblity when these  package  does not have lib,
 //  app will work because of alias, But may be jest won't work because of not alais
 //  So need to think about use alais in jest 
+const appPath = process.cwd();
+const {
+  alias,
+  app
+} = (0, _utils.getOptions)();
+const {
+  disableES5Transpile
+} = app;
+
+function aliasPathCreation(customAlias) {
+  if (customAlias == null) {
+    return {};
+  }
+
+  const newAlias = {};
+  Object.keys(customAlias).forEach(key => {
+    if (customAlias[key].startsWith('.')) {
+      newAlias[key] = _path.default.resolve(appPath, customAlias[key]);
+    } else {
+      newAlias[key] = customAlias[key];
+    }
+  });
+  return newAlias;
+}
+
 const libAlias = {
   '@zohodesk/components/lib': '@zohodesk/components/es',
   // '@zohodesk/zc-custom/lib': '@zohodesk/zc-custom/es',
@@ -31,8 +64,9 @@ const libAlias = {
 // '^@components(.*)$': '<rootDir>/src/components$1',
 
 exports.libAlias = libAlias;
-const jestModuleNameMapper = Object.keys(libAlias).reduce((previousValue, key) => {
-  previousValue[`^${key}(.*)$`] = `${libAlias[key]}$1`;
+const totalAlias = disableES5Transpile ? Object.assign({}, libAlias, aliasPathCreation(alias)) : aliasPathCreation(alias);
+const jestModuleNameMapper = Object.keys(totalAlias).reduce((previousValue, key) => {
+  previousValue[`^${key}(.*)$`] = `${totalAlias[key]}$1`;
   return previousValue;
 }, {});
 exports.jestModuleNameMapper = jestModuleNameMapper;

package/lib/configs/resolvers.js

@@ -21,7 +21,7 @@ function moduleResolver(options) {
     moduleResolvePath,
     disableES5Transpile
   } = options.app;
-  const customAlias = options.app.alias;
+  const customAlias = options.alias;
   let required = moduleResolvePath && (0, _requireLocalOrGlobal.requireLocal)(moduleResolvePath);
 
   if (!required) {
@@ -33,11 +33,11 @@ function moduleResolver(options) {
   }
 
   const nodeModulesPath = required ? required.nodeModulesPath : _client_packages_group.nodeModulesPath;
-  const totalAlias = Object.assign({}, _libAlias.libAlias, customAlias);
+  const totalAlias = disableES5Transpile ? Object.assign({}, _libAlias.libAlias, (0, _libAlias.aliasPathCreation)(customAlias)) : (0, _libAlias.aliasPathCreation)(customAlias);
   return {
     extensions: ['.js', '.jsx', '.ts', '.tsx'],
     modules: [nodeModulesPath, _constants.cliNodeModulesPath, 'node_modules'].filter(Boolean),
-    alias: disableES5Transpile ? totalAlias : {} // alias: { ...libAlias, ...clientDependenies }
+    alias: totalAlias // alias: { ...libAlias, ...clientDependenies }
 
   };
 }

package/lib/schemas/index.js

@@ -15,6 +15,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // TODO move deprecated options to separate file and manage seperately
 var _default = {
+  alias: null,
   unstableDepsInverse: {
     value: false,
     cli: 'unstable_deps_inverse'
@@ -125,7 +126,6 @@ var _default = {
     cssDirStatement: null
   },
   app: {
-    alias: null,
     moduleResolvePath: {
       value: '@zohodesk/client_packages_group',
       cli: 'module_resolve_path'
@@ -729,8 +729,7 @@ var _default = {
       value: 'prod',
       cli: 'module_mode'
     },
-    disableES5Transpile: true,
-    alias: null
+    disableES5Transpile: true
   },
   stats: {
     enable: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/react-cli",
-  "version": "1.1.22-exp.3",
+  "version": "1.1.22-exp.5",
   "description": "A CLI tool for build modern web application and libraries",
   "scripts": {
     "init": "node ./lib/utils/init.js",

package/lib/utils/addModulePathAlias.js

@@ -1,23 +0,0 @@
-"use strict";
-
-var _getOptions = _interopRequireDefault(require("./getOptions"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const options = (0, _getOptions.default)();
-const alias = options.app.alias;
-
-module.exports = () => ({
-  visitor: {
-    ImportDeclaration(path) {
-      const source = path.node.source.value;
-      const aliasName = Object.keys(alias);
-      aliasName.forEach(name => {
-        if (source.includes(name)) {
-          path.node.source.value = source.replace(name, alias[name]);
-        }
-      });
-    }
-
-  }
-});