prettier-config-nick2bad4u 1.0.15 → 1.0.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -456,14 +456,14 @@ export const createConfig = (options = {}) => {
456
456
  if (Object.hasOwn(override, "options")) {
457
457
  const inheritedOptions = inheritedSourceOverride.options;
458
458
  const overrideOptions = override.options;
459
- inheritedOverride.options = {
460
- ...(typeof inheritedOptions === "object"
461
- ? inheritedOptions
462
- : {}),
463
- ...(typeof overrideOptions === "object"
464
- ? overrideOptions
465
- : {}),
466
- };
459
+ const mergedOptions = {};
460
+ if (typeof inheritedOptions === "object") {
461
+ Object.assign(mergedOptions, inheritedOptions);
462
+ }
463
+ if (typeof overrideOptions === "object") {
464
+ Object.assign(mergedOptions, overrideOptions);
465
+ }
466
+ inheritedOverride.options = mergedOptions;
467
467
  }
468
468
  else if (Object.hasOwn(inheritedSourceOverride, "options")) {
469
469
  const inheritedOptions = inheritedSourceOverride.options;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "$schema": "https://www.schemastore.org/package.json",
3
3
  "name": "prettier-config-nick2bad4u",
4
- "version": "1.0.15",
4
+ "version": "1.0.17",
5
5
  "private": false,
6
6
  "description": "Shared Prettier config for Nick2bad4u projects.",
7
7
  "keywords": [
@@ -48,28 +48,28 @@
48
48
  "preset.mjs"
49
49
  ],
50
50
  "scripts": {
51
- "build": "node scripts/clean-build-output.mjs && tsc -p tsconfig.build.json && prettier preset.mjs prettier.config.mjs index.d.ts prettier.config.d.mts --write",
52
- "changelog:generate": "git-cliff --config cliff.toml --output CHANGELOG.md",
53
- "changelog:preview": "git-cliff --config cliff.toml --unreleased",
54
- "changelog:release-notes": "git-cliff --config cliff.toml --current --strip all",
55
- "coverage": "vitest run --coverage",
56
- "lint": "cross-env NODE_OPTIONS=--max_old_space_size=8192 eslint . --cache --cache-strategy content --cache-location .cache/.eslintcache",
51
+ "build": "node scripts/clean-build-output.mjs && tsc -p tsconfig.build.json && npx prettier preset.mjs prettier.config.mjs index.d.ts prettier.config.d.mts --write",
52
+ "changelog:generate": "npx git-cliff --config cliff.toml --output CHANGELOG.md",
53
+ "changelog:preview": "npx git-cliff --config cliff.toml --unreleased",
54
+ "changelog:release-notes": "npx git-cliff --config cliff.toml --current --strip all",
55
+ "coverage": "npx vitest run --coverage",
56
+ "lint": "npx cross-env NODE_OPTIONS=--max_old_space_size=8192 npx eslint . --cache --cache-strategy content --cache-location .cache/.eslintcache",
57
57
  "lint:all": "npm run lint && npm run typecheck && npm run test && npm run lint:prettier && npm run lint:package && npm run lint:yaml && npm run lint:yamllint && npm run lint:gitleaks && npm run lint:secretlint",
58
58
  "lint:all:fix": "npm run lint:fix && npm run lint:prettier:fix && npm run lint:package:fix && npm run typecheck && npm run test && npm run lint:yaml:fix && npm run lint:secretlint",
59
- "lint:attw": "attw --pack . --profile esm-only",
59
+ "lint:attw": "npx attw --pack . --profile esm-only",
60
60
  "lint:fix": "npm run lint -- --fix",
61
61
  "lint:gitleaks": "gitleaks dir --config .gitleaks.toml .",
62
62
  "lint:package": "npm run lint:package-sort && npm run lint:package-json && npm run lint:package-check",
63
- "lint:package:fix": "sort-package-json package.json",
63
+ "lint:package:fix": "npx sort-package-json package.json",
64
64
  "lint:package-check": "npm run package:check && npm run lint:publint && npm run lint:attw",
65
65
  "lint:package-fix": "npm run lint:package:fix",
66
- "lint:package-json": "npmPkgJsonLint . --config .npmpackagejsonlintrc.json",
67
- "lint:package-sort": "sort-package-json --check package.json",
68
- "lint:prettier": "prettier . --log-level warn --cache --cache-location=.cache/.prettier-cache --cache-strategy=content --check",
69
- "lint:prettier:fix": "prettier . --log-level warn --cache --cache-location=.cache/.prettier-cache --cache-strategy=content --write",
70
- "lint:publint": "publint",
71
- "lint:secretlint": "secretlint --secretlintrc .secretlintrc.cjs --secretlintignore .gitignore \"**/*\"",
72
- "lint:yaml": "eslint --cache --cache-strategy content --cache-location .cache/.eslintcache \"**/*.{yml,yaml}\"",
66
+ "lint:package-json": "npx npmPkgJsonLint . --config .npmpackagejsonlintrc.json",
67
+ "lint:package-sort": "npx sort-package-json --check package.json",
68
+ "lint:prettier": "npx prettier . --log-level warn --cache --cache-location=.cache/.prettier-cache --cache-strategy=content --check",
69
+ "lint:prettier:fix": "npx prettier . --log-level warn --cache --cache-location=.cache/.prettier-cache --cache-strategy=content --write",
70
+ "lint:publint": "npx publint",
71
+ "lint:secretlint": "npx secretlint --secretlintrc .secretlintrc.cjs --secretlintignore .gitignore \"**/*\"",
72
+ "lint:yaml": "npx eslint --cache --cache-strategy content --cache-location .cache/.eslintcache \"**/*.{yml,yaml}\"",
73
73
  "lint:yaml:fix": "npm run lint:yaml -- --fix",
74
74
  "lint:yamllint": "yamllint -c .yamllint .",
75
75
  "package:check": "npm run build && npm pack --dry-run --ignore-scripts",
@@ -78,11 +78,12 @@
78
78
  "sync:node-version-files": "node scripts/sync-node-version-files.mjs",
79
79
  "sync:peer-prettier-range": "node scripts/sync-peer-prettier-range.mjs",
80
80
  "pretest": "npm run build",
81
- "test": "vitest run",
81
+ "test": "npx vitest run",
82
82
  "test:coverage": "npm run coverage",
83
- "typecheck": "tsc -p tsconfig.build.json --noEmit && tsc -p tsconfig.json --noEmit && tsc -p tsconfig.eslint.json --noEmit && tsc -p tsconfig.js.json --noEmit && tsc -p tsconfig.vitest-typecheck.json --noEmit",
83
+ "typecheck": "npx tsc -p tsconfig.build.json --noEmit && npx tsc -p tsconfig.json --noEmit && npx tsc -p tsconfig.eslint.json --noEmit && npx tsc -p tsconfig.js.json --noEmit && npx tsc -p tsconfig.vitest-typecheck.json --noEmit",
84
84
  "typecheck:all": "npm run typecheck",
85
- "types:update": "typesync",
85
+ "types:update": "npx typesync",
86
+ "update-actions": "npx actions-up --yes --style sha",
86
87
  "update-deps": "npx ncu -i --install never && npm update --force && npm install --force && npm run sync:peer-prettier-range && npm run sync:node-version-files",
87
88
  "verify": "npm run release:verify"
88
89
  },
@@ -108,20 +109,19 @@
108
109
  },
109
110
  "devDependencies": {
110
111
  "@arethetypeswrong/cli": "^0.18.3",
111
- "@codecov/bundle-analyzer": "^2.0.1",
112
112
  "@microsoft/tsdoc-config": "^0.18.1",
113
- "@types/node": "^25.9.2",
114
- "@vitest/coverage-v8": "^4.1.8",
113
+ "@types/node": "^25.9.3",
114
+ "@vitest/coverage-v8": "^4.1.9",
115
115
  "cross-env": "^10.1.0",
116
- "eslint": "^10.4.1",
117
- "eslint-config-nick2bad4u": "^1.2.8",
116
+ "eslint": "^10.5.0",
117
+ "eslint-config-nick2bad4u": "^1.2.15",
118
118
  "git-cliff": "^2.13.1",
119
119
  "gitleaks-config-nick2bad4u": "^1.0.2",
120
120
  "npm-check-updates": "^22.2.3",
121
- "npm-package-json-lint": "^10.4.0",
121
+ "npm-package-json-lint": "^10.4.1",
122
122
  "npm-package-json-lint-config-nick2bad4u": "^1.0.2",
123
123
  "picocolors": "^1.1.1",
124
- "prettier": "^3.8.3",
124
+ "prettier": "^3.8.4",
125
125
  "publint": "^0.3.21",
126
126
  "secretlint": "^13.0.2",
127
127
  "secretlint-config-nick2bad4u": "^1.1.0",
@@ -129,13 +129,13 @@
129
129
  "tsdoc-config-nick2bad4u": "^1.0.4",
130
130
  "typescript": "^6.0.3",
131
131
  "vite": "^8.0.16",
132
- "vitest": "^4.1.8",
132
+ "vitest": "^4.1.9",
133
133
  "yamllint-config-nick2bad4u": "^1.0.1"
134
134
  },
135
135
  "peerDependencies": {
136
- "prettier": "^3.0.0 || ^3.8.3"
136
+ "prettier": "^3.0.0 || ^3.8.4"
137
137
  },
138
- "packageManager": "npm@11.16.0",
138
+ "packageManager": "npm@11.17.0",
139
139
  "engines": {
140
140
  "node": ">=22.0.0"
141
141
  },