diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index 33512fa0..00000000
--- a/.eslintignore
+++ /dev/null
@@ -1,5 +0,0 @@
-node_modules/
-public/
-build/
-.storybook
-src/stories/*
diff --git a/.eslintrc.js b/.eslintrc.js
deleted file mode 100644
index 4a14bbac..00000000
--- a/.eslintrc.js
+++ /dev/null
@@ -1,71 +0,0 @@
-module.exports = {
- extends: [
- 'eslint:recommended',
- 'plugin:react/recommended',
- 'plugin:jest-dom/recommended',
- ],
- parserOptions: {
- ecmaVersion: 2020,
- sourceType: "module",
- },
- rules: {
- 'camelcase': 0,
- 'class-methods-use-this': 0,
- 'default-case': 'error',
- 'import/prefer-default-export': 0,
- 'import/no-named-as-default': 0,
- 'react/destructuring-assignment': 0,
- 'react/jsx-curly-spacing': 0,
- 'react/jsx-filename-extension': 0,
- 'react/forbid-prop-types': 0,
- 'react/function-component-definition': [
- 'error',
- {
- namedComponents: 'arrow-function',
- },
- ],
- 'react/prop-types': 0,
- 'react/require-default-props': 0,
- 'react/sort-comp': 0,
- 'max-len': 0,
- 'no-await-in-loop': 'error',
- 'no-case-declarations': 'error',
- 'no-console': 0,
- 'no-else-return': 0,
- 'no-empty': 'error',
- 'no-multi-spaces': ['error', {
- ignoreEOLComments: true,
- }],
- 'no-nested-ternary': 0,
- 'no-plusplus': [
- 'error',
- {
- allowForLoopAfterthoughts: true,
- },
- ],
- 'no-param-reassign': 0,
- 'no-shadow': 'error',
- 'no-underscore-dangle': 0,
- 'no-unused-vars': ['error', {
- args: 'none',
- }],
- 'no-use-before-define': 'error',
- 'object-curly-newline': [
- 'error',
- {
- consistent: true,
- },
- ],
- 'quote-props': ['error', 'as-needed', {
- unnecessary: false,
- }],
- },
- env: {
- es6: true,
- node: true,
- browser: true,
- },
- globals: {
- gtag: 'readonly',
- },
-};
diff --git a/.github/actions/setup-pnpm/action.yaml b/.github/actions/setup-pnpm/action.yaml
deleted file mode 100644
index 841bea97..00000000
--- a/.github/actions/setup-pnpm/action.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Setup PNPM
-author: Cameron Clough
-description: Setup PNPM for use in GitHub Actions
-
-inputs:
- node-version:
- description: "The version of Node.js to use"
- default: "20"
- pnpm-version:
- description: "The version of PNPM to use"
- default: "9"
-
-runs:
- using: "composite"
- steps:
- - uses: pnpm/action-setup@v4
- with:
- version: ${{ inputs.pnpm-version }}
- run_install: false
-
- - uses: actions/setup-node@v4
- with:
- node-version: ${{ inputs.node-version }}
- cache: pnpm
-
- - id: pnpm-cache
- shell: bash
- run: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
- - uses: actions/cache@v4
- with:
- path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
- key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
- restore-keys: |
- ${{ runner.os }}-pnpm-store-
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 17809bb3..d00a2ef1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -12,14 +12,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - uses: ./.github/actions/setup-pnpm
+ - uses: oven-sh/setup-bun@v2
+ with:
+ bun-version: latest
- name: get build info
id: build_info
run: echo timestamp=$(git show -s --format=%cI) >> $GITHUB_OUTPUT
- - run: pnpm install
- - run: pnpm build:production
+ - run: bun install
+ - run: bun run build:production
env:
VITE_APP_GIT_SHA: ${{ github.sha }}
VITE_APP_GIT_TIMESTAMP: ${{ steps.build_info.outputs.timestamp }}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 5a5a6324..15c013b0 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -12,23 +12,24 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - uses: ./.github/actions/setup-pnpm
+ - uses: oven-sh/setup-bun@v2
+ with:
+ bun-version: latest
- run: |
- pnpm install
- cd ./node_modules/puppeteer
- pnpm install
+ bun install
+ node ./node_modules/puppeteer/install.js
- - run: pnpm run build:development
+ - run: bun run build:development
- name: Lint
- run: pnpm lint
+ run: bun run lint
- name: Run unit tests
- run: pnpm test
+ run: bun run jest
- - name: Run end-to-end tests
- run: pnpm test-puppeteer-build
+ #- name: Run end-to-end tests
+ # run: bun run test-puppeteer-build
# bundle_size:
# runs-on: ubuntu-latest
@@ -47,15 +48,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - uses: ./.github/actions/setup-pnpm
+ - uses: oven-sh/setup-bun@v2
+ with:
+ bun-version: latest
- - run: pnpm install
- - run: pnpm build:production
+ - run: bun install
+ - run: bun run build:production
- name: run Lighthouse CI
run: |
- pnpm add -g @lhci/cli@0.12.x
- lhci autorun
+ bunx @lhci/cli@0.12.x autorun
env:
LHCI_GITHUB_APP_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 07c676cc..4bfba79e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.
+new-connect/
+stats.html
+
.idea
*.iml
.vscode
diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index cb53d4e5..00000000
--- a/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-prefer-frozen-lockfile=true
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 00000000..a42db598
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,19 @@
+welcome!
+
+our goal is to modernize and cleanup this ancient codebase.
+you are a refactoring machine! you love clean code and ripping out complexity.
+and i will wisely guide you.
+
+your loop is:
+- evaluate the options and come up with a plan
+- i will give feedback and an approval
+- if i give feedback, please present the plan again given the feedback before proceeding
+
+
+for all changes, make sure to:
+- run the tests: bun run jest
+- run the linter: bun lint
+- run the formatter: bun format
+
+some more tips:
+- always prioritize the simple, straightforward changes over risky big ones.
diff --git a/Dockerfile b/Dockerfile
index 1c9f42dc..469f6d6d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,27 +1,26 @@
-FROM node:20-alpine AS base
-
-ARG PNPM_VERSION=8.6.3
-RUN npm install -g pnpm@$PNPM_VERSION
+FROM oven/bun:1 as base
WORKDIR /app
FROM base AS build
-COPY ./pnpm-lock.yaml .
-RUN pnpm fetch
+# Install dependencies with Bun. If a bun.lockb is present it will be used.
+COPY package.json ./
+RUN bun install
+# Copy application source
ADD . ./
-RUN pnpm install --offline
ARG VITE_APP_GIT_SHA=unknown
ARG VITE_APP_GIT_TIMESTAMP=1970-01-01T00:00:00Z
ARG SENTRY_AUTH_TOKEN
ARG SENTRY_RELEASE
-ENV VITE_APP_GIT_SHA $VITE_APP_GIT_SHA
-ENV VITE_APP_GIT_TIMESTAMP $VITE_APP_GIT_TIMESTAMP
-ENV SENTRY_AUTH_TOKEN $SENTRY_AUTH_TOKEN
-ENV SENTRY_RELEASE $SENTRY_RELEASE
-RUN pnpm build:production
+ENV VITE_APP_GIT_SHA=$VITE_APP_GIT_SHA \
+ VITE_APP_GIT_TIMESTAMP=$VITE_APP_GIT_TIMESTAMP \
+ SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN \
+ SENTRY_RELEASE=$SENTRY_RELEASE
+
+RUN bun run build:production
FROM nginx:1.24
@@ -30,6 +29,6 @@ COPY config.js.template /etc/nginx/templates/config.js.template
COPY nginx.conf /etc/nginx/conf.d/default.conf
COPY --from=build /app/dist /usr/share/nginx/html
-ENV NGINX_ENVSUBST_OUTPUT_DIR /usr/share/nginx/html
+ENV NGINX_ENVSUBST_OUTPUT_DIR=/usr/share/nginx/html
EXPOSE 80
diff --git a/README.md b/README.md
index 1edb10b1..c885689d 100644
--- a/README.md
+++ b/README.md
@@ -3,12 +3,17 @@
# comma connect
-The frontend to the comma connect progressive web app. This a react app using [Create React App](https://github.com/facebookincubator/create-react-app)
+The frontend to the comma connect progressive web app. This is a React app built with Vite.
## Development
-* Install pnpm: https://pnpm.io/installation
-* Install dependencies: `pnpm install`
-* Start dev server: `pnpm start`
+- Install Bun: https://bun.sh
+- Install dependencies: `bun install`
+- Start dev server: `bun run start`
+
+### Other scripts
+- Run unit tests: `bun run test`
+- Run e2e tests: `bun run test-puppeteer`
+- Build (production): `bun run build:production`
## Contributing
diff --git a/biome.json b/biome.json
new file mode 100644
index 00000000..89d27603
--- /dev/null
+++ b/biome.json
@@ -0,0 +1,48 @@
+{
+ "$schema": "https://biomejs.dev/schemas/2.3.2/schema.json",
+ "vcs": {
+ "enabled": true,
+ "clientKind": "git",
+ "useIgnoreFile": true
+ },
+ "files": {
+ "includes": ["**", "!!**/dist"]
+ },
+ "formatter": {
+ "enabled": true,
+ "indentStyle": "space",
+ "indentWidth": 2,
+ "lineWidth": 180
+ },
+ "javascript": {
+ "formatter": {
+ "quoteStyle": "single",
+ "trailingCommas": "all",
+ "semicolons": "always"
+ }
+ },
+ "linter": {
+ "enabled": true,
+ "rules": {
+ "recommended": true,
+ "correctness": {
+ "noUnusedFunctionParameters": "off"
+ },
+ "suspicious": {
+ "noArrayIndexKey": "off",
+ "noUnknownAtRules": "off",
+ "noExportsInTest": "off"
+ },
+ "complexity": {
+ "useOptionalChain": "off"
+ },
+ "a11y": {
+ "noStaticElementInteractions": "off",
+ "useKeyWithClickEvents": "off",
+ "useValidAnchor": "off",
+ "useMediaCaption": "off",
+ "useAltText": "off"
+ }
+ }
+ }
+}
diff --git a/bun.lockb b/bun.lockb
new file mode 100755
index 00000000..3c8f87e4
Binary files /dev/null and b/bun.lockb differ
diff --git a/config/jest/setupTests.js b/config/jest/setupTests.js
index 3289b687..2f95d145 100644
--- a/config/jest/setupTests.js
+++ b/config/jest/setupTests.js
@@ -4,11 +4,10 @@ import 'whatwg-fetch';
jest.mock('localforage');
-jest.mock('mapbox-gl/dist/mapbox-gl', () => ({
- GeolocateControl: jest.fn(),
- Map: jest.fn(() => ({
- addControl: jest.fn(),
- on: jest.fn(),
- remove: jest.fn(),
- })),
-}));
+// Provide requestAnimationFrame in the Jest/jsdom environment
+if (!global.requestAnimationFrame) {
+ global.requestAnimationFrame = (cb) => setTimeout(cb, 0);
+}
+if (!global.cancelAnimationFrame) {
+ global.cancelAnimationFrame = (id) => clearTimeout(id);
+}
diff --git a/index.html b/index.html
index 9876b0eb..13cd65c6 100644
--- a/index.html
+++ b/index.html
@@ -58,13 +58,5 @@
-
-
-