alerte-secours/as-services
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(clean): remove yarn-dev-portal
Some checks failed
/ build (map[dockerfile:./services/files/Dockerfile name:files]) (push) Failing after 15s
Details
/ build (map[dockerfile:./services/tasks/Dockerfile name:tasks]) (push) Failing after 23s
Details
/ build (map[dockerfile:./services/app/Dockerfile name:app]) (push) Successful in 47s
Details
/ build (map[dockerfile:./services/hasura/Dockerfile name:hasura]) (push) Successful in 58s
Details
/ deploy (push) Has been skipped
Details
/ build (map[dockerfile:./services/api/Dockerfile name:api]) (push) Failing after 11s
Details
/ build (map[dockerfile:./services/watchers/Dockerfile name:watchers]) (push) Failing after 22s
Details
/ build (map[dockerfile:./services/web/Dockerfile name:web]) (push) Failing after 24s
Details

Browse source
This commit is contained in:
devthejo 2025-04-23 15:01:15 +02:00
parent 4ddb801574
commit c42a406b89
43 changed files with 13 additions and 23898 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.aidigestignore
View file

@ -1,11 +1,6 @@
# ai-digest
.aidigestignore
# yarn-dev-portal
yarn.lock.*
package.json.*
.yarn-dev-portal
# versioning
CHANGELOG.md
.versionrc.json

3
.gitignore vendored
View file

