more merge conflict fixes

DestinyItemManager · Nov 29, 2023 · 755b8d7 · 755b8d7
1 parent 175a2cd
commit 755b8d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "generate-data-main": "dotenv node built/src/main.js",
     "generate-data-font": "dotenv node built/src/main.js generate-font-glyph-enums generate-symbols",
     "generate-font": "run-s build generate-data-font",
+    "generate-data": "run-s build generate-data-main"
   },
   "husky": {
     "hooks": {

diff --git a/src/main.ts b/src/main.ts
@@ -21,12 +21,7 @@ const prioritizedScripts = ['enums', 'season-info', 'source-info', 'watermark-in
 const toCompileOutputs = ['generated-enums.ts', 'd2-font-glyphs.ts', 'seasons_unfiltered.json'];
 const outputDirectories = ['data', 'output'];
 // These files should be copied verbatim from data/ to output/
-const copyDataToOutput = [
-  'legacy-triumphs.json',
-  'stat-effects.ts',
-  'd2-font-glyphs.ts',
-  'generated-enums.ts',
-];
+const copyDataToOutput = ['legacy-triumphs.json', 'd2-font-glyphs.ts', 'generated-enums.ts'];
 
 // Read all `generate-` files
 const scriptsDir = dirname(fileURLToPath(import.meta.url));