pnpm-settings-migrator 0.0.5 → 0.0.7

package/README.md

@@ -52,6 +52,13 @@ Disable removing pnpm settings in `.npmrc` file.
 
 Disable removing `pnpm` field in `package.json`.
 
+### `---no-newline-between`
+
+- **Type**: `boolean`
+- **Default**: `false`
+
+Disable adding newlines between each root keys.
+
 ## Context
 
 - [Moving settings to pnpm-workspace.yaml](https://github.com/orgs/pnpm/discussions/9037)

package/dist/cli.d.mts

@@ -1,2 +1,2 @@
 
-export {  }
+export { };

package/dist/cli.mjs

@@ -1,12 +1,12 @@
 import process from 'node:process';
 import { cac } from 'cac';
 import { consola } from 'consola';
-import { b as bold, d as dim, a as magenta, m as migratePnpmSettings, g as green, c as red } from './shared/pnpm-settings-migrator.D3JrUqMg.mjs';
+import { b as bold, d as dim, a as magenta, m as migratePnpmSettings, g as green, c as red } from './shared/pnpm-settings-migrator.D1Qw10Y6.mjs';
 import '@ntnyq/utils';
 import 'defu';
 import 'detect-indent';
-import 'js-yaml';
 import 'pathe';
+import 'yaml';
 import 'node:fs/promises';
 import 'consola/utils';
 import 'camelcase-keys';
@@ -14,12 +14,15 @@ import 'read-ini-file';
 import 'uncase';
 
 const name = "pnpm-settings-migrator";
-const version = "0.0.5";
+const version = "0.0.7";
 
 const cli = cac(name);
 cli.version(version).option("--cwd [cwd]", "Current working directory").option("--sort-keys", "Sort keys when write pnpm-workspace.yaml").option(
   "--no-yarn-resolutions",
   "Disable migrating resolutions field in package.json"
+).option(
+  "--no-newline-between",
+  "Disable adding newlines between each root keys"
 ).option("--no-clean-npmrc", "Disable removing pnpm settings in .npmrc file").option(
   "--no-clean-package-json",
   "Disable removing pnpm field in package.json"

package/dist/index.d.mts

@@ -19,6 +19,11 @@ interface Options {
      * @default process.cwd()
      */
     cwd?: string;
+    /**
+     * Add newlines between each root keys like pnpm does
+     * @default true
+     */
+    newlineBetween?: boolean;
     /**
      * Sort keys when write `pnpm-workspace.yaml`
      *
@@ -81,4 +86,5 @@ type NpmRC = Record<string, any>;
  */
 type PnpmWorkspace = PnpmSettings & PnpmWorkspaceLegacy;
 
-export { type NpmRC, type Options, type PackageJson, type PnpmWorkspace, type PnpmWorkspaceLegacy, migratePnpmSettings, resolveOptions };
+export { migratePnpmSettings, resolveOptions };
+export type { NpmRC, Options, PackageJson, PnpmWorkspace, PnpmWorkspaceLegacy };

package/dist/index.mjs

@@ -1,10 +1,10 @@
-export { m as migratePnpmSettings, r as resolveOptions } from './shared/pnpm-settings-migrator.D3JrUqMg.mjs';
+export { m as migratePnpmSettings, r as resolveOptions } from './shared/pnpm-settings-migrator.D1Qw10Y6.mjs';
 import '@ntnyq/utils';
 import 'consola';
 import 'defu';
 import 'detect-indent';
-import 'js-yaml';
 import 'pathe';
+import 'yaml';
 import 'node:process';
 import 'node:fs/promises';
 import 'consola/utils';

package/dist/shared/{pnpm-settings-migrator.D3JrUqMg.mjs → pnpm-settings-migrator.D1Qw10Y6.mjs}

@@ -2,8 +2,8 @@ import { pick } from '@ntnyq/utils';
 import consola from 'consola';
 import { defu } from 'defu';
 import detectIndent from 'detect-indent';
-import { load, dump } from 'js-yaml';
 import { resolve } from 'pathe';
+import { parse, Document } from 'yaml';
 import process from 'node:process';
 import { access, readFile, writeFile } from 'node:fs/promises';
 import { getColor } from 'consola/utils';
@@ -20,6 +20,7 @@ const PNPM_SETTINGS_FIELDS = [
   "allowNonAppliedPatches",
   "auditConfig",
   "configDependencies",
+  "dangerouslyAllowAllBuilds",
   "executionEnv",
   "ignoredBuiltDependencies",
   "ignoredOptionalDependencies",
@@ -40,6 +41,7 @@ function resolveOptions(options = {}) {
     cleanNpmrc: options.cleanNpmrc ?? true,
     cleanPackageJson: options.cleanPackageJson ?? true,
     cwd: options.cwd ?? process.cwd(),
+    newlineBetween: options.newlineBetween ?? true,
     sortKeys: options.sortKeys ?? false,
     strategy: options.strategy ?? "merge",
     yarnResolutions: options.yarnResolutions ?? true
@@ -106,7 +108,7 @@ async function migratePnpmSettings(rawOptions = {}) {
   if (isPnpmWorkspaceExist) {
     const content = await fsReadFile(pnpmWorkspaceYamlPath);
     pnpmWorkspaceYamlIndent = detectIndent(content).amount;
-    pnpmWorkspaceYamlObject = load(content);
+    pnpmWorkspaceYamlObject = parse(content);
   }
   const pnpmSettingsInNpmrc = isNpmrcExist ? pick(await readNpmrc(npmrcPath), PNPM_SETTINGS_FIELDS) : {};
   if (!packageJsonObject.pnpm && (!options.yarnResolutions || !packageJsonObject.resolutions) && !Object.keys(pnpmSettingsInNpmrc).length) {
@@ -127,13 +129,20 @@ async function migratePnpmSettings(rawOptions = {}) {
     ...pnpmSettingsInNpmrc,
     ...pnpmSettingsInPackageJson
   });
-  await fsWriteFile(
-    pnpmWorkspaceYamlPath,
-    dump(pnpmWorkspaceResult, {
-      indent: pnpmWorkspaceYamlIndent,
-      sortKeys: options.sortKeys
-    })
-  );
+  const yamlDocument = new Document({
+    indent: pnpmWorkspaceYamlIndent,
+    sortMapEntries: options.sortKeys
+  });
+  Object.entries(pnpmWorkspaceResult).forEach(([key, value], index) => {
+    yamlDocument.add({ key, value });
+    if (options.newlineBetween && index < Object.keys(pnpmWorkspaceResult).length - 1) {
+      yamlDocument.add({
+        key: "",
+        value: null
+      });
+    }
+  });
+  await fsWriteFile(pnpmWorkspaceYamlPath, yamlDocument.toString());
   if (isNpmrcExist && options.cleanNpmrc) {
     await pruneNpmrc(npmrcPath);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm-settings-migrator",
   "type": "module",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Move pnpm settings from `pnpm` field in `package.json` and `.npmrc` file to `pnpm-workspace.yaml`",
   "keywords": [
     "migrator",
@@ -37,33 +37,32 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@ntnyq/utils": "^0.6.1",
-    "@pnpm/types": "^1000.2.1",
+    "@ntnyq/utils": "^0.7.0",
+    "@pnpm/types": "^1000.5.0",
     "cac": "^6.7.14",
     "camelcase-keys": "^9.1.3",
-    "consola": "^3.4.0",
+    "consola": "^3.4.2",
     "defu": "^6.1.4",
     "detect-indent": "^7.0.1",
-    "js-yaml": "^4.1.0",
     "pathe": "^2.0.3",
     "read-ini-file": "^4.0.0",
-    "uncase": "^0.0.4"
+    "uncase": "^0.1.0",
+    "yaml": "^2.7.1"
   },
   "devDependencies": {
-    "@ntnyq/eslint-config": "^4.0.0-beta.11",
+    "@ntnyq/eslint-config": "^4.2.0",
     "@ntnyq/prettier-config": "^2.0.0",
-    "@types/js-yaml": "^4.0.9",
-    "@types/node": "^22.13.9",
-    "bumpp": "^10.0.3",
-    "eslint": "^9.22.0",
+    "@types/node": "^22.15.17",
+    "bumpp": "^10.1.0",
+    "eslint": "^9.26.0",
     "husky": "^9.1.7",
     "nano-staged": "^0.8.0",
-    "npm-run-all2": "^7.0.2",
+    "npm-run-all2": "^8.0.1",
     "prettier": "^3.5.3",
-    "tsx": "^4.19.3",
-    "typescript": "^5.8.2",
+    "tsx": "^4.19.4",
+    "typescript": "^5.8.3",
     "unbuild": "^3.5.0",
-    "vitest": "^3.0.8"
+    "vitest": "^3.1.3"
   },
   "engines": {
     "node": ">=18.18.0"