@zohodesk/client_build_tool 0.0.6-exp.2 → 0.0.6-exp.21

package/lib/schemas/defaultConfigValues.js

@@ -323,8 +323,6 @@ var _default = {
     cssAttributes: null,
     i18nAttributes: null
   },
-  typeScript: {
-    enable: false
-  }
+  externals: null
 };
 exports.default = _default;

package/lib/shared/babel/babelWebConfig.js

@@ -26,7 +26,7 @@ function babelWebConfig(options, mode) {
     browserList
   } = options.babelCustomizations;
   return {
-    presets: [getBabelPresetEnvConfig(browserList, mode), require.resolve('@babel/preset-react'), require.resolve('@babel/preset-typescript')],
+    presets: [getBabelPresetEnvConfig(browserList, mode), require.resolve('@babel/preset-react')],
     plugins: customBabelPlugins(babelPlugins).concat((0, _getBabelPlugin.getBabelPlugin)(options)).filter(Boolean)
   };
 }

package/lib/shared/bundler/webpack/common/nameTemplates.js

@@ -15,10 +15,10 @@ var _modeUtils = require("./modeUtils");
 const templates = {
   html: ['index.html', 'index.[contenthash].html'],
   js: ['js/[name].js', 'js/[name].[contenthash].js'],
-  chunkjs: ['js-chunks/[name].js', 'js-chunks/[name].[contenthash].js'],
-  i18njs: ['i18n-chunks/[locale]/[name].i18n.js', 'i18n-chunks/[locale]/[name].[chunkhash].i18n.js'],
-  i18nchunkjs: ['i18n-chunks/[locale]/[name].i18n.js', // 'i18n-chunks/[locale]/[name].[chunkhash].i18n.js'
-  'i18n-chunks/[locale]/[name].[contenthash].i18n.js'],
+  chunkjs: ['js-chunk/[name].js', 'js-chunks/[name].[contenthash].js'],
+  i18njs: ['i18n-chunk/[locale]/[name].i18n.js', 'i18n-chunk/[locale]/[name].[chunkhash].i18n.js'],
+  i18nchunkjs: ['i18n-chunk/[locale]/[name].i18n.js', // 'i18n-chunk/[locale]/[name].[chunkhash].i18n.js'
+  'i18n-chunk/[locale]/[name].[contenthash].i18n.js'],
   i18nmanifest: ['i18n-manifest.json', 'i18n-manifest.json'],
   workerjs: ['js/[name].js', 'js/[name].[contenthash].js'],
   css: ['css/[name].css', 'css/[name].[contenthash].css'],

package/lib/shared/bundler/webpack/custom_plugins/{CdnChangePlugin.js → CdnChangePlugin/index.js}

@@ -7,14 +7,20 @@ exports.default = void 0;
 
 var _htmlWebpackPlugin = _interopRequireDefault(require("html-webpack-plugin"));
 
-var _nameTemplates = require("../common/nameTemplates");
+var _webpack = require("webpack");
 
-var _modeUtils = require("../common/modeUtils");
+var _nameTemplates = require("../../common/nameTemplates");
+
+var _modeUtils = require("../../common/modeUtils");
+
+var _webpackCustomJsUrlLoader = _interopRequireDefault(require("./webpackCustomJsUrlLoader"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // import { RuntimeGlobals, RuntimeModule } from 'webpack';
+// eslint-disable-next-line import/extensions
 // import { Template } from 'webpack';
+// eslint-disable-next-line import/extensions
 const pluginName = 'CdnChangePlugin'; // const MODULE_TYPE = 'css/mini-extract';
 // class CdnChangeRuntimePlugin extends RuntimeModule {
 //   constructor(compiler, { variableName }) {
@@ -33,7 +39,7 @@ class CdnChangePlugin {
   constructor(options) {
     this.createSeparateSMap = options.createSeparateSMap;
     this.i18nTemplate = options.i18nTemplate || '{{__I18N_CDN__}}';
-    this.variableName = options.variableName || '__CSS_CDN__';
+    this.variableName = options.variableName || 'window.__SMAP_PATH__';
     this.cssTemplate = options.cssTemplate || '{{__CSS_CDN__}}';
     this.jsTemplate = options.jsTemplate || '{{__JS_CDN__}}';
     this.mode = options.mode || 'prod';
@@ -71,15 +77,32 @@ class CdnChangePlugin {
         data.assets = { ...data.assets,
           css: data.assets.css.map(css => `${this.cssTemplate}${css}`),
           js: data.assets.js.map(js => {
-            if (((0, _modeUtils.isProductionMode)(mode) || createSeparateSMap) && !(0, _nameTemplates.isI18nFile)(js)) {
-              js = js.replace('js/', `{{--js-smap}}js/`); //eslint-disable-line
+            if ((0, _modeUtils.isProductionMode)(mode) && createSeparateSMap && !(0, _nameTemplates.isI18nFile)(js)) {
+              console.log(js, js.includes('smap'));
+
+              if (js.includes('smap')) {
+                js = js.replace('smap/js/', `{{--js-smap}}js/`); //eslint-disable-line
+              } else {
+                js = js.replace('js/', `{{--js-smap}}js/`); //eslint-disable-line
+              }
             }
 
+            console.log('ending', js);
             return `${(0, _nameTemplates.isI18nFile)(js) ? this.i18nTemplate : this.jsTemplate}${js}`;
           })
         };
         cb && cb(null, data);
       });
+
+      compilation.hooks.runtimeRequirementInTree.for(_webpack.RuntimeGlobals.getChunkScriptFilename).tap(pluginName, (chunk, set) => {
+        if (typeof compilation.outputOptions.chunkFilename === 'string' && /\[(full)?hash(:\d+)?\]/.test(compilation.outputOptions.chunkFilename)) {
+          set.add(_webpack.RuntimeGlobals.getFullHash);
+        }
+
+        compilation.addRuntimeModule(chunk, // eslint-disable-next-line new-cap
+        new _webpackCustomJsUrlLoader.default('javascript', 'javascript', _webpack.RuntimeGlobals.getChunkScriptFilename, chunk => chunk.filenameTemplate || (chunk.canBeInitial() ? compilation.outputOptions.filename : compilation.outputOptions.chunkFilename), false, this.variableName));
+        return true;
+      });
     });
   }
 

package/lib/shared/bundler/webpack/custom_plugins/CdnChangePlugin/webpackCustomJsUrlLoader.js

@@ -0,0 +1,43 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+// import { RuntimeGlobals, RuntimeModule, Template } from 'webpack';
+const GetChunkFilenameRuntimeModule = require('webpack/lib/runtime/GetChunkFilenameRuntimeModule'); // import GetChunkFilenameRuntimeModule from 'webpack/lib/runtime/GetChunkFilenameRuntimeModule';
+// const first = set => {
+//   const entry = set.values().next();
+//   return entry.done ? undefined : entry.value;
+// };
+
+
+class CustomizedGetChunkFilenameRuntimeModule extends GetChunkFilenameRuntimeModule {
+  /**
+   * @param {string} contentType the   to use the content hash for
+   * @param {string} name kind of filename
+   * @param {string} global function name to be assigned
+   * @param {function(Chunk): string | FilenameFunction} getFilenameForChunk functor to get the filename or function
+   * @param {boolean} allChunks when false, only async chunks are included
+   */
+  constructor(contentType, name, global, getFilenameForChunk, allChunks, variableName) {
+    super(contentType, name, global, getFilenameForChunk, allChunks);
+    this.contentType = contentType;
+    this.global = global;
+    this.getFilenameForChunk = getFilenameForChunk;
+    this.allChunks = allChunks;
+    this.dependentHash = true;
+    this.variableName = variableName;
+  }
+
+  generate() {
+    const sourceCode = super.generate().toString();
+    const replaceCode = sourceCode.replaceAll('"js-chunks/', `${this.variableName} + "js-chunks/`);
+    return replaceCode;
+  }
+
+}
+
+var _default = CustomizedGetChunkFilenameRuntimeModule;
+exports.default = _default;

package/lib/shared/bundler/webpack/custom_plugins/SourceMapPlugin/index.js

@@ -13,7 +13,7 @@ function checkSmapFilePattern(assetName) {
 }
 
 function skipRuntimeFiles(assetName) {
-  return !assetName.includes('runtime') || !assetName.includes('[locale]');
+  return !assetName.includes('[locale]');
 }
 
 const pluginName = 'SplitSourceMapPlugin'; // Purpose:
@@ -45,6 +45,21 @@ class SourceMapPlugin {
           }
         });
       });
