diff --git a/bin/deploy-bamboo.sh b/bin/deploy-bamboo.sh index 3ee47d22b..65f43c01e 100755 --- a/bin/deploy-bamboo.sh +++ b/bin/deploy-bamboo.sh @@ -51,6 +51,7 @@ dockerRun() { -e "STELLATE_KEY=$bamboo_STELLATE_KEY" \ -e "SUBNET_ID_A=$bamboo_SUBNET_ID_A" \ -e "SUBNET_ID_B=$bamboo_SUBNET_ID_B" \ + -e "URS_ROOT_URL=$bamboo_URS_ROOT_URL" \ -e "VPC_ID=$bamboo_VPC_ID" \ $dockerTag "$@" } diff --git a/bin/start-and-watch.sh b/bin/start-and-watch.sh deleted file mode 100755 index 17b3a4424..000000000 --- a/bin/start-and-watch.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# This will start the watch script and start the sam local api. -# The watch script watches for code changes and rebuilts the CDK template. -# The sam local api starts the api locally using the CDK template. - -# This is done in a shell script because CTRL-C will kill both processes and shut down any running docker containers. -(trap 'kill 0' SIGINT; npm run watch & sam local start-api -t ./cdk/graphql/cdk.out/graphql-dev.template.json --warm-containers LAZY --port 3013 --docker-network host) diff --git a/bin/start.js b/bin/start.js new file mode 100644 index 000000000..5610da963 --- /dev/null +++ b/bin/start.js @@ -0,0 +1,14 @@ +const concurrently = require('concurrently') + +concurrently([{ + command: 'npm run watch', + name: 'watch' +}, { + command: 'sam local start-api -t ./cdk/earthdata-access/cdk.out/earthdata-access-dev.template.json --warm-containers LAZY --port 5001 --docker-network host', + name: 'api' +}], { + prefix: 'name', + padPrefix: true, + prefixColors: 'auto', + handleInput: true +}) diff --git a/cdk/graphql-infrastructure/package-lock.json b/cdk/graphql-infrastructure/package-lock.json index c4c4f080a..a37ea9e8a 100644 --- a/cdk/graphql-infrastructure/package-lock.json +++ b/cdk/graphql-infrastructure/package-lock.json @@ -8,7 +8,7 @@ "name": "graphql-infrastructure", "version": "0.1.0", "dependencies": { - "@edsc/cdk-utils": "^0.0.3", + "@edsc/cdk-utils": "^0.0.5", "aws-cdk-lib": "^2.173.2", "constructs": "^10.0.0" }, @@ -1514,9 +1514,9 @@ } }, "node_modules/@edsc/cdk-utils": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@edsc/cdk-utils/-/cdk-utils-0.0.3.tgz", - "integrity": "sha512-zekplq4EB3bsIcwFzEo3ZLXjYpesyICkMSA4pZSXA9pMacWgkJkTM/ZJ2BINQkoJfRKZMFhAChv0dmkSj8nS/A==", + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/@edsc/cdk-utils/-/cdk-utils-0.0.5.tgz", + "integrity": "sha512-PxO3spd1/5FC5JNvOhd1osPNAvMQKAbCVYAVDxGjuhCr+ghZrGittcUaabyKi/MxSGaTRJ7bwivpdLmMlUTtkw==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-s3": "^3.717.0", diff --git a/cdk/graphql-infrastructure/package.json b/cdk/graphql-infrastructure/package.json index cc0046ff7..f52130b5e 100644 --- a/cdk/graphql-infrastructure/package.json +++ b/cdk/graphql-infrastructure/package.json @@ -20,7 +20,7 @@ "typescript": "~5.6.3" }, "dependencies": { - "@edsc/cdk-utils": "^0.0.3", + "@edsc/cdk-utils": "^0.0.5", "aws-cdk-lib": "^2.173.2", "constructs": "^10.0.0" } diff --git a/cdk/graphql/lib/graphql-stack.ts b/cdk/graphql/lib/graphql-stack.ts index 421fc8ac0..f6f91f031 100644 --- a/cdk/graphql/lib/graphql-stack.ts +++ b/cdk/graphql/lib/graphql-stack.ts @@ -31,7 +31,7 @@ const environment = { edlJwk: process.env.EDL_JWK!, edlKeyId: process.env.EDL_KEY_ID!, graphdbHost: process.env.GRAPHDB_HOST || 'http://localhost', - graphdbPath: process.env.GRAPHDB_PATH || 'gremlin', + graphdbPath: process.env.GRAPHDB_PATH!, graphdbPort: process.env.GRAPHDB_PORT || '8182', maxRetries: process.env.MAX_RETRIES || '1', retryDelay: process.env.RETRY_DELAY || '1000', diff --git a/cdk/graphql/package-lock.json b/cdk/graphql/package-lock.json index e3a581f12..52cd99e9f 100644 --- a/cdk/graphql/package-lock.json +++ b/cdk/graphql/package-lock.json @@ -8,7 +8,7 @@ "name": "graphql", "version": "0.1.0", "dependencies": { - "@edsc/cdk-utils": "^0.0.3", + "@edsc/cdk-utils": "^0.0.5", "aws-cdk-lib": "^2.173.2", "constructs": "^10.0.0" }, @@ -1515,9 +1515,9 @@ } }, "node_modules/@edsc/cdk-utils": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@edsc/cdk-utils/-/cdk-utils-0.0.3.tgz", - "integrity": "sha512-zekplq4EB3bsIcwFzEo3ZLXjYpesyICkMSA4pZSXA9pMacWgkJkTM/ZJ2BINQkoJfRKZMFhAChv0dmkSj8nS/A==", + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/@edsc/cdk-utils/-/cdk-utils-0.0.5.tgz", + "integrity": "sha512-PxO3spd1/5FC5JNvOhd1osPNAvMQKAbCVYAVDxGjuhCr+ghZrGittcUaabyKi/MxSGaTRJ7bwivpdLmMlUTtkw==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-s3": "^3.717.0", diff --git a/cdk/graphql/package.json b/cdk/graphql/package.json index 447f5aaf9..7f511a2c4 100644 --- a/cdk/graphql/package.json +++ b/cdk/graphql/package.json @@ -21,7 +21,7 @@ "typescript": "~5.6.3" }, "dependencies": { - "@edsc/cdk-utils": "^0.0.3", + "@edsc/cdk-utils": "^0.0.5", "aws-cdk-lib": "^2.173.2", "constructs": "^10.0.0" } diff --git a/package-lock.json b/package-lock.json index ba6676404..a3e07c9e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,6 +52,7 @@ "@rollup/plugin-graphql": "^2.0.4", "@vitest/coverage-istanbul": "^1.4.0", "aws-sdk-client-mock": "^4.0.0", + "concurrently": "^9.1.2", "esbuild": "^0.20.2", "nock": "^13.5.4", "onchange": "^7.1.0", @@ -6686,6 +6687,21 @@ "node": ">=8" } }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -6729,6 +6745,124 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, + "node_modules/concurrently": { + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.1.2.tgz", + "integrity": "sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.2", + "lodash": "^4.17.21", + "rxjs": "^7.8.1", + "shell-quote": "^1.8.1", + "supports-color": "^8.1.1", + "tree-kill": "^1.2.2", + "yargs": "^17.7.2" + }, + "bin": { + "conc": "dist/bin/concurrently.js", + "concurrently": "dist/bin/concurrently.js" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/open-cli-tools/concurrently?sponsor=1" + } + }, + "node_modules/concurrently/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/concurrently/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/concurrently/node_modules/chalk/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/concurrently/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/concurrently/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/concurrently/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/concurrently/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/confusing-browser-globals": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz", @@ -7039,6 +7173,13 @@ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.715.tgz", "integrity": "sha512-XzWNH4ZSa9BwVUQSDorPWAUQ5WGuYz7zJUNpNif40zFCiCl20t8zgylmreNmn26h5kiyw2lg7RfTmeMBsDklqg==" }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, "node_modules/encodeurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", @@ -8235,6 +8376,16 @@ "node": ">=6.9.0" } }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, "node_modules/get-func-name": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", @@ -8900,6 +9051,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/is-generator-function": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", @@ -10752,6 +10913,16 @@ "jsesc": "bin/jsesc" } }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -10889,6 +11060,16 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, "node_modules/safe-array-concat": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz", @@ -11184,6 +11365,19 @@ "node": ">=8" } }, + "node_modules/shell-quote": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz", + "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/side-channel": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", @@ -11745,6 +11939,21 @@ "@esbuild/win32-x64": "0.17.19" } }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/string.prototype.matchall": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz", @@ -13299,16 +13508,109 @@ "node": ">=8" } }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index 8c0f37d9b..4256122d0 100644 --- a/package.json +++ b/package.json @@ -23,12 +23,13 @@ "preinstall": "cd cdk/graphql && npm ci", "run-synth": "cd cdk/graphql && npm run cdk synth -- --quiet", "watch": "onchange 'src/**' -- npm run run-synth", - "prestart": "npm run run-synth", - "start": "./bin/start-and-watch.sh", - "start-prod": "dotenvx run -f .env.prod -- npm run start", - "start-uat": "dotenvx run -f .env.uat -- npm run start", - "start-sit": "dotenvx run -f .env.sit -- npm run start", - "start-local": "dotenvx run -f .env.local -- npm run start", + "prestart:app": "npm run run-synth", + "start:app": "node bin/start.js", + "start": "npm run start-prod", + "start-prod": "dotenvx run -f .env.prod -- npm run start:app", + "start-uat": "dotenvx run -f .env.uat -- npm run start:app", + "start-sit": "dotenvx run -f .env.sit -- npm run start:app", + "start-local": "dotenvx run -f .env.local -- npm run start:app", "test": "vitest --config vitest.config.js", "silent-test": "vitest --config vitest.config.js --silent", "lint": "eslint .", @@ -39,6 +40,7 @@ "@rollup/plugin-graphql": "^2.0.4", "@vitest/coverage-istanbul": "^1.4.0", "aws-sdk-client-mock": "^4.0.0", + "concurrently": "^9.1.2", "esbuild": "^0.20.2", "nock": "^13.5.4", "onchange": "^7.1.0", diff --git a/vitest.config.js b/vitest.config.js index fc8527d78..8237028ce 100644 --- a/vitest.config.js +++ b/vitest.config.js @@ -13,7 +13,8 @@ export default defineConfig({ exclude: [ 'cdk', '**/handler.js', - 'tmp' + 'tmp', + 'bin' ], provider: 'istanbul', reporter: ['text', 'lcov', 'clover', 'json'],