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

package/bin/cli.js

@@ -300,8 +300,6 @@ switch (option) {
         'src',
         '-d',
         'lib',
-        '--extensions',
-        '.js,.ts',
         `--presets=${require.resolve('../lib/babel/cmjs-plugins-presets.js')}`,
         '--copy-files'
       ].concat(args),
@@ -318,8 +316,6 @@ switch (option) {
         'src',
         '--out-dir',
         'es',
-        '--extensions',
-        '.js,.ts',
         `--presets=${require.resolve('../lib/babel/es-plugins-presets.js')}`,
         '--copy-files'
       ].concat(args),

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

@@ -15,7 +15,7 @@ let {
 let isProd = mode.toLowerCase() === 'prod';
 
 var _default = () => ({
-  presets: [require.resolve('@babel/preset-env'), require.resolve('@babel/preset-react'), require.resolve('@babel/preset-typescript')],
+  presets: [require.resolve('@babel/preset-env'), require.resolve('@babel/preset-react')],
   plugins: [[require.resolve('babel-plugin-transform-define'), isProd ? {
     __DOCS__: false
   } : {}]]

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

@@ -25,7 +25,7 @@ var _default = () => ({
     }
   } : {
     modules: false
-  }], require.resolve('@babel/preset-react'), require.resolve('@babel/preset-typescript')],
+  }], require.resolve('@babel/preset-react')],
   plugins: [[require.resolve('babel-plugin-transform-define'), isProd ? {
     __DOCS__: false
   } : {}], require.resolve('@babel/plugin-syntax-dynamic-import')]

package/lib/configs/webpack.dev.config.js

@@ -141,10 +141,6 @@ module.exports = {
           minimize: true
         }
       }]
