diff --git a/bin/companion.sh b/bin/companion.sh index 4b31af6684..dc7a3ee16d 100755 --- a/bin/companion.sh +++ b/bin/companion.sh @@ -2,7 +2,7 @@ # Load local env vars. In CI, these are injected. if [ -f .env ]; then - nodemon --watch packages/@uppy/companion/src --exec node -r dotenv/config ./packages/@uppy/companion/src/standalone/start-server.js + node --watch -r dotenv/config ./packages/@uppy/companion/src/standalone/start-server.js else env \ COMPANION_DATADIR="./output" \ @@ -13,6 +13,6 @@ else COMPANION_SECRET="development" \ COMPANION_PREAUTH_SECRET="development2" \ COMPANION_ALLOW_LOCAL_URLS="true" \ - nodemon --watch packages/@uppy/companion/src --exec node ./packages/@uppy/companion/src/standalone/start-server.js + node --watch ./packages/@uppy/companion/src/standalone/start-server.js fi diff --git a/docs/companion.md b/docs/companion.md index c8dfd0fcb6..7d5720aac8 100644 --- a/docs/companion.md +++ b/docs/companion.md @@ -910,8 +910,8 @@ See also ``` This would get the Companion instance running on `http://localhost:3020`. It -uses [nodemon](https://github.com/remy/nodemon) so it will automatically restart -when files are changed. +uses [`node --watch`](https://nodejs.org/api/cli.html#--watch) so it will +automatically restart when files are changed. [`http.incomingmessage`]: https://nodejs.org/api/http.html#class-httpincomingmessage diff --git a/package.json b/package.json index 69c5e79480..e58cb350c7 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,6 @@ "jsdom": "^24.0.0", "lint-staged": "^15.0.0", "mime-types": "^2.1.26", - "nodemon": "^2.0.8", "npm-packlist": "^5.0.0", "npm-run-all": "^4.1.5", "onchange": "^7.1.0", diff --git a/yarn.lock b/yarn.lock index 20beda29b7..7ff61420d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8321,7 +8321,6 @@ __metadata: jsdom: "npm:^24.0.0" lint-staged: "npm:^15.0.0" mime-types: "npm:^2.1.26" - nodemon: "npm:^2.0.8" npm-packlist: "npm:^5.0.0" npm-run-all: "npm:^4.1.5" onchange: "npm:^7.1.0" @@ -11732,7 +11731,7 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.0.0, chokidar@npm:^3.3.1, chokidar@npm:^3.4.0, chokidar@npm:^3.4.1, chokidar@npm:^3.5.0, chokidar@npm:^3.5.1, chokidar@npm:^3.5.2, chokidar@npm:^3.5.3": +"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.0.0, chokidar@npm:^3.3.1, chokidar@npm:^3.4.0, chokidar@npm:^3.4.1, chokidar@npm:^3.5.0, chokidar@npm:^3.5.1, chokidar@npm:^3.5.3": version: 3.6.0 resolution: "chokidar@npm:3.6.0" dependencies: @@ -14741,8 +14740,8 @@ __metadata: linkType: hard "eslint-plugin-jsdoc@npm:^48.0.0": - version: 48.2.4 - resolution: "eslint-plugin-jsdoc@npm:48.2.4" + version: 48.2.5 + resolution: "eslint-plugin-jsdoc@npm:48.2.5" dependencies: "@es-joy/jsdoccomment": "npm:~0.43.0" are-docs-informative: "npm:^0.0.2" @@ -14751,11 +14750,11 @@ __metadata: escape-string-regexp: "npm:^4.0.0" esquery: "npm:^1.5.0" is-builtin-module: "npm:^3.2.1" - semver: "npm:^7.6.0" + semver: "npm:^7.6.1" spdx-expression-parse: "npm:^4.0.0" peerDependencies: eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 - checksum: 10/7e325741500db630abbab3b5bfb0930d38b859496745ce2d23ec02290baefd8b224a02169b1882e63973be13fe293b9dd59ca9875f17c461e83e31a2c56f9a2f + checksum: 10/d2ae657b73468bc08ba17c8d10b68512db1efcae7b25fe725387546dd155487e263e434ea6eae55aaf71fe1ebbb39e9f7de791119784d725d36f18fe418e697d languageName: node linkType: hard @@ -17372,13 +17371,6 @@ __metadata: languageName: node linkType: hard -"ignore-by-default@npm:^1.0.1": - version: 1.0.1 - resolution: "ignore-by-default@npm:1.0.1" - checksum: 10/441509147b3615e0365e407a3c18e189f78c07af08564176c680be1fabc94b6c789cad1342ad887175d4ecd5225de86f73d376cec8e06b42fd9b429505ffcf8a - languageName: node - linkType: hard - "ignore-walk@npm:^5.0.1": version: 5.0.1 resolution: "ignore-walk@npm:5.0.1" @@ -22939,26 +22931,6 @@ __metadata: languageName: node linkType: hard -"nodemon@npm:^2.0.8": - version: 2.0.22 - resolution: "nodemon@npm:2.0.22" - dependencies: - chokidar: "npm:^3.5.2" - debug: "npm:^3.2.7" - ignore-by-default: "npm:^1.0.1" - minimatch: "npm:^3.1.2" - pstree.remy: "npm:^1.1.8" - semver: "npm:^5.7.1" - simple-update-notifier: "npm:^1.0.7" - supports-color: "npm:^5.5.0" - touch: "npm:^3.1.0" - undefsafe: "npm:^2.0.5" - bin: - nodemon: bin/nodemon.js - checksum: 10/1fbddb426e6c5510ed42001a947e9caad3f3ca29c36ca7aac143b3a084d3ba855fdf4020f41a890101b91cbe60824e70fcbcb98f21574ed0a7964b3a825e0a1f - languageName: node - linkType: hard - "nopt@npm:^6.0.0": version: 6.0.0 resolution: "nopt@npm:6.0.0" @@ -25333,13 +25305,6 @@ __metadata: languageName: node linkType: hard -"pstree.remy@npm:^1.1.8": - version: 1.1.8 - resolution: "pstree.remy@npm:1.1.8" - checksum: 10/ef13b1b5896b35f67dbd4fb7ba54bb2a5da1a5c317276cbad4bcad4159bf8f7b5e1748dc244bf36865f3d560d2fc952521581280a91468c9c2df166cc760c8c1 - languageName: node - linkType: hard - "pump@npm:^3.0.0": version: 3.0.0 resolution: "pump@npm:3.0.0" @@ -27153,7 +27118,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0, semver@npm:^5.6.0, semver@npm:^5.7.1": +"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0, semver@npm:^5.6.0": version: 5.7.2 resolution: "semver@npm:5.7.2" bin: @@ -27200,15 +27165,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:~7.0.0": - version: 7.0.0 - resolution: "semver@npm:7.0.0" - bin: - semver: bin/semver.js - checksum: 10/be264384c7c2f283d52a28cff172a4a25b99cc10f1481ece9479987e7145d197d3c00d8a0b2662316224fb346e97f770545126b0af88f94fee0292004cf809a1 - languageName: node - linkType: hard - "send@npm:0.17.2": version: 0.17.2 resolution: "send@npm:0.17.2" @@ -27528,15 +27484,6 @@ __metadata: languageName: node linkType: hard -"simple-update-notifier@npm:^1.0.7": - version: 1.1.0 - resolution: "simple-update-notifier@npm:1.1.0" - dependencies: - semver: "npm:~7.0.0" - checksum: 10/0f9be259b33fe34b9ac949552c62b3d89ed020ec8e2f64d17cbd1c6c09bf38b4352198cb1871fe191a1566ef4722ef90232f2629ea836b63425d7586a8cfa3f2 - languageName: node - linkType: hard - "sirv-cli@npm:^1.0.0": version: 1.0.14 resolution: "sirv-cli@npm:1.0.14" @@ -28770,7 +28717,7 @@ __metadata: languageName: node linkType: hard -"supports-color@npm:^5.3.0, supports-color@npm:^5.5.0": +"supports-color@npm:^5.3.0": version: 5.5.0 resolution: "supports-color@npm:5.5.0" dependencies: @@ -29372,15 +29319,6 @@ __metadata: languageName: node linkType: hard -"touch@npm:^3.1.0": - version: 3.1.1 - resolution: "touch@npm:3.1.1" - bin: - nodetouch: bin/nodetouch.js - checksum: 10/853e763a1f4903302c5654ed353f84ad85baf757dac62c2d37ab67e0477cfd271e8c64771fcfad42310aff7c9d284ddb435ee5ca13ff36d0f3693fedd8e971d1 - languageName: node - linkType: hard - "tough-cookie@npm:^4.1.3": version: 4.1.4 resolution: "tough-cookie@npm:4.1.4" @@ -29770,13 +29708,6 @@ __metadata: languageName: node linkType: hard -"undefsafe@npm:^2.0.5": - version: 2.0.5 - resolution: "undefsafe@npm:2.0.5" - checksum: 10/f42ab3b5770fedd4ada175fc1b2eb775b78f609156f7c389106aafd231bfc210813ee49f54483d7191d7b76e483bc7f537b5d92d19ded27156baf57592eb02cc - languageName: node - linkType: hard - "undici-types@npm:~5.26.4": version: 5.26.5 resolution: "undici-types@npm:5.26.5"