test updates, env var cleanup

Author: kremalicious

.env.sample

@@ -1,8 +1,8 @@
 GITHUB_TOKEN=xxx
 ADOBE_ID=xxx
+UMAMI_SCRIPT_URL=xxx
+UMAMI_WEBSITE_ID=xxx
+
 PUBLIC_MAPBOX_ACCESS_TOKEN=xxx
-PUBLIC_UMAMI_SCRIPT_URL=xxx
-PUBLIC_UMAMI_WEBSITE_ID=xxx
-PUBLIC_INFURA_ID=xxx
 PUBLIC_WALLETCONNECT_ID="xxx"
 PUBLIC_WEB3_API_URL="xxx"

.github/workflows/ci.yml

@@ -11,10 +11,9 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   ADOBE_ID: ${{ secrets.ADOBE_ID }}
+  UMAMI_SCRIPT_URL: ${{ secrets.UMAMI_SCRIPT_URL }}
+  UMAMI_WEBSITE_ID: ${{ secrets.UMAMI_WEBSITE_ID }}
   PUBLIC_MAPBOX_ACCESS_TOKEN: ${{ secrets.GATSBY_MAPBOX_ACCESS_TOKEN }}
-  PUBLIC_UMAMI_SCRIPT_URL: ${{ secrets.GATSBY_UMAMI_SCRIPT_URL }}
-  PUBLIC_UMAMI_WEBSITE_ID: ${{ secrets.GATSBY_UMAMI_WEBSITE_ID }}
-  PUBLIC_INFURA_ID: ${{ secrets.GATSBY_INFURA_ID }}
   PUBLIC_WALLETCONNECT_ID: ${{ secrets.GATSBY_WALLETCONNECT_ID }}
   PUBLIC_WEB3_API_URL: ${{ secrets.PUBLIC_WEB3_API_URL }}
 

AGENTS.md

@@ -30,12 +30,6 @@ you are a senior programmer with expert-level experience in typescript, bun, bio
 - If you do not know or are not sure about the answer, say so, instead of guessing.
 - If you're unsure, ask me for help or more input.
 
-## Dependencies and libraries
-
-- when adding new dependencies always use the latest version for each dependency
-- prefer using least amount of dependencies for features suggested
-- prioritize small, minimal, focused, and well-maintained libraries when introducing new dependencies
-
 ## Error Handling and Validation
 
 - Prioritize error handling and edge cases:
@@ -85,14 +79,3 @@ you are a senior programmer with expert-level experience in typescript, bun, bio
   - Use an object to return results.
   - Declare necessary types for input arguments and output.
 - Use a single level of abstraction.
-
-### Testing
-
-- Follow the Arrange-Act-Assert convention for tests.
-- Name test variables clearly.
-  - Follow the convention: inputX, mockX, actualX, expectedX, etc.
-- Write unit tests for each public function.
-  - Use test doubles to simulate dependencies.
-    - Except for third-party dependencies that are not expensive to execute.
-- Write acceptance tests for each module.
-  - Follow the Given-When-Then convention.

package.json

