diff --git a/data/lib/index.ts b/data/lib/index.ts index ba47ad03..e5b74224 100644 --- a/data/lib/index.ts +++ b/data/lib/index.ts @@ -1,11 +1,9 @@ import path from 'path'; -import { fileURLToPath } from 'url'; import fs from 'fs'; +import root from '@smogon/sprite-root'; -const __dirname = path.dirname(fileURLToPath(import.meta.url)); - -const libdir = path.join(__dirname, "../.."); +const libdir = path.join(root, "data"); export type SpecieEntry = { num: number, diff --git a/data/lib/tsconfig.json b/data/lib/tsconfig.json index e844c6fe..3ab3b81b 100644 --- a/data/lib/tsconfig.json +++ b/data/lib/tsconfig.json @@ -2,5 +2,8 @@ "extends": "../../tsconfig-base", "compilerOptions": { "outDir": "dist" - } + }, + "references": [ + {"path": "../../lib/root"} + ] } diff --git a/ps-items.sheet.mjs b/ps-items.sheet.mjs index 86c11a31..f3c2011b 100644 --- a/ps-items.sheet.mjs +++ b/ps-items.sheet.mjs @@ -1,9 +1,7 @@ import path from 'path'; import * as spritedata from '@smogon/sprite-data'; -import { fileURLToPath } from 'url'; - -const __dirname = path.dirname(fileURLToPath(import.meta.url)); +import root from '@smogon/sprite-root'; function toPSID(name) { return name.toLowerCase().replace(/[^a-z0-9]+/g, ''); @@ -531,7 +529,7 @@ const found = new Map; for (const [num, {sid, name}] of spritedata.itemEntries()) { const id = toPSID(name); - found.set(id, path.join(__dirname, "newsrc/minisprites/items", sid + ".png")); + found.set(id, path.join(root, "newsrc/minisprites/items", sid + ".png")); } const entries = []; diff --git a/ps-pokemon.sheet.mjs b/ps-pokemon.sheet.mjs index 820da302..41ef3271 100644 --- a/ps-pokemon.sheet.mjs +++ b/ps-pokemon.sheet.mjs @@ -1,11 +1,10 @@ import fs from 'fs'; import path from 'path'; -import {fileURLToPath} from 'url'; import * as spritedata from '@smogon/sprite-data'; -const __dirname = path.dirname(fileURLToPath(import.meta.url)); +import root from '@smogon/sprite-root'; -const srcDir = path.join(__dirname, "newsrc"); +const srcDir = path.join(root, "newsrc"); const spritesDir = path.join(srcDir, "minisprites/pokemon/gen6"); function toPSID(name) {