Commit d8ebb385 authored by dmorley's avatar dmorley
Browse files

migrate to yarn 2

parent efe2f2b8
......@@ -2,3 +2,4 @@ bower_components
config.php
node_modules
vendor
/.yarn/
......@@ -40,11 +40,10 @@ deploy:
script:
- export DEBIAN_FRONTEND=noninteractive
- apt-get update && apt-get install -y sudo curl gnupg2
- curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
- echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
- apt-get update && apt-get install -y minify zip unzip php7.4 php7.4-curl php7.4-pgsql php7.4-bcmath php-geoip php7.4-cli php7.4-common php7.4-fpm php7.4-bcmath php7.4-json php7.4-readline php7.4-mbstring php7.4-xml php7.4-intl php-cgi git curl npm nodejs yarn
- apt-get update && apt-get install -y minify zip unzip php7.4 php7.4-curl php7.4-pgsql php7.4-bcmath php-geoip php7.4-cli php7.4-common php7.4-fpm php7.4-bcmath php7.4-json php7.4-readline php7.4-mbstring php7.4-xml php7.4-intl php-cgi git curl npm nodejs
- curl -sS https://getcomposer.org/installer | php
- php composer.phar install
- sudo npm install -g yarn
- yarn install
- minify -o js/podup.min.js js/podup.js
- minify -o css/poduptime.min.css css/poduptime.css
......
yarnPath: ".yarn/releases/yarn-berry.cjs"
nodeLinker: "node-modules"
\ No newline at end of file
......@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog] and this project adheres to [Semantic
### Changed
- Tell robots not to follow links to pods
### Deprecated
- yarn 1.0 support
### Removed
### Fixed
- Show stats in proper order yymm
......
# Poduptime
Poduptime is software to get live stats and data on listed Diaspora and other Pods that support nodeinfo output.
Poduptime is software to get live stats and data on pods that support nodeinfo output.
# To Install:
......@@ -11,7 +11,7 @@ OS Dependencies:
php7.4 php7.4-curl php7.4-pgsql php7.4-bcmath php-geoip php7.4-cli php7.4-common php7.4-fpm php7.4-bcmath php7.4-json php7.4-readline php7.4-mbstring php7.4-xml php7.4-intl php-cgi git curl postgresql postgresql-contrib dnsutils bind9 npm nodejs composer
```
Yarn is a separate install: https://yarnpkg.com
Yarn is a separate install: sudo npm install -g yarn
Clone and setup:
......
{
"name": "poduptime",
"version": "2.7.0",
"version": "2.8.0",
"description": "Poduptime is software to get live stats and data on listed Diaspora Pods.",
"main": "index.php",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.2.0",
"@popperjs/core": "^2.5.3",
"bootstrap": "^4.5.3",
"chart.js": "^2.9.4",
......@@ -15,8 +14,7 @@
"leaflet": "^1.4.1",
"leaflet.markercluster": "^1.4.1",
"popper.js": "^1.15.0",
"tablesorter": "^2.31.3",
"typeface-roboto": "^0.0.54"
"tablesorter": "^2.31.3"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
......
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1
"@fortawesome/fontawesome-free@^5.2.0":
version "5.15.1"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.1.tgz#ccfef6ddbe59f8fe8f694783e1d3eb88902dc5eb"
integrity sha512-OEdH7SyC1suTdhBGW91/zBfR6qaIhThbcN8PUXtXilY4GYnSBbVqOntdHbC1vXwsDnX0Qix2m2+DSU1J51ybOQ==
"@popperjs/core@^2.5.3":
version "2.5.4"
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.5.4.tgz#de25b5da9f727985a3757fd59b5d028aba75841a"
integrity sha512-ZpKr+WTb8zsajqgDkvCEWgp6d5eJT6Q63Ng2neTbzBO76Lbe91vX/iVIW9dikq+Fs3yEo+ls4cxeXABD2LtcbQ==
bootstrap@^4.5.3:
version "4.5.3"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6"
integrity sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ==
chart.js@^2.9.4:
version "2.9.4"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684"
integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==
# This file is generated by running "yarn install" inside your project.
# Manual changes might be lost - proceed with caution!
__metadata:
version: 4
cacheKey: 7
"@popperjs/core@npm:^2.5.3":
version: 2.5.4
resolution: "@popperjs/core@npm:2.5.4"
checksum: 2f70875408c8d6fe43acd50f466db9d960ecd75828ac59544697854d6e7b43dbc1e13647133f99cc3e47e02fa781ca873aaa306545f942f10c7a2f0565b94442
languageName: node
linkType: hard
"bootstrap@npm:^4.5.3":
version: 4.5.3
resolution: "bootstrap@npm:4.5.3"
peerDependencies:
jquery: 1.9.1 - 3
popper.js: ^1.16.1
checksum: 8c8850152f535ea1f3a24ceb06baaf12557423ad02fa17d8a1517a4a46b46cee58ecf0d031fca0e4d0cce2165d3bac0c90e782eb31cf7a84dae640531f7b2f7c
languageName: node
linkType: hard
"chart.js@npm:^2.9.4":
version: 2.9.4
resolution: "chart.js@npm:2.9.4"
dependencies:
chartjs-color "^2.1.0"
moment "^2.10.2"
chartjs-color-string@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
chartjs-color: ^2.1.0
moment: ^2.10.2
checksum: 4551932943bc5e42d25ae5632d91878fb89e22937095a2742e23c4d0d0bde405bed6be2cb8480694ba599d6dbb9882c8bce6bac1e4667c820eb24c38416380aa
languageName: node
linkType: hard
"chartjs-color-string@npm:^0.6.0":
version: 0.6.0
resolution: "chartjs-color-string@npm:0.6.0"
dependencies:
color-name "^1.0.0"
chartjs-color@^2.1.0:
version "2.4.1"
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
color-name: ^1.0.0
checksum: 29f7ef3ebf5af1a76034da3148e1f230eee0c0f6df497ab7072ce5fb9c11ff37f5f030d2a2a5f1fd9230895d9aa294b455c5dd0f0e04f38688c69d0ccbdca7dd
languageName: node
linkType: hard
"chartjs-color@npm:^2.1.0":
version: 2.4.1
resolution: "chartjs-color@npm:2.4.1"
dependencies:
chartjs-color-string "^0.6.0"
color-convert "^1.9.3"
color-convert@^1.9.3:
version "1.9.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
chartjs-color-string: ^0.6.0
color-convert: ^1.9.3
checksum: 850408dfcda057ef0115018d5c83b88f5539cf93bbae8389bd3c5caa405a18e1f1d89b22a26107e1559248206a4ad6243294a820d50f042c6782a1d9d09fb3de
languageName: node
linkType: hard
"color-convert@npm:^1.9.3":
version: 1.9.3
resolution: "color-convert@npm:1.9.3"
dependencies:
color-name "1.1.3"
color-name@1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
color-name@^1.0.0:
version "1.1.4"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
featherlight@^1.7.14:
version "1.7.14"
resolved "https://registry.yarnpkg.com/featherlight/-/featherlight-1.7.14.tgz#7896909d0d7ac4672c334ba018363e519d31e4db"
integrity sha512-4R0Vk0pTN5IPCuMABPtXJ6hgGgoK1qwbxGB4Nf06gXovw/i+r3s/f94ksZYjsW3c2oMEAS9A8exdlNaX9YSSRQ==
color-name: 1.1.3
checksum: 5f244daa3d1fe1f216d48878c550465067d15268688308554e613b7640a068f96588096d51f0b98b68f15d6ff6bb8ad24e172582ac8c0ad43fa4d3da60fd1b79
languageName: node
linkType: hard
"color-name@npm:1.1.3":
version: 1.1.3
resolution: "color-name@npm:1.1.3"
checksum: d8b91bb90aefc05b6ff568cf8889566dcc6269824df6f3c9b8ca842b18d7f4d089c07dc166808d33f22092d4a79167aa56a96a5ff0d21efab548bf44614db43b
languageName: node
linkType: hard
"color-name@npm:^1.0.0":
version: 1.1.4
resolution: "color-name@npm:1.1.4"
checksum: 3e1c9a4dee12eada307436f61614dd11fe300469db2b83f80c8b7a7cd8a1015f0f18dd13403f018927b249003777ff60baba4a03c65f12e6bddc0dfd9642021f
languageName: node
linkType: hard
"featherlight@npm:^1.7.14":
version: 1.7.14
resolution: "featherlight@npm:1.7.14"
checksum: 9ea0d43024a0e629330eae02586849495a7a4b672486a78c7902f702293d9c3586a578bbe0e5ccb7eeb111aa0eab27916bff008a96d48a69603154d80b43217f
languageName: node
linkType: hard
fork-awesome@ForkAwesome/Fork-Awesome:
version "1.2.0"
resolved "https://codeload.github.com/ForkAwesome/Fork-Awesome/tar.gz/964d92e199856be623ccf4c31ffd27603ecb2944"
ion-rangeslider@^2.2.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/ion-rangeslider/-/ion-rangeslider-2.3.1.tgz#92ade52cb56fc30b9162d0483ff02b6f9ed237c2"
integrity sha512-6V+24FD13/feliI485gnRHZYD9Ev64M5NAFTxnVib516ATHa9PlXQrC+nOiPngouRYTCLPJyokAJEi3e1Umi5g==
jquery@>=1.2.6, jquery@^3.5.0:
version "3.5.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
leaflet.markercluster@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/leaflet.markercluster/-/leaflet.markercluster-1.4.1.tgz#b53f2c4f2ca7306ddab1dbb6f1861d5e8aa6c5e5"
integrity sha512-ZSEpE/EFApR0bJ1w/dUGwTSUvWlpalKqIzkaYdYB7jaftQA/Y2Jav+eT4CMtEYFj+ZK4mswP13Q2acnPBnhGOw==
leaflet@^1.4.1:
version "1.7.1"
resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.7.1.tgz#10d684916edfe1bf41d688a3b97127c0322a2a19"
integrity sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==
moment@^2.10.2:
version "2.29.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
popper.js@^1.14.7:
version "1.16.1"
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
tablesorter@^2.31.3:
version "2.31.3"
resolved "https://registry.yarnpkg.com/tablesorter/-/tablesorter-2.31.3.tgz#94c33234ba0e5d9efc5ba4e48651010a396c8b64"
integrity sha512-ueEzeKiMajDcCWnUoT1dOeNEaS1OmPh9+8J0O2Sjp3TTijMygH74EA9QNJiNkLJqULyNU0RhbKY26UMUq9iurA==
version: 1.2.0
resolution: "fork-awesome@https://github.com/ForkAwesome/Fork-Awesome.git#commit=964d92e199856be623ccf4c31ffd27603ecb2944"
checksum: e2f6ace9a717420b6fcecc1bcb14a4d340ec9793fe5c004d043079ca04bd69092701735efc5e690c89322b08a5ddf67831a49382bb19378bc52da38ae4787706
languageName: node
linkType: hard
"ion-rangeslider@npm:^2.2.0":
version: 2.3.1
resolution: "ion-rangeslider@npm:2.3.1"
peerDependencies:
jquery: ">=1.8"
checksum: 8399461d5903e3c98b3749afd1f822a9f3133c68c0188d98703b6d2f188ec7fe895a5602971143c0101b4d11de651e35bcdc42c06ac0bf038a5623741f934e25
languageName: node
linkType: hard
"jquery@npm:>=1.2.6, jquery@npm:^3.5.0":
version: 3.5.1
resolution: "jquery@npm:3.5.1"
checksum: c50818c84837902a60938c85786feb612f346a9918f7285409d605449460790b3815ad8aaf5806f19e89f1a79b27d327802b421ab354fe213f3fd1801e3562e6
languageName: node
linkType: hard
"leaflet.markercluster@npm:^1.4.1":
version: 1.4.1
resolution: "leaflet.markercluster@npm:1.4.1"
peerDependencies:
leaflet: ~1.3.1
checksum: 6f1ea023e95a9f5ca55b6eeb441ecb7ee257412b0ece870af14b0aa0afc9dcf78da0fb5ada22a443eee368ed4de3e9285cfdbab09c8e74f50fa8f512ba4f09b0
languageName: node
linkType: hard
"leaflet@npm:^1.4.1":
version: 1.7.1
resolution: "leaflet@npm:1.7.1"
checksum: 7a841174dc3c8e135a2ba9a81cdd8145ef4c00e516eb558281ea47b20499f94ddab58a76a72ee15104e0dce88a07ae91fe933cfab75b569c5ed0770497aa7d99
languageName: node
linkType: hard
"moment@npm:^2.10.2":
version: 2.29.1
resolution: "moment@npm:2.29.1"
checksum: 86729013febf7160de5b93da69273dd304d674b0224f9544b3abd09a87671ddd2cdd57598261ce57588910d63747ffd5590965e83c790d8bf327083c0e0a06e0
languageName: node
linkType: hard
"poduptime@workspace:.":
version: 0.0.0-use.local
resolution: "poduptime@workspace:."
dependencies:
jquery ">=1.2.6"
typeface-roboto@^0.0.54:
version "0.0.54"
resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.54.tgz#8f02c9a18d1cfa7f49381a6ff0d21ff061f38ad2"
integrity sha512-sOFA1FXgP0gOgBYlS6irwq6hHYA370KE3dPlgYEJHL3PJd5X8gQE0RmL79ONif6fL5JZuGDj+rtOrFeOqz5IZQ==
"@popperjs/core": ^2.5.3
bootstrap: ^4.5.3
chart.js: ^2.9.4
featherlight: ^1.7.14
fork-awesome: ForkAwesome/Fork-Awesome
ion-rangeslider: ^2.2.0
jquery: ^3.5.0
leaflet: ^1.4.1
leaflet.markercluster: ^1.4.1
popper.js: ^1.15.0
tablesorter: ^2.31.3
languageName: unknown
linkType: soft
"popper.js@npm:^1.15.0":
version: 1.16.1
resolution: "popper.js@npm:1.16.1"
checksum: eb53806fb7680e31c7d1db096f95438a40a7cb869f7ee0e27100c0860f11583a0d322606c6073618e7fe8865f834ec36482901b547256d9a0cf2b22434bca75d
languageName: node
linkType: hard
"tablesorter@npm:^2.31.3":
version: 2.31.3
resolution: "tablesorter@npm:2.31.3"
dependencies:
jquery: ">=1.2.6"
checksum: 1c0304f2976973bb8f0edffb1c46e8118dcc4fae966f55c8d7b9407a32b30b92ac8e8a984d4ec6de8af1be05799adf1f904c0bb865acd861cdf575046ee3e0e6
languageName: node
linkType: hard
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment