@zohodesk/client_build_tool 0.0.6-exp.7 → 0.0.6-exp.8

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 }) {
@@ -80,6 +86,12 @@ class CdnChangePlugin {
         };
         cb && cb(null, data);
       });
+
+      compilation.hooks.runtimeRequirementInTree.for(_webpack.RuntimeGlobals.getChunkScriptFilename).tap(pluginName, (chunk, set) => {
+        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));
+        return true;
+      });
     });
   }
 

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Dummy = void 0;
+exports.default = void 0;
 
 var _webpack = require("webpack");
 
@@ -12,126 +12,14 @@ const first = set => {
   return entry.done ? undefined : entry.value;
 };
 
-class Dummy {
-  constructor() {
-    this.variableName = '__CSS_CDN__';
-  } // eslint-disable-next-line class-methods-use-this
-  //   apply(compiler) {
-  //     // Access processAssets hook from v5 API
-  //     const { RawSource } = compiler.webpack.sources;
-  //     compiler.hooks.compilation.tap('MyCutomPlugin', compilation => {
-  //       compilation.hooks.processAssets.tap(
-  //         {
-  //           name: 'MyCustomPlugin',
-  //           stage: Compilation.PROCESS_ASSETS_STAGE_ADDITIONS // Choose an appropriate stage based on your needs
-  //         },
-  //         assets => {
-  //           console.log('working');
-  //           // Here you can interact with assets
-  //           const asset = 'js/runtime~main'; // Replace with your actual chunk file name pattern
-  //           Object.keys(assets).forEach(assetName => {
-  //             // if (assetName.includes('main')) console.log(assetName);
-  //             // });
-  //             if (assetName.includes(asset)) {
-  //               console.log('found');
-  //               const originalSource = assets[assetName].source();
-  //               // console.log(originalSource);
-  //               const modifiedSource = originalSource.replace(
-  //                 '__webpack_require__.p + __webpack_require__.u(chunkId);',
-  //                 `window['${this.variableName}'] + __webpack_require__.u(chunkId);`
-  //               );
-  //               console.log(assetName);
-  //               // console.log(modifiedSource);
-  //               // console.log(a);
-  //               // Apply your modifications here
-  //               // const modifiedSource = someModificationFunction(originalSource);
-  //               // Update the asset's source
-  //               // eslint-disable-next-line no-param-reassign
-  //               compilation.updateAsset(assetName, new RawSource(modifiedSource));
-  //             }
-  //           });
-  //         }
-  //       );
-  //     });
-  //   }
-  // }
-  // apply(compiler) {
-  //   compiler.hooks.compilation.tap('MyPlugin', compilation => {
-  // console.log(compilation.moduleTemplates);
-  // Object.keys(compilation).forEach(hi => {
-  //   console.log(hi);
-  // })
-  // const a = compilation.mainTemplate.hooks.localVars;
-  // a.tap('nj',(source, chunk, hash) => {
-  //   console.log(source, 'pol');
-  // })
-  // console.log(compilation.moduleTemplates.javascript.hooks.localVars);
-  // const { moduleTemplates } = compilation;
-  // if (
-  //   moduleTemplates &&
-  //   moduleTemplates.javascript &&
-  //   moduleTemplates.javascript.hooks
-  // ) {
-  //   moduleTemplates.javascript.hooks.localVars.tap(
-  //     'MyPlugin',
-  //     (source, chunk, hash) => {
-  //       // Your logic for modifying localVars
-  //       return source;
-  //     }
-  //   );
-  // } else {
-  //   console.error(
-  //     'Hooks or module template not available for this compilation.'
-  //   );
-  // }
-  //     });
-  //   }
-  // }
-  // apply(compiler) {
-  //   // Access the compilation hook
-  //   compiler.hooks.compilation.tap('MyCustomRuntimePlugin', compilation => {
-  //     console.log(webpack.javascript.JavascriptModulesPlugin.getCompilationHooks)
-  //     // Hook into the webpack runtime module template
-  //     webpack.javascript.JavascriptModulesPlugin.getCompilationHooks(
-  //       compilation
-  //     ).renderRequire.tap('MyCustomRuntimePlugin', (source, renderContext) => {console.log(source)
-  //       // A naive example to demonstrate the replacement of __webpack_require__.u function.
-  //       // const newSource = source.replace('__webpack_require__.u', function () {
-  //       //   // Your modified code or logic here
-  //       //   return '/* custom logic */';
-  //       });
-  //       // return newSource;
-  //     });
-  //   };
-  // }
-  // MyCustomRuntimePlugin.js
-  // }
-  //  apply(compiler) {
-  //    compiler.hooks.compilation.tap('MyWebpackPlugin', (compilation) => {
-  //       console.log(compilation.hooks.runtimeModule.compile.toString());
-  //       // Example: tapping into the 'optimize' hook
-  //       compilation.hooks.optimize.tap('MyWebpackPlugin', () => {
-  //         console.log('Assets are being optimized.');
-  //       });
-  //     });
-  // }
-
-
-  apply(compiler) {
-    compiler.hooks.compilation.tap("k", compilation => {
-      compilation.hooks.runtimeRequirementInTree.for(_webpack.RuntimeGlobals.getChunkScriptFilename).tap("RuntimePlugin", (chunk, set) => {
-        console.log('NUmber2');
-        compilation.addRuntimeModule(chunk, new hello("javascript", "javascript", _webpack.RuntimeGlobals.getChunkScriptFilename, chunk => chunk.filenameTemplate || (chunk.canBeInitial() ? compilation.outputOptions.filename : compilation.outputOptions.chunkFilename), false));
-        return true;
-      });
-    });
-  }
-
-}
-
-exports.Dummy = Dummy;
-
-class hello extends _webpack.RuntimeModule {
+class CustomizedGetChunkFilenameRuntimeModule extends _webpack.RuntimeModule {
+  /**
+   * @param {string} contentType the contentType 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) {
     super(`get ${name} chunk filename`);
     this.contentType = contentType;
@@ -305,7 +193,7 @@ class hello extends _webpack.RuntimeModule {
       const obj = {};
       let useId = false;
       let lastKey;
-      let entries = 0;
+      let entries = 0; // eslint-disable-next-line no-restricted-syntax
 
       for (const c of dynamicUrlChunks) {
         const value = fn(c);
@@ -364,12 +252,14 @@ class hello extends _webpack.RuntimeModule {
       contentHashType: contentType
     });
     const cdn = `__CSS_CDN__`;
-    console.log('jolly', dynamicFilename, url, 'url', cdn, url.endsWith('.js'), typeof url, url.includes('.js'));
-    return _webpack.Template.asString([`// This function allow to reference ${includedChunksMessages.join(' and ')}`, `${global} = ${runtimeTemplate.basicFunction('chunkId', staticUrls.size > 0 ? ['// a return url for filenames not based on template', // it minimizes to `x===1?"...":x===2?"...":"..."`
+    return _webpack.Template.asString([`// This function allow to reference ${inclucdndedChunksMessages.join(' and ')}`, `${global} = ${runtimeTemplate.basicFunction('chunkId', staticUrls.size > 0 ? ['// return url for filenames not based on template', // it minimizes to `x===1?"...":x===2?"...":"..."`
     _webpack.Template.asString(Array.from(staticUrls, ([url, ids]) => {
       const condition = ids.size === 1 ? `chunkId === ${JSON.stringify(first(ids))}` : `{${Array.from(ids, id => `${JSON.stringify(id)}:1`).join(',')}}[chunkId]`;
       return `if (${condition}) return window.${cdn}+${url};`;
-    })), '// b return url for filenames based on template', `return window.${cdn}+${url};`] : ['// c return url for filenames based on template', `return window.${cdn}+${url};`])};`]);
+    })), '// return url for filenames based on template', `return window.${cdn}+${url};`] : ['// return url for filenames based on template', `return window.${cdn}+${url};`])};`]);
   }
 
-}
+}
+
+var _default = CustomizedGetChunkFilenameRuntimeModule;
+exports.default = _default;

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

@@ -33,10 +33,16 @@ class SourceMapPlugin {
         name: pluginName,
         stage: _webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
       }, assets => {
+        console.log('working');
         Object.keys(assets).forEach(assetName => {
+          if (assetName.includes('runtime')) {
+            console.log(assetName, true);
+          }
+
           const assetCode = assets[assetName].source();
 
-          if (checkSmapFilePattern(assetName) && skipRuntimeFiles(assetName)) {
+          if (checkSmapFilePattern(assetName) // skipRuntimeFiles(assetName)
+          ) {
             compilation.renameAsset(assetName, `smap/${assetName}`);
 
             if (!/\.map$/.test(assetName)) {

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

@@ -47,12 +47,10 @@ var _configBundleIntegrityReport = require("./pluginConfigs/configBundleIntegrit
 
 var _configRuntimeResourceCleanup = require("./pluginConfigs/configRuntimeResourceCleanup");
 
-var _configDummy = require("./pluginConfigs/configDummy");
-
 // import { IgnorePlugin } from 'webpack';
 function plugins(options) {
   const {
     webpackPlugins
   } = options;
-  return [(0, _configEnvVariables.configEnvVariables)(options), (0, _configCustomAttributesPlugin.configCustomAttributesPlugin)(options), (0, _configTPHashMappingPlugin.configTPHashMappingPlugin)(options), (0, _configCopyPublicFolders.configCopyPublicFolders)(options), (0, _configIgnorePlugin.configIgnorePlugin)(options), (0, _configMiniCSSExtractPlugin.configMiniCSSExtractPlugin)(options), (0, _configSelectorWeightPlugin.configSelectorWeightPlugin)(options), (0, _configVariableConversionPlugin.configVariableConversionPlugin)(options), (0, _configI18nSplitPlugin.configI18nSplitPlugin)(options), (0, _configRtlCssPlugin.configRtlCssPlugin)(options), (0, _configHtmlWebpackPlugin.configHtmlWebpackPlugin)(options), (0, _configCdnChangePlugin.configCdnChangePlugin)(options), (0, _configServiceWorkerPlugin.configServiceWorkerPlugin)(options), (0, _configEFCTemplatePlugin.configEFCTemplatePlugin)(options), (0, _configResourceHintsPlugin.configResourceHintsPlugin)(options), (0, _configBundleAnalyzer.configBundleAnalyzer)(options), (0, _configManifestJsonPlugin.configManifestJsonPlugin)(options), (0, _configSourceMapPlugin.configSourceMapPlugin)(options), (0, _configProgressPlugin.configProgressPlugin)(options), (0, _configBundleIntegrityReport.configBundleIntegrityReport)(options), (0, _configRuntimeResourceCleanup.configRuntimeResourceCleanup)(options), (0, _configDummy.configDummy)(options), ...webpackPlugins].filter(Boolean);
+  return [(0, _configEnvVariables.configEnvVariables)(options), (0, _configCustomAttributesPlugin.configCustomAttributesPlugin)(options), (0, _configTPHashMappingPlugin.configTPHashMappingPlugin)(options), (0, _configCopyPublicFolders.configCopyPublicFolders)(options), (0, _configIgnorePlugin.configIgnorePlugin)(options), (0, _configMiniCSSExtractPlugin.configMiniCSSExtractPlugin)(options), (0, _configSelectorWeightPlugin.configSelectorWeightPlugin)(options), (0, _configVariableConversionPlugin.configVariableConversionPlugin)(options), (0, _configI18nSplitPlugin.configI18nSplitPlugin)(options), (0, _configRtlCssPlugin.configRtlCssPlugin)(options), (0, _configHtmlWebpackPlugin.configHtmlWebpackPlugin)(options), (0, _configCdnChangePlugin.configCdnChangePlugin)(options), (0, _configServiceWorkerPlugin.configServiceWorkerPlugin)(options), (0, _configEFCTemplatePlugin.configEFCTemplatePlugin)(options), (0, _configResourceHintsPlugin.configResourceHintsPlugin)(options), (0, _configBundleAnalyzer.configBundleAnalyzer)(options), (0, _configManifestJsonPlugin.configManifestJsonPlugin)(options), (0, _configSourceMapPlugin.configSourceMapPlugin)(options), (0, _configProgressPlugin.configProgressPlugin)(options), (0, _configBundleIntegrityReport.configBundleIntegrityReport)(options), (0, _configRuntimeResourceCleanup.configRuntimeResourceCleanup)(options), ...webpackPlugins].filter(Boolean);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/client_build_tool",
-  "version": "0.0.6-exp.7",
+  "version": "0.0.6-exp.8",
   "description": "A CLI tool to  build  web applications and client libraries",
   "main": "lib/index.js",
   "bin": {

package/lib/shared/bundler/webpack/pluginConfigs/configDummy.js

@@ -1,12 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.configDummy = configDummy;
-
-var _dummy = require("../custom_plugins/dummy");
-
-function configDummy(options) {
-  return new _dummy.Dummy();
-}