Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ran ncu -u (March 18th) #1996

Merged
merged 8 commits into from
Mar 18, 2025
+503 −520
Merged

fix: ran ncu -u (March 18th) #1996

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
38e35ab
fix: ran ncu -u (March 18th)
JoshuaKGoldberg Mar 18, 2025
f70161d
fix: packageJson.configs.recommended
JoshuaKGoldberg Mar 18, 2025
4fa8975
Actually fix the block
JoshuaKGoldberg Mar 18, 2025
726432e
no need to mock resolveBin
JoshuaKGoldberg Mar 18, 2025
372a5a3
unused vi
JoshuaKGoldberg Mar 18, 2025
45dbd5f
fix: allow reading package.json data to be Error
JoshuaKGoldberg Mar 18, 2025
672b297
||, not ??, for empty string
JoshuaKGoldberg Mar 18, 2025
2a7d13e
blank line
JoshuaKGoldberg Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eslint.config.js
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ import jsdoc from "eslint-plugin-jsdoc";
import jsonc from "eslint-plugin-jsonc";
import markdown from "eslint-plugin-markdown";
import n from "eslint-plugin-n";
import packageJson from "eslint-plugin-package-json/configs/recommended";
import packageJson from "eslint-plugin-package-json";
import perfectionist from "eslint-plugin-perfectionist";
import * as regexp from "eslint-plugin-regexp";
import yml from "eslint-plugin-yml";
@@ -34,7 +34,7 @@ export default tseslint.config(
jsonc.configs["flat/recommended-with-json"],
markdown.configs.recommended,
n.configs["flat/recommended"],
packageJson,
packageJson.configs.recommended,
perfectionist.configs["recommended-natural"],
regexp.configs["flat/recommended"],
{
2 changes: 1 addition & 1 deletion knip.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://unpkg.com/knip@5.45.0/schema.json",
"$schema": "https://unpkg.com/knip@5.46.0/schema.json",
"entry": ["src/index.ts", "src/**/*.test.*"],
"ignoreDependencies": [
"all-contributors-cli",
24 changes: 12 additions & 12 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -67,36 +67,36 @@
},
"devDependencies": {
"@eslint-community/eslint-plugin-eslint-comments": "4.4.1",
"@eslint/js": "9.21.0",
"@eslint/js": "9.22.0",
"@prettier/sync": "^0.5.2",
"@release-it/conventional-changelog": "10.0.0",
"@types/eslint-plugin-markdown": "2.0.2",
"@types/git-url-parse": "9.0.3",
"@types/html-to-text": "9.0.4",
"@types/js-yaml": "4.0.9",
"@types/lodash": "4.17.16",
"@types/node": "22.13.9",
"@types/node": "22.13.10",
"@types/parse-author": "2.0.3",
"@vitest/coverage-v8": "3.0.7",
"@vitest/coverage-v8": "3.0.9",
"@vitest/eslint-plugin": "1.1.38",
"all-contributors-cli": "6.26.1",
"bingo-requests": "^0.5.4",
"bingo-stratum-testers": "0.5.6",
"bingo-testers": "^0.5.6",
"console-fail-test": "0.5.0",
"cspell": "8.17.5",
"eslint": "9.21.0",
"eslint-plugin-jsdoc": "50.6.3",
"eslint": "9.22.0",
"eslint-plugin-jsdoc": "50.6.8",
"eslint-plugin-jsonc": "2.19.1",
"eslint-plugin-markdown": "5.1.0",
"eslint-plugin-n": "17.16.2",
"eslint-plugin-package-json": "0.26.2",
"eslint-plugin-perfectionist": "4.10.0",
"eslint-plugin-package-json": "0.29.0",
"eslint-plugin-perfectionist": "4.10.1",
"eslint-plugin-regexp": "2.7.0",
"eslint-plugin-yml": "1.17.0",
"husky": "9.1.7",
"knip": "5.45.0",
"lint-staged": "15.4.3",
"knip": "5.46.0",
"lint-staged": "15.5.0",
"lodash": "^4.17.21",
"markdownlint": "0.37.4",
"markdownlint-cli": "0.44.0",
@@ -108,10 +108,10 @@
"sentences-per-line": "0.3.0",
"tsup": "8.4.0",
"typescript": "5.8.2",
"typescript-eslint": "8.26.0",
"vitest": "3.0.7"
"typescript-eslint": "8.26.1",
"vitest": "3.0.9"
},
"packageManager": "[email protected].0",
"packageManager": "[email protected].4",
"engines": {
"node": ">=18.3.0"
},
872 changes: 405 additions & 467 deletions pnpm-lock.yaml
View file

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions src/blocks/blockESLint.test.ts
View file
Original file line number Diff line number Diff line change
@@ -68,10 +68,10 @@ describe("blockESLint", () => {
"addons": {
"properties": {
"devDependencies": {
"@eslint/js": "9.21.0",
"@types/node": "22.13.9",
"eslint": "9.21.0",
"typescript-eslint": "8.26.0",
"@eslint/js": "9.22.0",
"@types/node": "22.13.10",
"eslint": "9.22.0",
"typescript-eslint": "8.26.1",
},
"scripts": {
"lint": "eslint . --max-warnings 0",
@@ -197,10 +197,10 @@ describe("blockESLint", () => {
"addons": {
"properties": {
"devDependencies": {
"@eslint/js": "9.21.0",
"@types/node": "22.13.9",
"eslint": "9.21.0",
"typescript-eslint": "8.26.0",
"@eslint/js": "9.22.0",
"@types/node": "22.13.10",
"eslint": "9.22.0",
"typescript-eslint": "8.26.1",
},
"scripts": {
"lint": "eslint . --max-warnings 0",
@@ -369,13 +369,13 @@ describe("blockESLint", () => {
"addons": {
"properties": {
"devDependencies": {
"@eslint/js": "9.21.0",
"@eslint/js": "9.22.0",
"@types/eslint-plugin-markdown": "2.0.2",
"@types/node": "22.13.9",
"eslint": "9.21.0",
"@types/node": "22.13.10",
"eslint": "9.22.0",
"eslint-plugin-markdown": "5.1.0",
"eslint-plugin-regexp": "2.7.0",
"typescript-eslint": "8.26.0",
"typescript-eslint": "8.26.1",
},
"scripts": {
"lint": "eslint . --max-warnings 0",
@@ -515,10 +515,10 @@ describe("blockESLint", () => {
"addons": {
"properties": {
"devDependencies": {
"@eslint/js": "9.21.0",
"@types/node": "22.13.9",
"eslint": "9.21.0",
"typescript-eslint": "8.26.0",
"@eslint/js": "9.22.0",
"@types/node": "22.13.10",
"eslint": "9.22.0",
"typescript-eslint": "8.26.1",
},
"scripts": {
"lint": "eslint . --max-warnings 0",
34 changes: 34 additions & 0 deletions src/blocks/blockESLintPackageJson.test.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { testBlock } from "bingo-stratum-testers";
import { describe, expect, test } from "vitest";

import { blockESLintPackageJson } from "./blockESLintPackageJson.js";
import { optionsBase } from "./options.fakes.js";

describe("blockESLintPackageJson", () => {
test("production", () => {
const creation = testBlock(blockESLintPackageJson, {
options: optionsBase,
});

expect(creation).toMatchInlineSnapshot(`
{
"addons": [
{
"addons": {
"extensions": [
"packageJson.configs.recommended",
],
"imports": [
{
"source": "eslint-plugin-package-json",
"specifier": "packageJson",
},
],
},
"block": [Function],
},
],
}
`);
});
});
4 changes: 2 additions & 2 deletions src/blocks/blockESLintPackageJson.ts
View file
Original file line number Diff line number Diff line change
@@ -9,10 +9,10 @@ export const blockESLintPackageJson = base.createBlock({
return {
addons: [
blockESLint({
extensions: ["packageJson"],
extensions: ["packageJson.configs.recommended"],
imports: [
{
source: "eslint-plugin-package-json/configs/recommended",
source: "eslint-plugin-package-json",
specifier: "packageJson",
},
],
12 changes: 6 additions & 6 deletions src/blocks/blockKnip.test.ts
View file
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ describe("blockKnip", () => {
"addons": {
"properties": {
"devDependencies": {
"knip": "5.45.0",
"knip": "5.46.0",
},
"scripts": {
"lint:knip": "knip",
@@ -61,7 +61,7 @@ describe("blockKnip", () => {
},
],
"files": {
"knip.json": "{"$schema":"https://unpkg.com/knip@5.45.0/schema.json","entry":["src/index.ts","src/**/*.test.*"],"ignoreExportsUsedInFile":{"interface":true,"type":true},"project":["src/**/*.ts"]}",
"knip.json": "{"$schema":"https://unpkg.com/knip@5.46.0/schema.json","entry":["src/index.ts","src/**/*.test.*"],"ignoreExportsUsedInFile":{"interface":true,"type":true},"project":["src/**/*.ts"]}",
},
}
`);
@@ -111,7 +111,7 @@ describe("blockKnip", () => {
"addons": {
"properties": {
"devDependencies": {
"knip": "5.45.0",
"knip": "5.46.0",
},
"scripts": {
"lint:knip": "knip",
@@ -122,7 +122,7 @@ describe("blockKnip", () => {
},
],
"files": {
"knip.json": "{"$schema":"https://unpkg.com/knip@5.45.0/schema.json","entry":["src/index.ts","src/**/*.test.*"],"ignoreDependencies":["abc","def"],"ignoreExportsUsedInFile":{"interface":true,"type":true},"project":["src/**/*.ts"]}",
"knip.json": "{"$schema":"https://unpkg.com/knip@5.46.0/schema.json","entry":["src/index.ts","src/**/*.test.*"],"ignoreDependencies":["abc","def"],"ignoreExportsUsedInFile":{"interface":true,"type":true},"project":["src/**/*.ts"]}",
},
}
`);
@@ -170,7 +170,7 @@ describe("blockKnip", () => {
"addons": {
"properties": {
"devDependencies": {
"knip": "5.45.0",
"knip": "5.46.0",
},
"scripts": {
"lint:knip": "knip",
@@ -181,7 +181,7 @@ describe("blockKnip", () => {
},
],
"files": {
"knip.json": "{"$schema":"https://unpkg.com/knip@5.45.0/schema.json","entry":["src/index.ts","src/**/*.test.*"],"ignoreExportsUsedInFile":{"interface":true,"type":true},"project":["src/**/*.ts"]}",
"knip.json": "{"$schema":"https://unpkg.com/knip@5.46.0/schema.json","entry":["src/index.ts","src/**/*.test.*"],"ignoreExportsUsedInFile":{"interface":true,"type":true},"project":["src/**/*.ts"]}",
},
"scripts": [
{
6 changes: 3 additions & 3 deletions src/blocks/blockPrettier.test.ts
View file
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ describe("blockPrettier", () => {
"properties": {
"devDependencies": {
"husky": "9.1.7",
"lint-staged": "15.4.3",
"lint-staged": "15.5.0",
"prettier": "^3.5.3",
},
"lint-staged": {
@@ -172,7 +172,7 @@ describe("blockPrettier", () => {
"properties": {
"devDependencies": {
"husky": "9.1.7",
"lint-staged": "15.4.3",
"lint-staged": "15.5.0",
"prettier": "^3.5.3",
},
"lint-staged": {
@@ -299,7 +299,7 @@ describe("blockPrettier", () => {
"properties": {
"devDependencies": {
"husky": "9.1.7",
"lint-staged": "15.4.3",
"lint-staged": "15.5.0",
"prettier": "^3.5.3",
"prettier-plugin-curly": "0.3.1",
"prettier-plugin-packagejson": "2.5.10",
12 changes: 6 additions & 6 deletions src/blocks/blockVitest.test.ts
View file
Original file line number Diff line number Diff line change
@@ -169,10 +169,10 @@ describe("blockVitest", () => {
"addons": {
"properties": {
"devDependencies": {
"@vitest/coverage-v8": "3.0.7",
"@vitest/coverage-v8": "3.0.9",
"@vitest/eslint-plugin": "1.1.38",
"console-fail-test": "0.5.0",
"vitest": "3.0.7",
"vitest": "3.0.9",
},
"scripts": {
"test": "vitest",
@@ -407,10 +407,10 @@ describe("blockVitest", () => {
"addons": {
"properties": {
"devDependencies": {
"@vitest/coverage-v8": "3.0.7",
"@vitest/coverage-v8": "3.0.9",
"@vitest/eslint-plugin": "1.1.38",
"console-fail-test": "0.5.0",
"vitest": "3.0.7",
"vitest": "3.0.9",
},
"scripts": {
"test": "vitest",
@@ -666,10 +666,10 @@ describe("blockVitest", () => {
"addons": {
"properties": {
"devDependencies": {
"@vitest/coverage-v8": "3.0.7",
"@vitest/coverage-v8": "3.0.9",
"@vitest/eslint-plugin": "1.1.38",
"console-fail-test": "0.5.0",
"vitest": "3.0.7",
"vitest": "3.0.9",
},
"scripts": {
"test": "vitest",
12 changes: 10 additions & 2 deletions src/options/readPackageDataFull.test.ts
View file
Original file line number Diff line number Diff line change
@@ -3,8 +3,16 @@ import { describe, expect, it, vi } from "vitest";
import { readPackageDataFull } from "./readPackageDataFull.js";

describe(readPackageDataFull, () => {
it("returns {} when there is no package.json", async () => {
const take = vi.fn().mockResolvedValueOnce(undefined);
it("returns {} when reading package.json results in an error", async () => {
const take = vi.fn().mockResolvedValueOnce(new Error("Oh no!"));

const actual = await readPackageDataFull(take);

expect(actual).toEqual({});
});

it("returns {} when package.json is empty", async () => {
const take = vi.fn().mockResolvedValueOnce("");

const actual = await readPackageDataFull(take);

9 changes: 6 additions & 3 deletions src/options/readPackageDataFull.ts
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,16 @@ import { TakeInput } from "bingo";
import { inputFromFileJSON } from "input-from-file-json";

import { PartialPackageData } from "../types.js";
import { swallowError } from "../utils/swallowError.js";

export async function readPackageDataFull(
take: TakeInput,
): Promise<PartialPackageData> {
return (
(await take(inputFromFileJSON, {
filePath: "./package.json",
})) ?? {}
swallowError(
await take(inputFromFileJSON, {
filePath: "./package.json",
}),
) || {}
);
}