From 526ed01d0a026ec7f056be83dac4aa36c19e8a48 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Fri, 16 Jul 2021 09:23:55 -0700 Subject: [PATCH 1/9] Fix issue with country db. --- lib/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/request.js b/lib/request.js index e5527f7d..dda9ede2 100644 --- a/lib/request.js +++ b/lib/request.js @@ -64,7 +64,7 @@ export async function getCountry(req, ip) { // Database lookup if (!lookup) { - lookup = await maxmind.open(path.resolve('./public/geo/GeoLite2-Country.mmdb')); + lookup = await maxmind.open(path.resolve(__dirname, '../public/geo/GeoLite2-Country.mmdb')); } const result = lookup.get(ip); From 2b0025b00855e2172ac7e401a065a4944a959996 Mon Sep 17 00:00:00 2001 From: Juntai Park Date: Mon, 19 Jul 2021 13:38:56 +0900 Subject: [PATCH 2/9] feat: add Korean language --- lang/ko-KR.json | 100 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 lang/ko-KR.json diff --git a/lang/ko-KR.json b/lang/ko-KR.json new file mode 100644 index 00000000..e268fa3e --- /dev/null +++ b/lang/ko-KR.json @@ -0,0 +1,100 @@ +{ + "label.accounts": "계정", + "label.add-account": "계정 추가", + "label.add-website": "웹사이트 추가", + "label.administrator": "관리자", + "label.all": "전체", + "label.all-websites": "모든 웹사이트", + "label.all-events": "모든 이벤트", + "label.back": "뒤로", + "label.cancel": "취소", + "label.change-password": "비밀번호 변경", + "label.confirm-password": "비밀번호 확인", + "label.copy-to-clipboard": "클립보드에 복사", + "label.current-password": "현재 비밀번호", + "label.custom-range": "범위 지정", + "label.dashboard": "대시보드", + "label.date-range": "날짜 범위", + "label.default-date-range": "기본 날짜 범위", + "label.delete": "삭제", + "label.delete-account": "계정 삭제", + "label.delete-website": "웹사이트 삭제", + "label.dismiss": "무시하기", + "label.domain": "도메인", + "label.edit": "편집", + "label.edit-account": "계정 수정", + "label.edit-website": "웹사이트 수정", + "label.enable-share-url": "URL 공유 활성화", + "label.invalid": "무효", + "label.invalid-domain": "잘못된 도메인", + "label.last-days": "최근 {x} 일간", + "label.last-hours": "최근 {x} 시간", + "label.logged-in-as": "{username}(으)로 로그인됨", + "label.login": "로그인", + "label.logout": "로그아웃", + "label.more": "더 보기", + "label.name": "이름", + "label.new-password": "새 비밀번호", + "label.password": "비밀번호", + "label.passwords-dont-match": "비밀번호가 일치하지 않음", + "label.profile": "프로필", + "label.realtime": "실시간", + "label.realtime-logs": "실시간 로그", + "label.refresh": "새로고침", + "label.required": "필수", + "label.reset": "리셋", + "label.save": "저장", + "label.settings": "설정", + "label.share-url": "공유 URL", + "label.single-day": "하루", + "label.this-month": "이번 달", + "label.this-week": "이번 주", + "label.this-year": "올해", + "label.timezone": "표준 시간대", + "label.today": "오늘", + "label.tracking-code": "추적 코드", + "label.unknown": "알 수 없음", + "label.username": "사용자명", + "label.view-details": "상세보기", + "label.websites": "웹사이트", + "message.active-users": "{x}명의 사용자가 보는 중입니다.", + "message.confirm-delete": "{target}을(를) 삭제하시겠습니까?", + "message.copied": "복사했습니다!", + "message.delete-warning": "관련된 모든 데이터도 삭제됩니다.", + "message.failure": "오류가 발생하였습니다.", + "message.get-share-url": "공유 URL 가져오기", + "message.get-tracking-code": "추적 코드 가져오기", + "message.go-to-settings": "설정으로 이동", + "message.incorrect-username-password": "사용자 이름/비밀번호가 잘못되었습니다..", + "message.log.visitor": "{os} {device}에서 {browser}을(를) 사용하는 {country}의 방문자", + "message.new-version-available": "새 버전의 umami {version} 사용가능!", + "message.no-data-available": "사용 가능한 데이터가 없습니다.", + "message.no-websites-configured": "구성된 웹 사이트가 없습니다.", + "message.page-not-found": "페이지를 찾을 수 없습니다.", + "message.powered-by": "이 시스템은 {name}에서 구동되고 있습니다.", + "message.save-success": "성공적으로 저장되었습니다.", + "message.share-url": "이것은 {target}의 공개적으로 공유된 URL입니다.", + "message.track-stats": "{target}에 대한 통계를 추적하려면 웹사이트의 {head} 섹션에 다음 코드를 입력하십시오.", + "message.type-delete": "확인을 위해 아래 박스에 {delete}값을 입력하십시오.", + "metrics.actions": "액션", + "metrics.average-visit-time": "평균 방문 시간", + "metrics.bounce-rate": "이탈률", + "metrics.browsers": "브라우저", + "metrics.countries": "국가", + "metrics.device.desktop": "데스크탑", + "metrics.device.laptop": "노트북", + "metrics.device.mobile": "모바일", + "metrics.device.tablet": "태블릿", + "metrics.devices": "기기", + "metrics.events": "이벤트", + "metrics.filter.combined": "합쳐서 보기", + "metrics.filter.domain-only": "도메인만", + "metrics.filter.raw": "전체 보기", + "metrics.operating-systems": "운영체제", + "metrics.page-views": "페이지 뷰(PV)", + "metrics.pages": "페이지", + "metrics.referrers": "리퍼러", + "metrics.unique-visitors": "순방문자(UV)", + "metrics.views": "조회수", + "metrics.visitors": "방문객" +} \ No newline at end of file From 4f38242927fc357893e2a5df246727e1abd9e1e5 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Sun, 18 Jul 2021 23:48:30 -0700 Subject: [PATCH 3/9] Update geo lookup --- lib/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/request.js b/lib/request.js index dda9ede2..e5527f7d 100644 --- a/lib/request.js +++ b/lib/request.js @@ -64,7 +64,7 @@ export async function getCountry(req, ip) { // Database lookup if (!lookup) { - lookup = await maxmind.open(path.resolve(__dirname, '../public/geo/GeoLite2-Country.mmdb')); + lookup = await maxmind.open(path.resolve('./public/geo/GeoLite2-Country.mmdb')); } const result = lookup.get(ip); From e6bfe8efd120c210f2274349d60f4a3a79b91f2c Mon Sep 17 00:00:00 2001 From: Meir Roth <12494197+meirroth@users.noreply.github.com> Date: Tue, 20 Jul 2021 20:02:58 +0300 Subject: [PATCH 4/9] Remove fonts.gstatic.com preconnect artifact Not needed anymore, as fonts are now sourced locally :smirk: See: https://github.com/mikecao/umami/pull/677 --- pages/_app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/_app.js b/pages/_app.js index 25048e43..b239f91f 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -38,7 +38,6 @@ export default function App({ Component, pageProps }) { - From 4f27a1773d9656059891067052144136c6667d9e Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Thu, 22 Jul 2021 19:16:21 -0700 Subject: [PATCH 5/9] Added Korean language. --- lib/lang.js | 3 +++ public/country/ko-KR.json | 1 + 2 files changed, 4 insertions(+) create mode 100644 public/country/ko-KR.json diff --git a/lib/lang.js b/lib/lang.js index 0cbe2f29..d746f650 100644 --- a/lib/lang.js +++ b/lib/lang.js @@ -15,6 +15,7 @@ import { id, it, ja, + ko, mn, ms, nb, @@ -54,6 +55,7 @@ export const languages = { 'it-IT': { label: 'Italiano', display: 'it' }, 'id-ID': { label: 'Bahasa Indonesia', display: 'id' }, 'ja-JP': { label: '日本語', display: 'ja' }, + 'ko-KR': { label: '한국어', display: 'ko' }, 'ms-MY': { label: 'Malay', display: 'ms' }, 'mn-MN': { label: 'Монгол', display: 'mn' }, 'nl-NL': { label: 'Nederlands', display: 'nl' }, @@ -108,4 +110,5 @@ export const dateLocales = { 'ms-MY': ms, 'ca-ES': ca, 'hu-HU': hu, + 'ko-KR': ko, }; diff --git a/public/country/ko-KR.json b/public/country/ko-KR.json new file mode 100644 index 00000000..0e0ff962 --- /dev/null +++ b/public/country/ko-KR.json @@ -0,0 +1 @@ +{"GH":"\uac00\ub098","GA":"\uac00\ubd09","GY":"\uac00\uc774\uc544\ub098","GM":"\uac10\ube44\uc544","GG":"\uac74\uc9c0","GP":"\uacfc\ub4e4\ub8e8\ud504","GT":"\uacfc\ud14c\ub9d0\ub77c","GU":"\uad0c","GD":"\uadf8\ub808\ub098\ub2e4","GR":"\uadf8\ub9ac\uc2a4","GL":"\uadf8\ub9b0\ub780\ub4dc","GN":"\uae30\ub2c8","GW":"\uae30\ub2c8\ube44\uc0ac\uc6b0","NA":"\ub098\ubbf8\ube44\uc544","NR":"\ub098\uc6b0\ub8e8","NG":"\ub098\uc774\uc9c0\ub9ac\uc544","AQ":"\ub0a8\uadf9 \ub300\ub959","SS":"\ub0a8\uc218\ub2e8","ZA":"\ub0a8\uc544\ud504\ub9ac\uce74","NL":"\ub124\ub35c\ub780\ub4dc","BQ":"\ub124\ub35c\ub780\ub4dc\ub839 \uce74\ub9ac\ube0c","NP":"\ub124\ud314","NO":"\ub178\ub974\uc6e8\uc774","NF":"\ub178\ud37d\uc12c","NZ":"\ub274\uc9c8\ub79c\ub4dc","NC":"\ub274\uce7c\ub808\ub3c4\ub2c8\uc544","NU":"\ub2c8\uc6b0\uc5d0","NE":"\ub2c8\uc81c\ub974","NI":"\ub2c8\uce74\ub77c\uacfc","TW":"\ub300\ub9cc","KR":"\ub300\ud55c\ubbfc\uad6d","DK":"\ub374\ub9c8\ud06c","DM":"\ub3c4\ubbf8\ub2c8\uce74","DO":"\ub3c4\ubbf8\ub2c8\uce74 \uacf5\ud654\uad6d","DE":"\ub3c5\uc77c","TL":"\ub3d9\ud2f0\ubaa8\ub974","LA":"\ub77c\uc624\uc2a4","LR":"\ub77c\uc774\ubca0\ub9ac\uc544","LV":"\ub77c\ud2b8\ube44\uc544","RU":"\ub7ec\uc2dc\uc544","LB":"\ub808\ubc14\ub17c","LS":"\ub808\uc18c\ud1a0","RO":"\ub8e8\ub9c8\ub2c8\uc544","LU":"\ub8e9\uc148\ubd80\ub974\ud06c","RW":"\ub974\uc644\ub2e4","LY":"\ub9ac\ube44\uc544","RE":"\ub9ac\uc720\ub2c8\uc628","LT":"\ub9ac\ud22c\uc544\ub2c8\uc544","LI":"\ub9ac\ud788\ud150\uc288\ud0c0\uc778","MG":"\ub9c8\ub2e4\uac00\uc2a4\uce74\ub974","MQ":"\ub9c8\ub974\ud2f0\ub2c8\ud06c","MH":"\ub9c8\uc15c \uc81c\ub3c4","YT":"\ub9c8\uc694\ud2b8","MO":"\ub9c8\uce74\uc624(\uc911\uad6d \ud2b9\ubcc4\ud589\uc815\uad6c)","MW":"\ub9d0\ub77c\uc704","MY":"\ub9d0\ub808\uc774\uc2dc\uc544","ML":"\ub9d0\ub9ac","IM":"\ub9e8 \uc12c","MX":"\uba55\uc2dc\ucf54","MC":"\ubaa8\ub098\ucf54","MA":"\ubaa8\ub85c\ucf54","MU":"\ubaa8\ub9ac\uc154\uc2a4","MR":"\ubaa8\ub9ac\ud0c0\ub2c8","MZ":"\ubaa8\uc7a0\ube44\ud06c","ME":"\ubaac\ud14c\ub124\uadf8\ub85c","MS":"\ubaac\ud2b8\uc138\ub77c\ud2b8","MD":"\ubab0\ub3c4\ubc14","MV":"\ubab0\ub514\ube0c","MT":"\ubab0\ud0c0","MN":"\ubabd\uace8","US":"\ubbf8\uad6d","VI":"\ubbf8\uad6d\ub839 \ubc84\uc9c4\uc544\uc77c\ub79c\ub4dc","UM":"\ubbf8\uad6d\ub839 \ud574\uc678 \uc81c\ub3c4","MM":"\ubbf8\uc580\ub9c8","FM":"\ubbf8\ud06c\ub85c\ub124\uc2dc\uc544","VU":"\ubc14\ub204\uc544\ud22c","BH":"\ubc14\ub808\uc778","BB":"\ubc14\ubca0\uc774\ub3c4\uc2a4","VA":"\ubc14\ud2f0\uce78 \uc2dc\uad6d","BS":"\ubc14\ud558\ub9c8","BD":"\ubc29\uae00\ub77c\ub370\uc2dc","BM":"\ubc84\ubba4\ub2e4","BJ":"\ubca0\ub0c9","VE":"\ubca0\ub124\uc218\uc5d8\ub77c","VN":"\ubca0\ud2b8\ub0a8","BE":"\ubca8\uae30\uc5d0","BY":"\ubca8\ub77c\ub8e8\uc2a4","BZ":"\ubca8\ub9ac\uc988","BA":"\ubcf4\uc2a4\ub2c8\uc544 \ud5e4\ub974\uccb4\uace0\ube44\ub098","BW":"\ubcf4\uce20\uc640\ub098","BO":"\ubcfc\ub9ac\ube44\uc544","BI":"\ubd80\ub8ec\ub514","BF":"\ubd80\ub974\ud0a4\ub098\ud30c\uc18c","BV":"\ubd80\ubca0\uc12c","BT":"\ubd80\ud0c4","MP":"\ubd81\ub9c8\ub9ac\uc544\ub098\uc81c\ub3c4","MK":"\ubd81\ub9c8\ucf00\ub3c4\ub2c8\uc544","KP":"\ubd81\ud55c","BG":"\ubd88\uac00\ub9ac\uc544","BR":"\ube0c\ub77c\uc9c8","BN":"\ube0c\ub8e8\ub098\uc774","WS":"\uc0ac\ubaa8\uc544","SA":"\uc0ac\uc6b0\ub514\uc544\ub77c\ube44\uc544","GS":"\uc0ac\uc6b0\uc2a4\uc870\uc9c0\uc544 \uc0ac\uc6b0\uc2a4\uc0cc\ub4dc\uc704\uce58 \uc81c\ub3c4","SM":"\uc0b0\ub9c8\ub9ac\ub178","ST":"\uc0c1\ud22c\uba54 \ud504\ub9b0\uc2dc\ud398","MF":"\uc0dd\ub9c8\ub974\ud0f1","BL":"\uc0dd\ubc14\ub974\ud154\ub808\ubbf8","PM":"\uc0dd\ud53c\uc5d0\ub974 \ubbf8\ud074\ub871","EH":"\uc11c\uc0ac\ud558\ub77c","SN":"\uc138\ub124\uac08","RS":"\uc138\ub974\ube44\uc544","SC":"\uc138\uc774\uc178","LC":"\uc138\uc778\ud2b8\ub8e8\uc2dc\uc544","VC":"\uc138\uc778\ud2b8\ube48\uc13c\ud2b8\uadf8\ub808\ub098\ub518","KN":"\uc138\uc778\ud2b8\ud0a4\uce20 \ub124\ube44\uc2a4","SH":"\uc138\uc778\ud2b8\ud5ec\ub808\ub098","SO":"\uc18c\ub9d0\ub9ac\uc544","SB":"\uc194\ub85c\ubaac \uc81c\ub3c4","SD":"\uc218\ub2e8","SR":"\uc218\ub9ac\ub0a8","LK":"\uc2a4\ub9ac\ub791\uce74","SJ":"\uc2a4\ubc1c\ubc14\ub974\uc81c\ub3c4-\uc580\ub9c8\uc6ec\uc12c","SE":"\uc2a4\uc6e8\ub374","CH":"\uc2a4\uc704\uc2a4","ES":"\uc2a4\ud398\uc778","SK":"\uc2ac\ub85c\ubc14\ud0a4\uc544","SI":"\uc2ac\ub85c\ubca0\ub2c8\uc544","SY":"\uc2dc\ub9ac\uc544","SL":"\uc2dc\uc5d0\ub77c\ub9ac\uc628","SX":"\uc2e0\ud2b8\ub9c8\ub974\ud134","SG":"\uc2f1\uac00\ud3ec\ub974","AE":"\uc544\ub78d\uc5d0\ubbf8\ub9ac\ud2b8","AW":"\uc544\ub8e8\ubc14","AM":"\uc544\ub974\uba54\ub2c8\uc544","AR":"\uc544\ub974\ud5e8\ud2f0\ub098","AS":"\uc544\uba54\ub9ac\uce78 \uc0ac\ubaa8\uc544","IS":"\uc544\uc774\uc2ac\ub780\ub4dc","HT":"\uc544\uc774\ud2f0","IE":"\uc544\uc77c\ub79c\ub4dc","AZ":"\uc544\uc81c\ub974\ubc14\uc774\uc794","AF":"\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4","AD":"\uc548\ub3c4\ub77c","AL":"\uc54c\ubc14\ub2c8\uc544","DZ":"\uc54c\uc81c\ub9ac","AO":"\uc559\uace8\ub77c","AG":"\uc564\ud2f0\uac00 \ubc14\ubd80\ub2e4","AI":"\uc575\uadc8\ub77c","ER":"\uc5d0\ub9ac\ud2b8\ub9ac\uc544","SZ":"\uc5d0\uc2a4\uc640\ud2f0\ub2c8","EE":"\uc5d0\uc2a4\ud1a0\ub2c8\uc544","EC":"\uc5d0\ucf70\ub3c4\ub974","ET":"\uc5d0\ud2f0\uc624\ud53c\uc544","SV":"\uc5d8\uc0b4\ubc14\ub3c4\ub974","GB":"\uc601\uad6d","VG":"\uc601\uad6d\ub839 \ubc84\uc9c4\uc544\uc77c\ub79c\ub4dc","IO":"\uc601\uad6d\ub839 \uc778\ub3c4\uc591 \uc2dd\ubbfc\uc9c0","YE":"\uc608\uba58","OM":"\uc624\ub9cc","AU":"\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544","AT":"\uc624\uc2a4\ud2b8\ub9ac\uc544","HN":"\uc628\ub450\ub77c\uc2a4","AX":"\uc62c\ub780\ub4dc \uc81c\ub3c4","WF":"\uc648\ub9ac\uc2a4-\ud478\ud22c\ub098 \uc81c\ub3c4","JO":"\uc694\ub974\ub2e8","UG":"\uc6b0\uac04\ub2e4","UY":"\uc6b0\ub8e8\uacfc\uc774","UZ":"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4","UA":"\uc6b0\ud06c\ub77c\uc774\ub098","IQ":"\uc774\ub77c\ud06c","IR":"\uc774\ub780","IL":"\uc774\uc2a4\ub77c\uc5d8","EG":"\uc774\uc9d1\ud2b8","IT":"\uc774\ud0c8\ub9ac\uc544","IN":"\uc778\ub3c4","ID":"\uc778\ub3c4\ub124\uc2dc\uc544","JP":"\uc77c\ubcf8","JM":"\uc790\uba54\uc774\uce74","ZM":"\uc7a0\ube44\uc544","JE":"\uc800\uc9c0","GQ":"\uc801\ub3c4 \uae30\ub2c8","GE":"\uc870\uc9c0\uc544","CN":"\uc911\uad6d","CF":"\uc911\uc559 \uc544\ud504\ub9ac\uce74 \uacf5\ud654\uad6d","DJ":"\uc9c0\ubd80\ud2f0","GI":"\uc9c0\ube0c\ub864\ud130","ZW":"\uc9d0\ubc14\ube0c\uc6e8","TD":"\ucc28\ub4dc","CZ":"\uccb4\ucf54","CL":"\uce60\ub808","CM":"\uce74\uba54\ub8ec","CV":"\uce74\ubcf4\ubca0\ub974\ub370","KZ":"\uce74\uc790\ud750\uc2a4\ud0c4","QA":"\uce74\ud0c0\ub974","KH":"\uce84\ubcf4\ub514\uc544","CA":"\uce90\ub098\ub2e4","KE":"\ucf00\ub0d0","KY":"\ucf00\uc774\ub9e8 \uc81c\ub3c4","KM":"\ucf54\ubaa8\ub85c","CR":"\ucf54\uc2a4\ud0c0\ub9ac\uce74","CC":"\ucf54\ucf54\uc2a4 \uc81c\ub3c4","CI":"\ucf54\ud2b8\ub514\ubd80\uc544\ub974","CO":"\ucf5c\ub86c\ube44\uc544","CG":"\ucf69\uace0-\ube0c\ub77c\uc790\ube4c","CD":"\ucf69\uace0-\ud0a8\uc0e4\uc0ac","CU":"\ucfe0\ubc14","KW":"\ucfe0\uc6e8\uc774\ud2b8","CK":"\ucfe1 \uc81c\ub3c4","CW":"\ud034\ub77c\uc18c","HR":"\ud06c\ub85c\uc544\ud2f0\uc544","CX":"\ud06c\ub9ac\uc2a4\ub9c8\uc2a4\uc12c","KG":"\ud0a4\ub974\uae30\uc2a4\uc2a4\ud0c4","KI":"\ud0a4\ub9ac\ubc14\uc2dc","CY":"\ud0a4\ud504\ub85c\uc2a4","TJ":"\ud0c0\uc9c0\ud0a4\uc2a4\ud0c4","TZ":"\ud0c4\uc790\ub2c8\uc544","TH":"\ud0dc\uad6d","TC":"\ud130\ud06c\uc2a4 \ucf00\uc774\ucee4\uc2a4 \uc81c\ub3c4","TR":"\ud130\ud0a4","TG":"\ud1a0\uace0","TK":"\ud1a0\ucf08\ub77c\uc6b0","TO":"\ud1b5\uac00","TM":"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4","TV":"\ud22c\ubc1c\ub8e8","TN":"\ud280\ub2c8\uc9c0","TT":"\ud2b8\ub9ac\ub2c8\ub2e4\ub4dc \ud1a0\ubc14\uace0","PA":"\ud30c\ub098\ub9c8","PY":"\ud30c\ub77c\uacfc\uc774","PK":"\ud30c\ud0a4\uc2a4\ud0c4","PG":"\ud30c\ud478\uc544\ub274\uae30\ub2c8","PW":"\ud314\ub77c\uc6b0","PS":"\ud314\ub808\uc2a4\ud0c0\uc778 \uc9c0\uad6c","FO":"\ud398\ub85c \uc81c\ub3c4","PE":"\ud398\ub8e8","PT":"\ud3ec\ub974\ud22c\uac08","FK":"\ud3ec\ud074\ub79c\ub4dc \uc81c\ub3c4","PL":"\ud3f4\ub780\ub4dc","PR":"\ud478\uc5d0\ub974\ud1a0\ub9ac\ucf54","FR":"\ud504\ub791\uc2a4","TF":"\ud504\ub791\uc2a4 \ub0a8\ubd80 \uc9c0\ubc29","GF":"\ud504\ub791\uc2a4\ub839 \uae30\uc544\ub098","PF":"\ud504\ub791\uc2a4\ub839 \ud3f4\ub9ac\ub124\uc2dc\uc544","FJ":"\ud53c\uc9c0","FI":"\ud540\ub780\ub4dc","PH":"\ud544\ub9ac\ud540","PN":"\ud54f\ucf00\uc5b8 \uc12c","HM":"\ud5c8\ub4dc \ub9e5\ub3c4\ub110\ub4dc \uc81c\ub3c4","HU":"\ud5dd\uac00\ub9ac","HK":"\ud64d\ucf69(\uc911\uad6d \ud2b9\ubcc4\ud589\uc815\uad6c)"} \ No newline at end of file From e5e484cb30d650000e5dcbd9d1972ade72f6b169 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Thu, 22 Jul 2021 19:17:40 -0700 Subject: [PATCH 6/9] Revert Next version back to 10. --- package.json | 2 +- yarn.lock | 85 ++++++++++++++++++++++++---------------------------- 2 files changed, 40 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index 7fe5efd5..3be9d2ab 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "jose": "2.0.5", "maxmind": "^4.3.2", "moment-timezone": "^0.5.33", - "next": "^11.0.1", + "next": "10.2.2", "prompts": "2.4.1", "prop-types": "^15.7.2", "react": "^17.0.2", diff --git a/yarn.lock b/yarn.lock index 38c6a29c..01a557e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1331,25 +1331,25 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== -"@next/env@11.0.1": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@next/env/-/env-11.0.1.tgz#6dc96ac76f1663ab747340e907e8933f190cc8fd" - integrity sha512-yZfKh2U6R9tEYyNUrs2V3SBvCMufkJ07xMH5uWy8wqcl5gAXoEw6A/1LDqwX3j7pUutF9d1ZxpdGDA3Uag+aQQ== +"@next/env@10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@next/env/-/env-10.2.2.tgz#cb61f6c29f349815108184c2f1926ada65458e28" + integrity sha512-m0xOpl4F9z7R7Yt2OtJoo6ZUsFPdx+kuvZeoctH7T6lO66DmZL3W6MQDxso/ArkH8VOlDPZgeQVVBPf+I7wflA== "@next/eslint-plugin-next@11.0.1": version "11.0.1" resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-11.0.1.tgz#5dd3264a40fadcf28eba00d914d69103422bb7e6" integrity sha512-UzdX3y6XSrj9YuASUb/p4sRvfjP2klj2YgIOfMwrWoLTTPJQMh00hREB9Ftr7m7RIxjVSAaaLXIRLdxvq948GA== -"@next/polyfill-module@11.0.1": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-11.0.1.tgz#ca2a110c1c44672cbcff6c2b983f0c0549d87291" - integrity sha512-Cjs7rrKCg4CF4Jhri8PCKlBXhszTfOQNl9AjzdNy4K5jXFyxyoSzuX2rK4IuoyE+yGp5A3XJCBEmOQ4xbUp9Mg== +"@next/polyfill-module@10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-10.2.2.tgz#48d108dd562ed021dd23510c0ffe96badf5f9c04" + integrity sha512-0t5Hw1Dr18TWP65qAnakRa8+jza6SAFOz0b2v67s5AVquAwXXlclR4SfUy3ahrRtjCqlbLEE/oFIzCGbyMYfVA== -"@next/react-dev-overlay@11.0.1": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-11.0.1.tgz#3c481e83347255abd466dcf7e59ac8a79a0d7fd6" - integrity sha512-lvUjMVpLsgzADs9Q8wtC5LNqvfdN+M0BDMSrqr04EDWAyyX0vURHC9hkvLbyEYWyh+WW32pwjKBXdkMnJhoqMg== +"@next/react-dev-overlay@10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-10.2.2.tgz#88fb5013d3df70bd37b854234c41d884e108a149" + integrity sha512-uPslFPWvvZ8AdadGdK2/834UnJy6F+7071/ere6QpN88Ngzqx9lDIhjslEeFLRtpyBst4s1YUdbm69btVPdE5w== dependencies: "@babel/code-frame" "7.12.11" anser "1.4.9" @@ -1363,10 +1363,10 @@ stacktrace-parser "0.1.10" strip-ansi "6.0.0" -"@next/react-refresh-utils@11.0.1": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-11.0.1.tgz#a7509f22b6f70c13101a26573afd295295f1c020" - integrity sha512-K347DM6Z7gBSE+TfUaTTceWvbj0B6iNAsFZXbFZOlfg3uyz2sbKpzPYYFocCc27yjLaS8OfR8DEdS2mZXi8Saw== +"@next/react-refresh-utils@10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-10.2.2.tgz#69dd150e3656aebe63fc828916105f1472810488" + integrity sha512-OL7r0iz+SiE9SMWcxZocUtEAHv0/TlBWxIE3KjjO1vWSU1r0gMrE2l2RxHfMLIPsl6CjAkcPxoaXlosFsJ2S5w== "@nodelib/fs.scandir@2.1.3": version "2.1.3" @@ -1389,6 +1389,18 @@ "@nodelib/fs.scandir" "2.1.3" fastq "^1.6.0" +"@opentelemetry/api@0.14.0": + version "0.14.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-0.14.0.tgz#4e17d8d2f1da72b19374efa7b6526aa001267cae" + integrity sha512-L7RMuZr5LzMmZiQSQDy9O1jo0q+DaLy6XpYJfIGfYSfoJA5qzYwUP3sP1uMIQ549DvxAgM3ng85EaPTM/hUHwQ== + dependencies: + "@opentelemetry/context-base" "^0.14.0" + +"@opentelemetry/context-base@^0.14.0": + version "0.14.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.14.0.tgz#c67fc20a4d891447ca1a855d7d70fa79a3533001" + integrity sha512-sDOAZcYwynHFTbLo6n8kIbLiVF3a3BLkrmehJUyEbT9F+Smbi47kLGS2gG2g0fjBLR/Lr1InPD7kXL7FaTqEkw== + "@panva/asn1.js@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@panva/asn1.js/-/asn1.js-1.0.0.tgz#dd55ae7b8129e02049f009408b97c61ccf9032f6" @@ -4432,13 +4444,6 @@ ignore@^5.1.4, ignore@^5.1.8: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== -image-size@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.0.tgz#58b31fe4743b1cec0a0ac26f5c914d3c5b2f0750" - integrity sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw== - dependencies: - queue "6.0.2" - immer@^9.0.1, immer@^9.0.5: version "9.0.5" resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.5.tgz#a7154f34fe7064f15f00554cc94c66cc0bf453ec" @@ -5548,17 +5553,18 @@ next-tick@~1.0.0: resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= -next@^11.0.1: - version "11.0.1" - resolved "https://registry.yarnpkg.com/next/-/next-11.0.1.tgz#b8e3914d153aaf7143cb98c09bcd3c8230eeb17a" - integrity sha512-yR7be7asNbvpVNpi6xxEg28wZ7Gqmj1nOt0sABH9qORmF3+pms2KZ7Cng33oK5nqPIzEEFJD0pp2PCe3/ueMIg== +next@10.2.2: + version "10.2.2" + resolved "https://registry.yarnpkg.com/next/-/next-10.2.2.tgz#aadcc526e420282b4a735b0595041195d748a91d" + integrity sha512-HPGSLrflWPvf3zEZSIk/uj0CZ+YYrpZwZS0PFAgXbEwb894iRuAPzglagqlzcCh7lg12RBEaKNIxhrVa5xgjtQ== dependencies: "@babel/runtime" "7.12.5" "@hapi/accept" "5.0.2" - "@next/env" "11.0.1" - "@next/polyfill-module" "11.0.1" - "@next/react-dev-overlay" "11.0.1" - "@next/react-refresh-utils" "11.0.1" + "@next/env" "10.2.2" + "@next/polyfill-module" "10.2.2" + "@next/react-dev-overlay" "10.2.2" + "@next/react-refresh-utils" "10.2.2" + "@opentelemetry/api" "0.14.0" assert "2.0.0" ast-types "0.13.2" browserify-zlib "0.2.0" @@ -5576,7 +5582,6 @@ next@^11.0.1: find-cache-dir "3.3.1" get-orientation "1.1.2" https-browserify "1.0.0" - image-size "1.0.0" jest-worker "27.0.0-next.5" native-url "0.3.4" node-fetch "2.6.1" @@ -5591,7 +5596,7 @@ next@^11.0.1: prop-types "15.7.2" querystring-es3 "0.2.1" raw-body "2.4.1" - react-is "17.0.2" + react-is "16.13.1" react-refresh "0.8.3" stream-browserify "3.0.0" stream-http "3.1.1" @@ -6725,13 +6730,6 @@ querystring@0.2.0, querystring@^0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= -queue@6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65" - integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA== - dependencies: - inherits "~2.0.3" - quick-lru@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" @@ -6796,12 +6794,7 @@ react-intl@^5.20.4: intl-messageformat "9.7.1" tslib "^2.1.0" -react-is@17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" - integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== - -react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1: +react-is@16.13.1, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== From 17a673a69a62dd450ca2fa5e5a6141ec329ce5dc Mon Sep 17 00:00:00 2001 From: Sammy-T Date: Sun, 25 Jul 2021 02:42:13 -0400 Subject: [PATCH 7/9] Preserve page's scroll position --- components/layout/Page.js | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/components/layout/Page.js b/components/layout/Page.js index 28492ddf..3fbd7673 100644 --- a/components/layout/Page.js +++ b/components/layout/Page.js @@ -2,6 +2,25 @@ import React from 'react'; import classNames from 'classnames'; import styles from './Page.module.css'; -export default function Page({ className, children }) { - return
{children}
; +export default class Page extends React.Component { + getSnapshotBeforeUpdate() { + if (window.pageXOffset === 0 && window.pageYOffset === 0) return null; + + // Return the scrolled position as the snapshot value + return { x: window.pageXOffset, y: window.pageYOffset }; + } + + /* eslint-disable no-unused-vars */ + componentDidUpdate(prevProps, prevState, snapshot) { + if (snapshot !== null) { + // Restore the scrolled position after re-rendering + window.scrollTo(snapshot.x, snapshot.y); + } + } + /* eslint-enable no-unused-vars */ + + render() { + const { className, children } = this.props; + return
{children}
; + } } From 2cc6a98241f69691c7964ca8780272fe5b284966 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Sun, 25 Jul 2021 21:36:07 -0700 Subject: [PATCH 8/9] Updated packages. --- package.json | 18 ++-- yarn.lock | 231 ++++++++++++++++++++++++++++----------------------- 2 files changed, 135 insertions(+), 114 deletions(-) diff --git a/package.json b/package.json index 3be9d2ab..996d164b 100644 --- a/package.json +++ b/package.json @@ -60,15 +60,15 @@ "@fontsource/noto-sans-jp": "^4.5.0", "@fontsource/noto-sans-sc": "^4.5.0", "@fontsource/noto-sans-tc": "^4.5.0", - "@prisma/client": "2.26.0", - "@reduxjs/toolkit": "^1.5.1", + "@prisma/client": "2.27.0", + "@reduxjs/toolkit": "^1.6.1", "bcryptjs": "^2.4.3", "chalk": "^4.1.1", "chart.js": "^2.9.4", "classnames": "^2.3.1", "cookie": "^0.4.1", "cors": "^2.8.5", - "date-fns": "^2.22.1", + "date-fns": "^2.23.0", "date-fns-tz": "^1.1.4", "detect-browser": "^5.2.0", "dotenv": "^8.2.0", @@ -76,7 +76,7 @@ "immer": "^9.0.5", "ipaddr.js": "^2.0.1", "is-localhost-ip": "^1.4.0", - "isbot": "^3.1.0", + "isbot": "^3.2.2", "jose": "2.0.5", "maxmind": "^4.3.2", "moment-timezone": "^0.5.33", @@ -85,7 +85,7 @@ "prop-types": "^15.7.2", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-intl": "^5.20.4", + "react-intl": "^5.20.6", "react-redux": "^7.2.4", "react-simple-maps": "^2.3.0", "react-spring": "^8.0.27", @@ -102,7 +102,7 @@ "uuid": "^8.3.2" }, "devDependencies": { - "@formatjs/cli": "^4.2.27", + "@formatjs/cli": "^4.2.29", "@rollup/plugin-buble": "^0.21.3", "@rollup/plugin-node-resolve": "^11.2.1", "@rollup/plugin-replace": "^2.3.4", @@ -110,7 +110,7 @@ "cross-env": "^7.0.3", "del": "^6.0.0", "dotenv-cli": "^4.0.0", - "eslint": "^7.30.0", + "eslint": "^7.31.0", "eslint-config-next": "^11.0.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-prettier": "^3.4.0", @@ -128,7 +128,7 @@ "postcss-rtlcss": "^3.3.2", "prettier": "^2.3.2", "prettier-eslint": "^12.0.0", - "prisma": "2.26.0", + "prisma": "2.27.0", "rollup": "^2.48.0", "rollup-plugin-hashbang": "^2.2.2", "rollup-plugin-terser": "^7.0.2", @@ -136,6 +136,6 @@ "stylelint-config-css-modules": "^2.2.0", "stylelint-config-prettier": "^8.0.1", "stylelint-config-recommended": "^5.0.0", - "tar": "^6.0.5" + "tar": "^6.1.1" } } diff --git a/yarn.lock b/yarn.lock index 01a557e8..9d1d4318 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1153,10 +1153,10 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@eslint/eslintrc@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179" - integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg== +"@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -1188,13 +1188,13 @@ resolved "https://registry.yarnpkg.com/@fontsource/noto-sans-tc/-/noto-sans-tc-4.5.0.tgz#ea83a2c0851241464a9aea5facd9be7455b0f2dd" integrity sha512-7z8aT4aY5EJ8gggfJhUhtXL/CZQQSZ+HBuhXxiHy+NkvZG2Jz+Aa1kxrsJivzroJuK9dySYN4Pd/GENJv5WFqA== -"@formatjs/cli@^4.2.27": - version "4.2.27" - resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-4.2.27.tgz#b452ce68895741ccf6f4c27415e4d133f17b8250" - integrity sha512-P+y3nIBa+IMfv8dKPdZ38xhF/l9AghsU8kKi2onUJLpvjjDdjTEUTleaPpVghZKhe6BqNbso+anludxlZUdKoA== +"@formatjs/cli@^4.2.29": + version "4.2.29" + resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-4.2.29.tgz#00c320c2981e0c8a908d3924a988651f27c06175" + integrity sha512-uU3joDk6qcNkbk6kink8HBREkGHgqyKV6cGOK+NUq4z/3AIDr9l7eJCIm87tTsNjLJ6iKP3p80W8lk0IoElbcQ== dependencies: - "@formatjs/icu-messageformat-parser" "2.0.7" - "@formatjs/ts-transformer" "3.4.5" + "@formatjs/icu-messageformat-parser" "2.0.8" + "@formatjs/ts-transformer" "3.4.6" "@types/json-stable-stringify" "^1.0.32" "@types/lodash" "^4.14.150" "@types/node" "14" @@ -1202,7 +1202,7 @@ "@vue/compiler-sfc" "^3.0.5" chalk "^4.0.0" commander "8" - fast-glob "^3.2.4" + fast-glob "^3.2.7" fs-extra "^9.0.0" json-stable-stringify "^1.0.1" lodash "^4.17.15" @@ -1210,11 +1210,12 @@ tslib "^2.1.0" typescript "^4.0" -"@formatjs/ecma402-abstract@1.9.4": - version "1.9.4" - resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.4.tgz#797ae6c407fb5a0d09023a60c86f19aca1958c5e" - integrity sha512-ePJXI7tWC9PBxQxS7jtbkCLGVmpC8MH8n9Yjmg8dsh9wXK9svu7nAbq76Oiu5Zb+5GVkLkeTVerlSvHCbNImlA== +"@formatjs/ecma402-abstract@1.9.5": + version "1.9.5" + resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.5.tgz#89ddbc6f18f2ac3cbe841ae13cb1e0a65eddbf53" + integrity sha512-cGpEBzrf9bL2lTMEuRZ3gjLrEUEucxAXDIdX4tNqNdNZO81ZN558BfjiFfyPgrhILEuJU/+sgLwWxddSn6usHw== dependencies: + "@formatjs/intl-localematcher" "0.2.18" tslib "^2.1.0" "@formatjs/ecma402-abstract@^1.2.2": @@ -1227,37 +1228,46 @@ resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.1.1.tgz#3006b58aca1e39a98aca213356b42da5d173f26b" integrity sha512-mIqBr5uigIlx13eZTOPSEh2buDiy3BCdMYUtewICREQjbb4xarDiVWoXSnrERM7NanZ+0TAHNXSqDe6HpEFQUg== -"@formatjs/icu-messageformat-parser@2.0.7": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.7.tgz#326efc14d9409cdbf1b7d3f42e0eed273c95c663" - integrity sha512-gduYfh/YdBTmb1XzLueNaofiGZVMrkaDg0RSa0GNztKWs4QXIRS+28cjcuWNpV0q5S8aiLMkP7SHQpZKnPCHLw== +"@formatjs/icu-messageformat-parser@2.0.8": + version "2.0.8" + resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.8.tgz#a7a8714e92c7a1afec3dc4ed94e9e82256f0afb2" + integrity sha512-fZlQ7ls3eQswO4RFB0lSi+ritPvud0Z2EQB6SU8qI5+MIS4qU4AHjq/dFJNvhdEdmJqLWHe31K4yHaRdavkSQQ== dependencies: - "@formatjs/ecma402-abstract" "1.9.4" - "@formatjs/icu-skeleton-parser" "1.2.8" + "@formatjs/ecma402-abstract" "1.9.5" + "@formatjs/icu-skeleton-parser" "1.2.9" tslib "^2.1.0" -"@formatjs/icu-skeleton-parser@1.2.8": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.8.tgz#ddf6c1f7274244b71237fad49a67dd97e81f5c0a" - integrity sha512-KLSSAA7Q2Uv7msij8saaOE5rpsHK/2WkfS3737JnDyVTFOYe8l2OarIBUoTC5gi1BnCgiN/1icZlqXwyUX6obA== +"@formatjs/icu-skeleton-parser@1.2.9": + version "1.2.9" + resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.9.tgz#70c36735be9cffec0669fa089d061fa6b60e5a8a" + integrity sha512-cx8Ug1gxRtv0rRddWd6dt5Sn/BhnhktSHvokbmLUVOEp2dy/6Ehvv2e00wow28AaSIzvBvM6ew1Qwe9wzDzcOw== dependencies: - "@formatjs/ecma402-abstract" "1.9.4" + "@formatjs/ecma402-abstract" "1.9.5" tslib "^2.1.0" -"@formatjs/intl-displaynames@5.1.6": - version "5.1.6" - resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-5.1.6.tgz#b2905cff3802c4a703cf0ce1da10083e37652716" - integrity sha512-s0eDyQFM2gQIPgn+MyaH+UcCvp6ui2ft9UW1gsIkjBkaprRlzKMd3fjxcUFO/I7oyXXA6FYR4qHR8u1I0+PvXA== +"@formatjs/intl-displaynames@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-5.2.0.tgz#b2cc92d941d1fe7c83ff081b955197e647d26d10" + integrity sha512-Vox3IbI2I1aG2agCQUKdmtB8aM9C7iaGui2S2Apo50MVC7sJuFz7sXq5vuqp8erCAalhuCfRMQREQ3jw/rwW6w== dependencies: - "@formatjs/ecma402-abstract" "1.9.4" + "@formatjs/ecma402-abstract" "1.9.5" + "@formatjs/intl-localematcher" "0.2.18" tslib "^2.1.0" -"@formatjs/intl-listformat@6.2.6": - version "6.2.6" - resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-6.2.6.tgz#4e3d6580df3b6ef737e5d7ce85bae7e065518ff9" - integrity sha512-6FMdQY1+QKqJW5IhsVPFuEaR/uRiBKP+Y1oDvamZKzDfJ2vQmk9jqSF51VztlZH8XSfdO0IgvBzeRPHahKChQA== +"@formatjs/intl-listformat@6.3.0": + version "6.3.0" + resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-6.3.0.tgz#d64b8cb99050b74e7a2acf360e98b5a3d9f40f26" + integrity sha512-xfNODLDWAV2pAZIK3a/HedvNmvg7GJxFVyOSbYMJP3uTrgjxIUZXeUIu5A5aHe8hn6Tv/GdT9QltDol/YlXmcg== + dependencies: + "@formatjs/ecma402-abstract" "1.9.5" + "@formatjs/intl-localematcher" "0.2.18" + tslib "^2.1.0" + +"@formatjs/intl-localematcher@0.2.18": + version "0.2.18" + resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.18.tgz#8fd26045d4f8d85a69519a29f5ee491577ff3eb8" + integrity sha512-xI9X+mi7wbucbh35GNTY+C0+oMJXAp8ueC73SOyJlBpRNjLuOlSwgw3yJaCZxy3WpjcRBCP0laJ5zlpITO0QpA== dependencies: - "@formatjs/ecma402-abstract" "1.9.4" tslib "^2.1.0" "@formatjs/intl-numberformat@^5.5.2": @@ -1267,25 +1277,25 @@ dependencies: "@formatjs/ecma402-abstract" "^1.2.2" -"@formatjs/intl@1.13.2": - version "1.13.2" - resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-1.13.2.tgz#4bfa02f9447152a19a2cbc4184295c740ebb85ab" - integrity sha512-aonTXXaI/Guqr4t87m/XWfmgE9aPefDTLRnCwadxBDkUHw1/HQeUV+lp/3BgiPZfemIdBq9UgdigDCwrpEwrTA== +"@formatjs/intl@1.13.4": + version "1.13.4" + resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-1.13.4.tgz#7c0143558647800359bea4875fc1005844794031" + integrity sha512-Hk3jPFsi2g75Yc0bdEsQTgk8TM9CrCBfBwHbngfsNYX0P0QHq00vxIK0kXB/QyOP4SL3hVENA30yRb6cbNp6ww== dependencies: - "@formatjs/ecma402-abstract" "1.9.4" + "@formatjs/ecma402-abstract" "1.9.5" "@formatjs/fast-memoize" "1.1.1" - "@formatjs/icu-messageformat-parser" "2.0.7" - "@formatjs/intl-displaynames" "5.1.6" - "@formatjs/intl-listformat" "6.2.6" - intl-messageformat "9.7.1" + "@formatjs/icu-messageformat-parser" "2.0.8" + "@formatjs/intl-displaynames" "5.2.0" + "@formatjs/intl-listformat" "6.3.0" + intl-messageformat "9.8.1" tslib "^2.1.0" -"@formatjs/ts-transformer@3.4.5": - version "3.4.5" - resolved "https://registry.yarnpkg.com/@formatjs/ts-transformer/-/ts-transformer-3.4.5.tgz#53423dbb606f88e7e7637d941f9d19d508dd10c4" - integrity sha512-VzjT9jbpizZhwvtX/jaoTOeHQ/nvEx9ttzDrRXcFIGXyxupBZKTxr/+v6j3NjUmeiuN3JfaXhZUYmG+zsS0kxw== +"@formatjs/ts-transformer@3.4.6": + version "3.4.6" + resolved "https://registry.yarnpkg.com/@formatjs/ts-transformer/-/ts-transformer-3.4.6.tgz#2a0572b2226e81d3c8bdd04c99e85108feefd485" + integrity sha512-lk44kgdPSC2CW4/NtokdR8KZIrmXJlJfy+u0vAof7214b3IyHTN0usqifAF0w97XAriWKNdZPT5tVPMrjdERAg== dependencies: - "@formatjs/icu-messageformat-parser" "2.0.7" + "@formatjs/icu-messageformat-parser" "2.0.8" chalk "^4.1.1" tslib "^2.1.0" @@ -1406,27 +1416,27 @@ resolved "https://registry.yarnpkg.com/@panva/asn1.js/-/asn1.js-1.0.0.tgz#dd55ae7b8129e02049f009408b97c61ccf9032f6" integrity sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw== -"@prisma/client@2.26.0": - version "2.26.0" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.26.0.tgz#a23a83bc5c931243ee20b78d9ded423e158aa4c1" - integrity sha512-iwhjdUV/MEQZ7RzTEcZ/D+ewxx/pGExWJ2LypfHioJIvEMyK0saPiR0tjMvMT2I2SVzrIM5dXGhBHWi2JksWrQ== +"@prisma/client@2.27.0": + version "2.27.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.27.0.tgz#17d98e64deea29063bee1778d85b5f7edeb14a26" + integrity sha512-Sh2b1M8MGbOHbwG1FEqdWTUCrEX3p7gt2e7gpaBWou8yTIJvP1UZ4YlHgpuUcR1q4pEIR/JTZJeQk2l4iDyRBQ== dependencies: - "@prisma/engines-version" "2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d" + "@prisma/engines-version" "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" -"@prisma/engines-version@2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d": - version "2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d.tgz#aa707f4496ab92ef1eaf17758274f63b86d2ff9f" - integrity sha512-8tygPkPxag3myF5fgNQ60zwnNSZzFf4J+DXGKykXaBLLt9W2FLkaE5sVL8/OqAGhLAnVsKj83CqPms35bKrTKw== +"@prisma/engines-version@2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb": + version "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb.tgz#60a34634fe26be9caca42556605a132e70810e3c" + integrity sha512-pwOsYdzw8+cwKlUrCzasiRh96RhNuJ/QcKr0HwjxxlUWTmbEayDKjqRRz5fsUYIpSv5fW1B3SsbzHOqVtFZ6XQ== -"@prisma/engines@2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d": - version "2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d.tgz#cfdacfad3acc0f3bf1d7710aa8f3852fd85ac6d9" - integrity sha512-a0jIhLvw9rFh6nZTr5Y3uzP28I2xNDu3pqxANvwMNnmIoYr1wYEcO1pMXn/36BGXldDdAWMmAbhfloHA3IB8DA== +"@prisma/engines@2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb": + version "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb.tgz#22084a81e90b66665aa3aacde79ef5b1bc3587fe" + integrity sha512-AIbIhAxmd2CHZO5XzQTPrfk+Tp/5eoNoSledOG3yc6Dk97siLvnBuSEv7prggUbedCufDwZLAvwxV4PEw3zOlQ== -"@reduxjs/toolkit@^1.5.1": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.6.0.tgz#0a17c6941c57341f8b31e982352b495ab69d5add" - integrity sha512-eGL50G+Vj5AG5uD0lineb6rRtbs96M8+hxbcwkHpZ8LQcmt0Bm33WyBSnj5AweLkjQ7ZP+KFRDHiLMznljRQ3A== +"@reduxjs/toolkit@^1.6.1": + version "1.6.1" + resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.6.1.tgz#7bc83b47352a663bf28db01e79d17ba54b98ade9" + integrity sha512-pa3nqclCJaZPAyBhruQtiRwtTjottRrVJqziVZcWzI73i6L3miLTtUyWfauwv08HWtiXLx1xGyGt+yLFfW/d0A== dependencies: immer "^9.0.1" redux "^4.1.0" @@ -3054,10 +3064,10 @@ date-fns-tz@^1.1.4: resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.1.4.tgz#38282c2bfab08946a4e9bb89d733451e5525048b" integrity sha512-lQ+FF7xUxxRuRqIY7H/lagnT3PhhSnnvtGHzjE5WZKwRyLU7glJfLys05SZ7zHlEr6RXWiqkmgWq4nCkcElR+g== -date-fns@^2.22.1: - version "2.22.1" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.22.1.tgz#1e5af959831ebb1d82992bf67b765052d8f0efc4" - integrity sha512-yUFPQjrxEmIsMqlHhAhmxkuH769baF21Kk+nZwZGyrMoyLA+LugaQtC0+Tqf9CBUUULWwUJt6Q5ySI3LJDDCGg== +date-fns@^2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9" + integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA== debounce@^1.2.0: version "1.2.0" @@ -3639,13 +3649,13 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint@^7.30.0: - version "7.30.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.30.0.tgz#6d34ab51aaa56112fd97166226c9a97f505474f8" - integrity sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg== +eslint@^7.31.0: + version "7.31.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.31.0.tgz#f972b539424bf2604907a970860732c5d99d3aca" + integrity sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.2" + "@eslint/eslintrc" "^0.4.3" "@humanwhocodes/config-array" "^0.5.0" ajv "^6.10.0" chalk "^4.0.0" @@ -3889,7 +3899,7 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== -fast-glob@^3.1.1, fast-glob@^3.2.4: +fast-glob@^3.1.1: version "3.2.4" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3" integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ== @@ -3913,6 +3923,17 @@ fast-glob@^3.2.5: micromatch "^4.0.2" picomatch "^2.2.1" +fast-glob@^3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" @@ -4528,13 +4549,13 @@ intl-messageformat-parser@^6.0.7: dependencies: "@formatjs/ecma402-abstract" "^1.2.2" -intl-messageformat@9.7.1: - version "9.7.1" - resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.7.1.tgz#98e3f6d063413196ff7b63f63bcc3975ad67e83c" - integrity sha512-DNiuD+/59G9qaYu3U0KgwCV0zpN9XRoUvc8izSNCNAA5MknhiIUONFE0WtScP+E/7JfoENu+CX57P/SURRbI0A== +intl-messageformat@9.8.1: + version "9.8.1" + resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.8.1.tgz#f2352f1e12dcc1b135da315a9d565a473ba7bffe" + integrity sha512-2rSZQu8GmLOlxNiehRvxWjkIqzemW833zm8ZS63JNvSpSuGnpqSWRqqwqv1kEBto/97/UBjtWy14m/CIdwVqFg== dependencies: "@formatjs/fast-memoize" "1.1.1" - "@formatjs/icu-messageformat-parser" "2.0.7" + "@formatjs/icu-messageformat-parser" "2.0.8" tslib "^2.1.0" ipaddr.js@^2.0.1: @@ -4813,10 +4834,10 @@ isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= -isbot@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/isbot/-/isbot-3.1.0.tgz#9d5b19ebc52e8717cefad9052dec225928065979" - integrity sha512-k5pKC3anQbDdCJwHMJaaKyvw5CbZIGxWudenyVnorYUV7xZ/j8yCHPSTYwO5T3JBDOPbEPdYaeFda6XeSPVqhQ== +isbot@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/isbot/-/isbot-3.2.2.tgz#bbb0ff5ccfab5d54ec3aaa4554fda1e7c4c6712f" + integrity sha512-UJMhrEkmMU8cN25r4xG70iBPX6x0syzLgJf5vn1ApBIM/bw+Xs3ZkzYwuVGd0wL59R26C3nIq9XBy/xVT/Lq4Q== isexe@^2.0.0: version "2.0.0" @@ -6649,12 +6670,12 @@ pretty-format@^23.0.1: ansi-regex "^3.0.0" ansi-styles "^3.2.0" -prisma@2.26.0: - version "2.26.0" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-2.26.0.tgz#48f7b8fa166900ae20f2383da711ac8712a56b86" - integrity sha512-MXTQlF8X9mabkdTRb9x5nF6jvo1kT85d9hqIpYjLLZy+5tlvEaCaLBj+ok8GINdfYBS7gwQERZ9MHx0tb5dCdg== +prisma@2.27.0: + version "2.27.0" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-2.27.0.tgz#45fdecb9c2470c7ad602e804ffed70dfa7c46ad1" + integrity sha512-/3H9C+IPlJmY5KArhfKHMpxKXqcZIBZ+LjM1b5FxvLCGQkq/mRC96SpHcKcLtiYgftNAX13nvlxg+cBw9Dbe8Q== dependencies: - "@prisma/engines" "2.26.0-23.9b816b3aa13cc270074f172f30d6eda8a8ce867d" + "@prisma/engines" "2.27.0-43.cdba6ec525e0213cce26f8e4bb23cf556d1479bb" process-nextick-args@~2.0.0: version "2.0.1" @@ -6779,19 +6800,19 @@ react-fast-compare@^2.0.1: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9" integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw== -react-intl@^5.20.4: - version "5.20.4" - resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-5.20.4.tgz#e458384a94af86a8c542880d7fa4c154bea683ca" - integrity sha512-lYUL8hWkRHbpVtedGSjpQ1kK/x2AAGZHGgOHsU0SFDufHo2aS7xdvRcaxXD3PMVDuh53KcU+vTaun+bcrwKpbA== +react-intl@^5.20.6: + version "5.20.6" + resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-5.20.6.tgz#fc64d09143d0df233b373d40a646542b167c118c" + integrity sha512-+G5HIb0GCBgIMd/OWISCnUCbRE6fHOkNJxaefbrjvXwCXZLLpUUYtO65DJOEuc+hB3VkAsM6QJDJ6AarO3hPKQ== dependencies: - "@formatjs/ecma402-abstract" "1.9.4" - "@formatjs/icu-messageformat-parser" "2.0.7" - "@formatjs/intl" "1.13.2" - "@formatjs/intl-displaynames" "5.1.6" - "@formatjs/intl-listformat" "6.2.6" + "@formatjs/ecma402-abstract" "1.9.5" + "@formatjs/icu-messageformat-parser" "2.0.8" + "@formatjs/intl" "1.13.4" + "@formatjs/intl-displaynames" "5.2.0" + "@formatjs/intl-listformat" "6.3.0" "@types/hoist-non-react-statics" "^3.3.1" hoist-non-react-statics "^3.3.2" - intl-messageformat "9.7.1" + intl-messageformat "9.8.1" tslib "^2.1.0" react-is@16.13.1, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1: @@ -7895,10 +7916,10 @@ table@^6.0.9, table@^6.6.0: string-width "^4.2.0" strip-ansi "^6.0.0" -tar@^6.0.5: - version "6.1.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" - integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== +tar@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.1.tgz#4d7da4b132b334bb8c175ed1de466fe9157ea0eb" + integrity sha512-GG0R7yt/CQkvG4fueXDi52Zskqxe2AyRJ+Wm54yqarnBgcX3qRIWh10qLVAAN+mlPFGTfP5UxvD3Fbi11UOTUQ== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" From c7265c68d202144d27bbd478726b59a54a219cec Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Sun, 25 Jul 2021 21:36:36 -0700 Subject: [PATCH 9/9] Bump version 1.20.0. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 996d164b..c52fbb30 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "umami", - "version": "1.19.0", + "version": "1.20.0", "description": "A simple, fast, website analytics alternative to Google Analytics. ", "author": "Mike Cao ", "license": "MIT",