@zohodesk/client_build_tool 0.0.6-exp.16 → 0.0.6-exp.18

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/index.js

@@ -77,7 +77,7 @@ 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)) {
+            if ((0, _modeUtils.isProductionMode)(mode) && createSeparateSMap && !(0, _nameTemplates.isI18nFile)(js)) {
               if (js.includes('smap')) {
                 js = js.replace('smap/js/', `{{--js-smap}}js/`); //eslint-disable-line
               } else {
@@ -92,6 +92,10 @@ class CdnChangePlugin {
       });
 
       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

@@ -5,14 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _webpack = require("webpack");
+// 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;
+// };
 
-const first = set => {
-  const entry = set.values().next();
-  return entry.done ? undefined : entry.value;
-};
 
-class CustomizedGetChunkFilenameRuntimeModule extends _webpack.RuntimeModule {
+class CustomizedGetChunkFilenameRuntimeModule extends GetChunkFilenameRuntimeModule {
   /**
    * @param {string} contentType the   to use the content hash for
    * @param {string} name kind of filename
@@ -21,7 +22,7 @@ class CustomizedGetChunkFilenameRuntimeModule extends _webpack.RuntimeModule {
    * @param {boolean} allChunks when false, only async chunks are included
    */
   constructor(contentType, name, global, getFilenameForChunk, allChunks, variableName) {
-    super(`get ${name} chunk filename`);
+    super(contentType, name, global, getFilenameForChunk, allChunks);
     this.contentType = contentType;
     this.global = global;
     this.getFilenameForChunk = getFilenameForChunk;
@@ -31,232 +32,9 @@ class CustomizedGetChunkFilenameRuntimeModule extends _webpack.RuntimeModule {
   }
 
   generate() {
-    const {
-      global,
-      chunk,
-      chunkGraph,
-      contentType,
-      getFilenameForChunk,
-      allChunks,
-      compilation
-    } = this;
-    const {
-      runtimeTemplate
-    } = compilation;
-    /** @type {Map<string | FilenameFunction, Set<Chunk>>} */
-
-    const chunkFilenames = new Map();
-    let maxChunks = 0;
-    /** @type {string} */
-
-    let dynamicFilename;
-    /**
-     * @param {Chunk} c the chunk
-     * @returns {void}
-     */
-
-    const addChunk = c => {
-      const chunkFilename = getFilenameForChunk(c);
-
-      if (chunkFilename) {
-        let set = chunkFilenames.get(chunkFilename);
-
-        if (set === undefined) {
-          chunkFilenames.set(chunkFilename, set = new Set());
-        }
-
-        set.add(c);
-
-        if (typeof chunkFilename === 'string') {
-          if (set.size < maxChunks) return;
-
-          if (set.size === maxChunks) {
-            if (chunkFilename.length < dynamicFilename.length) return;
-
-            if (chunkFilename.length === dynamicFilename.length) {
-              if (chunkFilename < dynamicFilename) return;
-            }
-          }
-
-          maxChunks = set.size;
-          dynamicFilename = chunkFilename;
-        }
-      }
-    };
-    /** @type {string[]} */
-
-
-    const includedChunksMessages = [];
-
-    if (allChunks) {
-      includedChunksMessages.push('all chunks');
-
-      for (const c of chunk.getAllReferencedChunks()) {
-        addChunk(c);
-      }
-    } else {
-      includedChunksMessages.push('async chunks');
-
-      for (const c of chunk.getAllAsyncChunks()) {
-        addChunk(c);
-      }
-
-      const includeEntries = chunkGraph.getTreeRuntimeRequirements(chunk).has(_webpack.RuntimeGlobals.ensureChunkIncludeEntries);
-
-      if (includeEntries) {
-        includedChunksMessages.push('sibling chunks for the entrypoint');
-
-        for (const c of chunkGraph.getChunkEntryDependentChunksIterable(chunk)) {
-          addChunk(c);
-        }
-      }
-    }
-
-    for (const entrypoint of chunk.getAllReferencedAsyncEntrypoints()) {
-      addChunk(entrypoint.chunks[entrypoint.chunks.length - 1]);
-    }
-    /** @type {Map<string, Set<string | number>>} */
-
-
-    const staticUrls = new Map();
-    /** @type {Set<Chunk>} */
-
-    const dynamicUrlChunks = new Set();
-    /**
-     * @param {Chunk} c the chunk
-     * @param {string | FilenameFunction} chunkFilename the filename template for the chunk
-     * @returns {void}
-     */
-
-    const addStaticUrl = (c, chunkFilename) => {
-      /**
-       * @param {string | number} value a value
-       * @returns {string} string to put in quotes
-       */
-      const unquotedStringify = value => {
-        const str = `${value}`;
-
-        if (str.length >= 5 && str === `${c.id}`) {
-          // This is shorter and generates the same result
-          return '" + chunkId + "';
-        }
-
-        const s = JSON.stringify(str);
-        return s.slice(1, s.length - 1);
-      };
-
-      const unquotedStringifyWithLength = value => length => unquotedStringify(`${value}`.slice(0, length));
-
-      const chunkFilenameValue = typeof chunkFilename === 'function' ? JSON.stringify(chunkFilename({
-        chunk: c,
-        contentHashType: contentType
-      })) : JSON.stringify(chunkFilename);
-      const staticChunkFilename = compilation.getPath(chunkFilenameValue, {
-        hash: `" + ${_webpack.RuntimeGlobals.getFullHash}() + "`,
-        hashWithLength: length => `" + ${_webpack.RuntimeGlobals.getFullHash}().slice(0, ${length}) + "`,
-        chunk: {
-          id: unquotedStringify(c.id),
-          hash: unquotedStringify(c.renderedHash),
-          hashWithLength: unquotedStringifyWithLength(c.renderedHash),
-          name: unquotedStringify(c.name || c.id),
-          contentHash: {
-            [contentType]: unquotedStringify(c.contentHash[contentType])
-          },
-          contentHashWithLength: {
-            [contentType]: unquotedStringifyWithLength(c.contentHash[contentType])
-          }
-        },
-        contentHashType: contentType
-      });
-      let set = staticUrls.get(staticChunkFilename);
-
-      if (set === undefined) {
-        staticUrls.set(staticChunkFilename, set = new Set());
-      }
-
-      set.add(c.id);
-    };
-
-    for (const [filename, chunks] of chunkFilenames) {
-      if (filename !== dynamicFilename) {
-        for (const c of chunks) addStaticUrl(c, filename);
-      } else {
-        for (const c of chunks) dynamicUrlChunks.add(c);
-      }
-    }
-    /**
-     * @param {function(Chunk): string | number} fn function from chunk to value
-     * @returns {string} code with static mapping of results of fn
-     */
-
-
-    const createMap = fn => {
-      const obj = {};
-      let useId = false;
-      let lastKey;
-      let entries = 0; // eslint-disable-next-line no-restricted-syntax
-
-      for (const c of dynamicUrlChunks) {
-        const value = fn(c);
-
-        if (value === c.id) {
-          useId = true;
-        } else {
-          obj[c.id] = value;
-          lastKey = c.id;
-          entries++;
-        }
-      }
-
-      if (entries === 0) return 'chunkId';
-
-      if (entries === 1) {
-        return useId ? `(chunkId === ${JSON.stringify(lastKey)} ? ${JSON.stringify(obj[lastKey])} : chunkId)` : JSON.stringify(obj[lastKey]);
-      }
-
-      return useId ? `(${JSON.stringify(obj)}[chunkId] || chunkId)` : `${JSON.stringify(obj)}[chunkId]`;
-    };
-    /**
-     * @param {function(Chunk): string | number} fn function from chunk to value
-     * @returns {string} code with static mapping of results of fn for including in quoted string
-     */
-
-
-    const mapExpr = fn => {
-      return `" + ${createMap(fn)} + "`;
-    };
-    /**
-     * @param {function(Chunk): string | number} fn function from chunk to value
-     * @returns {function(number): string} function which generates code with static mapping of results of fn for including in quoted string for specific length
-     */
-
-
-    const mapExprWithLength = fn => length => {
-      return `" + ${createMap(c => `${fn(c)}`.slice(0, length))} + "`;
-    };
-
-    const url = dynamicFilename && compilation.getPath(JSON.stringify(dynamicFilename), {
-      hash: `" + ${_webpack.RuntimeGlobals.getFullHash}() + "`,
-      hashWithLength: length => `" + ${_webpack.RuntimeGlobals.getFullHash}().slice(0, ${length}) + "`,
-      chunk: {
-        id: `" + chunkId + "`,
-        hash: mapExpr(c => c.renderedHash),
-        hashWithLength: mapExprWithLength(c => c.renderedHash),
-        name: mapExpr(c => c.name || c.id),
-        contentHash: {
-          [contentType]: mapExpr(c => c.contentHash[contentType])
-        },
-        contentHashWithLength: {
-          [contentType]: mapExprWithLength(c => c.contentHash[contentType])
-        }
-      },
-      contentHashType: contentType
-    });
-    return _webpack.Template.asString([`// This function allow to reference ${includedChunksMessages.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 ${this.variableName}+${url};`;
-    })), '// return url for filenames based on template', `return ${this.variableName}+${url};`] : ['// return url for filenames based on template', `return ${this.variableName}+${url};`])};`]);
+    const sourceCode = super.generate().toString();
+    const replaceCode = sourceCode.replaceAll('"js-chunks/', `${this.variableName} + "js-chunks/`);
+    return replaceCode;
   }
 
 }

package/package.json

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