@diplodoc/cli 0.0.0-rc-remove-cli-tests-27946830449 → 0.0.0-rc-remove-cli-tests-27970657034

package/build/index.js

@@ -324605,7 +324605,7 @@ var import_config93 = require("@diplodoc/cli/lib/config");
 
 // src/constants.ts
 var import_node_path2 = require("node:path");
-var VERSION = "0.0.0-rc-remove-cli-tests-27946830449" ? "0.0.0-rc-remove-cli-tests-27946830449" : "0.0.0";
+var VERSION = "0.0.0-rc-remove-cli-tests-27970657034" ? "0.0.0-rc-remove-cli-tests-27970657034" : "0.0.0";
 var MAIN_TIMER_ID = "Build time";
 var ASSETS_FOLDER = (0, import_node_path2.resolve)(__dirname, "../assets");
 var BUNDLE_FOLDER = "_bundle";
@@ -374630,8 +374630,8 @@ var run = async (argv2) => {
 if (import_node_worker_threads4.isMainThread && require.main === module) {
   (async () => {
     import_utils410.console.time(MAIN_TIMER_ID);
-    if ("0.0.0-rc-remove-cli-tests-27946830449") {
-      import_utils410.console.log(`Using v${"0.0.0-rc-remove-cli-tests-27946830449"} version`);
+    if ("0.0.0-rc-remove-cli-tests-27970657034") {
+      import_utils410.console.log(`Using v${"0.0.0-rc-remove-cli-tests-27970657034"} version`);
     }
     const report = await run(process.argv);
     import_utils410.console.timeEnd(MAIN_TIMER_ID);

package/build/index.mjs

@@ -324591,7 +324591,7 @@ import { Command as Command8 } from "@diplodoc/cli/lib/config";
 
 // src/constants.ts
 import { join, resolve as resolve2 } from "node:path";
-var VERSION = "0.0.0-rc-remove-cli-tests-27946830449" ? "0.0.0-rc-remove-cli-tests-27946830449" : "0.0.0";
+var VERSION = "0.0.0-rc-remove-cli-tests-27970657034" ? "0.0.0-rc-remove-cli-tests-27970657034" : "0.0.0";
 var MAIN_TIMER_ID = "Build time";
 var ASSETS_FOLDER = resolve2(__dirname, "../assets");
 var BUNDLE_FOLDER = "_bundle";
@@ -374654,8 +374654,8 @@ var run = async (argv2) => {
 if (isMainThread4 && __require.main === module) {
   (async () => {
     console7.time(MAIN_TIMER_ID);
-    if ("0.0.0-rc-remove-cli-tests-27946830449") {
-      console7.log(`Using v${"0.0.0-rc-remove-cli-tests-27946830449"} version`);
+    if ("0.0.0-rc-remove-cli-tests-27970657034") {
+      console7.log(`Using v${"0.0.0-rc-remove-cli-tests-27970657034"} version`);
     }
     const report = await run(process.argv);
     console7.timeEnd(MAIN_TIMER_ID);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/cli",
-  "version": "0.0.0-rc-remove-cli-tests-27946830449",
+  "version": "0.0.0-rc-remove-cli-tests-27970657034",
   "description": "Make documentation using yfm-docs in Markdown and HTML formats",
   "keywords": [
     "markdown",
@@ -109,6 +109,18 @@
     "threads": "1.7.0",
     "ts-dedent": "2.2.0"
   },
+  "peerDependencies": {
+    "strip-ansi": "^7.1.0",
+    "vitest": "^3.2.1"
+  },
+  "peerDependenciesMeta": {
+    "strip-ansi": {
+      "optional": true
+    },
+    "vitest": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.758.0",
     "@aws-sdk/lib-storage": "^3.758.0",

package/tests/e2e/__snapshots__/bundles.spec.ts.snap

@@ -6,7 +6,6 @@ exports[`Check bundles > bundles list is correct > filelist 1`] = `
   "_bundle/app-css",
   "_bundle/app-js",
   "_bundle/app-rtl-css",
-  "_bundle/chunk-js",
   "_bundle/latex-extension.css",
   "_bundle/latex-extension.js",
   "_bundle/mermaid-extension.js",

package/tests/fixtures/file.ts

@@ -94,8 +94,10 @@ export async function compareDirectories(
     // Here we sort the order of the included files after all processing
     // This is necessary for better test stability
     // We do not care in what order these files were received and processed
-    // We sort only the final list and put it in the snapshot
-    filesForSnapshot = filesForSnapshot.map(bundleless).map(hashless).sort();
+    // We sort only the final list and put it in the snapshot.
+    // `bundleless` strips dynamic (numeric-id) client chunks → drop the now-empty
+    // entries so they don't appear in the file list snapshot.
+    filesForSnapshot = filesForSnapshot.map(bundleless).map(hashless).filter(Boolean).sort();
 
     if (!ignoreFileList) {
         expect(JSON.stringify(filesForSnapshot, null, 2)).toMatchSnapshot('filelist');

package/tests/fixtures/test.ts

@@ -43,11 +43,58 @@ export function hashless(text: string): string {
  *           "vendor-00121562c7b7d3b5.rtl.css" → "vendor-rtl-css",
  *           "976-40cbc1d2518eb8ea.js" → "chunk-js" (numeric webpack chunk ID).
  */
+// Matches a dynamic client chunk reference: a numeric (webpack/rspack id) base
+// with a content hash, e.g. `_bundle/572-d105b8fc819aff93.rtl.css`,
+// `_bundle/189-ab12cd34ef56.js`.
+const DYNAMIC_CHUNK = String.raw`_bundle\/\d+-[a-f0-9]{12,16}(?:\.[a-z0-9]+)*\.[a-z0-9]+`;
+
+/**
+ * Removes dynamic (numeric-id) client chunks from both the file list and any
+ * references inside content.
+ *
+ * These chunks are an internal detail of the client bundler: their count,
+ * extensions and even existence change between `@diplodoc/client` releases
+ * (e.g. 5.7.11 → 5.7.13 added `572-*.css` / `572-*.rtl.css`). Asserting them
+ * makes snapshots depend on the exact client version, so a floating
+ * `npm install` (Arcadia) diverges from a locked `npm ci` (GitHub). Stripping
+ * them keeps snapshots stable across client patch releases while still
+ * asserting the named bundles (app/vendor/search/extensions).
+ */
+function stripDynamicChunks(text: string): string {
+    // Fast path. Besides being cheaper, this guard is essential: `bundleless` is
+    // also applied to binary asset content (fonts, images), and the punctuation
+    // cleanup below would otherwise corrupt random `,,`/`[,`/`,]` byte sequences.
+    // Binary content never contains a literal `_bundle/<id>-<hash>` reference.
+    if (!new RegExp(DYNAMIC_CHUNK).test(text)) {
+        return text;
+    }
+
+    // <script ... src="_bundle/572-hash.js"></script>
+    text = text.replace(
+        new RegExp(`<script\\b[^>]*?${DYNAMIC_CHUNK}[^>]*?>\\s*<\\/script>`, 'g'),
+        '',
+    );
+    // <link ... href="_bundle/572-hash.css" ...>
+    text = text.replace(new RegExp(`<link\\b[^>]*?${DYNAMIC_CHUNK}[^>]*?\\/?>`, 'g'), '');
+    // JSON/array string element: "_bundle/572-hash.css" (optionally escaped as \"...\").
+    text = text.replace(new RegExp(`\\\\?"${DYNAMIC_CHUNK}\\\\?",?`, 'g'), '');
+    // Any remaining bare reference (e.g. a file-list entry that is exactly the chunk).
+    text = text.replace(new RegExp(DYNAMIC_CHUNK, 'g'), '');
+    // Tidy up array punctuation left behind by removed elements.
+    return text
+        .replace(/\[\s*,/g, '[')
+        .replace(/,\s*\]/g, ']')
+        .replace(/,\s*,/g, ',');
+}
+
 export function bundleless(text: string): string {
     // On Windows the CLI may emit `_bundle\file` or JSON-escaped `_bundle\\/file`.
     // Collapse any mix of backslashes and forward slashes after `_bundle` into `/`.
     text = text.replace(/_bundle[/\\]+/g, '_bundle/');
 
+    // Drop nondeterministic dynamic chunks before mapping named bundles.
+    text = stripDynamicChunks(text);
+
     for (const entry of Object.values(assets)) {
         for (const files of Object.values(entry)) {
             for (const filename of files) {
@@ -57,9 +104,11 @@ export function bundleless(text: string): string {
                 if (!match) continue;
 
                 const [, rawBase, suffixes, ext] = match;
-                const base = /^\d+$/.test(rawBase) ? 'chunk' : rawBase;
+                // Numeric (dynamic) chunks are handled by stripDynamicChunks above.
+                if (/^\d+$/.test(rawBase)) continue;
+
                 const suffixPart = suffixes.replace(/\./g, '-').slice(1); // ".rtl" → "rtl"
-                const label = suffixPart ? `${base}-${suffixPart}-${ext}` : `${base}-${ext}`;
+                const label = suffixPart ? `${rawBase}-${suffixPart}-${ext}` : `${rawBase}-${ext}`;
                 const escapedSuffixes = suffixes.replace(/\./g, '\\.');
                 const pattern = new RegExp(
                     `${rawBase}-[a-f0-9]{12,16}${escapedSuffixes}\\.${ext}`,