From 0d55bd689353768714950751015a6a54e31c03cf Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sat, 12 Jul 2025 11:30:19 -0700 Subject: [PATCH 1/6] Stuff --- .github/workflows/ci.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42c7f5438..750a21228 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,11 +26,18 @@ jobs: npx turbo build build-library env: NODE_ENV: production - - name: Lint and type-check + # - name: Lint and type-check + # run: | + # npx turbo lint type-check + # - name: Validate Grats generated files are up-to-date + # run: ./scripts/validate-grats.sh + - name: Run db tests manually run: | - npx turbo lint type-check - - name: Validate Grats generated files are up-to-date - run: ./scripts/validate-grats.sh + touch packages/skin-database/config.js + cd packages/skin-database + pnpm run test + env: + NODE_ENV: test - name: Run tests run: | touch packages/skin-database/config.js From 4260c28da8434a43b4f1bc4832f9f875bd54fb0e Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sat, 12 Jul 2025 11:42:22 -0700 Subject: [PATCH 2/6] Can we see the account being used? --- packages/skin-database/algolia.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/skin-database/algolia.ts b/packages/skin-database/algolia.ts index a75922b3f..f642af604 100644 --- a/packages/skin-database/algolia.ts +++ b/packages/skin-database/algolia.ts @@ -1,4 +1,6 @@ import { algoliasearch } from "algoliasearch"; import { ALGOLIA_ACCOUNT, ALGOLIA_KEY } from "./config"; +console.log("Algolia account:", JSON.stringify(ALGOLIA_ACCOUNT)); + export const client = algoliasearch(ALGOLIA_ACCOUNT, ALGOLIA_KEY); From f75d52c0c65d75cfde740188f06d4084a9cb8ddf Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sat, 12 Jul 2025 11:52:26 -0700 Subject: [PATCH 3/6] Throw early --- packages/skin-database/algolia.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/skin-database/algolia.ts b/packages/skin-database/algolia.ts index f642af604..9e9b08749 100644 --- a/packages/skin-database/algolia.ts +++ b/packages/skin-database/algolia.ts @@ -1,6 +1,8 @@ import { algoliasearch } from "algoliasearch"; import { ALGOLIA_ACCOUNT, ALGOLIA_KEY } from "./config"; -console.log("Algolia account:", JSON.stringify(ALGOLIA_ACCOUNT)); +if (!ALGOLIA_ACCOUNT || !ALGOLIA_KEY) { + throw new Error("Algolia account and key must be defined in config.js"); +} export const client = algoliasearch(ALGOLIA_ACCOUNT, ALGOLIA_KEY); From 1b1430337d6e684d89d944242ffc5802837f0ab9 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sat, 12 Jul 2025 12:43:50 -0700 Subject: [PATCH 4/6] Throw in jest-setup --- packages/skin-database/jest-setup.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/skin-database/jest-setup.js b/packages/skin-database/jest-setup.js index 8074da146..8dcbad208 100644 --- a/packages/skin-database/jest-setup.js +++ b/packages/skin-database/jest-setup.js @@ -3,6 +3,11 @@ import { TextEncoder, TextDecoder } from "util"; global.TextEncoder = TextEncoder; global.TextDecoder = TextDecoder; +// eslint-disable-next-line no-constant-condition +if (true) { + throw new Error("HELLO FROM jest-setup"); +} + // In the real app, these are set via .env process.env.LOCAL_FILE_CACHE = ""; process.env.CLOUDFLARE_PURGE_AUTH_KEY = ""; From 31546fd8d2dbf8857e7b779ad1dc872969e6538f Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sat, 12 Jul 2025 12:57:49 -0700 Subject: [PATCH 5/6] Log --- packages/skin-database/__mocks__/algolia.ts | 1 + packages/skin-database/algolia.ts | 4 +--- packages/skin-database/api/__tests__/graphql.test.ts | 3 +++ packages/skin-database/config.ts | 2 ++ packages/skin-database/jest-setup.js | 5 ++--- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/skin-database/__mocks__/algolia.ts b/packages/skin-database/__mocks__/algolia.ts index beeb377ad..986448ba4 100644 --- a/packages/skin-database/__mocks__/algolia.ts +++ b/packages/skin-database/__mocks__/algolia.ts @@ -1,3 +1,4 @@ +console.log("RAN ALGOLIA MOCK"); export const client = { partialUpdateObjects: jest.fn(), }; diff --git a/packages/skin-database/algolia.ts b/packages/skin-database/algolia.ts index 9e9b08749..79b85990d 100644 --- a/packages/skin-database/algolia.ts +++ b/packages/skin-database/algolia.ts @@ -1,8 +1,6 @@ import { algoliasearch } from "algoliasearch"; import { ALGOLIA_ACCOUNT, ALGOLIA_KEY } from "./config"; -if (!ALGOLIA_ACCOUNT || !ALGOLIA_KEY) { - throw new Error("Algolia account and key must be defined in config.js"); -} +console.log("RAN ALGOLIA", ALGOLIA_ACCOUNT, ALGOLIA_KEY); export const client = algoliasearch(ALGOLIA_ACCOUNT, ALGOLIA_KEY); diff --git a/packages/skin-database/api/__tests__/graphql.test.ts b/packages/skin-database/api/__tests__/graphql.test.ts index b84500e0e..ea9d9fbde 100644 --- a/packages/skin-database/api/__tests__/graphql.test.ts +++ b/packages/skin-database/api/__tests__/graphql.test.ts @@ -1,13 +1,16 @@ +console.log("RAN GRAPHQL TESTS"); import { knex } from "../../db"; import SkinModel from "../../data/SkinModel"; import * as S3 from "../../s3"; import { processUserUploads } from "../processUserUploads"; import UserContext from "../../data/UserContext"; import { client } from "../../algolia"; +console.log("RAN GRAPHQL TESTS ALGOLIA IMPORT"); import { createYogaInstance } from "../../app/graphql/yoga"; import { YogaServerInstance } from "graphql-yoga"; jest.mock("../../s3"); jest.mock("../../algolia"); +console.log("RAN GRAPHQL TESTS ALGOLIA MOCK"); jest.mock("../processUserUploads"); jest.mock("../auth"); diff --git a/packages/skin-database/config.ts b/packages/skin-database/config.ts index bd02ce020..4af2e4054 100644 --- a/packages/skin-database/config.ts +++ b/packages/skin-database/config.ts @@ -30,6 +30,8 @@ export const INSTAGRAM_ACCOUNT_ID = env("INSTAGRAM_ACCOUNT_ID"); export const SECRET = env("SECRET"); export const NODE_ENV = env("NODE_ENV") || "production"; +console.log("RAN CONFIG", ALGOLIA_ACCOUNT); + function env(key: string): string { const value = process.env[key]; if (!value) { diff --git a/packages/skin-database/jest-setup.js b/packages/skin-database/jest-setup.js index 8dcbad208..caa088c8a 100644 --- a/packages/skin-database/jest-setup.js +++ b/packages/skin-database/jest-setup.js @@ -4,9 +4,6 @@ global.TextEncoder = TextEncoder; global.TextDecoder = TextDecoder; // eslint-disable-next-line no-constant-condition -if (true) { - throw new Error("HELLO FROM jest-setup"); -} // In the real app, these are set via .env process.env.LOCAL_FILE_CACHE = ""; @@ -36,3 +33,5 @@ process.env.INSTAGRAM_ACCESS_TOKEN = ""; process.env.INSTAGRAM_ACCOUNT_ID = ""; process.env.MASTODON_ACCESS_TOKEN = ""; process.env.SECRET = ""; + +console.log("RAN JEST SETUP", process.env.ALGOLIA_INDEX); From b0d63e33a83379cfcc0190ee2a492370a61b654a Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sat, 12 Jul 2025 13:05:43 -0700 Subject: [PATCH 6/6] No touching --- .github/workflows/ci.yml | 2 -- packages/skin-database/data/skins.ts | 1 + packages/skin-database/discord-bot/.gitignore | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 750a21228..29c0b3331 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,14 +33,12 @@ jobs: # run: ./scripts/validate-grats.sh - name: Run db tests manually run: | - touch packages/skin-database/config.js cd packages/skin-database pnpm run test env: NODE_ENV: test - name: Run tests run: | - touch packages/skin-database/config.js npx turbo test --no-cache -- --maxWorkers=2 env: NODE_ENV: test diff --git a/packages/skin-database/data/skins.ts b/packages/skin-database/data/skins.ts index c8be20df1..5af095528 100644 --- a/packages/skin-database/data/skins.ts +++ b/packages/skin-database/data/skins.ts @@ -1,4 +1,5 @@ import { ALGOLIA_INDEX } from "../config"; +console.log("RAN skins.ts", ALGOLIA_INDEX); import { knex } from "../db"; import path from "path"; import md5Hash from "md5"; diff --git a/packages/skin-database/discord-bot/.gitignore b/packages/skin-database/discord-bot/.gitignore index 000abf2e0..40b878db5 100644 --- a/packages/skin-database/discord-bot/.gitignore +++ b/packages/skin-database/discord-bot/.gitignore @@ -1,2 +1 @@ -config.js node_modules/ \ No newline at end of file