diff --git a/.github/workflows/curator-api-node.yml b/.github/workflows/curator-api-node.yml index 2987a780d..e392b2d92 100644 --- a/.github/workflows/curator-api-node.yml +++ b/.github/workflows/curator-api-node.yml @@ -24,7 +24,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v1 with: - node-version: "12.x" + node-version: "16.x" - name: Build and test run: | npm ci diff --git a/.github/workflows/curator-ui-node.yml b/.github/workflows/curator-ui-node.yml index 175377cc8..e37f38d64 100644 --- a/.github/workflows/curator-ui-node.yml +++ b/.github/workflows/curator-ui-node.yml @@ -24,7 +24,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v1 with: - node-version: "12.x" + node-version: "16.x" - name: Build and test run: | git config --global url."https://github.com/".insteadOf git@github.com: diff --git a/.github/workflows/data-service-node.yml b/.github/workflows/data-service-node.yml index 22d58a3db..94f3e5387 100644 --- a/.github/workflows/data-service-node.yml +++ b/.github/workflows/data-service-node.yml @@ -24,7 +24,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v1 with: - node-version: "12.x" + node-version: "16.x" - name: Build and test run: | npm ci diff --git a/.github/workflows/update-dev-curator-db-schema.yml b/.github/workflows/update-dev-curator-db-schema.yml index acb723465..c34516071 100644 --- a/.github/workflows/update-dev-curator-db-schema.yml +++ b/.github/workflows/update-dev-curator-db-schema.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v1 with: - node-version: "12.x" + node-version: "16.x" - name: Migrate dev database env: diff --git a/.github/workflows/update-prod-curator-db-schema.yaml b/.github/workflows/update-prod-curator-db-schema.yaml index 8a2d51ba5..19f81d64b 100644 --- a/.github/workflows/update-prod-curator-db-schema.yaml +++ b/.github/workflows/update-prod-curator-db-schema.yaml @@ -20,7 +20,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v1 with: - node-version: "12.x" + node-version: "16.x" - name: Migrate prod database env: diff --git a/data-serving/data-service/package-lock.json b/data-serving/data-service/package-lock.json index e004da295..ca4f9bd5f 100644 --- a/data-serving/data-service/package-lock.json +++ b/data-serving/data-service/package-lock.json @@ -46,7 +46,7 @@ "@types/jest": "^27.4.1", "@types/lodash": "^4.14.161", "@types/mongodb": "^3.5.27", - "@types/node": "^14.11.1", + "@types/node": "^16.11.7", "@types/pino": "^6.3.0", "@types/supertest": "^2.0.10", "@typescript-eslint/eslint-plugin": "^3.10.1", @@ -68,7 +68,7 @@ "typescript": "^3.9.7" }, "engines": { - "node": "14.17.1" + "node": "16.15.1" } }, "node_modules/@apidevtools/json-schema-ref-parser": { @@ -2410,9 +2410,9 @@ } }, "node_modules/@types/node": { - "version": "14.11.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz", - "integrity": "sha512-oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==" + "version": "16.11.42", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.42.tgz", + "integrity": "sha512-iwLrPOopPy6V3E+1yHTpJea3bdsNso0b0utLOJJwaa/PLzqBt3GZl3stMcakc/gr89SfcNk2ki3z7Gvue9hYGQ==" }, "node_modules/@types/parse-json": { "version": "4.0.0", @@ -15112,9 +15112,9 @@ } }, "@types/node": { - "version": "14.11.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz", - "integrity": "sha512-oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==" + "version": "16.11.42", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.42.tgz", + "integrity": "sha512-iwLrPOopPy6V3E+1yHTpJea3bdsNso0b0utLOJJwaa/PLzqBt3GZl3stMcakc/gr89SfcNk2ki3z7Gvue9hYGQ==" }, "@types/parse-json": { "version": "4.0.0", diff --git a/data-serving/data-service/package.json b/data-serving/data-service/package.json index dae532ce8..d25192772 100644 --- a/data-serving/data-service/package.json +++ b/data-serving/data-service/package.json @@ -37,7 +37,7 @@ "@types/jest": "^27.4.1", "@types/lodash": "^4.14.161", "@types/mongodb": "^3.5.27", - "@types/node": "^14.11.1", + "@types/node": "^16.11.7", "@types/pino": "^6.3.0", "@types/supertest": "^2.0.10", "@typescript-eslint/eslint-plugin": "^3.10.1", @@ -97,6 +97,6 @@ ] }, "engines": { - "node": "14.17.1" + "node": "16.15.1" } } diff --git a/data-serving/scripts/prepare_fields_list/package-lock.json b/data-serving/scripts/prepare_fields_list/package-lock.json index fa46687d2..6dca75e4f 100644 --- a/data-serving/scripts/prepare_fields_list/package-lock.json +++ b/data-serving/scripts/prepare_fields_list/package-lock.json @@ -1,13 +1,44 @@ { "name": "prepare_fields_list", "version": "0.0.1", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "prepare_fields_list", + "version": "0.0.1", + "license": "MIT", + "dependencies": { + "typescript": "4.3.5" + }, + "devDependencies": { + "@types/node": "^16.11.7" + } + }, + "node_modules/@types/node": { + "version": "16.11.42", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.42.tgz", + "integrity": "sha512-iwLrPOopPy6V3E+1yHTpJea3bdsNso0b0utLOJJwaa/PLzqBt3GZl3stMcakc/gr89SfcNk2ki3z7Gvue9hYGQ==", + "dev": true + }, + "node_modules/typescript": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + } + }, "dependencies": { "@types/node": { - "version": "16.7.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.8.tgz", - "integrity": "sha512-8upnoQU0OPzbIkm+ZMM0zCeFCkw2s3mS0IWdx0+AAaWqm4fkBb0UJp8Edl7FVKRamYbpJC/aVsHpKWBIbiC7Zg==", + "version": "16.11.42", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.42.tgz", + "integrity": "sha512-iwLrPOopPy6V3E+1yHTpJea3bdsNso0b0utLOJJwaa/PLzqBt3GZl3stMcakc/gr89SfcNk2ki3z7Gvue9hYGQ==", "dev": true }, "typescript": { diff --git a/data-serving/scripts/prepare_fields_list/package.json b/data-serving/scripts/prepare_fields_list/package.json index ac40e2bc9..87e7bdaf8 100644 --- a/data-serving/scripts/prepare_fields_list/package.json +++ b/data-serving/scripts/prepare_fields_list/package.json @@ -7,7 +7,7 @@ "typescript": "4.3.5" }, "devDependencies": { - "@types/node": "^16.7.8" + "@types/node": "^16.11.7" }, "scripts": { "build": "tsc", diff --git a/data-serving/scripts/prune-uploads/prune_uploads.py b/data-serving/scripts/prune-uploads/prune_uploads.py index f0e5817f8..812dfce3d 100644 --- a/data-serving/scripts/prune-uploads/prune_uploads.py +++ b/data-serving/scripts/prune-uploads/prune_uploads.py @@ -313,6 +313,7 @@ def get_selected_hooks(run_hooks): m = [] ingested_sources = [] for s in sources: + print(s) if result := prune_uploads(db.cases, db.sources, s, threshold, epoch, args.dry_run, args.allow_decrease): ingested_sources.append(s) diff --git a/data-serving/scripts/setup-db/package-lock.json b/data-serving/scripts/setup-db/package-lock.json index 6996d6895..5fe2a6fb1 100644 --- a/data-serving/scripts/setup-db/package-lock.json +++ b/data-serving/scripts/setup-db/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@types/node": "^13.13.21", + "@types/node": "^16.11.7", "@typescript-eslint/eslint-plugin": "^5.0.0", "@typescript-eslint/parser": "^5.0.0", "eslint": "^8.0.1", @@ -117,9 +117,9 @@ "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==" }, "node_modules/@types/node": { - "version": "13.13.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.21.tgz", - "integrity": "sha512-tlFWakSzBITITJSxHV4hg4KvrhR/7h3xbJdSFbYJBVzKubrASbnnIFuSgolUh7qKGo/ZeJPKUfbZ0WS6Jp14DQ==" + "version": "16.11.42", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.42.tgz", + "integrity": "sha512-iwLrPOopPy6V3E+1yHTpJea3bdsNso0b0utLOJJwaa/PLzqBt3GZl3stMcakc/gr89SfcNk2ki3z7Gvue9hYGQ==" }, "node_modules/@types/webidl-conversions": { "version": "6.1.1", @@ -1935,9 +1935,9 @@ "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==" }, "@types/node": { - "version": "13.13.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.21.tgz", - "integrity": "sha512-tlFWakSzBITITJSxHV4hg4KvrhR/7h3xbJdSFbYJBVzKubrASbnnIFuSgolUh7qKGo/ZeJPKUfbZ0WS6Jp14DQ==" + "version": "16.11.42", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.42.tgz", + "integrity": "sha512-iwLrPOopPy6V3E+1yHTpJea3bdsNso0b0utLOJJwaa/PLzqBt3GZl3stMcakc/gr89SfcNk2ki3z7Gvue9hYGQ==" }, "@types/webidl-conversions": { "version": "6.1.1", diff --git a/data-serving/scripts/setup-db/package.json b/data-serving/scripts/setup-db/package.json index 1ea5702f7..19bd78591 100644 --- a/data-serving/scripts/setup-db/package.json +++ b/data-serving/scripts/setup-db/package.json @@ -23,7 +23,7 @@ "homepage": "https://github.com/globaldothealth/list#readme", "node_modules": [], "dependencies": { - "@types/node": "^13.13.21", + "@types/node": "^16.11.7", "@typescript-eslint/eslint-plugin": "^5.0.0", "@typescript-eslint/parser": "^5.0.0", "eslint": "^8.0.1", diff --git a/verification/curator-service/api/package-lock.json b/verification/curator-service/api/package-lock.json index 06e5f459f..1880711b5 100644 --- a/verification/curator-service/api/package-lock.json +++ b/verification/curator-service/api/package-lock.json @@ -82,7 +82,7 @@ "typescript": "^3.9.7" }, "engines": { - "node": "16.14.2" + "node": "16.15.1" } }, "node_modules/@ampproject/remapping": { diff --git a/verification/curator-service/api/package.json b/verification/curator-service/api/package.json index dc9efe34b..9446181b1 100644 --- a/verification/curator-service/api/package.json +++ b/verification/curator-service/api/package.json @@ -109,6 +109,6 @@ ] }, "engines": { - "node": "16.14.2" + "node": "16.15.1" } } diff --git a/verification/curator-service/ui/package-lock.json b/verification/curator-service/ui/package-lock.json index 1fe517893..cb389604d 100644 --- a/verification/curator-service/ui/package-lock.json +++ b/verification/curator-service/ui/package-lock.json @@ -54,7 +54,7 @@ "@types/jest": "^24.9.1", "@types/lodash": "^4.14.175", "@types/mongodb": "^3.6.18", - "@types/node": "^12.20.15", + "@types/node": "^16.11.7", "@types/papaparse": "^5.3.0", "@types/react": "^16.14.8", "@types/react-dom": "^16.9.13", @@ -81,7 +81,7 @@ "prettier": "^2.4.1" }, "engines": { - "node": "14.17.1" + "node": "16.15.1" } }, "node_modules/@ampproject/remapping": { @@ -5002,9 +5002,9 @@ } }, "node_modules/@types/node": { - "version": "12.20.46", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.46.tgz", - "integrity": "sha512-cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A==" + "version": "16.11.42", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.42.tgz", + "integrity": "sha512-iwLrPOopPy6V3E+1yHTpJea3bdsNso0b0utLOJJwaa/PLzqBt3GZl3stMcakc/gr89SfcNk2ki3z7Gvue9hYGQ==" }, "node_modules/@types/normalize-package-data": { "version": "2.4.1", @@ -33067,9 +33067,9 @@ } }, "@types/node": { - "version": "12.20.46", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.46.tgz", - "integrity": "sha512-cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A==" + "version": "16.11.42", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.42.tgz", + "integrity": "sha512-iwLrPOopPy6V3E+1yHTpJea3bdsNso0b0utLOJJwaa/PLzqBt3GZl3stMcakc/gr89SfcNk2ki3z7Gvue9hYGQ==" }, "@types/normalize-package-data": { "version": "2.4.1", diff --git a/verification/curator-service/ui/package.json b/verification/curator-service/ui/package.json index b5925371b..e01a65e89 100644 --- a/verification/curator-service/ui/package.json +++ b/verification/curator-service/ui/package.json @@ -84,7 +84,7 @@ "@types/jest": "^24.9.1", "@types/lodash": "^4.14.175", "@types/mongodb": "^3.6.18", - "@types/node": "^12.20.15", + "@types/node": "^16.11.7", "@types/papaparse": "^5.3.0", "@types/react": "^16.14.8", "@types/react-dom": "^16.9.13", @@ -121,6 +121,6 @@ ] }, "engines": { - "node": "14.17.1" + "node": "16.15.1" } }