Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ export default defineConfig(
"no-useless-rename": "error",
"object-shorthand": "error",
"operator-assignment": "error",

// https://github.com/eslint-community/eslint-plugin-n/issues/472
"n/no-unpublished-bin": "off",
},
settings: { perfectionist: { partitionByComment: true, type: "natural" } },
},
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"main": "lib/index.js",
"bin": "bin/index.js",
"files": [
"bin/index.js",
"lib/"
],
"scripts": {
Expand Down Expand Up @@ -94,7 +93,7 @@
"eslint-plugin-jsonc": "2.21.0",
"eslint-plugin-markdown": "5.1.0",
"eslint-plugin-n": "17.23.1",
"eslint-plugin-package-json": "0.54.0",
"eslint-plugin-package-json": "0.85.0",
"eslint-plugin-perfectionist": "4.15.1",
"eslint-plugin-regexp": "2.10.0",
"eslint-plugin-yml": "1.19.0",
Expand Down
38 changes: 17 additions & 21 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/blocks/blockESLintNode.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ describe("blockESLintNode", () => {
"files": [
"**/*.{js,ts}",
],
"rules": [
{
"comment": "https://github.com/eslint-community/eslint-plugin-n/issues/472",
"entries": {
"n/no-unpublished-bin": "off",
},
},
],
},
{
"extends": [
Expand Down
9 changes: 9 additions & 0 deletions src/blocks/blockESLintNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ export const blockESLintNode = base.createBlock({
{
extends: ['n.configs["flat/recommended"]'],
files: [getScriptFileExtension(options)],
rules: [
{
comment:
"https://github.com/eslint-community/eslint-plugin-n/issues/472",
entries: {
"n/no-unpublished-bin": "off",
},
},
],
},
{
extends: ["tseslint.configs.disableTypeChecked"],
Expand Down
4 changes: 2 additions & 2 deletions src/blocks/blockPackageJson.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ describe("blockPackageJson", () => {
expect(creation).toMatchInlineSnapshot(`
{
"files": {
"package.json": "{"name":"test-repository","version":"0.0.0","description":"A very very very very very very very very very very very very very very very very long HTML-ish description ending with an emoji. 🧵","repository":{"type":"git","url":"git+https://github.com/test-owner/test-repository.git"},"author":{"email":"npm@email.com"},"type":"module","bin":"bin/index.js","files":["bin/index.js"],"engines":{"node":">=20.12.0"}}",
"package.json": "{"name":"test-repository","version":"0.0.0","description":"A very very very very very very very very very very very very very very very very long HTML-ish description ending with an emoji. 🧵","repository":{"type":"git","url":"git+https://github.com/test-owner/test-repository.git"},"author":{"email":"npm@email.com"},"type":"module","bin":"bin/index.js","engines":{"node":">=20.12.0"}}",
},
"scripts": [
{
Expand Down Expand Up @@ -275,7 +275,7 @@ describe("blockPackageJson", () => {
expect(creation).toMatchInlineSnapshot(`
{
"files": {
"package.json": "{"name":"test-repository","version":"0.0.0","description":"A very very very very very very very very very very very very very very very very long HTML-ish description ending with an emoji. 🧵","repository":{"type":"git","url":"git+https://github.com/test-owner/test-repository.git"},"author":{"email":"npm@email.com"},"type":"module","bin":{"absolute":"bin/absolute.js","relative":"./bin/relative.js"},"files":["bin/absolute.js","bin/relative.js"],"engines":{"node":">=20.12.0"}}",
"package.json": "{"name":"test-repository","version":"0.0.0","description":"A very very very very very very very very very very very very very very very very long HTML-ish description ending with an emoji. 🧵","repository":{"type":"git","url":"git+https://github.com/test-owner/test-repository.git"},"author":{"email":"npm@email.com"},"type":"module","bin":{"absolute":"bin/absolute.js","relative":"./bin/relative.js"},"engines":{"node":">=20.12.0"}}",
},
"scripts": [
{
Expand Down
18 changes: 5 additions & 13 deletions src/blocks/blockPackageJson.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,7 @@ export const blockPackageJson = base.createBlock({
...(options.pnpm && {
packageManager: `pnpm@${options.pnpm}`,
}),
files: processFiles([
...collectBinFiles(options.bin),
...(addons.properties.files ?? []),
]),
files: processFiles(addons.properties.files),
keywords: options.keywords,
name: options.repository,
repository: {
Expand Down Expand Up @@ -97,17 +94,12 @@ export const blockPackageJson = base.createBlock({
},
});

function collectBinFiles(bin: Record<string, string> | string | undefined) {
if (!bin) {
return [];
function processFiles(files: string[] | undefined) {
// If no files have been specified, we can skip the property altogether
if (!files?.length) {
return undefined;
}

const files = typeof bin === "object" ? Object.values(bin) : [bin];

return files.map((file) => file.replace(/^\.\//, ""));
}

function processFiles(files: string[]) {
// First sort so that shorter entries are first (e.g. "lib/")...
const sortedByLength = files
.filter(Boolean)
Expand Down