From 762096f79068f0b044b3177e90095489b796db89 Mon Sep 17 00:00:00 2001 From: tharvik Date: Wed, 7 Feb 2024 09:57:45 +0100 Subject: [PATCH] */pkg.json: add watch cmd --- cli/package.json | 6 +- discojs/discojs-core/package.json | 3 +- discojs/discojs-node/package.json | 3 +- discojs/discojs-web/package.json | 3 +- package-lock.json | 379 +++++++++--------------------- package.json | 5 +- server/package.json | 24 +- web-client/package.json | 8 +- 8 files changed, 130 insertions(+), 301 deletions(-) diff --git a/cli/package.json b/cli/package.json index 9b7208f851..c8178f3da4 100644 --- a/cli/package.json +++ b/cli/package.json @@ -3,9 +3,11 @@ "private": true, "main": "dist/benchmark.ts", "scripts": { + "watch": "nodemon --ext ts --ignore dist --watch ../discojs/discojs-node/dist --watch ../server/dist --exec npm run", + "start": "npm run build && node dist/benchmark.js", "build": "tsc", - "test": ": nothing", - "start": "npm run build && node dist/benchmark.js" + "lint": "npx eslint --max-warnings 0 .", + "test": ": nothing" }, "author": "", "license": "ISC", diff --git a/discojs/discojs-core/package.json b/discojs/discojs-core/package.json index 1d3f65f583..fb1080088b 100644 --- a/discojs/discojs-core/package.json +++ b/discojs/discojs-core/package.json @@ -4,9 +4,10 @@ "main": "dist/index.js", "types": "dist/index.d.ts", "scripts": { + "watch": "nodemon --ext ts --ignore dist --exec npm run", "build": "tsc", + "lint": "npx eslint --max-warnings 0 .", "test": "mocha", - "lint": "npx eslint --max-warnings 0 --ignore-pattern '*.spec.ts' .", "docs": "typedoc ./src/index.ts --theme oxide" }, "repository": { diff --git a/discojs/discojs-node/package.json b/discojs/discojs-node/package.json index b5e963398a..3659b5ba95 100644 --- a/discojs/discojs-node/package.json +++ b/discojs/discojs-node/package.json @@ -4,9 +4,10 @@ "main": "dist/index.js", "types": "dist/index.d.ts", "scripts": { + "watch": "nodemon --ext ts --ignore dist --watch ../discojs-core/dist --exec npm run", "build": "tsc", + "lint": "npx eslint --max-warnings 0 .", "test": "mocha", - "lint": "npx eslint --max-warnings 0 --ignore-pattern '*.spec.ts' .", "docs": "typedoc ./src/imports.ts --theme oxide" }, "repository": { diff --git a/discojs/discojs-web/package.json b/discojs/discojs-web/package.json index 301f93975c..0ade4c9895 100644 --- a/discojs/discojs-web/package.json +++ b/discojs/discojs-web/package.json @@ -4,9 +4,10 @@ "main": "dist/index.js", "types": "dist/index.d.ts", "scripts": { + "watch": "nodemon --ext ts --ignore dist --watch ../discojs-core/dist --exec npm run", "build": "tsc", + "lint": "npx eslint --max-warnings 0 .", "test": ": nothing", - "lint": "npx eslint --max-warnings 0 --ignore-pattern '*.spec.ts' .", "docs": "typedoc ./src/index.ts --theme oxide" }, "repository": { diff --git a/package-lock.json b/package-lock.json index 660995c092..7a5151d902 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,10 @@ "server", "cli", "web-client" - ] + ], + "devDependencies": { + "nodemon": "3" + } }, "cli": { "name": "@epfml/disco-cli", @@ -3256,6 +3259,12 @@ "node": ">= 4" } }, + "node_modules/ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", + "dev": true + }, "node_modules/immutable": { "version": "4.3.5", "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", @@ -4281,6 +4290,55 @@ } } }, + "node_modules/nodemon": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.0.3.tgz", + "integrity": "sha512-7jH/NXbFPxVaMwmBCC2B9F/V6X1VkEdNgx3iu9jji8WxWcvhMWkmhNWhI5077zknOnZnBzba9hZP6bCPJLSReQ==", + "dev": true, + "dependencies": { + "chokidar": "^3.5.2", + "debug": "^4", + "ignore-by-default": "^1.0.1", + "minimatch": "^3.1.2", + "pstree.remy": "^1.1.8", + "semver": "^7.5.3", + "simple-update-notifier": "^2.0.0", + "supports-color": "^5.5.0", + "touch": "^3.1.0", + "undefsafe": "^2.0.5" + }, + "bin": { + "nodemon": "bin/nodemon.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nodemon" + } + }, + "node_modules/nodemon/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/nodemon/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/nopt": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", @@ -4658,6 +4716,12 @@ "node": ">=0.4.0" } }, + "node_modules/pstree.remy": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", + "dev": true + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -5119,6 +5183,18 @@ "readable-stream": "^3.6.0" } }, + "node_modules/simple-update-notifier": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", + "dev": true, + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -5368,6 +5444,33 @@ "node": ">=8.0" } }, + "node_modules/touch": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", + "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "dev": true, + "dependencies": { + "nopt": "~1.0.10" + }, + "bin": { + "nodetouch": "bin/nodetouch.js" + } + }, + "node_modules/touch/node_modules/nopt": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", + "dev": true, + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "*" + } + }, "node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", @@ -5671,6 +5774,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", + "dev": true + }, "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", @@ -5943,7 +6052,6 @@ "express": "4", "express-ws": "5", "immutable": "4", - "lodash": "4", "msgpack-lite": "0.1", "uuid": "9" }, @@ -5956,7 +6064,6 @@ "@types/express-ws": "3", "@types/mocha": "9", "@types/msgpack-lite": "0.1", - "@types/supertest": "2", "@types/uuid": "9", "@typescript-eslint/eslint-plugin": "4", "@typescript-eslint/parser": "4", @@ -5967,10 +6074,6 @@ "eslint-plugin-node": "11", "eslint-plugin-promise": "5", "mocha": "9", - "nodemon": "2", - "supertest": "6", - "ts-node": "10", - "ts-node-register": "1", "typescript": "4" } }, @@ -5991,11 +6094,6 @@ "@types/node": "*" } }, - "server/node_modules/@types/cookiejar": { - "version": "2.1.2", - "dev": true, - "license": "MIT" - }, "server/node_modules/@types/cors": { "version": "2.8.12", "dev": true, @@ -6056,23 +6154,6 @@ "@types/node": "*" } }, - "server/node_modules/@types/superagent": { - "version": "4.1.15", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/cookiejar": "*", - "@types/node": "*" - } - }, - "server/node_modules/@types/supertest": { - "version": "2.0.12", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/superagent": "*" - } - }, "server/node_modules/@types/uuid": { "version": "9.0.1", "dev": true, @@ -6101,11 +6182,6 @@ "version": "1.1.1", "license": "MIT" }, - "server/node_modules/asap": { - "version": "2.0.6", - "dev": true, - "license": "MIT" - }, "server/node_modules/body-parser": { "version": "1.20.0", "license": "MIT", @@ -6146,11 +6222,6 @@ "node": ">= 0.8" } }, - "server/node_modules/component-emitter": { - "version": "1.3.0", - "dev": true, - "license": "MIT" - }, "server/node_modules/content-disposition": { "version": "0.5.4", "license": "MIT", @@ -6179,11 +6250,6 @@ "version": "1.0.6", "license": "MIT" }, - "server/node_modules/cookiejar": { - "version": "2.1.4", - "dev": true, - "license": "MIT" - }, "server/node_modules/cors": { "version": "2.8.5", "license": "MIT", @@ -6210,15 +6276,6 @@ "npm": "1.2.8000 || >= 1.4.16" } }, - "server/node_modules/dezalgo": { - "version": "1.0.4", - "dev": true, - "license": "ISC", - "dependencies": { - "asap": "^2.0.0", - "wrappy": "1" - } - }, "server/node_modules/ee-first": { "version": "1.1.1", "license": "MIT" @@ -6324,11 +6381,6 @@ "version": "2.0.0", "license": "MIT" }, - "server/node_modules/fast-safe-stringify": { - "version": "2.1.1", - "dev": true, - "license": "MIT" - }, "server/node_modules/finalhandler": { "version": "1.2.0", "license": "MIT", @@ -6356,34 +6408,6 @@ "version": "2.0.0", "license": "MIT" }, - "server/node_modules/formidable": { - "version": "2.1.1", - "dev": true, - "license": "MIT", - "dependencies": { - "dezalgo": "^1.0.4", - "hexoid": "^1.0.0", - "once": "^1.4.0", - "qs": "^6.11.0" - }, - "funding": { - "url": "https://ko-fi.com/tunnckoCore/commissions" - } - }, - "server/node_modules/formidable/node_modules/qs": { - "version": "6.11.0", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "server/node_modules/forwarded": { "version": "0.2.0", "license": "MIT", @@ -6398,14 +6422,6 @@ "node": ">= 0.6" } }, - "server/node_modules/hexoid": { - "version": "1.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "server/node_modules/http-errors": { "version": "2.0.0", "license": "MIT", @@ -6430,11 +6446,6 @@ "node": ">=0.10.0" } }, - "server/node_modules/ignore-by-default": { - "version": "1.0.1", - "dev": true, - "license": "ISC" - }, "server/node_modules/ipaddr.js": { "version": "1.9.1", "license": "MIT", @@ -6442,10 +6453,6 @@ "node": ">= 0.10" } }, - "server/node_modules/lodash": { - "version": "4.17.21", - "license": "MIT" - }, "server/node_modules/media-typer": { "version": "0.3.0", "license": "MIT", @@ -6481,69 +6488,6 @@ "node": ">= 0.6" } }, - "server/node_modules/nodemon": { - "version": "2.0.19", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "chokidar": "^3.5.2", - "debug": "^3.2.7", - "ignore-by-default": "^1.0.1", - "minimatch": "^3.0.4", - "pstree.remy": "^1.1.8", - "semver": "^5.7.1", - "simple-update-notifier": "^1.0.7", - "supports-color": "^5.5.0", - "touch": "^3.1.0", - "undefsafe": "^2.0.5" - }, - "bin": { - "nodemon": "bin/nodemon.js" - }, - "engines": { - "node": ">=8.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/nodemon" - } - }, - "server/node_modules/nodemon/node_modules/debug": { - "version": "3.2.7", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.1" - } - }, - "server/node_modules/nodemon/node_modules/has-flag": { - "version": "3.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "server/node_modules/nodemon/node_modules/semver": { - "version": "5.7.2", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" - } - }, - "server/node_modules/nodemon/node_modules/supports-color": { - "version": "5.5.0", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "server/node_modules/on-finished": { "version": "2.4.1", "license": "MIT", @@ -6576,11 +6520,6 @@ "node": ">= 0.10" } }, - "server/node_modules/pstree.remy": { - "version": "1.1.8", - "dev": true, - "license": "MIT" - }, "server/node_modules/qs": { "version": "6.10.3", "license": "BSD-3-Clause", @@ -6672,25 +6611,6 @@ "version": "1.2.0", "license": "ISC" }, - "server/node_modules/simple-update-notifier": { - "version": "1.0.7", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "~7.0.0" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "server/node_modules/simple-update-notifier/node_modules/semver": { - "version": "7.0.0", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, "server/node_modules/statuses": { "version": "2.0.1", "license": "MIT", @@ -6698,50 +6618,6 @@ "node": ">= 0.8" } }, - "server/node_modules/superagent": { - "version": "7.1.3", - "dev": true, - "license": "MIT", - "dependencies": { - "component-emitter": "^1.3.0", - "cookiejar": "^2.1.3", - "debug": "^4.3.4", - "fast-safe-stringify": "^2.1.1", - "form-data": "^4.0.0", - "formidable": "^2.0.1", - "methods": "^1.1.2", - "mime": "^2.5.0", - "qs": "^6.10.3", - "readable-stream": "^3.6.0", - "semver": "^7.3.7" - }, - "engines": { - "node": ">=6.4.0 <13 || >=14" - } - }, - "server/node_modules/superagent/node_modules/mime": { - "version": "2.6.0", - "dev": true, - "license": "MIT", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "server/node_modules/supertest": { - "version": "6.2.3", - "dev": true, - "license": "MIT", - "dependencies": { - "methods": "^1.1.2", - "superagent": "^7.1.3" - }, - "engines": { - "node": ">=6.0.0" - } - }, "server/node_modules/toidentifier": { "version": "1.0.1", "license": "MIT", @@ -6749,36 +6625,6 @@ "node": ">=0.6" } }, - "server/node_modules/touch": { - "version": "3.1.0", - "dev": true, - "license": "ISC", - "dependencies": { - "nopt": "~1.0.10" - }, - "bin": { - "nodetouch": "bin/nodetouch.js" - } - }, - "server/node_modules/touch/node_modules/nopt": { - "version": "1.0.10", - "dev": true, - "license": "MIT", - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - } - }, - "server/node_modules/ts-node-register": { - "version": "1.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "ts-node": ">=0.9.0" - } - }, "server/node_modules/type-is": { "version": "1.6.18", "license": "MIT", @@ -6790,11 +6636,6 @@ "node": ">= 0.6" } }, - "server/node_modules/undefsafe": { - "version": "2.0.5", - "dev": true, - "license": "MIT" - }, "server/node_modules/unpipe": { "version": "1.0.0", "license": "MIT", diff --git a/package.json b/package.json index 864e84862e..4bd365b2e9 100644 --- a/package.json +++ b/package.json @@ -7,5 +7,8 @@ "server", "cli", "web-client" - ] + ], + "devDependencies": { + "nodemon": "3" + } } diff --git a/server/package.json b/server/package.json index 065699aeb9..28dd8b6a85 100644 --- a/server/package.json +++ b/server/package.json @@ -6,12 +6,11 @@ "disco-server": "./dist/run_server.js" }, "scripts": { - "dev": "nodemon src/run_server.ts", - "start": "ts-node src/run_server.ts", + "watch": "nodemon --ext ts --ignore dist --watch ../discojs/discojs-node/dist --exec npm run", + "start": "npm run build && node dist/run_server.js", "build": "tsc", - "clean": "tsc --build --clean && rm -r dist || true", - "test": "mocha", - "lint": "npx eslint --max-warnings 0 ." + "lint": "npx eslint --max-warnings 0 .", + "test": "mocha" }, "author": "", "license": "ISC", @@ -22,26 +21,15 @@ "express": "4", "express-ws": "5", "immutable": "4", - "lodash": "4", "msgpack-lite": "0.1", "uuid": "9" }, - "nodemonConfig": { - "ignore": [ - "dist/*", - "models/*" - ], - "execMap": { - "ts": "node --inspect=0.0.0.0:9229 --nolazy -r ts-node/register" - } - }, "devDependencies": { "@types/chai": "4", "@types/cors": "2", "@types/express-ws": "3", "@types/mocha": "9", "@types/msgpack-lite": "0.1", - "@types/supertest": "2", "@types/uuid": "9", "@typescript-eslint/eslint-plugin": "4", "@typescript-eslint/parser": "4", @@ -52,10 +40,6 @@ "eslint-plugin-node": "11", "eslint-plugin-promise": "5", "mocha": "9", - "nodemon": "2", - "supertest": "6", - "ts-node": "10", - "ts-node-register": "1", "typescript": "4" }, "repository": { diff --git a/web-client/package.json b/web-client/package.json index 4e78257b7f..1f75fa17e2 100644 --- a/web-client/package.json +++ b/web-client/package.json @@ -2,14 +2,10 @@ "name": "@epfml/disco-web-client", "private": true, "scripts": { - "dev": "vue-cli-service serve", + "start": "vue-cli-service serve", "build": "vue-cli-service build", "lint": "vue-cli-service lint", - "test": "vue-cli-service test:unit tests", - "build17": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", - "lint17": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service lint", - "prod": "vue-cli-service serve --mode production", - "serve17": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve" + "test": "vue-cli-service test:unit tests" }, "dependencies": { "@epfml/discojs": "*",