@ -30,8 +30,7 @@ yarn.lock.dev
yarn.lock
/package.json.dev
/package.json
.yarn-dev-portal/.links/*
!.yarn-dev-portal/.links/.gitkeep
codebase.md

0
.yarn-dev-portal/.links/.gitkeep
View file

1
.yarn-dev-portal/@modjo/amqp
View file

@ -1 +0,0 @@
../.links/modjo/plugins/amqp

1
.yarn-dev-portal/@modjo/apollo-client
View file

@ -1 +0,0 @@
../.links/modjo/plugins/apollo-client

1
.yarn-dev-portal/@modjo/config
View file

@ -1 +0,0 @@
../.links/modjo/plugins/config

1
.yarn-dev-portal/@modjo/core
View file

@ -1 +0,0 @@
../.links/modjo/packages/core

1
.yarn-dev-portal/@modjo/express
View file

@ -1 +0,0 @@
../.links/modjo/plugins/express

1
.yarn-dev-portal/@modjo/express-asyncapi
View file

@ -1 +0,0 @@
../.links/modjo/plugins/express-asyncapi/

1
.yarn-dev-portal/@modjo/express-monitor
View file

@ -1 +0,0 @@
../.links/modjo/plugins/express-monitor

1
.yarn-dev-portal/@modjo/graphql-pubsub
View file

@ -1 +0,0 @@
../.links/modjo/plugins/graphql-pubsub

1
.yarn-dev-portal/@modjo/hasura
View file

@ -1 +0,0 @@
../.links/modjo/plugins/hasura

1
.yarn-dev-portal/@modjo/http-logger
View file

@ -1 +0,0 @@
../.links/modjo/plugins/http-logger

1
.yarn-dev-portal/@modjo/http-server
View file

@ -1 +0,0 @@
../.links/modjo/plugins/http-server

1
.yarn-dev-portal/@modjo/ioredis
View file

@ -1 +0,0 @@
../.links/modjo/plugins/ioredis

1
.yarn-dev-portal/@modjo/lightship
View file

@ -1 +0,0 @@
../.links/modjo/plugins/lightship

1
.yarn-dev-portal/@modjo/logger
View file

@ -1 +0,0 @@
../.links/modjo/plugins/logger

1
.yarn-dev-portal/@modjo/microservice-oapi
View file

@ -1 +0,0 @@
../.links/modjo/microservices/oapi

1
.yarn-dev-portal/@modjo/microservice-watcher
View file

@ -1 +0,0 @@
../.links/modjo/microservices/watcher

1
.yarn-dev-portal/@modjo/microservice-worker
View file

@ -1 +0,0 @@
../.links/modjo/microservices/worker

1
.yarn-dev-portal/@modjo/minio
View file

@ -1 +0,0 @@
../.links/modjo/plugins/minio

1
.yarn-dev-portal/@modjo/oa
View file

@ -1 +0,0 @@
../.links/modjo/plugins/oa

1
.yarn-dev-portal/@modjo/oa-graphql
View file

@ -1 +0,0 @@
../.links/modjo/plugins/oa-graphql

1
.yarn-dev-portal/@modjo/postgres
View file

@ -1 +0,0 @@
../.links/modjo/plugins/postgres

1
.yarn-dev-portal/@modjo/sentry
View file

@ -1 +0,0 @@
../.links/modjo/plugins/sentry

1
.yarn-dev-portal/@modjo/shutdown-handlers
View file

@ -1 +0,0 @@
../.links/modjo/plugins/shutdown-handlers

1
.yarn-dev-portal/@modjo/slonik
View file

@ -1 +0,0 @@
../.links/modjo/plugins/slonik

1
.yarn-dev-portal/@modjo/version
View file

@ -1 +0,0 @@
../.links/modjo/plugins/version

12
.yarn/plugins/@yarnpkg/plugin-dev-portal.cjs vendored
View file

@ -1,12 +0,0 @@
/* eslint-disable */
//prettier-ignore
module.exports = {
name: "@yarnpkg/plugin-dev-portal",
factory: function (require) {
var plugin=(()=>{var B=Object.defineProperty;var U=(n,e,o)=>e in n?B(n,e,{enumerable:!0,configurable:!0,writable:!0,value:o}):n[e]=o;var s=(n=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(n,{get:(e,o)=>(typeof require<"u"?require:e)[o]}):n)(function(n){if(typeof require<"u")return require.apply(this,arguments);throw new Error('Dynamic require of "'+n+'" is not supported')});var a=(n,e)=>()=>(e||n((e={exports:{}}).exports,e),e.exports);var v=(n,e,o)=>(U(n,typeof e!="symbol"?e+"":e,o),o);var $=a((se,P)=>{var g=s("fs");P.exports=function(e){if(g.existsSync(e)){let o=g.lstatSync(e);if(o.isSymbolicLink()){let p=g.realpathSync(e);return g.statSync(p).isDirectory()}return o.isDirectory()}return!1}});var S=a((te,w)=>{w.exports=function(e){process.stdout.write(`[YARN-DEV-PORTAL] ${e}
`)}});var A=a((ce,N)=>{var D=s("path"),O=s("fs"),m=$(),z=S();N.exports=function(e){let o=[];if(!m(e))return o;let p=O.readdirSync(e),y=(r,c)=>{o.push({name:r,path:c}),z(`found package ${r} that will resolve to portal "${c}"`)};for(let r of p){let c=D.join(e,r);if(!r.startsWith("."))if(r.startsWith("@")){let d=O.readdirSync(c);for(let f of d){let i=D.join(c,f);m(i)&&y(`${r}/${f}`,i)}}else m(c)&&y(r,c)}return o}});var E=a((ie,b)=>{var j=s("path"),t=s("fs"),G=s("os"),{execSync:H}=s("child_process"),T=A(),_=process.cwd(),I=".yarn-dev-portal",x=S();b.exports=function(e,{makeLink:o=!0,yarnInstallProcessEnv:p={}}={}){let y=j.join(_,"package.json"),r=JSON.parse(t.readFileSync(y,{encoding:"utf-8"})),c=j.join(G.homedir(),I),d=T(c),f=j.join(_,I);if(d=[...d,...T(f)],e==="dev")for(let i of d)r.resolutions[i.name]=`portal:${i.path}`;else for(let i of Object.keys(r.resolutions))r.resolutions[i].startsWith("portal:")&&delete r.resolutions[i];t.writeFileSync(y,JSON.stringify(r,null,2)),x(`installing ${e}`),H("yarn",{stdio:"inherit",env:{...process.env,INSIDE_YARN_DEV_PORTAL:"true",...p}}),x(`creating ${e} files`),t.copyFileSync("yarn.lock",`yarn.lock.${e}`),t.copyFileSync("package.json",`package.json.${e}`),o&&(x(`linking to ${e} files`),t.existsSync("package.json")&&t.unlinkSync("package.json"),t.symlinkSync(`package.json.${e}`,"package.json"),t.existsSync("yarn.lock")&&t.unlinkSync("yarn.lock"),t.symlinkSync(`yarn.lock.${e}`,"yarn.lock"))}});var L=a((ae,F)=>{F.exports=function(){try{return fs.readlinkSync("yarn.lock").split(".").pop()}catch{return null}}});var q=a((le,J)=>{var R=E(),K=L(),C=S();J.exports=function(e,o={}){if(e||(e=K()||"dev"),!["dev","prod"].includes(e))throw new Error(`Invalid yarn dev-portal env ${e}, allowed values are "dev" or "prod"`);yarnEnvOther=e==="prod"?"dev":"prod",C(`setting env ${e}`),R(yarnEnvOther,{...o,makeLink:!1}),R(e,{...o}),C(`env ${e} ready`)}});var W=a((ye,V)=>{var{BaseCommand:M}=s("@yarnpkg/cli"),{Command:Q,Option:X}=s("clipanion"),Z=q(),h;V.exports=(h=class extends M{args=X.Proxy();async execute(){let[e="dev"]=this.args;Z(e)}},v(h,"paths",[["dev-portal"]]),v(h,"usage",Q.Usage({description:"produce two yarn.lock to seamlessly link to external local libraries you're developing using yarn portal",details:`
upgrade both version, dev and prod, of yarn.lock and package.json, and switch between them
`,examples:[["yarn dev-portal","yarn dev-portal prod","yarn dev-portal dev"]]})),h)});var oe=a((ue,Y)=>{var l=s("fs"),u=s("path"),ee=W(),ne=q(),k=process.cwd();!l.existsSync(u.join(k,"yarn.lock"))&&l.existsSync(u.join(k,"yarn.lock.prod"))&&l.symlinkSync("yarn.lock.prod","yarn.lock");!l.existsSync(u.join(k,"package.json"))&&l.existsSync(u.join(k,"package.json.prod"))&&l.symlinkSync("package.json.prod","package.json");Y.exports={commands:[ee],hooks:{afterAllInstalled:async n=>{process.env.INSIDE_YARN_DEV_PORTAL!=="true"&&(!l.existsSync(u.join(k,"package.json.prod"))||ne(null))}}}});return oe();})();
return plugin;
}
};

