Skip to content

Commit

Permalink
chore: use complete tsconfigs
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zamiell
Zamiell committed Sep 11, 2024
1 parent e791c38 commit 39ddf55
Show file tree
Hide file tree
Showing 22 changed files with 116 additions and 60 deletions.
7 changes: 5 additions & 2 deletions packages/docs/scripts/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../../isaacscript-tsconfig/tsconfig.base.json",
"../../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

"include": ["*.ts", "*.mts"],
Expand Down
3 changes: 2 additions & 1 deletion packages/docs/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../isaacscript-tsconfig/tsconfig.base.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/facebook/docusaurus/blob/main/packages/docusaurus-tsconfig/tsconfig.json
"@docusaurus/tsconfig",
Expand Down
7 changes: 5 additions & 2 deletions packages/eslint-config-isaacscript/scripts/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../../isaacscript-tsconfig/tsconfig.base.json",
"../../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

"include": ["*.ts"],
Expand Down
7 changes: 5 additions & 2 deletions packages/eslint-config-isaacscript/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../isaacscript-tsconfig/tsconfig.base.json",
"../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

"include": ["./src/**/*.js"],
Expand Down
7 changes: 5 additions & 2 deletions packages/eslint-plugin-isaacscript/scripts/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../../isaacscript-tsconfig/tsconfig.base.json",
"../../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

"include": ["*.ts"],
Expand Down
7 changes: 5 additions & 2 deletions packages/eslint-plugin-isaacscript/tests/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../../isaacscript-tsconfig/tsconfig.base.json",
"../../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

"include": ["./**/*.ts"],
Expand Down
7 changes: 5 additions & 2 deletions packages/eslint-plugin-isaacscript/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../isaacscript-tsconfig/tsconfig.base.json",
"../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

// https://www.typescriptlang.org/docs/handbook/compiler-options.html
Expand Down
7 changes: 5 additions & 2 deletions packages/isaac-lua-polyfill/scripts/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../../isaacscript-tsconfig/tsconfig.base.json",
"../../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

"include": ["*.ts"],
Expand Down
7 changes: 5 additions & 2 deletions packages/isaac-lua-polyfill/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../isaacscript-tsconfig/tsconfig.base.json",
"../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

// https://www.typescriptlang.org/docs/handbook/compiler-options.html
Expand Down
7 changes: 5 additions & 2 deletions packages/isaac-typescript-definitions-repentogon/scripts/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../../isaacscript-tsconfig/tsconfig.base.json",
"../../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

"include": ["*.mts"],
Expand Down
7 changes: 5 additions & 2 deletions packages/isaac-typescript-definitions-repentogon/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/IsaacScript/isaacscript/main/packages/isaacscript-cli/schemas/tsconfig-isaacscript-schema.json",

