@zohodesk/react-cli 1.1.20-exp.5 → 1.1.20-exp.7

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

@@ -15,14 +15,11 @@ const {
   module: {
     mode
   },
-  app: {
-    babelCustomizationForLibrary,
-    enableTypeScript
-  }
+  babelCustomizationForLibrary: {
+    babelPlugins
+  },
+  enableTypeScript
 } = (0, _utils.getOptions)();
-const {
-  babelPlugins
-} = babelCustomizationForLibrary;
 const isProd = mode.toLowerCase() === 'prod';
 const defaultPlugins = [[require.resolve('babel-plugin-transform-define'), isProd ? {
   __DOCS__: false
@@ -40,8 +37,6 @@ if (enableTypeScript) {
   presets.push(require.resolve('@babel/preset-typescript'));
 }
 
-console.log(presets, plugins);
-
 var _default = () => ({
   presets: presets,
   plugins: plugins

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

@@ -16,14 +16,11 @@ const {
     mode,
     disableES5Transpile
   },
-  app: {
-    babelCustomizationForLibrary,
-    enableTypeScript
-  }
+  babelCustomizationForLibrary: {
+    babelPlugins
+  },
+  enableTypeScript
 } = (0, _utils.getOptions)();
-const {
-  babelPlugins
-} = babelCustomizationForLibrary;
 const isProd = mode.toLowerCase() === 'prod';
 const defaultPlugins = [[require.resolve('babel-plugin-transform-define'), isProd ? {
   __DOCS__: false
@@ -50,8 +47,6 @@ if (enableTypeScript) {
   presets.push(require.resolve('@babel/preset-typescript'));
 }
 
-console.log(presets, plugins);
-
 var _default = () => ({
   presets: presets,
   plugins: plugins

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

@@ -43,9 +43,9 @@ const {
     crossorigin,
     postCssPluginOrder,
     externals,
-    enableTypeScript,
     enableMjsLoader
-  }
+  },
+  enableTypeScript
 } = options;
 const {
   disableContextURL
@@ -148,7 +148,7 @@ module.exports = {
         }
       }]
     }, enableTypeScript ? {
-      test: /\.ts$/,
+      test: /\.ts$|\.tsx$/,
       use: 'ts-loader',
       include: _path.default.join(appPath, folder)
     } : null, {

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

@@ -49,9 +49,9 @@ const {
     devConsoleExculde,
     crossorigin,
     postCssPluginOrder,
-    externals,
-    enableTypeScript
-  }
+    externals
+  },
+  enableTypeScript
 } = options;
 let {
   enableChunkHash
@@ -132,7 +132,7 @@ module.exports = {
             modules: false
           }], (0, _babelPresetReactOption.default)({
             disableES5Transpile
-          }), enableTypeScript ? require.resolve('@babel/preset-typescript') : null].filename(Boolean),
+          }), enableTypeScript ? require.resolve('@babel/preset-typescript') : null].filter(Boolean),
           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'
           // ), REMOVING IT, BECAUSE WE ALREADY SUPPORT SPREAD SYNTAX FROM LIBRARIES.
@@ -239,7 +239,7 @@ module.exports = {
         }
       }]
     }, enableTypeScript ? {
-      test: /\.ts$/,
+      test: /\.ts$|\.tsx$/,
       use: 'ts-loader',
       include: _path.default.join(appPath, folder)
     } : null, {

package/lib/jest/preProcessors/jsPreprocessor.js

@@ -4,7 +4,30 @@ var _babelJest = _interopRequireDefault(require("babel-jest"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const getOptions = require('../../../lib/utils/getOptions').default;
+
+console.log('water');
+const {
+  enableTypeScript,
+  babelCustomizationForLibrary
+} = getOptions();
+const {
+  babelPlugins
+} = babelCustomizationForLibrary;
+const resolvedPlugins = [];
+babelPlugins.forEach(plugin => {
+  resolvedPlugins.push(require.resolve(plugin));
+});
+const presets = [require.resolve('@babel/preset-env'), require.resolve('@babel/preset-react')];
+
+if (enableTypeScript) {
+  presets.push(require.resolve('@babel/preset-typescript'));
+}
+
+const defaultPlugins = [require.resolve('babel-plugin-transform-dynamic-import')];
+const plugins = [...defaultPlugins, ...resolvedPlugins];
+console.log(presets, plugins, 'wtru');
 module.exports = _babelJest.default.createTransformer({
-  presets: [require.resolve('@babel/preset-env'), require.resolve('@babel/preset-react'), require.resolve('@babel/preset-typescript')],
-  plugins: [require.resolve('babel-plugin-transform-dynamic-import'), require.resolve('@babel/plugin-proposal-class-properties'), require.resolve('@babel/plugin-proposal-optional-chaining')]
+  presets: presets,
+  plugins: plugins
 });

package/lib/loaderUtils/getDevJsLoaders.js

@@ -16,9 +16,9 @@ let getDevJsLoaders = options => {
     app: {
       disableES5Transpile,
       instrumentScript,
-      devConsoleExculde,
-      enableTypeScript
+      devConsoleExculde
     },
+    enableTypeScript,
     esLint: {
       enable: enableEslint
     }

package/lib/schemas/index.js

@@ -125,13 +125,6 @@ var _default = {
     cssDirStatement: null
   },
   app: {
-    babelCustomizationForLibrary: {
-      babelPlugins: []
-    },
-    enableTypeScript: {
-      value: false,
-      cli: 'enable_typescript'
-    },
     moduleResolvePath: {
       value: '@zohodesk/client_packages_group',
       cli: 'module_resolve_path'
@@ -745,6 +738,13 @@ var _default = {
     fileName: null,
     options: null,
     excludeKeys: null
+  },
+  babelCustomizationForLibrary: {
+    babelPlugins: ['@babel/plugin-proposal-optional-chaining', '@babel/plugin-proposal-class-properties']
+  },
+  enableTypeScript: {
+    value: true,
+    cli: 'enable_typescript'
   }
 };
 exports.default = _default;

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/react-cli",
-  "version": "1.1.20-exp.4",
+  "version": "1.1.20-exp.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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