@zohodesk/react-cli 1.1.19-exp.3 → 1.1.19-exp.6

package/bin/cli.js

@@ -300,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),
@@ -316,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),

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

@@ -11,20 +11,25 @@ var _babelPresetReactOption = _interopRequireDefault(require("./babel-option-uti
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-let {
+const {
   module: {
     mode
+  },
+  babelCustomizationForLibrary: {
+    babelPlugins
   }
 } = (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-proposal-optional-chaining'), require.resolve('@babel/plugin-proposal-class-properties')];
+const plugins = [...babelPlugins, ...defaultPlugins];
 
 var _default = () => ({
   presets: [require.resolve('@babel/preset-env'), (0, _babelPresetReactOption.default)({
     disableES5Transpile: false
-  })],
-  plugins: [[require.resolve('babel-plugin-transform-define'), isProd ? {
-    __DOCS__: false
-  } : {}]]
+  }), require.resolve('@babel/preset-typescript')],
+  plugins: plugins
 });
 
 exports.default = _default;

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

@@ -11,13 +11,21 @@ var _babelPresetReactOption = _interopRequireDefault(require("./babel-option-uti
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-let {
+const {
   module: {
     mode,
     disableES5Transpile
+  },
+  babelCustomizationForLibrary: {
+    babelPlugins
   }
 } = (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-proposal-optional-chaining'), require.resolve('@babel/plugin-proposal-class-properties')];
+const plugins = [...babelPlugins, ...defaultPlugins];
+console.log(disableES5Transpile);
 
 var _default = () => ({
   presets: [[require.resolve('@babel/preset-env'), disableES5Transpile ? {
@@ -31,10 +39,8 @@ var _default = () => ({
     modules: false
   }], (0, _babelPresetReactOption.default)({
     disableES5Transpile
-  })],
-  plugins: [[require.resolve('babel-plugin-transform-define'), isProd ? {
-    __DOCS__: false
-  } : {}], require.resolve('@babel/plugin-syntax-dynamic-import')]
+  }), require.resolve('@babel/preset-typescript')],
+  plugins: plugins
 });
 
 exports.default = _default;

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

@@ -146,6 +146,10 @@ 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

@@ -131,7 +131,7 @@ module.exports = {
             modules: false
           }], (0, _babelPresetReactOption.default)({
             disableES5Transpile
-          })],
+          }), 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'
           // ), REMOVING IT, BECAUSE WE ALREADY SUPPORT SPREAD SYNTAX FROM LIBRARIES.
@@ -237,6 +237,10 @@ module.exports = {
           minimize: false
         }
       }]
