fix(core): remove duplicate js-yaml packages

(cherry picked from commit f1ae1bc)

e2e/utils/create-project-utils.ts

@@ -18,7 +18,7 @@ import {
 import * as isCI from 'is-ci';
 
 import { angularCliVersion as defaultAngularCliVersion } from '@nx/workspace/src/utils/versions';
-import { dump } from '@zkochan/js-yaml';
+import { dump } from 'js-yaml';
 import { execSync, ExecSyncOptions } from 'child_process';
 
 import { performance, PerformanceMeasure } from 'perf_hooks';

package.json

@@ -206,7 +206,7 @@
     "jest-runtime": "^29.4.1",
     "jest-util": "^29.4.1",
     "js-tokens": "^4.0.0",
-    "js-yaml": "4.1.0",
+    "js-yaml": "npm:@zkochan/[email protected]",
     "jsonc-eslint-parser": "^2.1.0",
     "jsonc-parser": "3.2.0",
     "kill-port": "^1.6.1",
@@ -320,7 +320,6 @@
     "@widgetbot/react-embed": "^1.9.0",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
-    "@zkochan/js-yaml": "0.0.6",
     "axios": "^1.6.0",
     "classnames": "^2.3.1",
     "cliui": "^8.0.1",

packages/eslint/.eslintrc.json

@@ -39,7 +39,8 @@
               "typescript",
               "eslint",
               "@angular-devkit/core",
-              "@typescript-eslint/eslint-plugin"
+              "@typescript-eslint/eslint-plugin",
+              "js-yaml" // The rule is failing with alias dependencies see
             ]
           }
         ]

packages/eslint/package.json

@@ -30,7 +30,7 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "peerDependencies": {
-    "js-yaml": "4.1.0"
+    "js-yaml": "npm:@zkochan/[email protected]"
   },
   "dependencies": {
     "@nx/devkit": "file:../devkit",

packages/nx/.eslintrc.json

@@ -100,7 +100,8 @@
               "events", // This is coming from @storybook/builder-manager since it uses the browser polyfill
               "process", // This is coming from @storybook/builder-manager since it uses the browser polyfill
               "prettier", // This is coming from @storybook/builder-manager since it uses the browser polyfill
-              "util" // This is coming from @storybook/builder-manager since it uses the browser polyfill
+              "util", // This is coming from @storybook/builder-manager since it uses the browser polyfill
+              "js-yaml" // The rule is failing with alias dependencies
             ]
           }
         ]

packages/nx/package.json

@@ -35,7 +35,6 @@
   "dependencies": {
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
-    "@zkochan/js-yaml": "0.0.6",
     "axios": "^1.6.0",
     "chalk": "^4.1.0",
     "cli-cursor": "3.1.0",
@@ -49,7 +48,7 @@
     "fs-extra": "^11.1.0",
     "ignore": "^5.0.4",
     "jest-diff": "^29.4.1",
-    "js-yaml": "4.1.0",
+    "js-yaml": "npm:@zkochan/[email protected]",
     "jsonc-parser": "3.2.0",
     "lines-and-columns": "~2.0.3",
     "minimatch": "9.0.3",

packages/nx/src/command-line/release/utils/github.ts

@@ -318,7 +318,7 @@ export async function resolveGithubToken(): Promise<string | null> {
   );
   if (existsSync(ghCLIPath)) {
     const yamlContents = await fsp.readFile(ghCLIPath, 'utf8');
-    const { load } = require('@zkochan/js-yaml');
+    const { load } = require('js-yaml');
     const ghCLIConfig = load(yamlContents);
     if (ghCLIConfig['github.com']) {
       // Web based session (the token is already embedded in the config)

packages/nx/src/plugins/js/lock-file/utils/pnpm-normalizer.ts

@@ -22,7 +22,7 @@ export function loadPnpmHoistedDepsDefinition() {
 
   if (existsSync(fullPath)) {
     const content = readFileSync(fullPath, 'utf-8');
-    const { load } = require('@zkochan/js-yaml');
+    const { load } = require('js-yaml');
     return load(content)?.hoistedDependencies ?? {};
   } else {
     throw new Error(`Could not find ".modules.yaml" at "${fullPath}"`);
@@ -38,7 +38,7 @@ export function loadPnpmHoistedDepsDefinition() {
  * https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/read.ts#L91
  */
 export function parseAndNormalizePnpmLockfile(content: string): Lockfile {
-  const { load } = require('@zkochan/js-yaml');
+  const { load } = require('js-yaml');
   const lockFileData = load(content);
   return revertFromInlineSpecifiersFormatIfNecessary(
     convertFromLockfileFileMutable(lockFileData)
@@ -87,7 +87,7 @@ export function stringifyToPnpmYaml(lockfile: Lockfile): string {
   const adaptedLockfile = isLockfileV6
     ? convertToInlineSpecifiersFormat(lockfile)
     : lockfile;
-  const { dump } = require('@zkochan/js-yaml');
+  const { dump } = require('js-yaml');
   return dump(
     sortLockfileKeys(
       normalizeLockfile(adaptedLockfile as Lockfile, isLockfileV6)