diff --git a/.circleci/config.yml b/.circleci/config.yml index bb176b7..8c71649 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,31 +25,58 @@ jobs: node-checks: docker: - - image: cimg/node:20.18 + - image: cimg/node:22.11 steps: - checkout - run: - name: Install dependencies + name: Install pnpm and root dependencies command: | sudo npm install -g pnpm pnpm install --frozen-lockfile - run: - name: Run linting - command: | - cd functions - npm run lint -- --max-warnings 0 + name: TypeScript type check (worker) + command: pnpm run type-check - run: - name: TypeScript type check - command: | - cd functions - npx tsc --noEmit + name: Install functions dependencies + command: npm install --legacy-peer-deps --prefix functions + - run: + name: Run linting (functions) + command: npm run lint --prefix functions -- --max-warnings 0 + - run: + name: TypeScript type check (functions) + command: npm run build --prefix functions - run: name: Quality GC check command: npx quality-gc run || echo "Quality GC issues found" + deploy-worker: + docker: + - image: cimg/node:22.11 + steps: + - checkout + - run: + name: Install pnpm and dependencies + command: | + sudo npm install -g pnpm + pnpm install --frozen-lockfile + - run: + name: Deploy YouTube API Worker to Cloudflare + command: pnpm run deploy:worker + environment: + CLOUDFLARE_API_TOKEN: $CLOUDFLARE_API_TOKEN + CLOUDFLARE_ACCOUNT_ID: $CLOUDFLARE_ACCOUNT_ID + workflows: version: 2 + validate: jobs: - python-checks - node-checks + + deploy: + jobs: + - deploy-worker: + filters: + branches: + only: main diff --git a/fix_app.py b/fix_app.py index 247998d..8dd1092 100644 --- a/fix_app.py +++ b/fix_app.py @@ -1,13 +1,16 @@ -import sys +from pathlib import Path -filepath = 'js/app.js' -with open(filepath, 'r') as f: +filepath = Path("js/app.js") +with filepath.open() as f: lines = f.readlines() # Part 1: DOM elements for i, line in enumerate(lines): if "themeMenu: document.getElementById('themeMenu')," in line: - lines.insert(i + 1, " episodesNavBtn: document.querySelector('[data-action=\"scroll-to-episodes\"]'),\n") + lines.insert( + i + 1, + " episodesNavBtn: document.querySelector('[data-action=\"scroll-to-episodes\"]'),\n", + ) lines.insert(i + 2, " episodesSection: document.getElementById('episodesSection'),\n") break @@ -20,16 +23,16 @@ " DOM.episodesNavBtn.addEventListener('click', () => {\n", " DOM.episodesSection.scrollIntoView({ behavior: 'smooth' });\n", " if (document.body.classList.contains('mobile-nav-active')) {\n", - " document.body.classList.remove('mobile-nav-active');\n", + " document.body.classList.remove('mobile-nav-active');\n", " if (DOM.menuToggle) DOM.menuToggle.setAttribute('aria-expanded', 'false');\n", " }\n", " });\n", " }\n", - "\n" + "\n", ] for idx, new_line in enumerate(scroll_listener): lines.insert(i + idx, new_line) break -with open(filepath, 'w') as f: +with filepath.open("w") as f: f.writelines(lines) diff --git a/fix_deps.py b/fix_deps.py index 34cbd97..f59b27b 100644 --- a/fix_deps.py +++ b/fix_deps.py @@ -15,12 +15,12 @@ # Maybe the CI is running against a different state of the PR? # Let's just make sure trigger-circleci-pipeline and circletui are in package.json if they are in the lockfile. -if 'dependencies' not in pkg: - pkg['dependencies'] = {} +if "dependencies" not in pkg: + pkg["dependencies"] = {} -pkg['dependencies']['trigger-circleci-pipeline'] = '^1.12.1' -pkg['dependencies']['circletui'] = '^1.0.3' -pkg['dependencies']['@circleci/circleci-config-sdk'] = '^0.12.5' +pkg["dependencies"]["trigger-circleci-pipeline"] = "^1.12.1" +pkg["dependencies"]["circletui"] = "^1.0.3" +pkg["dependencies"]["@circleci/circleci-config-sdk"] = "^0.12.5" with Path("package.json").open("w") as f: json.dump(pkg, f, indent=2) diff --git a/fix_index.py b/fix_index.py index 353b69c..28c62a4 100644 --- a/fix_index.py +++ b/fix_index.py @@ -1,10 +1,10 @@ -with open('index.html', 'r') as f: - content = f.read() +from pathlib import Path + +content = Path("index.html").read_text() # Add title attribute to search button -old_search = '