+    }, {
+      test: /\.ts$/,
+      use: 'ts-loader',
+      include: _path.default.join(appPath, folder)
     }, {
       test: /\.worker.js$/,
       use: {

package/lib/loaderUtils/getDevJsLoaders.js

@@ -44,7 +44,7 @@ let getDevJsLoaders = options => {
         modules: false
       }], (0, _babelPresetReactOption.default)({
         disableES5Transpile
-      })],
+      }), require.resolve('@babel/preset-typescript')],
       plugins: disableES5Transpile ? [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'), {
         exclude: ['error', 'log']

package/lib/loaders/workerLoader.js

@@ -19,32 +19,32 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /* import WebWorkerTemplatePlugin from 'webpack/lib/webworker/WebWorkerTemplatePlugin';
 import ExternalsPlugin from 'webpack/lib/ExternalsPlugin'; */
 const schema = {
-  type: 'object',
-  properties: {
-    publicPath: {
-      anyOf: [{
-        type: 'string'
+  'type': 'object',
+  'properties': {
+    'publicPath': {
+      'anyOf': [{
+        'type': 'string'
       }, {
-        instanceof: 'Function'
+        'instanceof': 'Function'
       }]
     },
-    filename: {
-      anyOf: [{
-        type: 'string',
-        minLength: 1
+    'filename': {
+      'anyOf': [{
+        'type': 'string',
+        'minLength': 1
       }, {
-        instanceof: 'Function'
+        'instanceof': 'Function'
       }]
     },
-    chunkFilename: {
-      type: 'string',
-      minLength: 1
+    'chunkFilename': {
+      'type': 'string',
+      'minLength': 1
     },
-    esModule: {
-      type: 'boolean'
+    'esModule': {
+      'type': 'boolean'
     }
   },
-  additionalProperties: false
+  'additionalProperties': false
 }; // eslint-disable-next-line
 
 function loader() {}
@@ -112,40 +112,25 @@ function pitch(request) {
     }
 
     function workerCode() {
-      if (this.workerInstance) {
-        return this.workerInstance;
-      }
-
       let blob;
 
       try {
         blob = new Blob([`importScripts('${this.workerUrl}');`], {
-          type: 'application/javascript'
+          'type': 'application/javascript'
         });
       } catch (e1) {
         throw new Error(e1);
       }
 
-      const url = window.URL || window.webkitURL;
-      const blobUrl = url.createObjectURL(blob);
-      this.workerInstance = new Worker(blobUrl);
-      return this.workerInstance;
+      let url = window.URL || window.webkitURL;
+      let blobUrl = url.createObjectURL(blob);
+      let worker = new Worker(blobUrl);
+      return worker;
     }
 
-    return cb(null, `const workerObj ={\n
-      workerInstance: null, \n
+    return cb(null, `${options.esModule ? 'export default' : 'module.exports ='} {\n
 			workerUrl: __webpack_public_path__ + ${JSON.stringify(entry)}, \n
 			getInstance: ${workerCode} \n
-		};\n
-    workerObj.getInstance();
-    ${options.esModule ? 'export default' : 'module.exports ='} workerObj;
-    `); // return cb(
-    //   null,
-    //   `${options.esModule ? 'export default' : 'module.exports ='} {\n
-    //   workerInstance: null, \n
-    // 	workerUrl: __webpack_public_path__ + ${JSON.stringify(entry)}, \n
-    // 	getInstance: ${workerCode} \n
-    // }`
-    // );
+		}`);
   });
 }

package/lib/pluginUtils/configHtmlWebpackPlugins.js

@@ -26,12 +26,6 @@ const defaultHTMLMiniFyOption = {
   removeStyleLinkTypeAttributes: true,
   useShortDoctype: true
 };
-const defaultScriptLoadingStrategy = 'defer';
-
-function getScriptLoadingStrategy(scriptLoadingStategey) {
-  const allowedScriptLoadingStrategies = ['blocking', 'defer'];
-  return allowedScriptLoadingStrategies.includes(scriptLoadingStategey) ? scriptLoadingStategey : defaultScriptLoadingStrategy;
-}
 
 function configHtmlWebpackPlugins(plugins, {
   enableChunkHash = false,
@@ -39,8 +33,7 @@ function configHtmlWebpackPlugins(plugins, {
   inject,
   crossorigin,
   hasEFC,
-  minify: minifyHtmlOptions = false,
-  scriptLoadingStrategey
+  minify: minifyHtmlOptions = false
 }) {
   const optionsHtmlWebpack = {
     chunksSortMode: 'none',
@@ -51,7 +44,7 @@ function configHtmlWebpackPlugins(plugins, {
     // ? minifyHtmlOptions
     // : minifyHtmlOptions,,
     templateParameters: _common.templateParameters,
-    scriptLoading: getScriptLoadingStrategy(scriptLoadingStrategey),
+    scriptLoading: 'defer',
     inject: inject
   };
 

package/lib/pluginUtils/getDevPlugins.js

@@ -60,8 +60,7 @@ const getDevPlugins = (options, publicPath) => {
         mode
       },
       htmlTemplate: {
-        inject,
-        scriptLoadingStrategey
+        inject
       },
       crossorigin
     },
@@ -167,8 +166,7 @@ const getDevPlugins = (options, publicPath) => {
     minify: false,
     inject,
     crossorigin,
-    hasEFC,
-    scriptLoadingStrategey
+    hasEFC
   });
 
   if (hasEFC) {

package/lib/pluginUtils/getProdPlugins.js

@@ -78,8 +78,7 @@ const getProdPlugins = (options, publicPath = '') => {
   } = options.app;
   const {
     inject,
-    minify: minifyHtmlOptions,
-    scriptLoadingStrategey
+    minify: minifyHtmlOptions
   } = htmlTemplate;
   const {
     i18n
@@ -177,7 +176,6 @@ const getProdPlugins = (options, publicPath = '') => {
     folder,
     inject,
     minify: minifyHtmlOptions,
-    scriptLoadingStrategey,
     crossorigin,
     hasEFC
   });

package/lib/schemas/index.js

@@ -322,8 +322,7 @@ var _default = {
     },
     htmlTemplate: {
       minify: null,
-      inject: true,
-      scriptLoadingStrategey: ''
+      inject: true
     },
     removePropTypes: false,
     customChunksBaseConfig: null,
@@ -739,6 +738,9 @@ var _default = {
     fileName: null,
     options: null,
     excludeKeys: null
+  },
+  babelCustomizationForLibrary: {
+    babelPlugins: []
   }
 };
 exports.default = _default;