-    }, {
-      test: /\.ts$/,
-      use: 'ts-loader',
-      include: _path.default.join(appPath, folder)
     }, {
       test: /\.worker.js$/,
       use: {

package/lib/configs/webpack.prod.config.js

@@ -127,8 +127,8 @@ module.exports = {
             }
           } : {
             modules: false
-          }], require.resolve('@babel/preset-react'), require.resolve('@babel/preset-typescript')],
-          plugins: disableES5Transpile ? [removeAttribute ? require.resolve('../utils/removeAttributes') : false, require.resolve('@babel/plugin-syntax-dynamic-import'), require.resolve('babel-plugin-lodash'), require.resolve('@babel/plugin-proposal-object-rest-spread'), devConsoleExculde ? [require.resolve('babel-plugin-transform-remove-console'), {
+          }], require.resolve('@babel/preset-react')],
+          plugins: disableES5Transpile ? [removeAttribute ? require.resolve('../utils/removeAttributes') : false, require.resolve('@babel/plugin-syntax-dynamic-import'), require.resolve('babel-plugin-lodash'), require.resolve('@babel/plugin-proposal-object-rest-spread'), shouldRemovePropTypes ? [require.resolve('babel-plugin-transform-react-remove-prop-types'), removePropTypes] : false, devConsoleExculde ? [require.resolve('babel-plugin-transform-remove-console'), {
             exclude: ['error', 'log']
           }] : null].filter(Boolean) : [removeAttribute ? require.resolve('../utils/removeAttributes') : false, shouldRemovePropTypes ? [require.resolve('babel-plugin-transform-react-remove-prop-types'), removePropTypes] : false, [require.resolve('@babel/plugin-transform-runtime'), {
             helpers: true,
@@ -230,10 +230,6 @@ module.exports = {
           minimize: false
         }
       }]
-    }, {
-      test: /\.ts$/,
-      use: 'ts-loader',
-      include: _path.default.join(appPath, folder)
     }, {
       test: /\.worker.js$/,
       use: {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@zohodesk/react-cli",
-  "version": "1.1.10",
+  "version": "1.1.16-exp.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@zohodesk/react-cli",
-      "version": "1.1.10",
+      "version": "1.1.16-exp.6",
       "license": "ISC",
       "dependencies": {
         "@babel/cli": "7.10.5",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/react-cli",
-  "version": "1.1.16-exp.5",
+  "version": "1.1.16-exp.6",
   "description": "A CLI tool for build modern web application and libraries",
   "scripts": {
     "init": "node ./lib/utils/init.js",
@@ -39,7 +39,6 @@
     "@babel/plugin-transform-runtime": "7.11.0",
     "@babel/preset-env": "7.11.0",
     "@babel/preset-react": "7.10.4",
-    "@babel/preset-typescript": "7.23.2",
     "@babel/runtime": "7.11.2",
     "@zohodesk/client_packages_group": "1.0.2",
     "@zohodesk/eslint-plugin-react-performance": "1.0.3",
@@ -97,8 +96,6 @@
     "redux-mock-store": "1.5.4",
     "rimraf": "3.0.2",
     "script-loader": "0.7.2",
-    "ts-loader": "8.2.0",
-    "typescript": "5.2.2",
     "uglifycss": "0.0.29",
     "url-loader": "4.1.0",
     "webpack": "4.44.1",

package/packages/client_build_tool/lib/allCommandsConfigs.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _fs = require("fs");
+
+var _path = require("path");
+
+const allConfigs = [];
+(0, _fs.readdirSync)((0, _path.join)(__dirname, 'commands')).forEach(folderName => {
+  const modulePath = (0, _path.join)(__dirname, './commands/' + folderName + '/config.js');
+
+  if ((0, _fs.existsSync)(modulePath)) {
+    const config = require(modulePath).default;
+
+    allConfigs.push(config);
+  }
+});
+var _default = allConfigs;
+exports.default = _default;

package/packages/client_build_tool/lib/buildToolLoggers.js

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.debugLogger = debugLogger;
+exports.errorLogger = errorLogger;
+exports.messageLogger = messageLogger;
+exports.verboseLogger = verboseLogger;
+exports.warnLogger = warnLogger;
+
+/* eslint-disable no-console */
+function verboseLogger(...args) {// TODO: need to be remove when publish happens 
+  // console.log(...args);
+  console.log(...args);
+}
+
+function warnLogger(...args) {
+  console.warn(...args);
+}
+
+function messageLogger(...args) {
+  console.log(...args);
+}
+
+function debugLogger(...args) {// TODO: need to be remove when publish happens 
+  // console.log(...args);
+}
+
+function errorLogger(...args) {
+  console.error(...args);
+}

package/packages/client_build_tool/lib/commands/build/commandExecutor.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.commandExecutor = commandExecutor;
+
+var _buildToolLoggers = require("../../buildToolLoggers");
+
+var _webpackBuild = _interopRequireDefault(require("../../shared/bundler/webpack/webpackBuild"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// import { spawnSyncIO } from '../../shared/commands-utlis/spanSync';
+function commandExecutor(options) {
+  (0, _buildToolLoggers.messageLogger)('Build is runnning');
+  (0, _webpackBuild.default)(options); // spawnSyncIO('webpack', [
+  //   '--config',
+  //   require.resolve('../../shared/bundler/webpack/webpack.dev.config.js')
+  // ]);
+}

package/packages/client_build_tool/lib/commands/build/config.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  name: "build",
+  alias: ["devbuild"],
+  dirname: __dirname
+};
+exports.default = _default;

package/packages/client_build_tool/lib/commands/build/errorHander.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.errorHander = errorHander;
+
+function errorHander(e) {
+  console.error(e);
+}

package/packages/client_build_tool/lib/commands/build/index.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.configs = void 0;
+
+var _commandExecutor = require("./commandExecutor");
+
+var _errorHander = require("./errorHander");
+
+var _optionsProcesser = require("./optionsProcesser");
+
+// import { spawnSyncIO } from '../commands-utlis/spanSync.js';
+function run(options) {
+  // const { disableWatch } = options.app;
+  // spawnSyncIO('node', [
+  //   require.resolve(
+  //     disableWatch ? '../servers/nowatchserver' : '../servers/server'
+  //   ),
+  //   '--expose-http2',
+  //   ...args
+  // ]);
+  (0, _commandExecutor.commandExecutor)(options).then(console.log).catch(e => {
+    (0, _errorHander.errorHander)(e);
+  });
+}
+
+const configs = {
+  name: 'devSeverStart',
+  alias: ['start'],
+  optionsProcesser: _optionsProcesser.optionsProcesser,
+  run
+};
+exports.configs = configs;

package/packages/client_build_tool/lib/commands/build/optionsProcesser.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.optionsProcesser = optionsProcesser;
+
+var _path = require("path");
+
+var _decidePublicPath = require("../../shared/bundler/webpack/common/decidePublicPath");
+
+var _urlConcat = require("../../shared/server/urlConcat");
+
+function optionsProcesser(options) {
+  const {
+    server,
+    context
+  } = options;
+  const {
+    disableContextURL
+  } = server;
+  const serverExtras = (0, _decidePublicPath.modifiedServerOptions)(options);
+  const publicPath = (0, _decidePublicPath.decidePublicPath)(serverExtras);
+  const contextURL = disableContextURL ? '' : `/${context}`;
+  const serverURL = (0, _urlConcat.urlConcat)(publicPath, contextURL);
+  const contextFolderPath = (0, _path.join)(process.cwd(), context);
+  console.log({
+    serverURL,
+    publicPath
+  });
+  const defaultApplyedOptions = { ...options,
+    serverExtras,
+    publicPath,
+    contextURL,
+    serverURL,
+    contextFolderPath,
+    httpsOptions: serverExtras.httpsOptions
+  };
+  return defaultApplyedOptions;
+}

package/packages/client_build_tool/lib/commands/buildEs/commandExecutor.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.commandExecutor = commandExecutor;
+
+var _spanSync = require("../../shared/commands-utlis/spanSync");
+
+var _constants = require("../../shared/constants");
+
+function commandExecutor(options) {
+  const {
+    extraArgs
+  } = options;
+  (0, _spanSync.spawnSyncIO)("babel", ["src", "--out-dir", "es", "--copy-files", "--config-file=" + _constants.babelrcPath, ...extraArgs]);
+}

package/packages/client_build_tool/lib/commands/buildEs/config.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  name: "build:es",
+  alias: ["build_es", "build:es"],
+  dirname: __dirname
+};
+exports.default = _default;

package/packages/client_build_tool/lib/commands/buildLib/commandExecutor.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.commandExecutor = commandExecutor;
+
+var _spanSync = require("../../shared/commands-utlis/spanSync");
+
+var _constants = require("../../shared/constants");
+
+function commandExecutor(options) {
+  const {
+    extraArgs
+  } = options;
+  (0, _spanSync.spawnSyncIO)("babel", ["src", "--out-dir", "lib", "--copy-files", "--config-file=" + _constants.babelrcPath, ...extraArgs]);
+}

package/packages/client_build_tool/lib/commands/buildLib/config.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  name: "build:lib",
+  alias: ["build_lib"],
+  dirname: __dirname
+};
+exports.default = _default;

package/packages/client_build_tool/lib/commands/start/commandExecutor.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.commandExecutor = commandExecutor;
+
+var _serverBywebpackDevMiddleware = require("../../shared/server/serverBywebpackDevMiddleware");
+
+function commandExecutor(options) {
+  // require("../../shared/server/devServer").run(options);
+  (0, _serverBywebpackDevMiddleware.run)(options);
+}

package/packages/client_build_tool/lib/commands/start/config.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  name: "start",
+  alias: ["dstart", "devSeverStart"],
+  dirname: __dirname
+};
+exports.default = _default;

package/packages/client_build_tool/lib/commands/start/deprecationHandler.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deprecationHandler = deprecationHandler;
+
+function deprecationHandler(options) {// options.app.deprecated &&
+  // console.log('options.app.deprecated this option  was deprecated since V1.3.1' );
+}

package/packages/client_build_tool/lib/commands/start/errorHander.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.errorHander = errorHander;
+
+function errorHander(e) {
+  console.error(e);
+}

package/packages/client_build_tool/lib/commands/start/optionsProcesser.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.optionsProcesser = optionsProcesser;
+
+var _path = require("path");
+
+var _decidePublicPath = require("../../shared/bundler/webpack/common/decidePublicPath");
+
+var _urlConcat = require("../../shared/server/urlConcat");
+
+function optionsProcesser(options) {
+  const {
+    server,
+    context
+  } = options;
+  const {
+    disableContextURL
+  } = server;
+  const serverExtras = (0, _decidePublicPath.modifiedServerOptions)(options);
+  const publicPath = (0, _decidePublicPath.decidePublicPath)(serverExtras);
+  const contextURL = disableContextURL ? '' : `/${context}`;
+  const serverURL = (0, _urlConcat.urlConcat)(publicPath, contextURL);
+  const contextFolderPath = (0, _path.join)(process.cwd(), context);
+  const defaultApplyedOptions = { ...options,
+    serverExtras,
+    publicPath,
+    contextURL,
+    serverURL,
+    contextFolderPath,
+    httpsOptions: serverExtras.httpsOptions
+  };
+  return defaultApplyedOptions;
+}

package/packages/client_build_tool/lib/commands/start/postProcesser.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.postProcesser = postProcesser;
+
+function postProcesser(options) {
+  console.log('postProcesser');
+}

package/packages/client_build_tool/lib/commands/start/preProcesser.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.preProcesser = preProcesser;
+
+function preProcesser(options) {
+  console.log('preProcesser');
+}

package/packages/client_build_tool/lib/commandsRouter.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.route = route;
+
+var _fs = require("fs");
+
+var _path = require("path");
+
+var _allCommandsConfigs = _interopRequireDefault(require("./allCommandsConfigs"));
+
+var _buildToolLoggers = require("./buildToolLoggers");
+
+var _readOptions = require("./shared/schemas/readOptions");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function runCommand(commandConfig) {
+  const options = (0, _readOptions.getOptions)();
+  const {
+    dirname
+  } = commandConfig;
+
+  function runRespectiveFile(name, data) {
+    const commandExecutorPath = (0, _path.join)(dirname, name + ".js");
+
+    if ((0, _fs.existsSync)(commandExecutorPath)) {
+      const commandExecutor = require(commandExecutorPath);
+
+      return (commandExecutor[name] || commandExecutor.default)(data);
+    } else {
+      (0, _buildToolLoggers.debugLogger)("file not found", commandExecutorPath);
+    }
+  }
+
+  const processedOption = runRespectiveFile("optionsProcesser", options) || options;
+  runRespectiveFile("deprecationHandler", processedOption); // runRespectiveFile("errorHandler", () => {
+
+  runRespectiveFile("preProcesser", processedOption);
+  runRespectiveFile("commandExecutor", processedOption);
+  runRespectiveFile("postProcesser", processedOption); // });
+}
+
+function route(option, args) {
+  // TODO:  need to modify this log
+  (0, _buildToolLoggers.debugLogger)("the command was " + option, args);
+  const commandConfig = findCommandConfig(option);
+
+  if (commandConfig) {
+    try {
+      runCommand(commandConfig);
+    } catch (error) {
+      console.error(error);
+    }
+  } else {
+    // TODO: need to  write proper error message
+    (0, _buildToolLoggers.warnLogger)("Un known command", option, "please check the document");
+  }
+}
+
+function findCommandConfig(option) {
+  for (const commandConfig of _allCommandsConfigs.default) {
+    if (commandConfig.name === option || commandConfig.alias.includes(option)) {
+      return commandConfig;
+    }
+  }
+
+  return null;
+}

package/packages/client_build_tool/lib/shared/bundler/webpack/common/decidePublicPath.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.decidePublicPath = decidePublicPath;
+exports.modifiedServerOptions = modifiedServerOptions;
+
+var _getServerURL = require("../../../server/getServerURL");
+
+var _httpsOptions = require("../../../server/httpsOptions");
+
+function decidePublicPath(serverExtras) {
+  return serverExtras.isHttps ? serverExtras.httpsUrl : serverExtras.httpUrl;
+}
+
+function modifiedServerOptions(options) {
+  const {
+    server
+  } = options;
+  const {
+    port
+  } = server;
+  const httpsOptions = (0, _httpsOptions.httpsOptionsWithUserFriendlyError)(options);
+  const machineDomain = (0, _getServerURL.getServerDomain)(server);
+  const httpPort = port + 1;
+  return {
+    httpsOptions,
+    machineDomain,
+    httpsPort: port,
+    httpPort,
+    httpsUrl: (0, _getServerURL.getServerUrl)({
+      domain: machineDomain,
+      port,
+      protocol: 'https'
+    }),
+    httpUrl: (0, _getServerURL.getServerUrl)({
+      domain: machineDomain,
+      port: httpPort,
+      protocol: 'http'
+    }),
+    isHttps: !!httpsOptions
+  };
+}

package/packages/client_build_tool/lib/shared/bundler/webpack/common/libAlias.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.libAlias = void 0;
+// 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 libAlias = {
+  '@zohodesk/components/lib': '@zohodesk/components/es',
+  // '@zohodesk/zc-custom/lib': '@zohodesk/zc-custom/es',
+  '@zohodesk/dot/lib': '@zohodesk/dot/es',
+  '@zohodesk/i18n/lib': '@zohodesk/i18n/es',
+  '@zohodesk/icons/lib': '@zohodesk/icons/es',
+  '@zohodesk/normalizer/lib': '@zohodesk/normalizer/es',
+  '@zohodesk/perf-components/lib': '@zohodesk/perf-components/es',
+  '@zohodesk/perf-middleware/lib': '@zohodesk/perf-middleware/es',
+  '@zohodesk/permissions/lib': '@zohodesk/permissions/es',
+  '@zohodesk/platform-middleware/lib': '@zohodesk/platform-middleware/es',
+  '@zohodesk/react-dnd/lib': '@zohodesk/react-dnd/es',
+  '@zohodesk/router-middleware/lib': '@zohodesk/router-middleware/es',
+  '@zohodesk/storage/lib': '@zohodesk/storage/es',
+  '@zohodesk/svg/lib': '@zohodesk/svg/es',
+  '@zohodesk/timetracker/lib': '@zohodesk/timetracker/es',
+  '@zohodesk/variables/lib': '@zohodesk/variables/es',
+  '@zohodesk/virtualizer/lib': '@zohodesk/virtualizer/es'
+};
+exports.libAlias = libAlias;