@@ -7,10 +7,10 @@
   "license": "MIT",
   "type": "module",
   "scripts": {
-    "dev": "bun run prebuild && astro dev --config 'src/config/astro.config.ts'",
-    "build": "astro build --config 'src/config/astro.config.ts'",
-    "preview": "astro preview",
-    "typecheck:astro": "astro check",
+    "dev": "bun run prebuild && bun run --bun astro dev --config 'src/config/astro.config.ts'",
+    "build": "bun run --bun astro build --config 'src/config/astro.config.ts'",
+    "preview": "bun run --bun astro preview",
+    "typecheck:astro": "bun run --bun astro check",
     "typecheck:tsc": "tsc --noEmit --pretty",
     "typecheck": "bun run typecheck:astro && bun run typecheck:tsc",
     "prebuild": "run-p --silent --continue-on-error create:symlinks move:downloads",
@@ -25,7 +25,6 @@
     "format": "run-p --silent format:biome format:md",
     "deploy:s3": "./scripts/deploy-s3.sh",
     "new": "bun run scripts/new/index.ts",
-    "create:redirects": "bun run scripts/redirect-from.ts",
     "create:symlinks": "./scripts/create-symlinks.sh",
     "move:downloads": "bun run scripts/move-downloads.ts",
     "iptc:add": "bun run scripts/iptc-add.ts"

scripts/move-downloads.test.ts

@@ -1,6 +1,7 @@
 import fs from 'node:fs/promises'
 import path from 'node:path'
 import chalk from 'chalk'
+import { globby } from 'globby'
 import type { Ora } from 'ora'
 import { expect, test, vi } from 'vitest'
 import { copyZipFiles } from './move-downloads'
@@ -9,6 +10,17 @@ vi.mock('globby', () => ({
   globby: vi.fn().mockResolvedValue(['file1.zip', 'file2.zip'])
 }))
 
+vi.mock('ora', () => ({
+  default: vi.fn(() => ({
+    start: () => ({
+      text: '',
+      start: vi.fn(),
+      succeed: vi.fn(),
+      fail: vi.fn()
+    })
+  }))
+}))
+
 test('copyZipFiles should copy zip files', async () => {
   // Create temporary directories and files
   const sourceDir = path.join(__dirname, 'tmp_source')
@@ -17,6 +29,11 @@ test('copyZipFiles should copy zip files', async () => {
   await fs.mkdir(destDir, { recursive: true })
   await fs.writeFile(path.join(sourceDir, 'file1.zip'), 'content1')
   await fs.writeFile(path.join(sourceDir, 'file2.zip'), 'content2')
+  // Add an existing file to destDir to test removal
+  await fs.writeFile(path.join(destDir, 'old.zip'), 'old content')
+  // Add a subdirectory with a file to test recursive removal
+  await fs.mkdir(path.join(destDir, 'subdir'), { recursive: true })
+  await fs.writeFile(path.join(destDir, 'subdir', 'old2.zip'), 'old content2')
 
   const mockOra = {
     text: '',
@@ -31,6 +48,10 @@ test('copyZipFiles should copy zip files', async () => {
   const file2 = await fs.readFile(path.join(destDir, 'file2.zip'), 'utf-8')
   expect(file1).toBe('content1')
   expect(file2).toBe('content2')
+  // Check that old file was removed
+  await expect(fs.access(path.join(destDir, 'old.zip'))).rejects.toThrow()
+  // Check that subdirectory was removed
+  await expect(fs.access(path.join(destDir, 'subdir'))).rejects.toThrow()
 
   expect(mockOra.succeed).toHaveBeenCalledWith(
     `${chalk.bold('[move-downloads]')} Copied 2 .zip files to ${destDir}`
@@ -40,3 +61,34 @@ test('copyZipFiles should copy zip files', async () => {
   await fs.rm(sourceDir, { recursive: true, force: true })
   await fs.rm(destDir, { recursive: true, force: true })
 })
+
+test('copyZipFiles should create destination folder if it does not exist', async () => {
+  // Create temporary directories and files
+  const sourceDir = path.join(__dirname, 'tmp_source2')
+  const destDir = path.join(__dirname, 'tmp_dest2')
+  await fs.mkdir(sourceDir, { recursive: true })
+  await fs.writeFile(path.join(sourceDir, 'file1.zip'), 'content1')
+
+  const globbyMock = vi.mocked(globby)
+  globbyMock.mockResolvedValue(['file1.zip'])
+
+  const mockOra = {
+    text: '',
+    start: vi.fn(),
+    succeed: vi.fn(),
+    fail: vi.fn()
+  }
+
+  await copyZipFiles(sourceDir, destDir, mockOra as unknown as Ora)
+
+  const file1 = await fs.readFile(path.join(destDir, 'file1.zip'), 'utf-8')
+  expect(file1).toBe('content1')
+
+  expect(mockOra.succeed).toHaveBeenCalledWith(
+    `${chalk.bold('[move-downloads]')} Copied 1 .zip files to ${destDir}`
+  )
+
+  // Cleanup
+  await fs.rm(sourceDir, { recursive: true, force: true })
+  await fs.rm(destDir, { recursive: true, force: true })
+})

scripts/move-downloads.ts

@@ -22,7 +22,7 @@ function removeFolderContents(folderPath: string) {
       const filePath = path.join(folderPath, file)
       if (fs.lstatSync(filePath).isDirectory()) {
         removeFolderContents(filePath)
-        fs.rmSync(filePath)
+        fs.rmdirSync(filePath)
       } else {
         fs.unlinkSync(filePath)
       }

src/components/ui/Loader/Loader.test.tsx

@@ -0,0 +1,7 @@
+import { render } from '@testing-library/react'
+import { test } from 'vitest'
+import { Loader } from './Loader'
+
+test('Loader', async () => {
+  render(<Loader />)
+})

src/env.d.ts

@@ -7,9 +7,6 @@ declare module '*.astro' {
 declare global {
   interface ImportMetaEnv {
     readonly PUBLIC_MAPBOX_ACCESS_TOKEN?: string
-    readonly PUBLIC_UMAMI_SCRIPT_URL?: string
-    readonly PUBLIC_UMAMI_WEBSITE_ID?: string
-    readonly PUBLIC_INFURA_ID?: string
     readonly PUBLIC_WALLETCONNECT_ID?: string
     readonly PUBLIC_WEB3_API_URL?: string
   }

src/lib/umami/umami.test.ts

@@ -4,8 +4,8 @@ import { getUmamiConfig } from '.'
 test('should throw an error if Umami environment variables are missing in production', () => {
   const mockEnv = {
     PROD: true,
-    PUBLIC_UMAMI_SCRIPT_URL: '',
-    PUBLIC_UMAMI_WEBSITE_ID: ''
+    UMAMI_SCRIPT_URL: '',
+    UMAMI_WEBSITE_ID: ''
   } as any
 
   expect(() => getUmamiConfig(mockEnv)).toThrow(
@@ -17,8 +17,8 @@ test('should not throw an error if Umami environment variables are present in pr
   // Mock production environment with Umami variables
   const mockEnv = {
     PROD: true,
-    PUBLIC_UMAMI_SCRIPT_URL: 'https://example.com/umami.js',
-    PUBLIC_UMAMI_WEBSITE_ID: 'your-website-id'
+    UMAMI_SCRIPT_URL: 'https://example.com/umami.js',
+    UMAMI_WEBSITE_ID: 'your-website-id'
   } as any
 
   expect(() => getUmamiConfig(mockEnv)).not.toThrow()
@@ -28,8 +28,8 @@ test('should not throw an error in non-production environments', () => {
   // Mock non-production environment
   const mockEnv = {
     PROD: false,
-    PUBLIC_UMAMI_SCRIPT_URL: '',
-    PUBLIC_UMAMI_WEBSITE_ID: ''
+    UMAMI_SCRIPT_URL: '',
+    UMAMI_WEBSITE_ID: ''
   } as any
 
   expect(() => getUmamiConfig(mockEnv)).not.toThrow()

src/lib/umami/umami.ts

@@ -2,8 +2,8 @@ export function getUmamiConfig(env = import.meta.env): {
   scriptUrl: string
   websiteId: string
 } {
-  const scriptUrl = env.PUBLIC_UMAMI_SCRIPT_URL
-  const websiteId = env.PUBLIC_UMAMI_WEBSITE_ID
+  const scriptUrl = env.UMAMI_SCRIPT_URL
+  const websiteId = env.UMAMI_WEBSITE_ID
   const isProduction = env.PROD
 
   if (isProduction && (!scriptUrl || !websiteId)) {