"extends": [
"../isaacscript-tsconfig/tsconfig.base.json",
"../isaacscript-tsconfig/tsconfig.mod.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

// https://www.typescriptlang.org/docs/handbook/compiler-options.html
Expand Down
7 changes: 5 additions & 2 deletions packages/isaac-typescript-definitions/scripts/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../../isaacscript-tsconfig/tsconfig.base.json",
"../../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

"include": ["*.mts"],
Expand Down
7 changes: 5 additions & 2 deletions packages/isaac-typescript-definitions/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/IsaacScript/isaacscript/main/packages/isaacscript-cli/schemas/tsconfig-isaacscript-schema.json",

"extends": [
"../isaacscript-tsconfig/tsconfig.base.json",
"../isaacscript-tsconfig/tsconfig.mod.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

// https://www.typescriptlang.org/docs/handbook/compiler-options.html
Expand Down
7 changes: 5 additions & 2 deletions packages/isaacscript-cli/plugins/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../../isaacscript-tsconfig/tsconfig.base.json",
"../../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

"compilerOptions": {
Expand Down
38 changes: 18 additions & 20 deletions packages/isaacscript-cli/scripts/build.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import {
$,
$op,
buildScript,
fixMonorepoPackageDistDirectory,
getFileNamesInDirectory,
mkdir,
mv,
Expand All @@ -23,10 +22,10 @@ await buildScript(async (packageRoot) => {
copyIsaacScriptCommonFiles(packageRoot);

const promises = [
compile(packageRoot),
compile(),
compilePlugins(packageRoot),
generateJSONSchemaForTSConfigJSON(),
generateJSONSchemaForIsaacScriptJSON(),
compilePlugins(packageRoot),
];

await Promise.all(promises);
Expand Down Expand Up @@ -236,24 +235,8 @@ function getCopiedFileHeader(packageName: string): string {
`.trimStart();
}

async function compile(packageRoot: string) {
async function compile() {
await $`tsc`;
fixMonorepoPackageDistDirectory(packageRoot);
}

/** Generate the JSON schema for the special "isaacscript" section in "tsconfig.json". */
async function generateJSONSchemaForTSConfigJSON() {
const TSCONFIG_SCHEMA_PATH =
"schemas/tsconfig-isaacscript-section-schema.json";
await $`ts-json-schema-generator --path src/interfaces/IsaacScriptTSConfig.ts --tsconfig tsconfig.json --out ${TSCONFIG_SCHEMA_PATH}`;
await $`prettier ${TSCONFIG_SCHEMA_PATH} --write --log-level=warn`;
}

/** Generate the JSON schema for the "isaacscript.json" file. */
async function generateJSONSchemaForIsaacScriptJSON() {
const ISAACSCRIPT_SCHEMA_PATH = "schemas/isaacscript-schema.json";
await $`ts-json-schema-generator --path src/classes/Config.ts --tsconfig tsconfig.json --out ${ISAACSCRIPT_SCHEMA_PATH}`;
await $`prettier ${ISAACSCRIPT_SCHEMA_PATH} --write --log-level=warn`;
}

async function compilePlugins(packageRoot: string) {
Expand All @@ -274,3 +257,18 @@ function renamePluginJSToCJS(pluginsDirPath: string) {
}
}
}

/** Generate the JSON schema for the special "isaacscript" section in "tsconfig.json". */
async function generateJSONSchemaForTSConfigJSON() {
const TSCONFIG_SCHEMA_PATH =
"schemas/tsconfig-isaacscript-section-schema.json";
await $`ts-json-schema-generator --path src/interfaces/IsaacScriptTSConfig.ts --tsconfig tsconfig.json --out ${TSCONFIG_SCHEMA_PATH}`;
await $`prettier ${TSCONFIG_SCHEMA_PATH} --write --log-level=warn`;
}

/** Generate the JSON schema for the "isaacscript.json" file. */
async function generateJSONSchemaForIsaacScriptJSON() {
const ISAACSCRIPT_SCHEMA_PATH = "schemas/isaacscript-schema.json";
await $`ts-json-schema-generator --path src/classes/Config.ts --tsconfig tsconfig.json --out ${ISAACSCRIPT_SCHEMA_PATH}`;
await $`prettier ${ISAACSCRIPT_SCHEMA_PATH} --write --log-level=warn`;
}
7 changes: 5 additions & 2 deletions packages/isaacscript-cli/scripts/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../../isaacscript-tsconfig/tsconfig.base.json",
"../../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

"include": ["*.ts"],
Expand Down
7 changes: 5 additions & 2 deletions packages/isaacscript-cli/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../isaacscript-tsconfig/tsconfig.base.json",
"../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

// https://www.typescriptlang.org/docs/handbook/compiler-options.html
Expand Down
7 changes: 5 additions & 2 deletions packages/isaacscript-common/scripts/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../../isaacscript-tsconfig/tsconfig.base.json",
"../../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

"include": ["*.mts"],
Expand Down
7 changes: 5 additions & 2 deletions packages/isaacscript-common/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://raw.githubusercontent.com/IsaacScript/isaacscript/main/packages/isaacscript-cli/schemas/tsconfig-isaacscript-schema.json",

"extends": [
"../isaacscript-tsconfig/tsconfig.base.json",
"../isaacscript-tsconfig/tsconfig.mod.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

// https://www.typescriptlang.org/docs/handbook/compiler-options.html
Expand Down
7 changes: 5 additions & 2 deletions packages/isaacscript-spell/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"../isaacscript-tsconfig/tsconfig.base.json",
"../isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

"include": ["./scripts/*.ts"],
Expand Down
2 changes: 1 addition & 1 deletion packages/isaacscript-tsconfig/tsconfig.mod.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This is a tsconfig.json intended to be used by IsaacScript mods.
// This is a TypeScript configuration intended to be used by IsaacScript mods.
{
// https://www.typescriptlang.org/docs/handbook/compiler-options.html
"compilerOptions": {
Expand Down
7 changes: 5 additions & 2 deletions tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
"$schema": "https://raw.githubusercontent.com/complete-ts/complete/main/packages/complete-tsconfig/schemas/tsconfig-strict-schema.json",

"extends": [
"./packages/isaacscript-tsconfig/tsconfig.base.json",
"./packages/isaacscript-tsconfig/tsconfig.node.json",
// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.base.json
"complete-tsconfig/tsconfig.base.json",

// https://github.com/complete-ts/complete/blob/main/packages/complete-tsconfig/tsconfig.node.json
"complete-tsconfig/tsconfig.node.json",
],

"include": ["./scripts/*.ts"],
Expand Down

0 comments on commit 39ddf55

Please sign in to comment.