Skip to content

Commit 6239b15

Browse files
committed
chore: squash 3 commits
1 parent bc109d6 commit 6239b15

File tree

6 files changed

+8
-16
lines changed

6 files changed

+8
-16
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ tsconfig*.json linguist-language=JSON-with-Comments
3434
package-lock.json linguist-generated=true
3535
yarn.lock linguist-generated=true
3636
pnpm-lock.yaml linguist-generated=true
37-
bun.lockb linguist-generated=true
37+
bun.lock linguist-generated=true
3838

3939
# @template-customization-start
4040

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"**/.yarn/": true,
3737
"**/dist/": true,
3838
"**/node_modules/": true,
39-
"bun.lockb": true,
39+
"bun.lock": true,
4040
"LICENSE": true,
4141
"package-lock.json": true,
4242
"pnpm-lock.yaml": true,

cspell.config.jsonc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"*.svg",
1515
".git/**",
1616
".yarn/**",
17-
"bun.lockb",
17+
"bun.lock",
1818
"dist/**",
1919
"LICENSE",
2020
"node_modules/**",

packages/isaacscript-cli/src/commands/check/check.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {
1717
ACTION_YML,
1818
ACTION_YML_TEMPLATE_PATH,
1919
CWD,
20-
TEMPLATES_DIR,
2120
TEMPLATES_DYNAMIC_DIR,
2221
TEMPLATES_STATIC_DIR,
2322
} from "../../constants.js";
@@ -53,15 +52,15 @@ export const checkCommand = new Command()
5352
)
5453
.option("-v, --verbose", "Enable verbose output.", false)
5554
.action((options) => {
56-
check(options, false);
55+
check(options);
5756
});
5857

5958
// eslint-disable-next-line @typescript-eslint/no-unused-vars
6059
const checkOptions = checkCommand.opts();
6160
// The options are identical for both, so we do not create a union.
6261
type CheckOptions = typeof checkOptions;
6362

64-
function check(options: CheckOptions, typeScript: boolean) {
63+
function check(options: CheckOptions) {
6564
const { verbose } = options;
6665

6766
let oneOrMoreErrors = false;
@@ -76,14 +75,7 @@ function check(options: CheckOptions, typeScript: boolean) {
7675
oneOrMoreErrors = true;
7776
}
7877

79-
// Second, check the files that are specific to either a TypeScript project or an IsaacScript mod.
80-
const staticDirSuffix = typeScript ? "ts" : "mod";
81-
const staticDirPath = path.join(TEMPLATES_DIR, `static-${staticDirSuffix}`);
82-
if (checkTemplateDirectory(staticDirPath, ignoreFileNamesSet, verbose)) {
83-
oneOrMoreErrors = true;
84-
}
85-
86-
// Third, check dynamic files that require specific logic.
78+
// Second, check dynamic files that require specific logic.
8779
if (checkIndividualFiles(ignoreFileNamesSet, verbose)) {
8880
oneOrMoreErrors = true;
8981
}

packages/isaacscript-cli/src/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const WATCHER_MOD_NAME = "isaacscript-watcher";
4343
export const WATCHER_MOD_SOURCE_PATH = path.join(REPO_ROOT, WATCHER_MOD_NAME);
4444

4545
// `isaacscript/file-templates`
46-
export const TEMPLATES_DIR = path.join(REPO_ROOT, "file-templates");
46+
const TEMPLATES_DIR = path.join(REPO_ROOT, "file-templates");
4747

4848
// `isaacscript/file-templates/static`
4949
export const TEMPLATES_STATIC_DIR = path.join(TEMPLATES_DIR, "static");

packages/isaacscript-cli/src/git.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ If you don't want to initialize a Git repository for this project, press enter t
108108
* If the GitHub CLI is installed, we can derive the user's GitHub username from their YAML
109109
* configuration.
110110
*/
111-
export async function getGitHubUsername(): Promise<string | undefined> {
111+
async function getGitHubUsername(): Promise<string | undefined> {
112112
const ghExists = await commandExists("gh");
113113
if (!ghExists) {
114114
return undefined;

0 commit comments

Comments
 (0)