Skip to content

Commit cf98c7b

Browse files
TurtIeSocksTurtIeSocks
authored
Merge pull request #911 from WatWowMap/develop
Sync Dev to Main
2 parents 3a80705 + 3bdc1dd commit cf98c7b

71 files changed

Lines changed: 6118 additions & 2512 deletions

Some content is hidden

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

‎.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ public/missing-locales
44
public/images/custom
55
public/images/uicons
66
server/src/configs/
7+
packages/types/**/*.d.ts

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
run: yarn masterfile
2525

2626
- name: Lint
27-
run: yarn eslint:check
27+
run: yarn eslint
2828

2929
- name: Prettier
30-
run: yarn prettier:check
30+
run: yarn prettier
3131

3232
- name: Build
3333
run: yarn build

‎.github/workflows/main.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: GitHub Release
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- main
8+
- develop
9+
10+
permissions: write-all
11+
12+
jobs:
13+
release:
14+
name: Build & release
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v3
19+
with:
20+
fetch-depth: 0
21+
- name: Install Volta
22+
uses: volta-cli/action@v4
23+
- name: Echo versions
24+
run: |
25+
node --version
26+
yarn --version
27+
- name: Install dependencies
28+
run: yarn --prefer-offline
29+
env:
30+
HUSKY: 0
31+
- name: Build app
32+
run: yarn build
33+
- name: Release
34+
env:
35+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36+
HUSKY: 0
37+
run: npx semantic-release

‎.github/workflows/release.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ jobs:
1919
- name: Install Dependencies
2020
run: yarn
2121

22-
- name: Create Locales
23-
run: yarn create-locales
24-
2522
- name: Sentry Build
2623
run: yarn release
2724
env:

‎.husky/commit-msg‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
npx --no -- commitlint --edit "${1}"

‎.husky/pre-commit‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
npx lint-staged --verbose