2
.yarnrc.yml
View file

@ -5,8 +5,6 @@ enableGlobalCache: false
nodeLinker: node-modules
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-dev-portal.cjs
spec: "https://codeberg.org/devthefuture/yarn-plugin-dev-portal/raw/branch/master/bundles/@yarnpkg/plugin-dev-portal.js"
- checksum: 240d225dd5bf1e25068497140ced7a3b7658a4c3754c08ea57162c9fe3335d757af0eae55555f96150a3015cdd0337852401f3fae69c1edd05221cb32f038d8c
path: .yarn/plugins/@yarnpkg/plugin-fetch.cjs
spec: "https://codeberg.org/devthefuture/yarn-plugin-fetch/raw/branch/master/bundles/@yarnpkg/plugin-fetch.js"

4
docker-compose.yaml
View file

@ -165,7 +165,6 @@ services:
volumes:
- ./.dev-secrets:/secrets:ro
- ./:/app
- ~/lab/devthefuture/modjo:/app/.yarn-dev-portal/.links/modjo
ports:
- ${EXPOSE_API_PORT:-4200}:${API_PORT:-4200}
environment:
@ -206,7 +205,6 @@ services:
volumes:
- ./.dev-secrets:/secrets:ro
- ./:/app
- ~/lab/devthefuture/modjo:/app/.yarn-dev-portal/.links/modjo
ports:
- ${EXPOSE_FILES_PORT:-4292}:${FILES_PORT:-4292}
environment:
@ -241,7 +239,6 @@ services:
dockerfile: ./services/tasks/Dockerfile.dev
volumes:
- ./:/app
- ~/lab/devthefuture/modjo:/app/.yarn-dev-portal/.links/modjo
environment:
API_URL: ${API_URL:-http://localhost:${EXPOSE_API_PORT:-4200}/api}
LOGLEVEL: ${TASKS_LOGLEVEL:-debug}
@ -281,7 +278,6 @@ services:
dockerfile: ./services/watchers/Dockerfile.dev
volumes:
- ./:/app
- ~/lab/devthefuture/modjo:/app/.yarn-dev-portal/.links/modjo
environment:
LOGLEVEL: ${WATCHERS_LOGLEVEL:-debug}
DATABASE_URL: ${DATABASE_URL-psql://dev:dev@db/dev}

70
package.json.prod
View file

@ -1,70 +0,0 @@
{
"name": "alerte-secours",
"version": "0.0.1",
"description": "Alerte-Secours - Le Réflexe qui Sauve",
"keywords": [
"alerte",
"secours",
"urgence",
"entraide",
"geolocalisation"
],
"author": "devthejo <jo@devthefuture.org>",
"homepage": "https://codeberg.org/alerte-secours/alerte-secours",
"repository": "https://codeberg.org/alerte-secours/alerte-secours",
"bugs": "https://codeberg.org/alerte-secours/alerte-secours/-/issues",
"private": true,
"workspaces": [
"services/*",
"libs/*",
"tests/*"
],
"scripts": {
"dev:web": "yarn workspace @as/web run dev",
"release": "commit-and-tag-version",
"lint": "eslint .",
"test": "jest tests",
"clear:local": "git clean -xdf",
"postinstall": "[ -d '.husky' ] && husky install || true && bin/direnv allow"
},
"lint-staged": {
"*.{js,jsx}": "eslint"
},
"husky": {
"hooks": {
"pre-commit": "yarn lint --fix",
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
}
},
"dependencies": {
"dotenv": "^16.0.0",
"js-yaml": "^4.1.0",
"lodash.camelcase": "^4.3.0"
},
"devDependencies": {
"@commitlint/cli": "^12.1.4",
"@commitlint/config-conventional": "^12.1.4",
"commit-and-tag-version": "^11.2.2",
"eslint": "^7.32.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-prettier": "^7",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.1",
"eslint-plugin-sql-pretty": "^1.1.2",
"husky": "^7.0.0",
"lint-staged": "^11.1.2",
"node-gyp": "^9.4.0",
"prettier": "^2.3.2",
"standard-changelog": "^2.0.27"
},
"engines": {
"node": ">=20"
},
"resolutions": {
"express": "5.0.0-beta.3"
},
"packageManager": "yarn@4.6.0"
}

3
services/api/Dockerfile
View file

@ -4,8 +4,7 @@ FROM ./dockerfile-x/node AS build
ENV NODE_ENV=production
# fetch
COPY --chown=1000:1000 .yarnrc.yml ./
COPY --chown=1000:1000 yarn.lock.prod ./yarn.lock
COPY --chown=1000:1000 yarn.lock .yarnrc.yml ./
COPY --chown=1000:1000 .yarn .yarn
RUN yarn fetch workspaces focus @as/api

3
services/api/nodemon.json
View file

@ -3,7 +3,6 @@
"ext": ".js, .json, .yaml, .yml",
"watch": [
"src",
"../../libs",
"../../.yarn-dev-portal/.links/modjo"
"../../libs"
]
}

3
services/files/Dockerfile
View file

@ -4,8 +4,7 @@ FROM ./dockerfile-x/node AS build
ENV NODE_ENV=production
# fetch
COPY --chown=1000:1000 .yarnrc.yml ./
COPY --chown=1000:1000 yarn.lock.prod ./yarn.lock
COPY --chown=1000:1000 yarn.lock .yarnrc.yml ./
COPY --chown=1000:1000 .yarn .yarn
RUN yarn fetch workspaces focus @as/files

3
services/files/nodemon.json
View file

@ -5,7 +5,6 @@
"ext": ".js, .json, .yaml, .yml",
"watch": [
"src",
"../../libs",
"../../.yarn-dev-portal/.links/modjo"
"../../libs"
]
}