+      compilation.hooks.processAssets.tap({
+        name: pluginName,
+        stage: _webpack.Compilation.PROCESS_ASSETS_STAGE_DERIVED // additionalAssets: true
+
+      }, assets => {
+        Object.keys(assets).forEach(assetName => {
+          if (assetName.includes('runtime') && skipRuntimeFiles(assetName)) {
+            const runtimeAssetCode = assets[assetName].source();
+            const newAssetName = `smap/${assetName}`;
+            compilation.emitAsset(newAssetName, new RawSource(runtimeAssetCode));
+          }
+
+          ;
+        });
+      });
     });
   }
 

package/lib/shared/bundler/webpack/devtoolConfig.js

@@ -5,6 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.devtoolConfig = devtoolConfig;
 
+// eslint-disable-next-line consistent-return
 function devtoolConfig(options) {
-  return options.devtool;
+  if (options.createSeparateSMap) {
+    return options.devtool;
+  }
 }

package/lib/shared/bundler/webpack/webpackConfig.js

@@ -11,8 +11,6 @@ var _outputConfig = require("./outputConfig");
 
 var _jsLoaders = require("./jsLoaders");
 
-var _tsLoaders = require("./tsLoaders");
-
 var _cssLoaders = require("./cssLoaders");
 
 var _assetLoaders = require("./loaderConfigs/assetLoaders");
