diff --git a/package-lock.json b/package-lock.json index dde7aa3..e40d30a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,13 +25,14 @@ "fs-extra": "^9.1.0", "gts": "^3.1.0", "jasmine": "^3.6.4", - "kolmafia": "npm:kolmafia-types@0.0.6", "kolmafia-stubs": "^0.1.0", + "kolmafia-types": "^0.1.1", "mock-require": "^3.0.3", "rollup": "^2.41.2", "rollup-plugin-copy": "^3.4.0", "simple-git": "^2.36.2", "ts-node": "^9.1.1", + "tsconfig-paths": "^3.9.0", "typescript": "^4.2.3" } }, @@ -363,6 +364,12 @@ "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==", "dev": true }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "dev": true + }, "node_modules/@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -2533,17 +2540,6 @@ "node": ">=0.10.0" } }, - "node_modules/kolmafia": { - "name": "kolmafia-types", - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/kolmafia-types/-/kolmafia-types-0.0.6.tgz", - "integrity": "sha512-ZYUtylAfl5ArC/ld3Co9+warjoSQmzifbk6wklGDElanXoN/zvIFA+ObmhQRtccKxi2f1usCVjKOMV5bTAxqlQ==", - "dev": true, - "engines": { - "npm": ">= 6.9.0", - "yarn": ">= 0.17.0" - } - }, "node_modules/kolmafia-stubs": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/kolmafia-stubs/-/kolmafia-stubs-0.1.0.tgz", @@ -2557,6 +2553,17 @@ "node": ">=10" } }, + "node_modules/kolmafia-types": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/kolmafia-types/-/kolmafia-types-0.1.1.tgz", + "integrity": "sha512-zgiHFQUzDxmseJ/mucVFkZeAhsBTXSGhtUy3ag5j26xr1ZtZHmoWHHrZnzSrSGG6fgAl8hWFjm1PJR5ObuMl+Q==", + "dev": true, + "engines": { + "node": ">= 11.14 || ^10.17", + "npm": ">= 6.9.0", + "yarn": ">= 0.17.0" + } + }, "node_modules/kolmafia-util": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/kolmafia-util/-/kolmafia-util-0.1.2.tgz", @@ -3793,6 +3800,15 @@ "node": ">=8" } }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -3945,6 +3961,30 @@ "node": ">=10.0.0" } }, + "node_modules/tsconfig-paths": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", + "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "dev": true, + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.0", + "strip-bom": "^3.0.0" + } + }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, "node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -4529,6 +4569,12 @@ "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==", "dev": true }, + "@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "dev": true + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -6299,12 +6345,6 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, - "kolmafia": { - "version": "npm:kolmafia-types@0.0.6", - "resolved": "https://registry.npmjs.org/kolmafia-types/-/kolmafia-types-0.0.6.tgz", - "integrity": "sha512-ZYUtylAfl5ArC/ld3Co9+warjoSQmzifbk6wklGDElanXoN/zvIFA+ObmhQRtccKxi2f1usCVjKOMV5bTAxqlQ==", - "dev": true - }, "kolmafia-stubs": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/kolmafia-stubs/-/kolmafia-stubs-0.1.0.tgz", @@ -6315,6 +6355,12 @@ "xmldom": "^0.5.0" } }, + "kolmafia-types": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/kolmafia-types/-/kolmafia-types-0.1.1.tgz", + "integrity": "sha512-zgiHFQUzDxmseJ/mucVFkZeAhsBTXSGhtUy3ag5j26xr1ZtZHmoWHHrZnzSrSGG6fgAl8hWFjm1PJR5ObuMl+Q==", + "dev": true + }, "kolmafia-util": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/kolmafia-util/-/kolmafia-util-0.1.2.tgz", @@ -7308,6 +7354,12 @@ "ansi-regex": "^5.0.0" } }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, "strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -7426,6 +7478,29 @@ "yn": "3.1.1" } }, + "tsconfig-paths": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", + "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "dev": true, + "requires": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + } + } + }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", diff --git a/package.json b/package.json index 1f4b9f9..9ab2148 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "lint": "gts lint", "prerelease": "npm run clean && npm run build", "release": "ts-node ./node-scripts/release-to-branch.ts", - "test": "jasmine --require=ts-node/register", + "test": "jasmine --require=tsconfig-paths/register --require=ts-node/register", "posttest": "npm run lint" }, "repository": { @@ -41,13 +41,14 @@ "fs-extra": "^9.1.0", "gts": "^3.1.0", "jasmine": "^3.6.4", - "kolmafia": "npm:kolmafia-types@0.0.6", "kolmafia-stubs": "^0.1.0", + "kolmafia-types": "^0.1.1", "mock-require": "^3.0.3", "rollup": "^2.41.2", "rollup-plugin-copy": "^3.4.0", "simple-git": "^2.36.2", "ts-node": "^9.1.1", + "tsconfig-paths": "^3.9.0", "typescript": "^4.2.3" }, "dependencies": { diff --git a/tsconfig.base.json b/tsconfig.base.json index 500339a..e0cdc36 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -3,6 +3,8 @@ { "extends": "./node_modules/gts/tsconfig-google.json", "compilerOptions": { + // Needed for paths field + "baseUrl": ".", "composite": true, // Import CommonJS modules using standard ESM syntax "esModuleInterop": true, @@ -11,6 +13,9 @@ "jsxFactory": "h", "jsxFragmentFactory": "null", "outDir": "build", + "paths": { + "kolmafia": ["./node_modules/kolmafia-types"] + }, "rootDir": "." } }