3
services/tasks/Dockerfile
View file

@ -4,8 +4,7 @@ FROM ./dockerfile-x/node AS build
ENV NODE_ENV=production
# fetch
COPY --chown=1000:1000 .yarnrc.yml ./
COPY --chown=1000:1000 yarn.lock.prod ./yarn.lock
COPY --chown=1000:1000 yarn.lock .yarnrc.yml ./
COPY --chown=1000:1000 .yarn .yarn
RUN yarn fetch workspaces focus @as/tasks

3
services/tasks/nodemon.json
View file

@ -5,7 +5,6 @@
"ext": ".js, .json, .yaml, .yml, .eta",
"watch": [
"src",
"../../libs",
"../../.yarn-dev-portal/.links/modjo"
"../../libs"
]
}

3
services/watchers/Dockerfile
View file

@ -4,8 +4,7 @@ FROM ./dockerfile-x/node AS build
ENV NODE_ENV=production
# fetch
COPY --chown=1000:1000 .yarnrc.yml ./
COPY --chown=1000:1000 yarn.lock.prod ./yarn.lock
COPY --chown=1000:1000 yarn.lock .yarnrc.yml ./
COPY --chown=1000:1000 .yarn .yarn
RUN yarn fetch workspaces focus @as/watchers

3
services/watchers/nodemon.json
View file

@ -5,7 +5,6 @@
"ext": ".js, .json, .yaml, .yml",
"watch": [
"src",
"../../libs",
"../../.yarn-dev-portal/.links/modjo"
"../../libs"
]
}

4
services/watchers/src/watchers/geodata-cleanup-cron.js
View file

@ -50,7 +50,9 @@ module.exports = async function () {
// Parse stored JSON to get `updatedAt`
const data = JSON.parse(deviceData)
const age = now - data.updatedAt
// const age = now - data.updatedAt
const age = data.updatedAt ? now - data.updatedAt : Infinity // trick is for missing updatedAt field on old entries
// If data is older than maxAge
if (age > maxAge) {

3
services/web/Dockerfile
View file

@ -3,8 +3,7 @@ FROM ./dockerfile-x/node AS build
ENV NODE_ENV=production
# fetch
COPY --chown=1000:1000 .yarnrc.yml ./
COPY --chown=1000:1000 yarn.lock.prod ./yarn.lock
COPY --chown=1000:1000 yarn.lock .yarnrc.yml ./
COPY --chown=1000:1000 .yarn .yarn
RUN yarn fetch workspaces focus @as/web

23759
yarn.lock.prod
View file

File diff suppressed because it is too large Load diff