‎CHANGELOG.md‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# [1.28.0-develop.4](https://github.com/WatWowMap/ReactMap/compare/v1.28.0-develop.3...v1.28.0-develop.4) (2024-01-07)
2+
3+
4+
### Bug Fixes
5+
6+
* subcategory viewing ([3ed2e8f](https://github.com/WatWowMap/ReactMap/commit/3ed2e8f53d59913138d23eb117a5340316866df1))
7+
8+
# [1.28.0-develop.3](https://github.com/WatWowMap/ReactMap/compare/v1.28.0-develop.2...v1.28.0-develop.3) (2024-01-06)
9+
10+
11+
### Bug Fixes
12+
13+
* rockruff form name issues ([188c63a](https://github.com/WatWowMap/ReactMap/commit/188c63a7e61e96f807458981e822f646c1c037d8))
14+
15+
# [1.28.0-develop.2](https://github.com/WatWowMap/ReactMap/compare/v1.28.0-develop.1...v1.28.0-develop.2) (2024-01-03)
16+
17+
18+
### Bug Fixes
19+
20+
* motd index setter ([f68153a](https://github.com/WatWowMap/ReactMap/commit/f68153a141ec038d48e37945772bb8da85f26a28))
21+
* motd types ([c4ad276](https://github.com/WatWowMap/ReactMap/commit/c4ad276f303357ac2c9b3698b7c6a07314d339c1))
22+
23+
# [1.28.0-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.27.2...v1.28.0-develop.1) (2024-01-02)
24+
25+
26+
### Bug Fixes
27+
28+
* `Notification` API checks ([22bb9ea](https://github.com/WatWowMap/ReactMap/commit/22bb9eab2e5da0ec0780206fd059d1cfe8f5c666))
29+
* active scanNext/scanZone btns ([5d5f8bb](https://github.com/WatWowMap/ReactMap/commit/5d5f8bbc9f1f419a75b32dcf6bf654da9836c13c))
30+
* add permission status to notif options menu ([c44a75c](https://github.com/WatWowMap/ReactMap/commit/c44a75c7aa5cfff504782aabe1bc102a5a6bdfa3))
31+
* also if map perm is missing ([6abc14e](https://github.com/WatWowMap/ReactMap/commit/6abc14e95ba80f09a26873231c4e79d2ea13782b))
32+
* catch bad play attempts ([5c68483](https://github.com/WatWowMap/ReactMap/commit/5c6848383111b06a7d188dacec5786112c795f84))
33+
* category toggles ([151ce50](https://github.com/WatWowMap/ReactMap/commit/151ce50f212479fa1569f5586a7faac34d7e652f))
34+
* ci stuff ([f960d91](https://github.com/WatWowMap/ReactMap/commit/f960d91c13a0863f6bcee5c2d9400e478473593a))
35+
* code organization ([7ced12e](https://github.com/WatWowMap/ReactMap/commit/7ced12e3d9c8762ceb410f0e6f01be8ec60939a6))
36+
* force popup open on click ([7c9f045](https://github.com/WatWowMap/ReactMap/commit/7c9f0454dbdeb9c62f44cc0861571e43127cb9ad))
37+
* generalize fallback ext ([8979d92](https://github.com/WatWowMap/ReactMap/commit/8979d92133a42145bb4fdb60f009a95fa3768811))
38+
* icon user settings ([4381817](https://github.com/WatWowMap/ReactMap/commit/43818171a385e6882f68f6c62365e124a6df793e))
39+
* let it be configurable too ([268f7d8](https://github.com/WatWowMap/ReactMap/commit/268f7d811fbb3e5b1ca0c5baa18b14db5bf096aa))
40+
* locales ([6a4ba6b](https://github.com/WatWowMap/ReactMap/commit/6a4ba6bb04fe07cc716f0d4aa4325f8c0e449390))
41+
* make sure window is focused on click ([c18f746](https://github.com/WatWowMap/ReactMap/commit/c18f746e93190ae12d56aea8b0ff5032059938e3))
42+
* missing join translation ([e532995](https://github.com/WatWowMap/ReactMap/commit/e532995285012313c42adab7904037dc84a3161e))
43+
* only show if customizable length > 0 ([0b6c89c](https://github.com/WatWowMap/ReactMap/commit/0b6c89cae2d926652e80db28d51c0666c1949202))
44+
* prompt user on options open ([f2c40fd](https://github.com/WatWowMap/ReactMap/commit/f2c40fdb89f17955150061e2093630bf85dd7e0a))
45+
* return early if in cache ([238edbd](https://github.com/WatWowMap/ReactMap/commit/238edbdc8231856d78dec503d0f6c366fd67ede1))
46+
* tilelayer background ([4ad64ca](https://github.com/WatWowMap/ReactMap/commit/4ad64cad5a571c27edcd1c687783fdd7560ac7e6))
47+
* volta versions ([ba829db](https://github.com/WatWowMap/ReactMap/commit/ba829dbd2726db5ebdf115cacdcb33b0a6a22fa9))
48+
49+
50+
### Features
51+
52+
* base notification implementation ([42de1e9](https://github.com/WatWowMap/ReactMap/commit/42de1e927f71757ea8a242185d8c1edc6cbb02bb))
53+
* ci for github releases ([4015be6](https://github.com/WatWowMap/ReactMap/commit/4015be68dcc6be7c248e1e93ccb3973e433b7ae9))
54+
* commit hooks ([945c572](https://github.com/WatWowMap/ReactMap/commit/945c572bee182c9c3ea7352d5320c22e9bcc06e5))
55+
* pokemon notifs ([adf7429](https://github.com/WatWowMap/ReactMap/commit/adf74293d3fcefed63e851a75a95e04151f8ec32))
56+
* raids ([9fc1b04](https://github.com/WatWowMap/ReactMap/commit/9fc1b0487aff1d7a6eea66e22eb8fa043df374d0))
57+
* show signed in info when blocked ([59b20cb](https://github.com/WatWowMap/ReactMap/commit/59b20cbcc7ef4254b803f66bb36a9fbe988c92ad))
58+
* support for uaudio ([1f30c7c](https://github.com/WatWowMap/ReactMap/commit/1f30c7c0aa4acf061849ec059d1b1db1ad9b302a))

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ COPY yarn.lock .
1616
RUN apk add git
1717
RUN npm install -g yarn
1818
COPY . .
19-
RUN yarn install --ignore-optional
19+
RUN yarn install
2020
RUN yarn build

‎package.json‎

Lines changed: 73 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "reactmap",
3-
"version": "1.27.2",
3+
"version": "1.28.0-develop.4",
44
"private": true,
55
"description": "React based frontend map.",
66
"license": "MIT",
@@ -14,20 +14,21 @@
1414
"config:check": "yarn workspace @rm/config run check",
1515
"config:env": "yarn workspace @rm/config run generate",
1616
"dev": "NODE_ENV=development nodemon server/src/index.js",
17-
"eslint:check": "eslint \"**/*.{js,jsx}\"",
18-
"eslint:fix": "eslint \"**/*.{js,jsx}\" --fix",
17+
"lint": "eslint \"**/*.{js,jsx}\"",
18+
"lint:fix": "eslint \"**/*.{js,jsx}\" --fix",
1919
"locales:create": "yarn workspace @rm/locales run create",
2020
"locales:generate": "yarn workspace @rm/locales run generate",
2121
"locales:missing": "yarn workspace @rm/locales run missing",
2222
"masterfile": "yarn workspace @rm/masterfile run generate",
2323
"migrate:latest": "knex --knexfile server/src/db/knexfile.cjs migrate:latest",
2424
"migrate:make": "knex --knexfile server/src/db/knexfile.cjs migrate:make",
2525
"migrate:rollback": "knex --knexfile server/src/db/knexfile.cjs migrate:rollback",
26-
"prettier:check": "prettier --check \"**/*.{css,html,js,jsx,yml}\"",
26+
"prettier": "prettier --check \"**/*.{css,html,js,jsx,yml}\"",
2727
"prettier:fix": "prettier --write \"**/*.{css,html,js,jsx,yml}\"",
2828
"release": "vite build -- -r",
2929
"server": "node server/src/index.js",
3030
"start": "node .",
31+
"prepare": "husky install",
3132
"watch": "vite"
3233
},
3334
"nodemonConfig": {
@@ -42,6 +43,62 @@
4243
"logs"
4344
]
4445
},
46+
"lint-staged": {
47+
"*.{js,jsx,ts,tsx}": [
48+
"eslint --fix"
49+
],
50+
"**/*": [
51+
"prettier --write --ignore-unknown"
52+
]
53+
},
54+
"config": {
55+
"commitizen": {
56+
"path": "cz-conventional-changelog"
57+
}
58+
},
59+
"commitlint": {
60+
"extends": [
61+
"@commitlint/config-conventional"
62+
]
63+
},
64+
"release": {
65+
"branches": [
66+
"+([0-9])?(.{+([0-9]),x}).x",
67+
"main",
68+
{
69+
"name": "develop",
70+
"prerelease": true
71+
}
72+
],
73+
"plugins": [
74+
"@semantic-release/commit-analyzer",
75+
"@semantic-release/release-notes-generator",
76+
"@semantic-release/changelog",
77+
[
78+
"@semantic-release/npm",
79+
{
80+
"npmPublish": false
81+
}
82+
],
83+
"@semantic-release/github",
84+
[
85+
"@semantic-release/git",
86+
{
87+
"assets": [
88+
"CHANGELOG.md",
89+
"package.json",
90+
"yarn.lock"
91+
],
92+
"message": "chore(release): ${nextRelease.gitTag} [skip ci]\n\n${nextRelease.notes}"
93+
}
94+
]
95+
],
96+
"preset": "angular"
97+
},
98+
"volta": {
99+
"node": "18.18.2",
100+
"yarn": "1.22.19"
101+
},
45102
"dependencies": {
46103
"@apollo/client": "^3.8.7",
47104
"@apollo/server": "^4.9.5",
@@ -68,7 +125,7 @@
68125
"@turf/helpers": "^6.5.0",
69126
"bcrypt": "^5.0.1",
70127
"body-parser": "^1.20.2",
71-
"chalkercli": "^1.6.4",
128+
"chalkercli": "https://github.com/TurtIeSocks/chalkercli.git",
72129
"chokidar": "^3.5.3",
73130
"compression": "^1.7.4",
74131
"cors": "^2.8.5",
@@ -121,13 +178,19 @@
121178
"zustand": "4.4.6"
122179
},
123180
"devDependencies": {
181+
"@commitlint/cli": "^17.2.0",
182+
"@commitlint/config-conventional": "^17.2.0",
124183
"@rm/types": "*",
184+
"@semantic-release/changelog": "^6.0.1",
185+
"@semantic-release/git": "^10.0.1",
125186
"@sentry/vite-plugin": "2.2.1",
126187
"@types/dlv": "^1.1.2",
127188
"@types/node": "^18",
128189
"@types/react": "^18.2.20",
129190
"@types/react-dom": "^18.0.9",
130191
"@vitejs/plugin-react": "4.0.0",
192+
"commitizen": "^4.2.5",
193+
"cz-conventional-commit": "^1.0.6",
131194
"eslint": "^8.44.0",
132195
"eslint-config-airbnb": "^19.0.4",
133196
"eslint-config-prettier": "^8.8.0",
@@ -136,10 +199,13 @@
136199
"eslint-plugin-jsx-a11y": "^6.7.1",
137200
"eslint-plugin-react": "^7.32.2",
138201
"eslint-plugin-react-hooks": "^4.6.0",
202+
"husky": "^8.0.1",
203+
"lint-staged": "^13.0.3",
139204
"monaco-editor": "^0.41.0",
140-
"nodemon": "^2.0.22",
205+
"nodemon": "^3.0.2",
141206
"prettier": "^2.8.8",
142207
"rollup-plugin-delete": "^2.0.0",
208+
"semantic-release": "^19.0.5",
143209
"vite": "4.3.9",
144210
"vite-plugin-checker": "0.6.0",
145211
"vite-plugin-static-copy": "0.16.0"
@@ -148,4 +214,4 @@
148214
"node": ">=18",
149215
"yarn": "^1.22.x"
150216
}
151-
}
217+
}

‎packages/config/.configref‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
23123
1+
23527

0 commit comments

Comments
 (0)