Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 remco
|
595ba43195 |
No files matched your search
+1
-1
@@ -76,7 +76,7 @@
|
||||
"@vitest/coverage-v8": "4.1.10",
|
||||
"drizzle-kit": "^0.31.10",
|
||||
"husky": "^9.1.7",
|
||||
"knip": "6.32.2",
|
||||
"knip": "6.32.1",
|
||||
"lint-staged": "^17.3.0",
|
||||
"pino-pretty": "^13.1.3",
|
||||
"postcss": "^8.5.26",
|
||||
|
||||
Generated
+104
-86
@@ -168,8 +168,8 @@ importers:
|
||||
specifier: ^9.1.7
|
||||
version: 9.1.7
|
||||
knip:
|
||||
specifier: 6.32.2
|
||||
version: 6.32.2
|
||||
specifier: 6.32.1
|
||||
version: 6.32.1
|
||||
lint-staged:
|
||||
specifier: ^17.3.0
|
||||
version: 17.3.0
|
||||
@@ -905,128 +905,136 @@ packages:
|
||||
'@otplib/[email protected]':
|
||||
resolution: {integrity: sha512-xaIm7bvICMhoB2rZIR5luiaMdssWR5nY5nXnR1fdezUgZuEO58D6zrGzLp7pQuBmlpmL0HagnscDQFoskp9yiA==}
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-n9uozULWflPqBtdmI8lAabLqGKNgLVNN0ZH8HfgCwpKGNtzRzauB76jTiW/3YLkcA7N1zskpi9GdVnZuu1SAvg==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-ZiRGDutGsv1G6bL/ozy/koC0Sv39T1DqyoC4KD1DOy9ZoACm1O5UWhEK2c02Qdk+4lfLVkvFa/mQ0fm/4h1BtQ==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [arm]
|
||||
os: [android]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-9BbdjHETk6O3zH/DDid9IgBtF0GlpLabNKN231uraXpRDSfY+iiZxTP5bk1Z63GBownVdhdINFIeddmMz4MzpQ==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-WZkvGRLNQTz8lR9zP5nLjUdlroRCopBu3g9zF1p/laE6DzT1UbQo8Rdz5MWhaJUPYg/6gp+jo7HUgsyKaN1FtQ==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [arm64]
|
||||
os: [android]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-gh+6ecoHUy4/sUcolBl/1qPXKBbYNxFY0Pk0ujgQvINTMSftJY7o4yb8gOkDJPeZeB8+a+u7xTe6umoP8N5HFA==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-l4khS8LQOOVYsGRVARo1gSaCT/aBSceUVXgtovWc2+drnxVuDr082WA3OCHVdVzIz5JIrP/y9CWsSKxBDNmYGg==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [arm64]
|
||||
os: [darwin]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-qd1hl2d+lXgHv/VQ/M9qm8TrMC5T4RqDBwtOnl+1D0QMjwcz+8AaB4JSg8STgeag0GP6a6L74XEGAsrTSJWNzQ==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-QBsNF3nqlXmcH2B1YOPqQYmCJoy4HuIjUxGbBO/k5JAJUl68ghU2psRY2zPk+RyBaWqKP/qfL4oaFgEMCdwskA==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [x64]
|
||||
os: [darwin]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-M5XXcNa7aOqLPKTR41msfghKu2yQ4xWvCm11/gwU0JzOzHNk5sgW//rVEjJ+LO48+VDAMzXTSzurUVxIDKwozw==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-b7Q7m4Cqc6XqNhri3R+QhU+GVy646Pn+bkdhrDdWym/Fdi0ZUa+d73H9dm5H91JtbtAQ/z1d8XKMW3oOV8a4tQ==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [x64]
|
||||
os: [freebsd]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-T/GXusuOkPNQhCQCSBbcU/N8j0rAypuDBl1IyFK+lyYT594XsVz80clPC/OtbSSpBGyJxj8uYEfctxVuxVYoww==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-3riVS5IhdH3uCZj1Y9ftDQlR0dvLsIlw/edrRqk8JhgNd5K0XSs+UBtgh50N13CAlW9/TXj6sVGXaKNBocd0Yg==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [arm]
|
||||
os: [linux]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-oKu4RcBlXSqo3OC62dp6YTnQaZIurNDpCX3BnAM3+bJxt7s8J2TJKMnC0UYer1qhlRaDCg6wkTaTw+2IlsZ12w==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-NmXUOpgpTSkhl795TiXmWppTwmSJ92RC1qvD6e4XOF+slgmo3e6Ah+kEu+6AN8s7NAOEwqGmir58MgSQSWmBSA==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [arm]
|
||||
os: [linux]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-WJBbD186AZmMGaSIhlktC+rPl8L3peCTXAh88Ih9uEvK0en2mPojGyCGYiL6mHtV1RPV3JyfJW5t6n5hh0lXhA==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-gc0EXsKtXgerujmU2Bql3u1L1HsSQ2774R83idq/FoNMPVV/RY/1ErFsvnit7KoiP/sLvzQixeUo4Ut0ic0wmw==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [arm64]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-t1AcYOwEzgceadT4v5e+vaCCb0AncCA3v5AyzfBAz/tMq11qzVccXKzNHtkWdjBsgvTKwRkaUF3QvT4kot8vcQ==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-F2XvmWSE0uWpie+jHKKIFgdVOe9ypGhkEZxKx5DuW215K6cbAC274yYaPkcM7EqY4Df3Weyhpcz3lsURyH2LVg==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [arm64]
|
||||
os: [linux]
|
||||
libc: [musl]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-RsnO/NoD8376LMJq8JS8TwI0ieNaFRTuNe2GVJntQg6gwZNMENZsEbknHdVwjpOmxdGLGodcwaGSbAeRr5Bgjw==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-wLMbT21U/QxknQsk+VvNF0b9D2/aGWhcaQQQ+VYlE8FwD5+GoWZIPPXNzyHmkYyhm0KB3itL+TBavjMatqNnYA==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [ppc64]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-48fSVfR9TZi5CASZFyv0VC6z6BCoeihFsX031mAD/oSH7d9PYsPgIqza7d9mjP7Z2KTEpTFyH6SIu0Ui6R1vdg==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-+G8F/4ckwT7FCJV4H2bt09xEzJbjNCfuL4Sp1AYNaFtFMVtgIGMuJlteT82U+K0UIZ/DzAR/LDlMFnEuajG7Kw==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [riscv64]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-T8CpdD+SfE01DnIOD4HpVxu0ZJOfMJ/VhCvikKfaXAxkZ+9veyLM/D2hpi7Y2hFUyPmVQO3FNZHmYzV/WlVR4g==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-hTsHtTLxMAfCo+rpF5K3qZJKW2NpPN/CHd4mYB3y7XlSdspHkd2gehDIofP64AacA9nWQw2tY3O7wR6UY8IVOA==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [riscv64]
|
||||
os: [linux]
|
||||
libc: [musl]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-QLdeMsCcacenPEFsfxnBUDF1y6opyz5+fmOz9bfD5Y7fiGCMupUCuB3KTPQhNwshIG1P9fPqar9MHxuBDd4bwQ==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-6y7qYY3TCUDYjqswImdTGl92y+KA/80twALegQPN27kfY+bG7Ib1+L3jbmrCZQx6wrVnai9IPsEZp07I0hx7JQ==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [s390x]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-659ujfqLy6k7cuH3sbzhd8b+ztSq+i6E2E9pG78Q0BmHjAExfGIdgc8cGgMdwAozDXeZFHkJ+LXYJdWsaGdgyw==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-i69kAWU+2LgoH5bR+zWiiu+UzAw7Oxkwv7COeJTeY19pn4e70nKQcr9Pm6cL2Z0Z54d+gl9qADlK/0yyuCPiBA==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [x64]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-/Mw/9j4TfZcnKphPrzOE6t4MMknXadcAAuVUlDRTF/ETWB5xOgQvOJV2Mh9We/bWxZdoxaGAdc+hy4GuYwQ2yQ==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-4SQs678MmjYVrmhAgCWD4o0vpaFszXw9xLX5p2Z9MMFcltxiLkA88wQjh80YHjPrXtpyZ2CWI5m+1yNKM0m2Pw==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [x64]
|
||||
os: [linux]
|
||||
libc: [musl]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-8rIKWR2BFuifbIK/1XB9wTaSdtuJ25dlE7ZQYDnEwj/2xH2vHsxnvIjHT3ZjSVuLLwGGlSslIG/fbOJ8TV8rTw==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-YHpx9N7Ln3a++Tc8rv+H7mrK1zyJQOAwCFg8LZ3lTs1T5afGWeZrLPhPT9HLnIwSjCyJqPWVMIrMxbjcmBr2oQ==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [arm64]
|
||||
os: [openharmony]
|
||||
|
||||
'@oxc-parser/binding-win32-arm64-msvc@0.143.0':
|
||||
resolution: {integrity: sha512-5U9kQYMfRRI6Zq7KDxgbIP0RMnKrfn3gLepRMgJuRkPSUALTiRCk9d/uyhb4lGDjUdzwK7mBkKqhLgzBPCmLpQ==}
|
||||
'@oxc-parser/binding-wasm32-wasi@0.142.0':
|
||||
resolution: {integrity: sha512-3pLDyY3+oogW73RM5uehNgAiR/Xfb7fvO2Q1Z1gIqZ2+50XDVQmBVlRkHXZTU4gKnQHpwETNsYQVsJ3joVB2iA==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [wasm32]
|
||||
|
||||
'@oxc-parser/[email protected]':
|
||||
resolution: {integrity: sha512-Had/VeVY28Oyb0K+Q4FV8KCzoBycIh93oDK6pCbya9lkzdq+ikMHMgBubsdqqlybjJmQRawCQRrnBRHyQwYvcQ==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [arm64]
|
||||
os: [win32]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-25P7AaHk4R88Yv2XH4gToDVmh0cOu+bEURQU10CRrmvgabfRArSGAP5osmwUKeSUHj0VS50upbpbRWWW/m7mHA==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-GGi3+YphVHavvgs6gum2UXoNCqzHAmPt/nXkn8ZQZstV2Q1qZD1Mn8fz/nWrDkefHQtrG/+1/XrbMxsBTo6Svw==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [ia32]
|
||||
os: [win32]
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
resolution: {integrity: sha512-ORMh3JE1s6V7ySicdRK7vgaDQnn5o+UHg9ct989PlWHbel8O9ARrmWXM6kZjrBMtNucxNayQ8g69G0VfWzhANw==}
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
resolution: {integrity: sha512-Ny/Wv4Us1LGC/ljwNTp+Hx3r/pH15EFfeDF0p+n898gt+TtRd6C9SccHcuUhDiNTb8s5tt7jdeAMDRQZ4Vq6hg==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [x64]
|
||||
os: [win32]
|
||||
|
||||
'@oxc-project/[email protected]':
|
||||
resolution: {integrity: sha512-7W+2q5AKQVU36fkaryontrHn3YDt1RyUYXatw9i5H8ocYe2sPKSFB6eS8WNPeRKiN1qAWWZUPm7gwFzJGrccqQ==}
|
||||
|
||||
'@oxc-project/[email protected]':
|
||||
resolution: {integrity: sha512-u6JZdLBTLotrNC9Vd6vPssINdzcCzleKAH6EJKImQb7GtYvX5keN2dxkoK44stCc4tffE6QQRtZTXVSzsLUlWA==}
|
||||
|
||||
@@ -2298,8 +2306,8 @@ packages:
|
||||
[email protected]:
|
||||
resolution: {integrity: sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==}
|
||||
|
||||
[email protected].2:
|
||||
resolution: {integrity: sha512-WXTXbmocrw7gqm1A1TQvFN0OgJ7hUSU6E1g6SPRIzzHFogUBhXByc7cYeOFVtJ2uODg7DP4VbESYBYnfbtBYsg==}
|
||||
[email protected].1:
|
||||
resolution: {integrity: sha512-mIiIHMTJVUgSlz0mxEgPt7wg8DmfbCp1Txqab3WpbMCJF7YHvHtC9jeAHHXfISMl72N8WzhyG71SQlaqCOGZtg==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
hasBin: true
|
||||
|
||||
@@ -2634,8 +2642,8 @@ packages:
|
||||
[email protected]:
|
||||
resolution: {integrity: sha512-o5CxfDw6bh7hoDv0NUUIcc0RqzJ9ipfUrzeKheKJ+vs4rXZnDlA9n4a/7R1cDjpmLjKLix4BgNVRmoDkm5rLSQ==}
|
||||
|
||||
[email protected]3.0:
|
||||
resolution: {integrity: sha512-ov0NzaDCOInknS7mP1cwKdJERt3utPW8ldjtdUXQ8Ty0GEFD08wk422vCUN0d7pST6kqtV7dxoI9w1Zi0l/9TA==}
|
||||
[email protected]2.0:
|
||||
resolution: {integrity: sha512-kKR+jPiRJYJDexVoziIg/FVGvr1fT1FZSSJOk6tVoMKKSlsf1Cso+cgGCJkOEDWOP174vRntCPFKg+AS7InWvw==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
|
||||
[email protected]:
|
||||
@@ -3582,63 +3590,72 @@ snapshots:
|
||||
dependencies:
|
||||
'@otplib/core': 13.4.1
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]3.0':
|
||||
'@oxc-parser/[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/binding-win32-arm64-msvc@0.143.0':
|
||||
'@oxc-parser/binding-wasm32-wasi@0.142.0':
|
||||
dependencies:
|
||||
'@emnapi/core': 1.11.2
|
||||
'@emnapi/runtime': 1.11.2
|
||||
'@napi-rs/wasm-runtime': 1.2.2(@emnapi/[email protected])(@emnapi/[email protected])
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/binding-win32-ia32[email protected]3.0':
|
||||
'@oxc-parser/binding-win32-arm64[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/binding-win32-x64[email protected]3.0':
|
||||
'@oxc-parser/binding-win32-ia32[email protected]2.0':
|
||||
optional: true
|
||||
|
||||
'@oxc-parser/[email protected]':
|
||||
optional: true
|
||||
|
||||
'@oxc-project/[email protected]': {}
|
||||
|
||||
'@oxc-project/[email protected]': {}
|
||||
|
||||
'@oxc-resolver/[email protected]':
|
||||
@@ -4547,13 +4564,13 @@ snapshots:
|
||||
readable-stream: 2.3.8
|
||||
setimmediate: 1.0.5
|
||||
|
||||
[email protected].2:
|
||||
[email protected].1:
|
||||
dependencies:
|
||||
fdir: 6.5.0([email protected])
|
||||
formatly: 0.3.0
|
||||
get-tsconfig: 4.14.1
|
||||
jiti: 2.7.0
|
||||
oxc-parser: 0.143.0
|
||||
oxc-parser: 0.142.0
|
||||
oxc-resolver: 11.24.2
|
||||
picomatch: 4.0.5
|
||||
smol-toml: 1.7.1
|
||||
@@ -4832,29 +4849,30 @@ snapshots:
|
||||
'@otplib/totp': 13.4.1
|
||||
'@otplib/uri': 13.4.1
|
||||
|
||||
[email protected]3.0:
|
||||
[email protected]2.0:
|
||||
dependencies:
|
||||
'@oxc-project/types': 0.143.0
|
||||
'@oxc-project/types': 0.142.0
|
||||
optionalDependencies:
|
||||
'@oxc-parser/binding-android-arm-eabi': 0.143.0
|
||||
'@oxc-parser/binding-android-arm64': 0.143.0
|
||||
'@oxc-parser/binding-darwin-arm64': 0.143.0
|
||||
'@oxc-parser/binding-darwin-x64': 0.143.0
|
||||
'@oxc-parser/binding-freebsd-x64': 0.143.0
|
||||
'@oxc-parser/binding-linux-arm-gnueabihf': 0.143.0
|
||||
'@oxc-parser/binding-linux-arm-musleabihf': 0.143.0
|
||||
'@oxc-parser/binding-linux-arm64-gnu': 0.143.0
|
||||
'@oxc-parser/binding-linux-arm64-musl': 0.143.0
|
||||
'@oxc-parser/binding-linux-ppc64-gnu': 0.143.0
|
||||
'@oxc-parser/binding-linux-riscv64-gnu': 0.143.0
|
||||
'@oxc-parser/binding-linux-riscv64-musl': 0.143.0
|
||||
'@oxc-parser/binding-linux-s390x-gnu': 0.143.0
|
||||
'@oxc-parser/binding-linux-x64-gnu': 0.143.0
|
||||
'@oxc-parser/binding-linux-x64-musl': 0.143.0
|
||||
'@oxc-parser/binding-openharmony-arm64': 0.143.0
|
||||
'@oxc-parser/binding-win32-arm64-msvc': 0.143.0
|
||||
'@oxc-parser/binding-win32-ia32-msvc': 0.143.0
|
||||
'@oxc-parser/binding-win32-x64-msvc': 0.143.0
|
||||
'@oxc-parser/binding-android-arm-eabi': 0.142.0
|
||||
'@oxc-parser/binding-android-arm64': 0.142.0
|
||||
'@oxc-parser/binding-darwin-arm64': 0.142.0
|
||||
'@oxc-parser/binding-darwin-x64': 0.142.0
|
||||
'@oxc-parser/binding-freebsd-x64': 0.142.0
|
||||
'@oxc-parser/binding-linux-arm-gnueabihf': 0.142.0
|
||||
'@oxc-parser/binding-linux-arm-musleabihf': 0.142.0
|
||||
'@oxc-parser/binding-linux-arm64-gnu': 0.142.0
|
||||
'@oxc-parser/binding-linux-arm64-musl': 0.142.0
|
||||
'@oxc-parser/binding-linux-ppc64-gnu': 0.142.0
|
||||
'@oxc-parser/binding-linux-riscv64-gnu': 0.142.0
|
||||
'@oxc-parser/binding-linux-riscv64-musl': 0.142.0
|
||||
'@oxc-parser/binding-linux-s390x-gnu': 0.142.0
|
||||
'@oxc-parser/binding-linux-x64-gnu': 0.142.0
|
||||
'@oxc-parser/binding-linux-x64-musl': 0.142.0
|
||||
'@oxc-parser/binding-openharmony-arm64': 0.142.0
|
||||
'@oxc-parser/binding-wasm32-wasi': 0.142.0
|
||||
'@oxc-parser/binding-win32-arm64-msvc': 0.142.0
|
||||
'@oxc-parser/binding-win32-ia32-msvc': 0.142.0
|
||||
'@oxc-parser/binding-win32-x64-msvc': 0.142.0
|
||||
|
||||
[email protected]:
|
||||
optionalDependencies:
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import "./load-env";
|
||||
import { readdirSync, readFileSync } from "node:fs";
|
||||
import { dirname, resolve } from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import "./load-env";
|
||||
import { Cron } from "croner";
|
||||
import { lt, sql } from "drizzle-orm";
|
||||
import { env } from "../src/env";
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
import { existsSync } from "node:fs";
|
||||
import { dirname, resolve } from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
|
||||
const __dirname = dirname(fileURLToPath(import.meta.url));
|
||||
const ROOT = resolve(__dirname, "..");
|
||||
|
||||
// Standalone scripts (tsx) don't auto-load .env like Next.js does, so the
|
||||
// deploy step symlinks ${LIVE}/.env into the stage but nothing ever read it.
|
||||
// Node's loadEnvFile() never overrides already-set variables, so real shell
|
||||
// env wins; we load .env.local first so it takes precedence over .env.
|
||||
function loadEnvFile(): void {
|
||||
for (const name of [".env.local", ".env"]) {
|
||||
const file = resolve(ROOT, name);
|
||||
if (existsSync(file)) process.loadEnvFile(file);
|
||||
}
|
||||
}
|
||||
|
||||
loadEnvFile();
|
||||
+12
-31
@@ -1,5 +1,5 @@
|
||||
const fs = require("node:fs");
|
||||
const { parse, printParseErrorCode } = require("jsonc-parser");
|
||||
const JSON5 = require("json5");
|
||||
|
||||
const exampleFile = process.argv[2];
|
||||
const targetFile = process.argv[3];
|
||||
@@ -26,47 +26,28 @@ function deepMerge(target, source) {
|
||||
return result;
|
||||
}
|
||||
|
||||
function parseJsonc(file) {
|
||||
if (!fs.existsSync(file)) {
|
||||
return undefined;
|
||||
}
|
||||
const content = fs.readFileSync(file, "utf-8");
|
||||
const errors = [];
|
||||
const value = parse(content, errors, {
|
||||
allowTrailingComma: true,
|
||||
allowEmptyContent: true,
|
||||
});
|
||||
if (errors.length > 0) {
|
||||
console.error(
|
||||
`[merge-config] parse error in ${file}: ${errors
|
||||
.map((e) => printParseErrorCode(e.error))
|
||||
.join(", ")}`,
|
||||
);
|
||||
return undefined;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
let example;
|
||||
try {
|
||||
example = parseJsonc(exampleFile);
|
||||
const content = fs.readFileSync(exampleFile, "utf-8");
|
||||
example = JSON5.parse(content);
|
||||
} catch {
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if (example === undefined) {
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
let current = {};
|
||||
try {
|
||||
const parsed = parseJsonc(targetFile);
|
||||
if (parsed !== undefined && parsed !== null) {
|
||||
current = parsed;
|
||||
if (fs.existsSync(targetFile)) {
|
||||
const content = fs.readFileSync(targetFile, "utf-8");
|
||||
current = JSON5.parse(content);
|
||||
}
|
||||
} catch {
|
||||
current = {};
|
||||
}
|
||||
|
||||
const merged = deepMerge(current, example);
|
||||
fs.writeFileSync(targetFile, `${JSON.stringify(merged, null, 4)}\n`);
|
||||
|
||||
const isJson5 = targetFile.endsWith(".json5");
|
||||
const output = isJson5
|
||||
? JSON5.stringify(merged, null, 4)
|
||||
: JSON.stringify(merged, null, 4);
|
||||
fs.writeFileSync(targetFile, `${output}\n`);
|
||||
+49
-195
@@ -116,13 +116,6 @@ BACKUP_DIR="${NITRO_BACKUP_DIR:-$EMULATOR_DIR/Database/Database Updates/backups}
|
||||
NITRO_CLIENT="${NITRO_CLIENT_SRC:-/var/www/Nitro-V3}"
|
||||
NITRO_RENDERER="${NITRO_RENDERER_SRC:-/var/www/Nitro_Render_V3}"
|
||||
NITRO_BRANCH="${NITRO_BRANCH:-}"
|
||||
# Dedicated per-repo yarn cache folders. The renderer + client installs run in
|
||||
# parallel and yarn 1.22 has no cache locking, so a single shared cache gets
|
||||
# corrupted and node_modules is left incomplete (vite/pixi.js missing) while
|
||||
# yarn still exits 0. Isolating each repo's cache via --cache-folder prevents
|
||||
# that race entirely.
|
||||
YARN_CACHE_DIR="${NITRO_YARN_CACHE_DIR:-/var/www/.yarn-cache}"
|
||||
mkdir -p "$YARN_CACHE_DIR" 2>/dev/null || true
|
||||
MIN_DISK_GB="${NITRO_MIN_DISK_GB:-5}"
|
||||
HEALTH_RETRIES="${NITRO_HEALTH_RETRIES:-12}"
|
||||
HEALTH_INTERVAL="${NITRO_HEALTH_INTERVAL:-5}"
|
||||
@@ -696,9 +689,6 @@ acquire_lock() {
|
||||
}
|
||||
|
||||
release_lock() {
|
||||
# Parallel job subshells inherit fd 9; releasing it here would drop the
|
||||
# main process's lock while the other jobs are still running.
|
||||
[ -n "$PARALLEL_JOB" ] && return 0
|
||||
flock -u 9 2>/dev/null || true
|
||||
rm -f "$LOCK_FILE" 2>/dev/null || true
|
||||
}
|
||||
@@ -722,6 +712,7 @@ die() {
|
||||
cursor_show
|
||||
exit 1
|
||||
}
|
||||
|
||||
cursor_hide() { tput civis 2>/dev/null || true; }
|
||||
cursor_show() { tput cnorm 2>/dev/null || true; }
|
||||
clear_line() { printf "\r\033[K"; }
|
||||
@@ -852,12 +843,7 @@ print(json.dumps(payload))
|
||||
cleanup_notify_failure() { $NOTIFY_FAILED && return; NOTIFY_FAILED=true; notify "FAILED" "$1"; }
|
||||
|
||||
cleanup_on_exit() {
|
||||
local ec=$?
|
||||
# Parallel job subshells must never run the full cleanup (rollback,
|
||||
# lock release, notify); only the main process owns those. Their status
|
||||
# is captured by parallel_wait instead.
|
||||
if [ -n "$PARALLEL_JOB" ]; then return $ec; fi
|
||||
cursor_show; release_lock
|
||||
local ec=$?; cursor_show; release_lock
|
||||
if [ $ec -ne 0 ] && [ "$ROLLBACK_NEEDED" = true ]; then
|
||||
echo -e "\n ${C_BG_RED}${C_WHITE}${C_BOLD} $(_t "ROLLBACK") ${C_RESET}"
|
||||
echo -e " $(_t "Restoring config back-ups from") $CONFIG_BACKUP_DIR/rollback..."
|
||||
@@ -867,13 +853,7 @@ cleanup_on_exit() {
|
||||
fi
|
||||
restore_binaries
|
||||
fi
|
||||
# Preserve the real exit status: the last command in an EXIT trap defines
|
||||
# the script's exit code, so never let a guard/notify call overwrite it.
|
||||
if [ $ec -ne 0 ]; then
|
||||
cleanup_notify_failure "Exit code $ec"
|
||||
return $ec
|
||||
fi
|
||||
return 0
|
||||
[ $ec -ne 0 ] && cleanup_notify_failure "Exit code $ec"
|
||||
}
|
||||
trap cleanup_on_exit EXIT
|
||||
trap 'release_lock; cursor_show; exit 1' SIGINT SIGTERM
|
||||
@@ -911,22 +891,17 @@ detect_best_branch() {
|
||||
|
||||
git_update() {
|
||||
local repo="$1" branch="$2"
|
||||
local name; name=$(basename "$repo")
|
||||
local rc=1
|
||||
(
|
||||
cd "$repo" || { warn "Cannot access $repo"; exit 2; }
|
||||
# Only stash TRACKED changes (never untracked files — runtime config
|
||||
# data in public/configuration/ must stay in place) and only when the
|
||||
# working tree is dirty, to keep the pull fast-forwardable. The stash is
|
||||
# left in the repo (recoverable via `git stash list`), never dropped.
|
||||
cd "$repo" || { warn "Cannot access $repo"; exit 1; }
|
||||
# Only stash when the working tree is dirty, to avoid losing nothing
|
||||
# and to keep the pull fast-forwardable.
|
||||
if ! git diff --quiet 2>/dev/null || ! git diff --cached --quiet 2>/dev/null; then
|
||||
git stash push -m "auto-update $(date +%F-%T)" 2>/dev/null \
|
||||
&& warn "Local tracked changes in $(basename "$repo") stashed (see 'git stash list')"
|
||||
git stash --include-untracked 2>/dev/null || true
|
||||
fi
|
||||
local old_head; old_head=$(git rev-parse HEAD 2>/dev/null || echo "")
|
||||
local rb; rb=$(detect_best_branch "$repo" "$branch")
|
||||
[ "$rb" != "$branch" ] && info "Branch '$branch' not in $(basename "$repo"), using '$rb'"
|
||||
git checkout "$rb" 2>/dev/null || { warn "Cannot checkout '$rb' in $(basename "$repo")"; exit 2; }
|
||||
git checkout "$rb" 2>/dev/null || { warn "Cannot checkout '$rb' in $(basename "$repo")"; exit 1; }
|
||||
local pulled=1
|
||||
for attempt in 1 2 3; do
|
||||
if git pull --ff-only origin "$rb" 2>/dev/null; then
|
||||
@@ -937,66 +912,17 @@ git_update() {
|
||||
warn "Pull attempt %s failed in %s, retrying..." "$attempt" "$(basename "$repo")" >&2
|
||||
sleep 2
|
||||
done
|
||||
if [ "$pulled" -ne 0 ]; then
|
||||
warn "Pull failed in $(basename "$repo")"
|
||||
echo "git error: pull failed" > "$PARALLEL_STATE_DIR/giterror-$name"
|
||||
exit 2
|
||||
fi
|
||||
# Remember the pre-update commit so a later build failure can reset the
|
||||
# repo back to it; otherwise the next run would see HEAD==origin and
|
||||
# silently skip the never-built change.
|
||||
echo "$old_head" > "$PARALLEL_STATE_DIR/oldhead-$name"
|
||||
[ "$(git rev-parse HEAD 2>/dev/null)" != "$old_head" ] && exit 0
|
||||
exit 1
|
||||
[ "$pulled" -ne 0 ] && { warn "Pull failed in $(basename "$repo")"; exit 1; }
|
||||
[ "$(git rev-parse HEAD 2>/dev/null)" != "$old_head" ]
|
||||
)
|
||||
rc=$?
|
||||
# Return 0 = new commits fetched, 1 = nothing to do, 2 = real git error.
|
||||
return $rc
|
||||
}
|
||||
|
||||
# Reverse a successful pull after a failed build, so the change is picked up
|
||||
# again on the next run instead of being silently skipped (HEAD would otherwise
|
||||
# equal origin and git_update would report "already up to date").
|
||||
git_revert_repo() {
|
||||
local repo="$1"
|
||||
local name; name=$(basename "$repo")
|
||||
[ -f "$PARALLEL_STATE_DIR/oldhead-$name" ] || return 0
|
||||
local prev; prev=$(cat "$PARALLEL_STATE_DIR/oldhead-$name" 2>/dev/null)
|
||||
[ -n "$prev" ] || return 0
|
||||
if git -C "$repo" reset --hard "$prev" >/dev/null 2>&1; then
|
||||
warn "Reverted $(basename "$repo") to $prev (build failed)"
|
||||
else
|
||||
warn "Could not revert $(basename "$repo") to $prev"
|
||||
clean_node_modules() {
|
||||
if [ ! -f "package.json" ]; then
|
||||
warn "clean_node_modules: no package.json found, skipping"
|
||||
return
|
||||
fi
|
||||
rm -f "$PARALLEL_STATE_DIR/oldhead-$name" 2>/dev/null || true
|
||||
}
|
||||
|
||||
# yarn install scoped to a per-repo cache folder. Parallel installs (renderer +
|
||||
# client) must never share a cache — yarn 1 corrupts the shared cache, leaving
|
||||
# node_modules incomplete (vite/pixi.js missing) while still exiting 0.
|
||||
# $1 = repo dir; remaining args forwarded to yarn. Runs inside the repo and
|
||||
# always returns the caller to SCRIPT_DIR so cwd never leaks between repos.
|
||||
yarn_install_repo() {
|
||||
local repo="$1"; shift
|
||||
local cache_dir="$YARN_CACHE_DIR/$(basename "$repo")"
|
||||
mkdir -p "$cache_dir" 2>/dev/null || true
|
||||
cd "$repo" 2>/dev/null || { warn "Cannot cd into %s" "$repo"; return 1; }
|
||||
# NODE_ENV may be exported as "production" via .env (the CMS runs in prod),
|
||||
# which makes yarn 1 skip devDependencies — vite is a devDep, so builds
|
||||
# would fail with "vite: not found". Force a non-production env so the full
|
||||
# dependency tree (including dev deps) is always installed.
|
||||
NODE_ENV=development yarn install --cache-folder "$cache_dir" "$@" >> "$LOG_FILE" 2>&1
|
||||
local rc=$?
|
||||
cd "$SCRIPT_DIR" 2>/dev/null || true
|
||||
return $rc
|
||||
}
|
||||
|
||||
# Nuke a repo's own yarn cache and node_modules for a truly clean reinstall.
|
||||
# Parallel installs may have corrupted the cache, so it must be discarded too.
|
||||
yarn_reset_repo() {
|
||||
local repo="$1"
|
||||
rm -rf "$repo/node_modules" "$YARN_CACHE_DIR/$(basename "$repo")" 2>/dev/null || true
|
||||
mkdir -p "$YARN_CACHE_DIR/$(basename "$repo")" 2>/dev/null || true
|
||||
rm -rf "node_modules" 2>/dev/null || sudo rm -rf "$(pwd)/node_modules" 2>/dev/null || true
|
||||
}
|
||||
|
||||
# =============================================================================
|
||||
@@ -1008,39 +934,11 @@ PARALLEL_NAMES=()
|
||||
PARALLEL_FAILED=()
|
||||
PARALLEL_RESULTS=()
|
||||
|
||||
# Each parallel job runs in a subshell, so variable changes (HAD_UPDATES,
|
||||
# UPDATED_REPOS, NITRO_BUILT) made inside update_renderer/update_client would
|
||||
# otherwise be lost. Jobs persist their state to a per-job file which
|
||||
# parallel_wait re-reads back into the parent shell.
|
||||
PARALLEL_STATE_DIR="${TMPDIR:-/tmp}/nitro-parallel-$$"
|
||||
mkdir -p "$PARALLEL_STATE_DIR" 2>/dev/null || true
|
||||
|
||||
parallel_run() {
|
||||
local name="$1"; shift
|
||||
PARALLEL_NAMES+=("$name")
|
||||
(
|
||||
# This subshell inherits the parent's EXIT trap and lock fd 9. Mark it
|
||||
# so cleanup_on_exit/release_lock become no-ops here: the main process
|
||||
# owns rollback, lock release and notifications.
|
||||
PARALLEL_JOB=1
|
||||
# Snapshot inherited state so we only persist the delta back: the
|
||||
# emulator (run before the parallel phase) may already be in
|
||||
# UPDATED_REPOS, so emitting the full array would duplicate it.
|
||||
local _orig="${UPDATED_REPOS[*]:-}"
|
||||
"$@" >/dev/null 2>&1
|
||||
local rc=$?
|
||||
{
|
||||
# Note: exit status is captured via `wait`; only fold state vars back.
|
||||
echo "HAD_UPDATES=$HAD_UPDATES"
|
||||
echo "NITRO_BUILT=$NITRO_BUILT"
|
||||
for r in "${UPDATED_REPOS[@]:-}"; do
|
||||
case " $_orig " in
|
||||
*" $r "*) ;;
|
||||
*) printf 'UPDATED_REPOS+=(\047%s\047)\n' "$r" ;;
|
||||
esac
|
||||
done
|
||||
} > "$PARALLEL_STATE_DIR/$name"
|
||||
exit $rc
|
||||
) &
|
||||
PARALLEL_PIDS+=($!)
|
||||
}
|
||||
@@ -1058,17 +956,10 @@ parallel_wait() {
|
||||
PARALLEL_RESULTS+=("__PARALLEL_FAIL__${name}")
|
||||
PARALLEL_FAILED+=("$name")
|
||||
fi
|
||||
# Fold the job's persisted state back into the parent shell so the
|
||||
# summary reflects renderer/client updates, not just the emulator.
|
||||
if [ -f "$PARALLEL_STATE_DIR/$name" ]; then
|
||||
. "$PARALLEL_STATE_DIR/$name"
|
||||
rm -f "$PARALLEL_STATE_DIR/$name"
|
||||
fi
|
||||
i=$((i+1))
|
||||
done
|
||||
PARALLEL_PIDS=()
|
||||
PARALLEL_NAMES=()
|
||||
rm -rf "$PARALLEL_STATE_DIR" 2>/dev/null || true
|
||||
}
|
||||
|
||||
parallel_failed() {
|
||||
@@ -1196,15 +1087,7 @@ preflight_check() {
|
||||
# =============================================================================
|
||||
update_emulator() {
|
||||
step 2 8 "Update & Build Emulator"
|
||||
local grc=1
|
||||
if git_update "$EMULATOR_REPO" "$NITRO_BRANCH"; then
|
||||
grc=0
|
||||
else
|
||||
grc=$?
|
||||
fi
|
||||
if [ $grc -eq 2 ]; then
|
||||
die "Emulator update failed (git error)"
|
||||
elif [ $grc -eq 0 ]; then
|
||||
HAD_UPDATES=true; UPDATED_REPOS+=("Emulator")
|
||||
cd "$EMULATOR_MODULE"
|
||||
backup_binaries
|
||||
@@ -1220,7 +1103,6 @@ update_emulator() {
|
||||
else
|
||||
spinner_stop fail
|
||||
tail -30 "$LOG_FILE" | grep -E '(ERROR|FAILURE|BUILD)' || true
|
||||
git_revert_repo "$EMULATOR_REPO"
|
||||
die "Maven build failed (see: %s)" "$LOG_FILE"
|
||||
fi
|
||||
local jar=$(find target -maxdepth 1 -name 'Polaris-*-jar-with-dependencies.jar' -printf '%T@ %p\n' 2>/dev/null | sort -rn | sed -n '1s/^[0-9.]* //p' | xargs -r basename 2>/dev/null || echo "")
|
||||
@@ -1244,32 +1126,21 @@ EOJ
|
||||
|
||||
update_renderer() {
|
||||
step 3 8 "Update Nitro_Render_V3"
|
||||
local grc=1
|
||||
if git_update "$NITRO_RENDERER" "$NITRO_BRANCH"; then
|
||||
grc=0
|
||||
else
|
||||
grc=$?
|
||||
fi
|
||||
if [ $grc -eq 2 ]; then
|
||||
# Let the caller fail the parallel group; the state file records it.
|
||||
warn "Renderer update failed (git error)"
|
||||
return 1
|
||||
elif [ $grc -eq 0 ]; then
|
||||
HAD_UPDATES=true; UPDATED_REPOS+=("Nitro_Render_V3")
|
||||
cd "$NITRO_RENDERER"
|
||||
spinner_start "Installing deps..."
|
||||
if ! yarn_install_repo "$NITRO_RENDERER" --frozen-lockfile --prefer-offline; then
|
||||
if ! yarn install --frozen-lockfile --prefer-offline >> "$LOG_FILE" 2>&1; then
|
||||
warn "Renderer: yarn install failed — cleaning node_modules and retrying"
|
||||
yarn_reset_repo "$NITRO_RENDERER"
|
||||
yarn_install_repo "$NITRO_RENDERER" || { spinner_stop fail; git_revert_repo "$NITRO_RENDERER"; die "yarn install failed (see: %s)" "$LOG_FILE"; }
|
||||
clean_node_modules
|
||||
yarn install >> "$LOG_FILE" 2>&1 || { spinner_stop fail; die "yarn install failed (see: %s)" "$LOG_FILE"; }
|
||||
fi
|
||||
cd "$NITRO_RENDERER"
|
||||
if [ ! -d node_modules/pixi.js ]; then
|
||||
warn "Renderer: node_modules incomplete — resetting repo cache and doing full install"
|
||||
# Parallel yarn installs can corrupt a shared cache; resetting the
|
||||
# repo's own cache folder guarantees a clean fetch from the registry.
|
||||
yarn_reset_repo "$NITRO_RENDERER"
|
||||
yarn_install_repo "$NITRO_RENDERER" || { spinner_stop fail; git_revert_repo "$NITRO_RENDERER"; die "yarn install failed (see: %s)" "$LOG_FILE"; }
|
||||
warn "Renderer: node_modules incomplete — cleaning and doing full install"
|
||||
clean_node_modules
|
||||
# Parallel yarn installs (renderer + client) can corrupt the shared
|
||||
# yarn cache, so force a clean fetch with --no-cache as a last resort.
|
||||
yarn install --no-cache >> "$LOG_FILE" 2>&1 || { spinner_stop fail; die "yarn install failed (see: %s)" "$LOG_FILE"; }
|
||||
fi
|
||||
spinner_stop ok; ok "Renderer dependencies installed"
|
||||
else
|
||||
@@ -1281,16 +1152,7 @@ update_renderer() {
|
||||
|
||||
update_client() {
|
||||
step 4 8 "Update & Build Nitro-V3"
|
||||
local grc=1
|
||||
if git_update "$NITRO_CLIENT" "$NITRO_BRANCH"; then
|
||||
grc=0
|
||||
else
|
||||
grc=$?
|
||||
fi
|
||||
if [ $grc -eq 2 ]; then
|
||||
warn "Nitro-V3 update failed (git error)"
|
||||
return 1
|
||||
elif [ $grc -eq 0 ]; then
|
||||
HAD_UPDATES=true; NITRO_BUILT=true; UPDATED_REPOS+=("Nitro-V3")
|
||||
cd "$NITRO_CLIENT"
|
||||
backup_binaries
|
||||
@@ -1298,19 +1160,17 @@ update_client() {
|
||||
spinner_start "Installing deps..."
|
||||
# yarn 1 can "succeed" while leaving node_modules incomplete, so verify
|
||||
# that the vite build binary actually exists before attempting a build.
|
||||
if ! yarn_install_repo "$NITRO_CLIENT" --frozen-lockfile --prefer-offline; then
|
||||
if ! yarn install --frozen-lockfile --prefer-offline >> "$LOG_FILE" 2>&1; then
|
||||
warn "Nitro-V3: yarn install failed — cleaning node_modules and retrying"
|
||||
yarn_reset_repo "$NITRO_CLIENT"
|
||||
yarn_install_repo "$NITRO_CLIENT" || { spinner_stop fail; git_revert_repo "$NITRO_CLIENT"; die "yarn install failed (see: %s)" "$LOG_FILE"; }
|
||||
clean_node_modules
|
||||
yarn install >> "$LOG_FILE" 2>&1 || { spinner_stop fail; die "yarn install failed (see: %s)" "$LOG_FILE"; }
|
||||
fi
|
||||
cd "$NITRO_CLIENT"
|
||||
if [ ! -x node_modules/.bin/vite ]; then
|
||||
warn "Nitro-V3: vite missing after install — resetting repo cache and doing full install"
|
||||
# Parallel yarn installs can corrupt a shared cache; resetting the
|
||||
# repo's own cache folder guarantees a clean fetch from the registry.
|
||||
yarn_reset_repo "$NITRO_CLIENT"
|
||||
yarn_install_repo "$NITRO_CLIENT" || { spinner_stop fail; git_revert_repo "$NITRO_CLIENT"; die "yarn install failed (see: %s)" "$LOG_FILE"; }
|
||||
cd "$NITRO_CLIENT"
|
||||
warn "Nitro-V3: vite missing after install — cleaning node_modules and doing full install"
|
||||
clean_node_modules
|
||||
# Parallel yarn installs (renderer + client) can corrupt the shared
|
||||
# yarn cache, so force a clean fetch with --no-cache as a last resort.
|
||||
yarn install --no-cache >> "$LOG_FILE" 2>&1 || { spinner_stop fail; die "yarn install failed (see: %s)" "$LOG_FILE"; }
|
||||
fi
|
||||
spinner_stop ok
|
||||
spinner_start "Building frontend..."
|
||||
@@ -1319,7 +1179,6 @@ update_client() {
|
||||
else
|
||||
spinner_stop fail
|
||||
tail -30 "$LOG_FILE" || true
|
||||
git_revert_repo "$NITRO_CLIENT"
|
||||
die "yarn build failed (see: %s)" "$LOG_FILE"
|
||||
fi
|
||||
else
|
||||
@@ -1434,9 +1293,6 @@ do_cleanup() {
|
||||
ok "Old config backups pruned"
|
||||
fi
|
||||
[ -d "$BACKUP_DIR" ] && find "$BACKUP_DIR" -maxdepth 1 -name '*.sql' -printf '%T@ %p\n' 2>/dev/null | sort -rn | tail -n +6 | sed 's/^[0-9.]* //' | xargs -r rm -f || true
|
||||
# NOTE: the per-repo yarn cache ($YARN_CACHE_DIR) is intentionally kept
|
||||
# between updates — it is what makes parallel installs fast and reliable.
|
||||
# It is only removed on an explicit "Clean" (menu) action.
|
||||
yarn cache clean 2>/dev/null || true
|
||||
rm -rf /tmp/nitro-* /tmp/epicnext-* 2>/dev/null || true
|
||||
# Clean old Maven build artifacts (older than 7 days)
|
||||
@@ -1603,9 +1459,7 @@ cmd_update() {
|
||||
echo ""
|
||||
acquire_lock
|
||||
DRY_RUN=${DRY_RUN:-false}
|
||||
local mode_label="${SELECTIVE_UPDATE:-full}"
|
||||
[ "$DRY_RUN" = true ] && mode_label="$mode_label [DRY-RUN]"
|
||||
info "Site: %s | Branch: %s | Mode: %s" "${NITRO_SITE_URL:-?}" "$NITRO_BRANCH" "$mode_label"
|
||||
info "Site: %s | Branch: %s | Mode: %s" "${NITRO_SITE_URL:-?}" "$NITRO_BRANCH" "${SELECTIVE_UPDATE:-full}${DRY_RUN:+ [DRY-RUN]}"
|
||||
info "Log: %s" "$LOG_FILE"
|
||||
if [ "$DRY_RUN" = true ]; then
|
||||
info "Dry-run: would update repos, run DB backups, build, sync configs, cleanup, restart services"
|
||||
@@ -1631,17 +1485,17 @@ cmd_update() {
|
||||
*)
|
||||
RUN_ROLLBACK=true
|
||||
update_emulator
|
||||
# Always attempt the renderer + client builds in parallel. Each
|
||||
# update_* function runs git_update itself and skips when its repo
|
||||
# is already up to date, so gating these on the emulator's update
|
||||
# status would wrongly skip them when only client/renderer changed.
|
||||
parallel_run "renderer" update_renderer
|
||||
parallel_run "client" update_client
|
||||
parallel_wait
|
||||
if ! parallel_failed; then
|
||||
warn "Parallel build(s) failed: %s — aborting before restart" "${PARALLEL_FAILED[*]}"
|
||||
ROLLBACK_NEEDED=true
|
||||
die "Build failure in: %s" "${PARALLEL_FAILED[*]}"
|
||||
if [ "$HAD_UPDATES" = true ]; then
|
||||
parallel_run "renderer" update_renderer
|
||||
parallel_run "client" update_client
|
||||
parallel_wait
|
||||
if ! parallel_failed; then
|
||||
warn "Parallel build(s) failed: %s — aborting before restart" "${PARALLEL_FAILED[*]}"
|
||||
ROLLBACK_NEEDED=true
|
||||
die "Build failure in: %s" "${PARALLEL_FAILED[*]}"
|
||||
fi
|
||||
else
|
||||
info "No repo updates; skipping parallel builds"
|
||||
fi
|
||||
sync_configs
|
||||
do_cleanup
|
||||
@@ -1881,14 +1735,14 @@ cmd_flyaway_repair() {
|
||||
# Reinstall dependencies if package.json exists
|
||||
if [ -f "$repo/package.json" ]; then
|
||||
spinner_start "Installing deps for %s..." "$name"
|
||||
if yarn_install_repo "$repo" --frozen-lockfile --prefer-offline 2>/dev/null; then
|
||||
if yarn install --frozen-lockfile --prefer-offline 2>/dev/null; then
|
||||
spinner_stop ok
|
||||
ok "Deps reinstalled for %s" "$name"
|
||||
else
|
||||
spinner_stop fail
|
||||
warn "yarn install failed for %s — resetting repo and retrying" "$name"
|
||||
yarn_reset_repo "$repo"
|
||||
yarn_install_repo "$repo" --frozen-lockfile --prefer-offline 2>/dev/null || warn "yarn install still failed for %s" "$name"
|
||||
warn "yarn install failed for %s — cleaning node_modules and retrying" "$name"
|
||||
rm -rf "$repo/node_modules" 2>/dev/null || true
|
||||
yarn install --frozen-lockfile --prefer-offline 2>/dev/null || warn "yarn install still failed for %s" "$name"
|
||||
fi
|
||||
fi
|
||||
repaired=$((repaired + 1))
|
||||
@@ -2063,11 +1917,11 @@ cmd_clean() {
|
||||
echo -e " ${C_BOLD}7)${C_RESET} $(_t "Maven") ${C_BOLD}0)${C_RESET} $(_t "Return")"
|
||||
echo -en "\n $(_t "Select:") "; local c; read -rt 30 c
|
||||
case "$c" in
|
||||
1) yarn cache clean 2>/dev/null; rm -rf "$YARN_CACHE_DIR" 2>/dev/null; ok "Yarn cleaned" ;;
|
||||
1) yarn cache clean 2>/dev/null && ok "Yarn cleaned" ;;
|
||||
2) cd "$SCRIPT_DIR" && rm -rf .next 2>/dev/null && ok "Next.js cache cleared" ;;
|
||||
3) redis-cli FLUSHALL 2>/dev/null && ok "Redis flushed" || warn "Redis N/A" ;;
|
||||
4) find "$EMULATOR_DIR" -name "*.log" -mtime +14 -exec rm -f {} \; 2>/dev/null; ok "Logs cleaned" ;;
|
||||
5) yarn cache clean 2>/dev/null; rm -rf "$YARN_CACHE_DIR" 2>/dev/null; find "$EMULATOR_DIR" -name "*.log" -mtime +14 -exec rm -f {} \; 2>/dev/null; rm -rf /tmp/nitro-* /tmp/epicnext-* 2>/dev/null; ok "Full cleanup" ;;
|
||||
5) yarn cache clean 2>/dev/null; find "$EMULATOR_DIR" -name "*.log" -mtime +14 -exec rm -f {} \; 2>/dev/null; rm -rf /tmp/nitro-* /tmp/epicnext-* 2>/dev/null; ok "Full cleanup" ;;
|
||||
6) command -v docker &>/dev/null && docker system prune -f 2>/dev/null && ok "Docker pruned" || warn "Docker N/A" ;;
|
||||
7) find "$EMULATOR_MODULE" -maxdepth 3 -name '*.jar' -mtime +7 -exec rm -f {} \; 2>/dev/null; ok "Old Maven artifacts cleaned" ;;
|
||||
esac
|
||||
|
||||
Reference in new issue
Block a user