diff --git a/package.json b/package.json index 6faadc7132..a19c4bf3d9 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "eslint-plugin-jest": "^27.0.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.0.0", - "fs-extra": "^11.1.0", + "fs-extra": "^11.1.1", "husky": "^8.0.0", "js-yaml": "^4.1.0", "lint-staged": "^13.0.0", @@ -27,18 +27,6 @@ "~dev-tools": "workspace:^" }, "resolutions": { - "@modjo/http-server": "latest", - "@modjo/core": "latest", - "@modjo/config": "latest", - "@modjo/express": "latest", - "@modjo/express-monitor": "latest", - "@modjo/http-logger": "latest", - "@modjo/lightship": "latest", - "@modjo/logger": "latest", - "@modjo/microservice-oapi": "latest", - "@modjo/oa": "latest", - "@modjo/shutdown-handlers": "latest", - "@modjo/sentry": "latest", "tar": "^6.1.9", "multer": "^1.4.4-lts.1", "fast-copy": "^3.0.0", @@ -76,8 +64,7 @@ "docker:kontinuous:build": "DOCKER_BUILDKIT=1 docker build --progress=plain -f packages/kontinuous/Dockerfile -t kontinuous .", "docker:kontinuous:run": "docker run -it -v $PWD:/workspace -v $(dirname $KUBECONFIG):/home/node/.kube -e KUBECONFIG=/home/node/.kube/$(basename $KUBECONFIG) kontinuous", "docker:kontinuous": "yarn docker:kontinuous:build && yarn docker:kontinuous:run", - "logs:remote-webhook": "kubectl --context prod -n kontinuous-webhook logs -f --all-containers -l component=kontinuous-webhook", - "upgrade:modjo": "yarn up -R \"@modjo/*\"" + "logs:remote-webhook": "kubectl --context prod -n kontinuous-webhook logs -f --all-containers -l component=kontinuous-webhook" }, "lint-staged": { "*.js": [ diff --git a/packages/common/package.json b/packages/common/package.json index 9df19a3f47..4252d9123d 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -17,7 +17,7 @@ "decompress": "^4.2.1", "direct-logger": "^2.7.3", "dotenv": "^16.0.2", - "fs-extra": "^11.1.0", + "fs-extra": "^11.1.1", "jest-diff": "^29.0.0", "js-yaml": "^4.1.0", "lodash.camelcase": "^4.3.0", @@ -25,7 +25,7 @@ "lodash.set": "^4.3.2", "micromatch": "^4.0.5", "ms": "^2.1.3", - "nctx": "^1.7.1", + "nctx": "^2.2.0", "parse-url": "^8.1.0", "qs": "^6.11.0", "slugify": "^1.6.5", diff --git a/packages/helm-tree/package.json b/packages/helm-tree/package.json index b67e0e7fb2..5f5d602c39 100644 --- a/packages/helm-tree/package.json +++ b/packages/helm-tree/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "decompress": "^4.2.1", - "fs-extra": "^11.1.0", + "fs-extra": "^11.1.1", "~common": "workspace:^" } } diff --git a/packages/kontinuous/package.json b/packages/kontinuous/package.json index d1f04dbda8..29a27b5943 100644 --- a/packages/kontinuous/package.json +++ b/packages/kontinuous/package.json @@ -20,7 +20,7 @@ "dree": "^4.0.0", "enquirer": "^2.3.6", "form-data": "^4.0.0", - "fs-extra": "^11.1.0", + "fs-extra": "^11.1.1", "helm-tree": "workspace:^", "launch-editor": "^2.4.0", "link-module-alias": "^1.2.0", @@ -32,7 +32,7 @@ "lodash.omit": "^4.5.0", "lodash.pick": "^4.4.0", "lodash.set": "^4.3.2", - "nctx": "^1.7.1", + "nctx": "^2.2.0", "nowtest": "^1.1.1", "qs": "^6.10.5", "ts-node": "^10.8.1", diff --git a/packages/kontinuous/src/cli/index.js b/packages/kontinuous/src/cli/index.js index bc52402360..6ddf3c2796 100644 --- a/packages/kontinuous/src/cli/index.js +++ b/packages/kontinuous/src/cli/index.js @@ -28,9 +28,7 @@ const addCommands = [ require("./commands/test"), ] -module.exports = async (args = process.argv) => { - ctx.provide() - +const cli = async (args) => { const logger = ctx.get("logger") || ctx.set("logger", createLogger()) const signals = ["SIGTERM", "SIGHUP", "SIGINT"] @@ -129,3 +127,9 @@ module.exports = async (args = process.argv) => { process.exit(exitCode) } } + +module.exports = async (args = process.argv) => { + await ctx.provide(async () => { + await cli(args) + }) +} diff --git a/packages/kontinuous/src/deploy/index.js b/packages/kontinuous/src/deploy/index.js index ff2ee8e2cf..82765c6ddc 100644 --- a/packages/kontinuous/src/deploy/index.js +++ b/packages/kontinuous/src/deploy/index.js @@ -21,9 +21,7 @@ const buildDeployPlugins = require("./build-deploy-plugins") const deploySidecars = require("./deploy-sidecars") const deployWith = require("./deploy-with") -module.exports = async (options) => { - ctx.provide() - +const deploy = async (options) => { await buildDeployPlugins() const config = ctx.require("config") @@ -174,3 +172,9 @@ module.exports = async (options) => { throw new ExitError(err) } } + +module.exports = async (options) => { + await ctx.provide(async () => { + await deploy(options) + }) +} diff --git a/packages/kontinuous/tests/index.test.js b/packages/kontinuous/tests/index.test.js index 88298a22c0..060f597258 100644 --- a/packages/kontinuous/tests/index.test.js +++ b/packages/kontinuous/tests/index.test.js @@ -99,29 +99,30 @@ describe("test build manifests with snapshots", () => { ) Object.assign(env, dotenvConfig) } - ctx.provide() - ctx.set("env", env) - - const logger = createLogger({ - fields: { - workspacePath: removePrefix(testdirPath, `${process.cwd()}/`), - buildPath, - }, - }) - ctx.set("logger", logger) - - try { - await cli([...process.argv.slice(0, 2), "build"]) - } catch (error) { - if (!(error instanceof MockExit && error.exitCode === 0)) { - throw error + await ctx.provide(async () => { + ctx.set("env", env) + + const logger = createLogger({ + fields: { + workspacePath: removePrefix(testdirPath, `${process.cwd()}/`), + buildPath, + }, + }) + ctx.set("logger", logger) + + try { + await cli([...process.argv.slice(0, 2), "build"]) + } catch (error) { + if (!(error instanceof MockExit && error.exitCode === 0)) { + throw error + } } - } - const result = ctx.require("result") - const { manifests } = result - expect(manifests).toMatchSpecificSnapshot( - `./__snapshots__/${testdir}.${environment}.yaml` - ) + const result = ctx.require("result") + const { manifests } = result + expect(manifests).toMatchSpecificSnapshot( + `./__snapshots__/${testdir}.${environment}.yaml` + ) + }) }) }) diff --git a/packages/webhook/package.json b/packages/webhook/package.json index d64b081bdf..488a851d5c 100644 --- a/packages/webhook/package.json +++ b/packages/webhook/package.json @@ -12,19 +12,19 @@ "test": "jest tests" }, "dependencies": { - "@modjo/core": "latest", - "@modjo/express": "^1.0.14", - "@modjo/microservice-oapi": "^1.0.5", - "@modjo/sentry": "^1.2.0", + "@modjo/core": "^1.2.6", + "@modjo/express": "^1.2.6", + "@modjo/microservice-oapi": "^1.2.6", + "@modjo/sentry": "^1.2.6", "@vercel/ncc": "^0.36.0", "async-retry": "^1.3.3", "chokidar": "^3.5.3", - "fs-extra": "^11.1.0", + "fs-extra": "^11.1.1", "helm-tree": "workspace:^", "link-module-alias": "^1.2.0", "lodash.defaultsdeep": "^4.6.1", "lodash.mergewith": "^4.6.2", - "nctx": "^1.7.1", + "nctx": "^2.2.0", "node-cron": "^3.0.0", "rimraf": "^4.1.2", "uuid": "^9.0.0", diff --git a/packages/webhook/src/daemon.js b/packages/webhook/src/daemon.js index d7914ad3f8..200226a738 100644 --- a/packages/webhook/src/daemon.js +++ b/packages/webhook/src/daemon.js @@ -9,8 +9,8 @@ module.exports = async () => { return } - ctx.provide() - - // at minute 0 past every 6th hour. see https://crontab.guru/ - cron.schedule("0 */6 * * *", cleanArtifact) + await ctx.provide(async () => { + // at minute 0 past every 6th hour. see https://crontab.guru/ + cron.schedule("0 */6 * * *", cleanArtifact) + }) } diff --git a/packages/webhook/src/server.js b/packages/webhook/src/server.js index 15ee9157e2..c090533199 100644 --- a/packages/webhook/src/server.js +++ b/packages/webhook/src/server.js @@ -41,6 +41,7 @@ module.exports = async (options = {}) => { }, }, }) - commonCtx.provide() - await modjo(options) + await commonCtx.provide(async () => { + await modjo(options) + }) } diff --git a/plugins/contrib/debug-manifests/tests/resources-tree-infos.test.js b/plugins/contrib/debug-manifests/tests/resources-tree-infos.test.js index 463208059b..84cffd3866 100644 --- a/plugins/contrib/debug-manifests/tests/resources-tree-infos.test.js +++ b/plugins/contrib/debug-manifests/tests/resources-tree-infos.test.js @@ -18,21 +18,22 @@ samples.forEach((sample) => { } ) const manifests = utils.yaml.loadAll(rawYaml) - ctx.provide() - const { logger, removeAllAnsiColors } = utils - logger.minLevel("debug") - ctx.set("logger", logger) - const spy = jest.spyOn(process.stderr, "write") - resourceTreeInfos( - manifests, - {}, - { - ctx, - utils, - } - ) - expect( - removeAllAnsiColors(spy.mock.calls.map((c) => c[0]).join("")) - ).toMatchSnapshot() + await ctx.provide(async () => { + const { logger, removeAllAnsiColors } = utils + logger.minLevel("debug") + ctx.set("logger", logger) + const spy = jest.spyOn(process.stderr, "write") + resourceTreeInfos( + manifests, + {}, + { + ctx, + utils, + } + ) + expect( + removeAllAnsiColors(spy.mock.calls.map((c) => c[0]).join("")) + ).toMatchSnapshot() + }) }) }) diff --git a/plugins/contrib/package.json b/plugins/contrib/package.json index cedff208b9..8d1114b072 100644 --- a/plugins/contrib/package.json +++ b/plugins/contrib/package.json @@ -6,7 +6,7 @@ "dependencies": { "async": "^3.2.4", "async-retry": "^1.3.3", - "fs-extra": "^11.1.0", + "fs-extra": "^11.1.1", "kubernetes-resource-parser": "^0.1.0", "lodash.camelcase": "^4.3.0", "lodash.clonedeep": "^4.5.0", diff --git a/plugins/contrib/patches/tests/janitor.test.js b/plugins/contrib/patches/tests/janitor.test.js index 6c9cad0652..73f4be97ae 100644 --- a/plugins/contrib/patches/tests/janitor.test.js +++ b/plugins/contrib/patches/tests/janitor.test.js @@ -7,34 +7,38 @@ metadata: name: some-ns ` -const runJanitor = (config, values) => { +const runJanitor = async (config, values) => { const ctx = require("~common/ctx") const utils = require("~common/utils") const manifests = utils.yaml.loadAll(rawNs) const { logger } = utils logger.minLevel("debug") - ctx.provide() - ctx.set("logger", logger) - return janitor( - manifests, - {}, - { - config, - values, - ctx, - utils, - } - ) + return ctx.provide(async () => { + ctx.set("logger", logger) + return janitor( + manifests, + {}, + { + config, + values, + ctx, + utils, + } + ) + }) } test(`add janitor annotation in dev`, async () => { - const result = runJanitor({ environment: "dev", gitBranch: "test-branch" }) + const result = await runJanitor({ + environment: "dev", + gitBranch: "test-branch", + }) expect(result[0].metadata.annotations["janitor/ttl"]).toEqual("7d") }) test(`add custom janitor annotation in dev`, async () => { - const result = runJanitor( + const result = await runJanitor( { environment: "dev", gitBranch: "test-branch" }, { ttl: "24h" } ) @@ -42,16 +46,19 @@ test(`add custom janitor annotation in dev`, async () => { }) test(`DONT add janitor in persist env`, async () => { - const result = runJanitor({ environment: "dev", gitBranch: "test/persist" }) + const result = await runJanitor({ + environment: "dev", + gitBranch: "test/persist", + }) expect(() => result[0].metadata.annotations["janitor/ttl"]).toThrow() }) test(`DONT add janitor annotation in preprod`, async () => { - const result = runJanitor({ environment: "preprod" }) + const result = await runJanitor({ environment: "preprod" }) expect(() => result[0].metadata.annotations["janitor/ttl"]).toThrow() }) test(`DONT add janitor annotation in prod`, async () => { - const result = runJanitor({ environment: "prod" }) + const result = await runJanitor({ environment: "prod" }) expect(() => result[0].metadata.annotations["janitor/ttl"]).toThrow() }) diff --git a/plugins/contrib/yarn.lock b/plugins/contrib/yarn.lock index 34c175b699..e784e409e8 100644 --- a/plugins/contrib/yarn.lock +++ b/plugins/contrib/yarn.lock @@ -1579,14 +1579,14 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^11.1.0": - version: 11.1.0 - resolution: "fs-extra@npm:11.1.0" +"fs-extra@npm:^11.1.1": + version: 11.1.1 + resolution: "fs-extra@npm:11.1.1" dependencies: graceful-fs: "npm:^4.2.0" jsonfile: "npm:^6.0.1" universalify: "npm:^2.0.0" - checksum: 20d9909070e7d9754cb651af067ae4343b5fc9b05fa9b8765a9348dab7dfa9b78c0f1ebe791774f06d4cca4231f4be9889a916d0457e8e87097a613e6bdd1746 + checksum: 9bc3e5ce6860e97abf1fb408f1d716253e1bb16da36203b2ee3f71160e5ec1e7a9d2b9bae4c99a50598a250be6db0e3b17e8031ea7c498c24513857f48db5402 languageName: node linkType: hard @@ -3615,7 +3615,7 @@ __metadata: dependencies: async: "npm:^3.2.4" async-retry: "npm:^1.3.3" - fs-extra: "npm:^11.1.0" + fs-extra: "npm:^11.1.1" jest: "npm:^29.3.1" kubernetes-resource-parser: "npm:^0.1.0" lodash.camelcase: "npm:^4.3.0" diff --git a/yarn.lock b/yarn.lock index a65fb209c6..e658088130 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3262,22 +3262,22 @@ __metadata: languageName: node linkType: hard -"@modjo/config@npm:latest": - version: 1.2.5 - resolution: "@modjo/config@npm:1.2.5" +"@modjo/config@npm:*": + version: 1.2.6 + resolution: "@modjo/config@npm:1.2.6" dependencies: lodash.defaultsdeep: "npm:^4.6.1" - nctx: "npm:^1.6.2" - checksum: edfebae4c14b6696854524155521afda03b7a92d6c7ec367c536a8cab2ccd4603a417c2bafcb7d0c604c54ce2af344c72465f5afe24231d53221282a3afd5484 + nctx: "npm:^2.2.0" + checksum: 0c5277a53bb3e0cac09331b8d1368ed1e3ec7abbec041872b6bcf65d98459fe61ffa4688e9b3c465448460bc79b745c465c4d32af47598a68902d7a095ef204e languageName: node linkType: hard -"@modjo/core@npm:latest": - version: 1.2.5 - resolution: "@modjo/core@npm:1.2.5" +"@modjo/core@npm:*, @modjo/core@npm:^1.2.6": + version: 1.2.6 + resolution: "@modjo/core@npm:1.2.6" dependencies: commander: "npm:^9.1.0" - fs-extra: "npm:^10.0.1" + fs-extra: "npm:^11.1.1" js-yaml: "npm:^4.1.0" link-module-alias: "npm:^1.2.0" lodash.camelcase: "npm:^4.3.0" @@ -3289,16 +3289,16 @@ __metadata: lodash.mergewith: "npm:^4.6.2" lodash.omit: "npm:^4.5.0" lodash.set: "npm:^4.3.2" - nctx: "npm:^1.6.2" + nctx: "npm:^2.2.0" pretty-ms: "npm:^7.0.1" yup: "npm:^0.32.11" - checksum: c83ee304dff908aa251bd3fc1ef4b788c62bbfcf1ac1d9983e6baea12e10f6ca285695b48bf9e95b5505f2848c60f5e28e435559e970009a592a7cea3773593a + checksum: ea078825689a856e8d0e1bccf680c0ab597ce988c5ee210b46ac49b69186271971f3746aa10e37ab6151dc262d32abe7d5d4c32289be4270550fa846d8e395f0 languageName: node linkType: hard -"@modjo/express@npm:latest": - version: 1.2.5 - resolution: "@modjo/express@npm:1.2.5" +"@modjo/express@npm:*, @modjo/express@npm:^1.2.6": + version: 1.2.6 + resolution: "@modjo/express@npm:1.2.6" dependencies: "@modjo/config": "npm:*" "@modjo/http-logger": "npm:*" @@ -3307,61 +3307,61 @@ __metadata: cookie-parser: "npm:^1.4.6" cors: "npm:^2.8.5" express: "npm:^5.0.0-beta.1" - nctx: "npm:^1.6.2" - checksum: e3477189e8f0b51f10a78bacf23dc84659c77aadc2236f091ec3dfd9c1c4ec7b5b4b19ab4ffd418392f5a144015dd69bc8088d5a8d5f087c1ffa0e9dddbfd7af + nctx: "npm:^2.2.0" + checksum: b5763422755a6cb6c60d3e72f0d3112bc14a450c532b962e2fb860f8f405993d612a57bacf07ab127efeb16025c255f973e1238e1ff24bda7af88af2d214ca12 languageName: node linkType: hard -"@modjo/http-logger@npm:latest": - version: 1.2.5 - resolution: "@modjo/http-logger@npm:1.2.5" +"@modjo/http-logger@npm:*": + version: 1.2.6 + resolution: "@modjo/http-logger@npm:1.2.6" dependencies: "@modjo/config": "npm:*" - nctx: "npm:^1.6.2" - checksum: c68260fa7b30639fac7c161f5e314b6bdf2224059f5fbb32048ddeffecd18f5b727480806fae59992d35829f57159c67e171199890e87acb489a3312deb67d49 + nctx: "npm:^2.2.0" + checksum: e44951018ac8185c2e8cf4121136f0d87175fd24a9ea636b4cbb7b9efbc14b1701d4c7092934c4575f589e5264746dec6b3d4200abc24616601accf0cf004516 languageName: node linkType: hard -"@modjo/http-server@npm:latest": - version: 1.2.5 - resolution: "@modjo/http-server@npm:1.2.5" +"@modjo/http-server@npm:*": + version: 1.2.6 + resolution: "@modjo/http-server@npm:1.2.6" dependencies: "@modjo/config": "npm:*" "@modjo/lightship": "npm:*" "@modjo/logger": "npm:*" "@modjo/shutdown-handlers": "npm:*" - nctx: "npm:^1.6.2" - checksum: ddd4273aa24f6575dc4cc11f6bb6426a0f9e7574079c42d95c21d89e4792f3fffa6190973a1d274d29b49292a8021fe03d005416af0bb5a0de8422d5ad28d6cf + nctx: "npm:^2.2.0" + checksum: ab69c01e402584c4a67d458ba94557cca63b3c971f1b42fdf09ed8aaecca92145c539d81a39e4fad00e9264f610d3b5ee4f9ef1c25fe6440da2d3b862e4a2409 languageName: node linkType: hard -"@modjo/lightship@npm:latest": - version: 1.2.5 - resolution: "@modjo/lightship@npm:1.2.5" +"@modjo/lightship@npm:*": + version: 1.2.6 + resolution: "@modjo/lightship@npm:1.2.6" dependencies: "@modjo/logger": "npm:*" lightship: "npm:^7.0.2" - nctx: "npm:^1.6.2" - checksum: 33136dc420cdb157c2f4b7a74dc1fa668d0b724b888508bdb5ca623f2823e549b529ebb9e5a8645f8071cada2e42ff7fea521564099a61c575f1dee37b6416fb + nctx: "npm:^2.2.0" + checksum: baf1d54d1b6e8322593862bf3372b67d857a5a83ff70c8aa280d6a8b6c2a5ac95bcf3004b957393c01d7013fb49cf6dcfe69e6aef8f0e0737cfc57d0b6d47ddb languageName: node linkType: hard -"@modjo/logger@npm:latest": - version: 1.2.5 - resolution: "@modjo/logger@npm:1.2.5" +"@modjo/logger@npm:*": + version: 1.2.6 + resolution: "@modjo/logger@npm:1.2.6" dependencies: "@modjo/logger": "npm:*" - nctx: "npm:^1.6.2" + nctx: "npm:^2.2.0" pino: "npm:^7.9.2" pino-abstract-transport: "npm:^1.0.0" pino-pretty: "npm:^7.6.0" - checksum: 2cb512272308a1ffbc1e5fb9bf13d9817a6f77626842eceffe4d1fb3d92e28d9d962a5b33a24fb2e92bd8c5e5cd53216955da541de9e21ad032924fe6a3b29c9 + checksum: 441d9becdbcc7d2f1030a111655808bc37a4d2da4bcfa709f1c6e26bafd130d80d7b88490f6f13637338b0a5439299928d1ddede10399ee2cbb377a7bacfd901 languageName: node linkType: hard -"@modjo/microservice-oapi@npm:latest": - version: 1.2.5 - resolution: "@modjo/microservice-oapi@npm:1.2.5" +"@modjo/microservice-oapi@npm:*, @modjo/microservice-oapi@npm:^1.2.6": + version: 1.2.6 + resolution: "@modjo/microservice-oapi@npm:1.2.6" dependencies: "@modjo/core": "npm:*" "@modjo/express": "npm:*" @@ -3372,23 +3372,23 @@ __metadata: "@modjo/microservice-oapi": "npm:*" "@modjo/oa": "npm:*" "@modjo/shutdown-handlers": "npm:*" - nctx: "npm:^1.6.2" - checksum: 346e6cc5bfcfd13201cf01aa638fa1c1905c62abf2ef8238efa56f7e81be789009a11f0e08d1585c58eb70e59ab4cc0a6358526f03db821e32f47803048a7683 + nctx: "npm:^2.2.0" + checksum: e7f899f1e7db70b9011b55a1e97f591e37f00d33e227386cf556423c764af085080fc9d002d59d0a836fdd9510ca950374ffab30a3e0fa3b9d5e260faa9e5051 languageName: node linkType: hard -"@modjo/oa@npm:latest": - version: 1.2.5 - resolution: "@modjo/oa@npm:1.2.5" +"@modjo/oa@npm:*": + version: 1.2.6 + resolution: "@modjo/oa@npm:1.2.6" dependencies: "@modjo/config": "npm:*" "@modjo/core": "npm:*" "@modjo/express": "npm:*" "@modjo/http-server": "npm:*" "@modjo/logger": "npm:*" - express: "npm:^4.17.3" + express: "npm:^5.0.0-beta.1" express-openapi-validator: "npm:^4.13.8" - fs-extra: "npm:^10.0.1" + fs-extra: "npm:^11.1.1" http-errors: "npm:^2.0.0" lodash.camelcase: "npm:^4.3.0" lodash.capitalize: "npm:^4.2.1" @@ -3397,31 +3397,31 @@ __metadata: lodash.get: "npm:^4.4.2" lodash.omit: "npm:^4.5.0" lodash.set: "npm:^4.3.2" - nctx: "npm:^1.6.2" + nctx: "npm:^2.2.0" openapi-schema-validator: "npm:^10.0.0" swagger-ui-dist: "npm:^4.10.0" swagger-ui-express: "npm:^4.3.0" - checksum: ecadb451787bb4cc73e78cc1b1176b4a6225ce2ca719380d6835f3c9ca0e9bafad329873548bac092b738057c7152acd14e85bbcbd6af6a5d2ca9be00c59dc8c + checksum: f7f74f29c43a5c54c2d3f59344b4fb03a4946c8c4749d40dc06f0db3a8fc90af71f37265298a2f794b20a8007951c4a87b93a2eb7a00c0bc980dc896be59f0b0 languageName: node linkType: hard -"@modjo/sentry@npm:latest": - version: 1.2.5 - resolution: "@modjo/sentry@npm:1.2.5" +"@modjo/sentry@npm:^1.2.6": + version: 1.2.6 + resolution: "@modjo/sentry@npm:1.2.6" dependencies: "@sentry/node": "npm:^7.30.0" - nctx: "npm:^1.6.2" - checksum: ede4bbd392e7f59191d6c6a25e9256d1ac2e6f0fdf84338a7cce5c479d7a03ff93e977a1dbfbc58d5dd31031d363b98815d4c1151f276b9d660364509ad9a591 + nctx: "npm:^2.2.0" + checksum: 6739deb6ff36afe02ed9184f11de11d2bd6f1b8b9509286b7df9fdcaa678dcdf60a0b55df69f5de52f2406ca7fdf967d9591d4310ee12b8c3a0dc526a44838eb languageName: node linkType: hard -"@modjo/shutdown-handlers@npm:latest": - version: 1.2.5 - resolution: "@modjo/shutdown-handlers@npm:1.2.5" +"@modjo/shutdown-handlers@npm:*": + version: 1.2.6 + resolution: "@modjo/shutdown-handlers@npm:1.2.6" dependencies: "@modjo/lightship": "npm:*" - nctx: "npm:^1.6.2" - checksum: 5b32d9da2000d3ba4b100a1a7e80032881447fe57d0774d74b3ebe4d7dc87d0a0ed33bc8e501772ff2e54562b6790c4464c8cc15692111035b844cc6ce741359 + nctx: "npm:^2.2.0" + checksum: 7743e8b585ee392b766522c005d25700cc0da46a6388a87ec54270354e426a4e3f02c26ef0482cb3cc3c7ae6cb90dca0ea7482c832e1d96753dff57913d1832d languageName: node linkType: hard @@ -4904,7 +4904,7 @@ __metadata: languageName: node linkType: hard -"accepts@npm:~1.3.7, accepts@npm:~1.3.8": +"accepts@npm:~1.3.7": version: 1.3.8 resolution: "accepts@npm:1.3.8" dependencies: @@ -5189,13 +5189,6 @@ __metadata: languageName: node linkType: hard -"array-flatten@npm:1.1.1": - version: 1.1.1 - resolution: "array-flatten@npm:1.1.1" - checksum: 4f31d5671990976098f6ea9d82986748f43d0d44e3ab815d84d33cd5369ee964386804213619d4d050b33fe1cefa5e1420e98d350cd0162ab087d9d58c02d1c4 - languageName: node - linkType: hard - "array-flatten@npm:3.0.0": version: 3.0.0 resolution: "array-flatten@npm:3.0.0" @@ -5551,26 +5544,6 @@ __metadata: languageName: node linkType: hard -"body-parser@npm:1.20.1": - version: 1.20.1 - resolution: "body-parser@npm:1.20.1" - dependencies: - bytes: "npm:3.1.2" - content-type: "npm:~1.0.4" - debug: "npm:2.6.9" - depd: "npm:2.0.0" - destroy: "npm:1.2.0" - http-errors: "npm:2.0.0" - iconv-lite: "npm:0.4.24" - on-finished: "npm:2.4.1" - qs: "npm:6.11.0" - raw-body: "npm:2.5.1" - type-is: "npm:~1.6.18" - unpipe: "npm:1.0.0" - checksum: 33f202c9d5e21f9364ecbcc6704b637104e3a802c81e3cc0b05af94681ce3984e2792bb8d05fe5e3471ac0179c13c8d9da80034178a513ebf4b4ab0d56823617 - languageName: node - linkType: hard - "body-parser@npm:2.0.0-beta.1": version: 2.0.0-beta.1 resolution: "body-parser@npm:2.0.0-beta.1" @@ -5783,13 +5756,6 @@ __metadata: languageName: node linkType: hard -"bytes@npm:3.1.2": - version: 3.1.2 - resolution: "bytes@npm:3.1.2" - checksum: b9b056ed671c71c7e0f4ce7b60a0c17305d1e3e9b6c967e0e82ce85bd8fad16efa4df992177d429e253b47c45a716e6823a9d046b660b4b5b7e1e21b4801edfe - languageName: node - linkType: hard - "cacache@npm:17.0.4": version: 17.0.4 resolution: "cacache@npm:17.0.4" @@ -6741,13 +6707,6 @@ __metadata: languageName: node linkType: hard -"cookie@npm:0.5.0, cookie@npm:^0.5.0": - version: 0.5.0 - resolution: "cookie@npm:0.5.0" - checksum: 23bd6dd64f025869373c6f3c72a870b9bd0e0e6a0ffe734229c032d7aca51972ba584b39100c09141b18043e790862425aae4a60d7449fca565b21cdae0cb3c3 - languageName: node - linkType: hard - "cookie@npm:^0.4.1": version: 0.4.2 resolution: "cookie@npm:0.4.2" @@ -6755,6 +6714,13 @@ __metadata: languageName: node linkType: hard +"cookie@npm:^0.5.0": + version: 0.5.0 + resolution: "cookie@npm:0.5.0" + checksum: 23bd6dd64f025869373c6f3c72a870b9bd0e0e6a0ffe734229c032d7aca51972ba584b39100c09141b18043e790862425aae4a60d7449fca565b21cdae0cb3c3 + languageName: node + linkType: hard + "cookiejar@npm:^2.1.4": version: 2.1.4 resolution: "cookiejar@npm:2.1.4" @@ -8171,45 +8137,6 @@ __metadata: languageName: node linkType: hard -"express@npm:^4.17.3": - version: 4.18.2 - resolution: "express@npm:4.18.2" - dependencies: - accepts: "npm:~1.3.8" - array-flatten: "npm:1.1.1" - body-parser: "npm:1.20.1" - content-disposition: "npm:0.5.4" - content-type: "npm:~1.0.4" - cookie: "npm:0.5.0" - cookie-signature: "npm:1.0.6" - debug: "npm:2.6.9" - depd: "npm:2.0.0" - encodeurl: "npm:~1.0.2" - escape-html: "npm:~1.0.3" - etag: "npm:~1.8.1" - finalhandler: "npm:1.2.0" - fresh: "npm:0.5.2" - http-errors: "npm:2.0.0" - merge-descriptors: "npm:1.0.1" - methods: "npm:~1.1.2" - on-finished: "npm:2.4.1" - parseurl: "npm:~1.3.3" - path-to-regexp: "npm:0.1.7" - proxy-addr: "npm:~2.0.7" - qs: "npm:6.11.0" - range-parser: "npm:~1.2.1" - safe-buffer: "npm:5.2.1" - send: "npm:0.18.0" - serve-static: "npm:1.15.0" - setprototypeof: "npm:1.2.0" - statuses: "npm:2.0.1" - type-is: "npm:~1.6.18" - utils-merge: "npm:1.0.1" - vary: "npm:~1.1.2" - checksum: 997d5407a0865f35ef7218c68ad23e846a1139d2cfc524ba9f58b7f3a54d9735edc0d992d896aaee62753ccd97be83d77a507511916972f0dfcd8f938216bc3e - languageName: node - linkType: hard - "express@npm:^5.0.0-beta.1": version: 5.0.0-beta.1 resolution: "express@npm:5.0.0-beta.1" @@ -8551,21 +8478,6 @@ __metadata: languageName: node linkType: hard -"finalhandler@npm:1.2.0": - version: 1.2.0 - resolution: "finalhandler@npm:1.2.0" - dependencies: - debug: "npm:2.6.9" - encodeurl: "npm:~1.0.2" - escape-html: "npm:~1.0.3" - on-finished: "npm:2.4.1" - parseurl: "npm:~1.3.3" - statuses: "npm:2.0.1" - unpipe: "npm:~1.0.0" - checksum: 31ca595367c936c6614f67bd94c7e64a31ad9b8bd52751811b4f9deb666928d8da578a230baacf7760845126ef35330382a2e935f0757d22312ba942056dc1c1 - languageName: node - linkType: hard - "find-my-way@npm:^7.3.0": version: 7.5.0 resolution: "find-my-way@npm:7.5.0" @@ -8724,7 +8636,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:10.1.0, fs-extra@npm:^10.0.1": +"fs-extra@npm:10.1.0": version: 10.1.0 resolution: "fs-extra@npm:10.1.0" dependencies: @@ -8746,6 +8658,17 @@ __metadata: languageName: node linkType: hard +"fs-extra@npm:^11.1.1": + version: 11.1.1 + resolution: "fs-extra@npm:11.1.1" + dependencies: + graceful-fs: "npm:^4.2.0" + jsonfile: "npm:^6.0.1" + universalify: "npm:^2.0.0" + checksum: 9bc3e5ce6860e97abf1fb408f1d716253e1bb16da36203b2ee3f71160e5ec1e7a9d2b9bae4c99a50598a250be6db0e3b17e8031ea7c498c24513857f48db5402 + languageName: node + linkType: hard + "fs-extra@npm:^8.1.0": version: 8.1.0 resolution: "fs-extra@npm:8.1.0" @@ -9374,7 +9297,7 @@ __metadata: resolution: "helm-tree@workspace:packages/helm-tree" dependencies: decompress: "npm:^4.2.1" - fs-extra: "npm:^11.1.0" + fs-extra: "npm:^11.1.1" ~common: "workspace:^" languageName: unknown linkType: soft @@ -10861,7 +10784,7 @@ __metadata: dree: "npm:^4.0.0" enquirer: "npm:^2.3.6" form-data: "npm:^4.0.0" - fs-extra: "npm:^11.1.0" + fs-extra: "npm:^11.1.1" helm-tree: "workspace:^" jest: "npm:^29.0.0" jest-specific-snapshot: "npm:^7.0.0" @@ -10875,7 +10798,7 @@ __metadata: lodash.omit: "npm:^4.5.0" lodash.pick: "npm:^4.4.0" lodash.set: "npm:^4.3.2" - nctx: "npm:^1.7.1" + nctx: "npm:^2.2.0" nowtest: "npm:^1.1.1" qs: "npm:^6.10.5" ts-node: "npm:^10.8.1" @@ -12009,15 +11932,12 @@ __metadata: languageName: node linkType: hard -"nctx@npm:^1.6.2, nctx@npm:^1.7.1": - version: 1.7.1 - resolution: "nctx@npm:1.7.1" +"nctx@npm:^2.2.0": + version: 2.2.0 + resolution: "nctx@npm:2.2.0" dependencies: - lodash.defaultsdeep: "npm:^4.6.1" - lodash.get: "npm:^4.4.2" - lodash.merge: "npm:^4.6.2" - lodash.set: "npm:^4.3.2" - checksum: 045347a401a79d573523014d9298f364bb015a3d841e98f7373d013c20e768c1765c478afefefc052a47ff2593efc1589fd5a2c768f496a8099de9d9dcfec317 + lodash: "npm:^4.17.21" + checksum: 3920f605b9ac814ed2ee0b6672ad37f58890243f59319dbb5571c450a73fb6957da6423713bec9b735274a1739d5667e4efde95f0c5a9de7e672c2698c346c91 languageName: node linkType: hard @@ -12815,13 +12735,6 @@ __metadata: languageName: node linkType: hard -"path-to-regexp@npm:0.1.7": - version: 0.1.7 - resolution: "path-to-regexp@npm:0.1.7" - checksum: 65caab5a929dda7ae7f6ab3be871a82390317291271694dea898eea5fdcc232ae7fd197a76a3cda4bd6dcef8d82e582578e02eb7d5fa659df0f4d33a53c9753f - languageName: node - linkType: hard - "path-to-regexp@npm:3.2.0": version: 3.2.0 resolution: "path-to-regexp@npm:3.2.0" @@ -13330,18 +13243,6 @@ __metadata: languageName: node linkType: hard -"raw-body@npm:2.5.1": - version: 2.5.1 - resolution: "raw-body@npm:2.5.1" - dependencies: - bytes: "npm:3.1.2" - http-errors: "npm:2.0.0" - iconv-lite: "npm:0.4.24" - unpipe: "npm:1.0.0" - checksum: b5e41c0e7213e078f045a2b2397eb35665e952ad5176ff7462b740f7c7730b3d47d496ab2b1dd31ed36f8ffed41291cf93b035516403e0babea72c42d039b66b - languageName: node - linkType: hard - "rc@npm:1.2.8, rc@npm:^1.2.8": version: 1.2.8 resolution: "rc@npm:1.2.8" @@ -14251,27 +14152,27 @@ __metadata: languageName: node linkType: hard -"serve-static@npm:1.15.0, serve-static@npm:^1.12.1": - version: 1.15.0 - resolution: "serve-static@npm:1.15.0" +"serve-static@npm:2.0.0-beta.1": + version: 2.0.0-beta.1 + resolution: "serve-static@npm:2.0.0-beta.1" dependencies: encodeurl: "npm:~1.0.2" escape-html: "npm:~1.0.3" parseurl: "npm:~1.3.3" - send: "npm:0.18.0" - checksum: 38b4b126ef7497103b0466c1b876e2ad9732d3a32a905ef6b54681525802a2defba6e8e48c136f68c666e48f8c2dc869d24060b0a83f1dbdf724632cccf072fe + send: "npm:1.0.0-beta.1" + checksum: f5927e465617318063d9c958356011246b15e317994124be605d4c0914a8b96de2d959a994d95f8b4c2bf8f8f4c19c04ec4c7757c1692bac4e8f05cd1147ff5e languageName: node linkType: hard -"serve-static@npm:2.0.0-beta.1": - version: 2.0.0-beta.1 - resolution: "serve-static@npm:2.0.0-beta.1" +"serve-static@npm:^1.12.1": + version: 1.15.0 + resolution: "serve-static@npm:1.15.0" dependencies: encodeurl: "npm:~1.0.2" escape-html: "npm:~1.0.3" parseurl: "npm:~1.3.3" - send: "npm:1.0.0-beta.1" - checksum: f5927e465617318063d9c958356011246b15e317994124be605d4c0914a8b96de2d959a994d95f8b4c2bf8f8f4c19c04ec4c7757c1692bac4e8f05cd1147ff5e + send: "npm:0.18.0" + checksum: 38b4b126ef7497103b0466c1b876e2ad9732d3a32a905ef6b54681525802a2defba6e8e48c136f68c666e48f8c2dc869d24060b0a83f1dbdf724632cccf072fe languageName: node linkType: hard @@ -16337,7 +16238,7 @@ __metadata: decompress: "npm:^4.2.1" direct-logger: "npm:^2.7.3" dotenv: "npm:^16.0.2" - fs-extra: "npm:^11.1.0" + fs-extra: "npm:^11.1.1" jest-diff: "npm:^29.0.0" js-yaml: "npm:^4.1.0" lodash.camelcase: "npm:^4.3.0" @@ -16345,7 +16246,7 @@ __metadata: lodash.set: "npm:^4.3.2" micromatch: "npm:^4.0.5" ms: "npm:^2.1.3" - nctx: "npm:^1.7.1" + nctx: "npm:^2.2.0" parse-url: "npm:^8.1.0" qs: "npm:^6.11.0" slugify: "npm:^1.6.5" @@ -16380,7 +16281,7 @@ __metadata: eslint-plugin-jest: "npm:^27.0.0" eslint-plugin-node: "npm:^11.1.0" eslint-plugin-prettier: "npm:^4.0.0" - fs-extra: "npm:^11.1.0" + fs-extra: "npm:^11.1.1" husky: "npm:^8.0.0" js-yaml: "npm:^4.1.0" lint-staged: "npm:^13.0.0" @@ -16394,21 +16295,21 @@ __metadata: version: 0.0.0-use.local resolution: "~webhook@workspace:packages/webhook" dependencies: - "@modjo/core": "npm:latest" - "@modjo/express": "npm:^1.0.14" - "@modjo/microservice-oapi": "npm:^1.0.5" - "@modjo/sentry": "npm:^1.2.0" + "@modjo/core": "npm:^1.2.6" + "@modjo/express": "npm:^1.2.6" + "@modjo/microservice-oapi": "npm:^1.2.6" + "@modjo/sentry": "npm:^1.2.6" "@vercel/ncc": "npm:^0.36.0" async-retry: "npm:^1.3.3" chokidar: "npm:^3.5.3" - fs-extra: "npm:^11.1.0" + fs-extra: "npm:^11.1.1" helm-tree: "workspace:^" jest: "npm:^29.0.0" jest-specific-snapshot: "npm:^7.0.0" link-module-alias: "npm:^1.2.0" lodash.defaultsdeep: "npm:^4.6.1" lodash.mergewith: "npm:^4.6.2" - nctx: "npm:^1.7.1" + nctx: "npm:^2.2.0" node-cron: "npm:^3.0.0" nodemon: "npm:^2.0.15" rimraf: "npm:^4.1.2"