From e0b25ca8e0b1c913fe14e716957598ff7499d907 Mon Sep 17 00:00:00 2001 From: Zamiell <5511220+Zamiell@users.noreply.github.com> Date: Sun, 10 Nov 2024 08:13:32 -0500 Subject: [PATCH] Revert "chore: update isaacscript" This reverts commit 1011f9c8aa27f7321bcd250a4081849d021b161c. --- .gitattributes | 15 ++------- knip.config.js | 12 +++---- package-lock.json | 82 +++++++++++++++-------------------------------- package.json | 2 +- 4 files changed, 34 insertions(+), 77 deletions(-) diff --git a/.gitattributes b/.gitattributes index 4550af367..1ba41eb78 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,18 +1,7 @@ -# https://git-scm.com/docs/git-config/#Documentation/git-config.txt-coreautocrlf -# Default value: input -# Explicitly setting it to false prevents Git from changing line endings at any point, which can -# prevent issues when Windows users collaborate with MacOS/Linus users. +# Prevent Windows systems from cloning this repository with "\r\n" line endings. core.autocrlf=false -# https://git-scm.com/docs/git-config/#Documentation/git-config.txt-coreignoreCase -# Default value: false (on Linux machines) or true (on Windows machines) -# Explicitly setting it to false prevents the issue where Windows users cannot pull down -# casing-related file renames. -core.ignoreCase=false - -# https://git-scm.com/docs/git-config/#Documentation/git-config.txt-pullrebase -# Default value: false -# Setting this prevents spurious merge commits: +# Prevent people from making merge commits: # https://www.endoflineblog.com/gitflow-considered-harmful pull.rebase=true diff --git a/knip.config.js b/knip.config.js index 0ea1ac51e..d16a497bf 100644 --- a/knip.config.js +++ b/knip.config.js @@ -5,17 +5,15 @@ /** @type {import("knip").KnipConfig} */ const config = { - ignore: [ - "eslint.config.mjs", // ESLint is provided by "complete-lint". - "prettier.config.mjs", // Prettier is provided by "complete-lint". - ], - ignoreBinaries: [ - "tsx", // This is provided by "complete-lint". - ], + ignore: ["eslint.config.mjs", "prettier.config.mjs"], ignoreDependencies: [ "complete-lint", // This is a linting meta-package. + "complete-node", // This is provided by "complete-lint". "complete-tsconfig", // This is provided by "complete-lint". ], + ignoreBinaries: [ + "tsx", // This is provided by "complete-lint". + ], }; export default config; diff --git a/package-lock.json b/package-lock.json index b90fd0ded..b12512136 100644 --- a/package-lock.json +++ b/package-lock.json @@ -65,7 +65,7 @@ "complete-lint": "^1.9.0", "git-pull-run": "^1.4.0", "husky": "^9.1.6", - "isaacscript": "^5.2.3", + "isaacscript": "^5.0.3", "jest": "^29.7.0", "prettier-plugin-go-template": "^0.0.15", "stacktracify": "^1.0.4", @@ -93,11 +93,6 @@ "node": ">=6.0.0" } }, - "node_modules/@arktype/fs": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@arktype/fs/-/fs-0.18.0.tgz", - "integrity": "sha512-88Ljo54DsBwRAra7NM29GlROpsGWn4AukNkDzZFQ/BdWAM0LTQf3Q0+el7uY6p6qTO73RfHgucz5kxrL79BE/A==" - }, "node_modules/@babel/code-frame": { "version": "7.22.13", "dev": true, @@ -3855,9 +3850,9 @@ } }, "node_modules/complete-common": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/complete-common/-/complete-common-1.0.1.tgz", - "integrity": "sha512-GQH3sIJDBgYz6LbrXjwquKncuYF7O+eQTFw/pdBuyRyDHyPammFSFoV66G88WuN3/StV9hc2ufMX++fae0LfhA==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/complete-common/-/complete-common-1.0.0.tgz", + "integrity": "sha512-MZVGvb2Mm/86pVlRLgjHDaMfTL6XmqMn+6UVuTnJTnnmGoJ0C9SNu2JQB88kSx9iSRk1P/AC1phOSPLQ94thiQ==", "license": "MIT" }, "node_modules/complete-lint": { @@ -3887,24 +3882,26 @@ } }, "node_modules/complete-node": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/complete-node/-/complete-node-1.7.4.tgz", - "integrity": "sha512-10WL175BO0GbZpXO5CyASq3w/gpID0T/XdiL/muDm3e5tr36ACbasXyqX3ev990scBjgcqjhiv3HHzLF46OeQw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/complete-node/-/complete-node-1.5.0.tgz", + "integrity": "sha512-CNbDPV2OlEoen8GnfxjpaKBkX2dKgWD5fZDnyir1EPGwHpCmOC1FQBC2LjfFnccUrzRaoag391IfWOlulcoL0w==", "license": "MIT", "dependencies": { - "@arktype/fs": "^0.18.0", + "@arktype/fs": "^0.8.0", "chalk": "^5.3.0", "command-exists": "^1.2.9", "complete-common": "^1.0.0", "diff": "^7.0.0", "dotenv": "^16.4.5", - "execa": "^9.4.1", + "execa": "^9.3.1", "jsonc-parser": "^3.3.1", - "npm-check-updates": "^17.1.4", - "prettier": "^3.3.3", + "npm-check-updates": "^17.1.1", "zod": "^3.23.8" } }, + "node_modules/complete-node/node_modules/@arktype/fs": { + "version": "0.8.0" + }, "node_modules/complete-node/node_modules/chalk": { "version": "5.3.0", "license": "MIT", @@ -5571,9 +5568,7 @@ } }, "node_modules/execa": { - "version": "9.5.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-9.5.1.tgz", - "integrity": "sha512-QY5PPtSonnGwhhHDNI7+3RvY285c7iuJFFB+lU+oEzMY/gEGJ808owqJsrr8Otd1E/x07po1LkUBmdAc5duPAg==", + "version": "9.3.1", "license": "MIT", "dependencies": { "@sindresorhus/merge-streams": "^4.0.0", @@ -5583,7 +5578,7 @@ "human-signals": "^8.0.0", "is-plain-obj": "^4.1.0", "is-stream": "^4.0.1", - "npm-run-path": "^6.0.0", + "npm-run-path": "^5.2.0", "pretty-ms": "^9.0.0", "signal-exit": "^4.1.0", "strip-final-newline": "^4.0.0", @@ -5641,16 +5636,13 @@ } }, "node_modules/execa/node_modules/npm-run-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz", - "integrity": "sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==", + "version": "5.3.0", "license": "MIT", "dependencies": { - "path-key": "^4.0.0", - "unicorn-magic": "^0.3.0" + "path-key": "^4.0.0" }, "engines": { - "node": ">=18" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -5658,8 +5650,6 @@ }, "node_modules/execa/node_modules/path-key": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", "license": "MIT", "engines": { "node": ">=12" @@ -5966,9 +5956,7 @@ } }, "node_modules/figlet": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.8.0.tgz", - "integrity": "sha512-chzvGjd+Sp7KUvPHZv6EXV5Ir3Q7kYNpCr4aHrRW79qFtTefmQZNny+W1pW9kf5zeE6dikku2W50W/wAH2xWgw==", + "version": "1.7.0", "dev": true, "license": "MIT", "bin": { @@ -7348,9 +7336,7 @@ } }, "node_modules/isaacscript": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/isaacscript/-/isaacscript-5.2.3.tgz", - "integrity": "sha512-sQPCO3Axazdw2/IpAw4XIBuo5IyT+4x/gh8Kz5Jvn/q9OjLOZn8IQs9+lUpn/fqa5Q9vosPFJGLBC1+B4kjYIQ==", + "version": "5.0.3", "dev": true, "license": "GPL-3.0", "dependencies": { @@ -7359,9 +7345,9 @@ "ajv": "^8.17.1", "chalk": "^5.3.0", "commander": "^12.1.0", - "complete-common": "^1.0.1", - "complete-node": "^1.7.4", - "figlet": "^1.8.0", + "complete-common": "^1.0.0", + "complete-node": "^1.3.0", + "figlet": "^1.7.0", "jsonc-parser": "^3.3.1", "klaw-sync": "^6.0.0", "moment": "^2.30.1", @@ -7369,7 +7355,7 @@ "source-map": "^0.7.4", "source-map-support": "^0.5.21", "xml2js": "^0.6.2", - "yaml": "^2.6.0" + "yaml": "^2.5.1" }, "bin": { "isaacscript": "dist/main.js" @@ -9279,9 +9265,7 @@ } }, "node_modules/npm-check-updates": { - "version": "17.1.10", - "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.10.tgz", - "integrity": "sha512-GnN6KbUzC8BpwsRYJntuumgCiagZ0+xxorvUJM9m06d7AlyK9lm3iFsAsnXF3VAZZzpD5QjZvWBwNze61Vywkw==", + "version": "17.1.1", "license": "Apache-2.0", "bin": { "ncu": "build/cli.js", @@ -11583,18 +11567,6 @@ "version": "5.26.5", "license": "MIT" }, - "node_modules/unicorn-magic": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz", - "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==", - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/unidecode": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/unidecode/-/unidecode-1.1.0.tgz", @@ -11964,9 +11936,7 @@ "license": "ISC" }, "node_modules/yaml": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz", - "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==", + "version": "2.5.1", "license": "ISC", "bin": { "yaml": "bin.mjs" diff --git a/package.json b/package.json index 7175b5d75..39d94e349 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "complete-lint": "^1.9.0", "git-pull-run": "^1.4.0", "husky": "^9.1.6", - "isaacscript": "^5.2.3", + "isaacscript": "^5.0.3", "jest": "^29.7.0", "prettier-plugin-go-template": "^0.0.15", "stacktracify": "^1.0.4",