瀏覽代碼

chore: fix remove yarn pnp overhead on wait-for scripts

Karol Sójko 2 年之前
父節點
當前提交
ffc270cc6f

+ 1 - 1
packages/api-gateway/package.json

@@ -18,7 +18,7 @@
     "setup:env": "cp .env.sample .env",
     "setup:env": "cp .env.sample .env",
     "wait-for:revisions": "docker/wait-for.sh localhost $REVISIONS_SERVER_PORT",
     "wait-for:revisions": "docker/wait-for.sh localhost $REVISIONS_SERVER_PORT",
     "start": "yarn node dist/bin/server.js",
     "start": "yarn node dist/bin/server.js",
-    "supervisor:start": "yarn wait-for:revisions && node dist/bin/server.js",
+    "supervisor:start": "docker/wait-for.sh localhost $REVISIONS_SERVER_PORT && node dist/bin/server.js",
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
   },
   },
   "dependencies": {
   "dependencies": {

+ 2 - 2
packages/auth/package.json

@@ -20,9 +20,9 @@
     "wait-for:syncing-server": "docker/wait-for.sh localhost $SYNCING_SERVER_PORT",
     "wait-for:syncing-server": "docker/wait-for.sh localhost $SYNCING_SERVER_PORT",
     "wait-for:auth": "docker/wait-for.sh localhost $AUTH_SERVER_PORT",
     "wait-for:auth": "docker/wait-for.sh localhost $AUTH_SERVER_PORT",
     "start": "yarn node dist/bin/server.js",
     "start": "yarn node dist/bin/server.js",
-    "supervisor:start": "yarn wait-for:syncing-server && node dist/bin/server.js",
+    "supervisor:start": "docker/wait-for.sh localhost $SYNCING_SERVER_PORT && node dist/bin/server.js",
     "worker": "yarn node dist/bin/worker.js",
     "worker": "yarn node dist/bin/worker.js",
-    "supervisor:worker": "yarn wait-for:auth && node dist/bin/worker.js",
+    "supervisor:worker": "docker/wait-for.sh localhost $AUTH_SERVER_PORT && node dist/bin/worker.js",
     "cleanup": "yarn node dist/bin/cleanup.js",
     "cleanup": "yarn node dist/bin/cleanup.js",
     "stats": "yarn node dist/bin/stats.js",
     "stats": "yarn node dist/bin/stats.js",
     "daily-backup:email": "yarn node dist/bin/backup.js email daily",
     "daily-backup:email": "yarn node dist/bin/backup.js email daily",

+ 2 - 2
packages/files/package.json

@@ -23,9 +23,9 @@
     "wait-for:auth": "docker/wait-for.sh localhost $AUTH_SERVER_PORT",
     "wait-for:auth": "docker/wait-for.sh localhost $AUTH_SERVER_PORT",
     "wait-for:files": "docker/wait-for.sh localhost $FILES_SERVER_PORT",
     "wait-for:files": "docker/wait-for.sh localhost $FILES_SERVER_PORT",
     "start": "yarn node dist/bin/server.js",
     "start": "yarn node dist/bin/server.js",
-    "supervisor:start": "yarn wait-for:auth && node dist/bin/server.js",
+    "supervisor:start": "docker/wait-for.sh localhost $AUTH_SERVER_PORT && node dist/bin/server.js",
     "worker": "yarn node dist/bin/worker.js",
     "worker": "yarn node dist/bin/worker.js",
-    "supervisor:worker": "yarn wait-for:files && node dist/bin/worker.js",
+    "supervisor:worker": "docker/wait-for.sh localhost $FILES_SERVER_PORT && node dist/bin/worker.js",
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
   },
   },
   "dependencies": {
   "dependencies": {

+ 2 - 2
packages/revisions/package.json

@@ -22,8 +22,8 @@
     "wait-for:files": "docker/wait-for.sh localhost $FILES_SERVER_PORT",
     "wait-for:files": "docker/wait-for.sh localhost $FILES_SERVER_PORT",
     "wait-for:revisions": "docker/wait-for.sh localhost $REVISIONS_SERVER_PORT",
     "wait-for:revisions": "docker/wait-for.sh localhost $REVISIONS_SERVER_PORT",
     "start": "yarn node dist/bin/server.js",
     "start": "yarn node dist/bin/server.js",
-    "supervisor:start": "yarn wait-for:files && node dist/bin/server.js",
-    "supervisor:worker": "yarn wait-for:revisions && node dist/bin/worker.js",
+    "supervisor:start": "docker/wait-for.sh localhost $FILES_SERVER_PORT && node dist/bin/server.js",
+    "supervisor:worker": "docker/wait-for.sh localhost $REVISIONS_SERVER_PORT && node dist/bin/worker.js",
     "worker": "yarn node dist/bin/worker.js"
     "worker": "yarn node dist/bin/worker.js"
   },
   },
   "dependencies": {
   "dependencies": {

+ 2 - 2
packages/syncing-server/package.json

@@ -24,9 +24,9 @@
     "wait-for:infra": "yarn wait-for:db && yarn wait-for:cache",
     "wait-for:infra": "yarn wait-for:db && yarn wait-for:cache",
     "wait-for:syncing-server": "docker/wait-for.sh localhost $SYNCING_SERVER_PORT",
     "wait-for:syncing-server": "docker/wait-for.sh localhost $SYNCING_SERVER_PORT",
     "start": "yarn node dist/bin/server.js",
     "start": "yarn node dist/bin/server.js",
-    "supervisor:start": "yarn wait-for:infra && node dist/bin/server.js",
+    "supervisor:start": "docker/wait-for.sh $DB_HOST $DB_PORT && docker/wait-for.sh $REDIS_HOST $REDIS_PORT && node dist/bin/server.js",
     "worker": "yarn node dist/bin/worker.js",
     "worker": "yarn node dist/bin/worker.js",
-    "supervisor:worker": "yarn wait-for:syncing-server && node dist/bin/worker.js",
+    "supervisor:worker": "docker/wait-for.sh localhost $SYNCING_SERVER_PORT && node dist/bin/worker.js",
     "content-size": "yarn node dist/bin/content.js",
     "content-size": "yarn node dist/bin/content.js",
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
   },
   },