@zohodesk/react-cli 1.1.24 → 1.1.25--exp.7

package/README.md

@@ -44,6 +44,10 @@ Now to run app
 
 # Change Logs
 
+# 1.1.25 (12-08-2024) 
+
+ - mp3 files support added
+
 # 1.1.24 (29-06-2024)
 
 - Worker loading logic fixes.

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

@@ -43,7 +43,8 @@ const {
     crossorigin,
     postCssPluginOrder,
     externals,
-    enableMjsLoader
+    enableMjsLoader,
+    displayClassName
   },
   enableTypeScript
 } = options;
@@ -120,7 +121,8 @@ module.exports = {
         classNameBlob: '[local]',
         cssUniqueness: false,
         selectorReplace: null,
-        postCssPluginOrder
+        postCssPluginOrder,
+        displayClassName
       })
     } : null, {
       test: seperateCssModules ? /\.module\.css$/ : /(\.module)?\.css$/,
@@ -137,7 +139,8 @@ module.exports = {
         selectorReplace,
         cssHashSelectors,
         classNamePrefix,
-        postCssPluginOrder
+        postCssPluginOrder,
+        displayClassName
       })
     }, (0, _configsAssetsLoaders.configImageLoader)(nameTemplate), (0, _configsAssetsLoaders.configFontLoader)(nameTemplate), (0, _configsAssetsLoaders.configSVGLoader)(nameTemplate), (0, _configsAssetsLoaders.configVideoLoader)(nameTemplate), (0, _configsAssetsLoaders.configAudioLoader)(nameTemplate), {
       test: /\.tmpl$/,

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

@@ -36,6 +36,7 @@ const {
     cssVariableReplacementConfig,
     selectorWeightConfig,
     cssUniqueness,
+    displayClassName,
     customClassNamePrefix,
     server: {
       mode
@@ -173,7 +174,8 @@ module.exports = {
         cssUniqueness: false,
         customClassNamePrefix,
         selectorReplace: null,
-        postCssPluginOrder
+        postCssPluginOrder,
+        displayClassName
       })
     } : null, {
       test: seperateCssModules ? /\.module\.css$/ : /\.css$/,
@@ -190,7 +192,8 @@ module.exports = {
         selectorReplace,
         cssHashSelectors,
         classNamePrefix,
-        postCssPluginOrder
+        postCssPluginOrder,
+        displayClassName
       })
     }, {
       test: /\.jpe?g$|\.gif$|\.png$/,
@@ -223,7 +226,7 @@ module.exports = {
         }
       }]
     }, {
-      test: /\.ogg$/,
+      test: /\.ogg|\.mp3$/,
       use: [{
         loader: 'file-loader',
         options: {

package/lib/loaderUtils/configsAssetsLoaders.js

@@ -19,7 +19,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const ImageExtRegex = /\.jpe?g$|\.gif$|\.png|\.webp$/;
 const FontExtRegex = /\.woff2|\.woff$|\.ttf$|\.eot$/;
 const SVGExtRegex = /\.svg$/;
-const AudioExtRegex = /\.ogg$/;
+const AudioExtRegex = /\.ogg|\.mp3$/;
 const VidioExtRegex = /\.mp4|\.webm$/;
 
 function createLoaderOptionQueryString(loaderName, nameTemplate, limit = 1000) {

package/lib/loaderUtils/getCSSLoaders.js

@@ -45,7 +45,8 @@ const getCSSLoaders = optionsObj => {
     cssHashSelectors,
     classNamePrefix,
     postCssPluginOrder,
-    customClassNamePrefix
+    customClassNamePrefix,
+    displayClassName
   } = optionsObj;
   const {
     devCssFileBountry
@@ -66,7 +67,7 @@ const getCSSLoaders = optionsObj => {
   if (classNameBlob) {
     cssLoaderOptions.modules.localIdentName = classNameBlob;
   } else {
-    cssLoaderOptions.modules.getLocalIdent = (0, _cssClassNameGenerate.default)(cssUniqueness, cssHashSelectors, classNamePrefix, customClassNamePrefix, patterns);
+    cssLoaderOptions.modules.getLocalIdent = (0, _cssClassNameGenerate.default)(cssUniqueness, cssHashSelectors, classNamePrefix, customClassNamePrefix, patterns, displayClassName);
   }
 
   const pluginOrder = calculatePostCssPluginOrder(postCssPluginOrder, Object.keys(plugins).filter(x => plugins[x] === true)); // console.log('selector weight config : ', selectorWeightConfig);

package/lib/pluginUtils/getDevPlugins.js

@@ -19,6 +19,8 @@ var _I18nSplitPlugin = _interopRequireDefault(require("../plugins/I18nSplitPlugi
 
 var _RequireVariablePublicPlugin = _interopRequireDefault(require("../plugins/RequireVariablePublicPlugin"));
 
+var _CssOrderControlPlugin = _interopRequireDefault(require("../plugins/CssOrderControlPlugin"));
+
 var _copyWebpackPlugin = _interopRequireDefault(require("copy-webpack-plugin"));
 
 var _webpack = _interopRequireDefault(require("webpack"));
@@ -45,6 +47,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const getDevPlugins = (options, publicPath) => {
   const {
     app: {
+      generateHtml,
       tpFolder,
       folder,
       instrumentScript,
@@ -74,7 +77,8 @@ const getDevPlugins = (options, publicPath) => {
       localeAttr: efcLocaleAttr
     },
     css: {
-      enableRTLSplit
+      enableRTLSplit,
+      cssOrderControler
     },
     i18n,
     unusedFiles,
@@ -163,7 +167,7 @@ const getDevPlugins = (options, publicPath) => {
     collections: true,
     shorthands: true
   }));
-  (0, _configHtmlWebpackPlugins.configHtmlWebpackPlugins)(pluginsArr, {
+  generateHtml && (0, _configHtmlWebpackPlugins.configHtmlWebpackPlugins)(pluginsArr, {
     enableChunkHash: false,
     folder,
     minify: false,
@@ -196,6 +200,7 @@ const getDevPlugins = (options, publicPath) => {
     mainChunkName: 'main'
   }));
   instrumentScript && pluginsArr.push(new _plugins.ScriptInstrumentPlugin());
+  cssOrderControler.enable && pluginsArr.push(new _CssOrderControlPlugin.default(cssOrderControler));
   customAttributes.enable && pluginsArr.push(new _CustomAttributePlugin.CustomAttributePlugin(customAttributes));
   customAttributes.enable && pluginsArr.push(new _EfcResourceCleanupPlugin.default(Object.assign({}, customAttributes, {
     globalCacheObj: context

package/lib/pluginUtils/getProdPlugins.js

@@ -35,6 +35,8 @@ var _CustomAttributePlugin = require("../plugins/CustomAttributePlugin");
 
 var _RtlCssPlugin = require("../plugins/RtlSplitPlugin/RtlCssPlugin");
 
+var _CssOrderControlPlugin = _interopRequireDefault(require("../plugins/CssOrderControlPlugin"));
+
 var _configHtmlWebpackPlugins = require("./configHtmlWebpackPlugins");
 
 var _StatsPlugin = _interopRequireDefault(require("../plugins/StatsPlugin"));
@@ -49,6 +51,7 @@ const getProdPlugins = (options, publicPath = '') => {
     enableChunkHash
   } = options.app;
   const {
+    generateHtml,
     manifestFileName,
     bundleAnalyze,
     optimize,
@@ -87,7 +90,8 @@ const getProdPlugins = (options, publicPath = '') => {
     i18n
   } = options;
   const {
-    enableRTLSplit
+    enableRTLSplit,
+    cssOrderControler
   } = options.css;
   const {
     hasEFC: newOptionForEnableEFC,
@@ -174,7 +178,7 @@ const getProdPlugins = (options, publicPath = '') => {
     to: `./${tpFolder}/`,
     toType: 'dir'
   }]));
-  (0, _configHtmlWebpackPlugins.configHtmlWebpackPlugins)(pluginsArr, {
+  generateHtml && (0, _configHtmlWebpackPlugins.configHtmlWebpackPlugins)(pluginsArr, {
     enableChunkHash,
     folder,
     inject,
@@ -301,6 +305,7 @@ const getProdPlugins = (options, publicPath = '') => {
   } // plugins.push(new VariableConversionCollector({}));
 
 
+  cssOrderControler.enable && pluginsArr.push(new _CssOrderControlPlugin.default(cssOrderControler));
   customAttributes.enable && pluginsArr.push(new _CustomAttributePlugin.CustomAttributePlugin(customAttributes));
   customAttributes.enable && pluginsArr.push(new _EfcResourceCleanupPlugin.default(Object.assign({}, customAttributes, {
     globalCacheObj: context

package/lib/plugins/CssOrderControlPlugin.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+class CssOrderControlPlugin {
+  constructor(options) {
+    this.options = {
+      className: options.className
+    };
+  }
+
+  apply(compiler) {
+    // NOTE: we not using this, Reason currently this option is only need for EFC,
+    // So it do not needed.
+    const className = this.options.className;
+    compiler.hooks.thisCompilation.tap({
+      name: 'CssOrderControlPlugin',
+      stage: 1,
+      fn: compilation => {
+        compilation.mainTemplate.hooks.requireEnsure.tap('CssOrderControlPlugin', source => {
+          // const str = attributeSetTemplate(cssAttributes, 'linkTag');
+          const replacedStr = source.replace('head.appendChild(linkTag);', `var referenceTag = document.getElementById('${className}');
+                   head.insertBefore(linkTag, referenceTag);`); //   console.log({ s: source, r: replacedStr });
+
+          return replacedStr;
+        });
+      }
+    });
+  }
+
+}
+
+exports.default = CssOrderControlPlugin;

package/lib/schemas/index.js

@@ -52,6 +52,10 @@ var _default = {
     propertiesFolder: null
   },
   css: {
+    cssOrderControler: {
+      enable: false,
+      className: 'customCss'
+    },
     enableRTLSplit: false,
     valueReplacer: null,
     //valueReplacer: [
@@ -126,6 +130,14 @@ var _default = {
     cssDirStatement: null
   },
   app: {
+    generateHtml: {
+      value: true,
+      cli: 'generate_html'
+    },
+    displayClassName: {
+      value: false,
+      cli: 'display_class_name'
+    },
     moduleResolvePath: {
       value: '@zohodesk/client_packages_group',
       cli: 'module_resolve_path'

package/lib/utils/cssClassNameGenerate.js

@@ -62,7 +62,7 @@ function patternBasedClass({
 var _default = (unique = true, {
   filenames,
   packages
-}, classNamePrefix, customClassNamePrefix, patterns) => (context, localIdentName, localName) => {
+}, classNamePrefix, customClassNamePrefix, patterns, displayClassName) => (context, localIdentName, localName) => {
   // console.log(patterns, context.resourcePath);
   // NOTE:  in build machine we use date as folder path.
   // So every time we create new build there is path will alway different
@@ -92,6 +92,11 @@ var _default = (unique = true, {
   */
 
 
+  if (displayClassName) {
+    return `${fileNameWithoutExt}__${localName}`;
+  } //  return cleanFileName
+
+
   if (context.resourcePath.endsWith('.plain.css')) {
     return localName;
   }

package/lib/utils/getFileType.js

@@ -45,5 +45,5 @@ function isVideoFileExt(ext) {
 }
 
 function isAudioFileExt(ext) {
-  return ext === '.ogg';
+  return ext === '.ogg' || ext === '.mp3';
 }