Skip to content

Commit 848b31b

Browse files
committed
Merge upstream/main, refactor colorblind glow to maybeDrawTeammateGlow (DRY)
2 parents df92d45 + 240690c commit 848b31b

237 files changed

Lines changed: 24620 additions & 7032 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CREDITS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,4 @@ Copyright © opentopography.org. All Rights Reserved. [Terms of Use](https://ope
5050

5151
Stats icon by [Meko](https://thenounproject.com/mekoda/)https://thenounproject.com/icon/stats-4942475/
5252
Pay Per Click icon by [Fauzan Adiima](https://thenounproject.com/creator/fauzan94/)https://thenounproject.com/icon/pay-per-click-2586454/
53+
Medal icon by [Snow](https://thenounproject.com/snowdoll/)https://thenounproject.com/icon/medal-4567887/

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ RUN --mount=type=cache,target=/root/.npm \
1313
# Copy only what's needed for build
1414
COPY tsconfig.json ./
1515
COPY vite.config.ts ./
16-
COPY tailwind.config.js ./
17-
COPY postcss.config.js ./
1816
COPY eslint.config.js ./
1917
COPY index.html ./
2018
COPY resources ./resources

eslint.config.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const gitignorePath = path.resolve(__dirname, ".gitignore");
1313
/** @type {import('eslint').Linter.Config[]} */
1414
export default [
1515
includeIgnoreFile(gitignorePath),
16-
{ ignores: ["src/server/gatekeeper/**"] },
16+
{ ignores: ["src/server/gatekeeper/**", "tests/pathfinding/playground/**"] },
1717
{ files: ["**/*.{js,mjs,cjs,ts}"] },
1818
{ languageOptions: { globals: { ...globals.browser, ...globals.node } } },
1919
pluginJs.configs.recommended,
@@ -26,8 +26,6 @@ export default [
2626
allowDefaultProject: [
2727
"__mocks__/fileMock.js",
2828
"eslint.config.js",
29-
"postcss.config.js",
30-
"tailwind.config.js",
3129
"scripts/sync-assets.mjs",
3230
],
3331
},

0 commit comments

Comments
 (0)