@@ -48,7 +46,7 @@ function webpackConfigCreator(options) {
     module: {
       /* strictExportPresence for break the build when imported module not present in respective file */
       // strictExportPresence: true,
-      rules: [...(0, _jsLoaders.jsLoaders)(options), ...(0, _tsLoaders.tsLoaders)(options), ...(0, _cssLoaders.cssLoaders)(options), (0, _configWebWorkerLoader.configWebWorkerLoader)(options), (0, _configHtmlTemplateLoader.configHtmlTemplateLoader)(options), ...(0, _assetLoaders.assetLoaders)(options), ...(0, _configCustomLoaders.configCustomLoaders)(options)]
+      rules: [...(0, _jsLoaders.jsLoaders)(options), ...(0, _cssLoaders.cssLoaders)(options), (0, _configWebWorkerLoader.configWebWorkerLoader)(options), (0, _configHtmlTemplateLoader.configHtmlTemplateLoader)(options), ...(0, _assetLoaders.assetLoaders)(options), ...(0, _configCustomLoaders.configCustomLoaders)(options)]
     },
     plugins: (0, _plugins.plugins)(options),
     externals: (0, _externals.externals)(options),

package/lib/shared/fileUtils/watchRun.js

@@ -11,8 +11,6 @@ var _watcher = _interopRequireDefault(require("watcher"));
 
 var _runBabelForJSFile = require("../babel/runBabelForJSFile");
 
-var _runBabelForTsFile = require("../babel/runBabelForTsFile");
-
 var _runPostCssForCssFile = require("../postcss/runPostCssForCssFile");
 
 var _directoryIterator = require("./directoryIterator");
@@ -25,8 +23,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const isJs = ext => ext === '.js';
 
-const isTs = ext => ext === '.ts';
-
 const isCss = ext => ext === '.css';
 
 function watchRun({
@@ -58,13 +54,6 @@ function watchRun({
         outputFile,
         options
       });
-    } else if (isTs(ext)) {
-      (0, _runBabelForTsFile.runBabelForTSFile)({
-        filename,
-        outputFile,
-        options,
-        mode
-      });
     } else {
       (0, _copyFile.copyFile)(filename, outputFile);
     }
@@ -92,8 +81,7 @@ function watchRun({
     const watcher = new _watcher.default(src, {
       recursive: true,
       ignoreInitial: true,
-      ignore: filename => filename.indexOf('__tests__') !== -1 // remove the test cases 
-
+      ignore: filename => filename.indexOf('__tests__') !== -1
     });
     watcher.on('all', (event, filename) => {
       if (event === 'unlink' || event === 'unlinkDir') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/client_build_tool",
-  "version": "0.0.6-exp.2",
+  "version": "0.0.6-exp.21",
   "description": "A CLI tool to  build  web applications and client libraries",
   "main": "lib/index.js",
   "bin": {
@@ -55,9 +55,6 @@
     "webpack": "5.79.0",
     "webpack-bundle-analyzer": "4.8.0",
     "webpack-cli": "4.10.0",
-    "webpack-dev-middleware": "6.1.1",
-    "typescript": "5.2.2",
-    "ts-loader": "8.2.0",
-    "@babel/preset-typescript": "7.23.2"
+    "webpack-dev-middleware": "6.1.1"
   }
 }

package/lib/shared/babel/runBabelForTsFile.js

@@ -1,30 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.runBabelForTSFile = runBabelForTSFile;
-
-var _core = require("@babel/core");
-
-var _babelWebConfig = require("./babelWebConfig");
-
-var _copyFile = require("../fileUtils/copyFile");
-
-function runBabelForTSFile({
-  filename,
-  outputFile,
-  options,
-  mode = 'es'
-}) {
-  const {
-    enable
-  } = options.typeScript;
-
-  if (enable) {
-    // const jsSourceCode = readFileSync(filename).toString();
-    const babelConfig = (0, _babelWebConfig.babelWebConfig)(options, mode);
-    const result = (0, _core.transformFileSync)(filename, babelConfig);
-    (0, _copyFile.writeFile)(outputFile.replace('.ts', '.js'), result.code);
-  }
-}

package/lib/shared/bundler/webpack/tsLoaders.js

@@ -1,23 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.tsLoaders = tsLoaders;
-
-function tsLoaders(options) {
-  const {
-    enable
-  } = options.typeScript;
-
-  if (enable) {
-    return [{
-      test: /\.js$/,
-      exclude: /node_modules/,
-      use: 'ts-loader' // include: path.join(appPath, folder)
-
-    }];
-  }
-
-  return [];
-}