From 2f8ec525a864bc48e7a4e657a92a392b9dd17073 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Sun, 23 Jun 2024 20:37:25 -0500 Subject: [PATCH 01/33] First sketch at outputting Parquet formatted data --- task/collect.js | 104 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 101 insertions(+), 3 deletions(-) diff --git a/task/collect.js b/task/collect.js index ea8ffdc2..f97994d2 100755 --- a/task/collect.js +++ b/task/collect.js @@ -16,6 +16,7 @@ import { mkdirp } from 'mkdirp'; import S3 from '@aws-sdk/client-s3'; import { Upload } from '@aws-sdk/lib-storage'; import archiver from 'archiver'; +import parquetjs from '@dsnp/parquetjs'; import minimist from 'minimist'; import { Transform } from 'stream'; @@ -108,9 +109,15 @@ async function collect(tmp, collection, oa) { const zip = await zip_datas(tmp, collection_data, collection.name); console.error(`ok - zip created: ${zip}`); - await upload_collection(zip, collection.name); + await upload_zip_collection(zip, collection.name); console.error('ok - archive uploaded'); + const pq = await parquet_datas(tmp, collection_data, collection.name); + + console.error(`ok - parquet created: ${pq}`); + await upload_parquet_collection(pq, collection.name); + console.error('ok - parquet uploaded'); + await oa.cmd('collection', 'update', { ':collection': collection.id, size: fs.statSync(zip).size @@ -193,7 +200,7 @@ async function get_source(oa, tmp, data, stats) { return path.resolve(tmp, 'sources', dir, source); } -async function upload_collection(file, name) { +async function upload_zip_collection(file, name) { const s3uploader = new Upload({ client: s3, params: { @@ -217,7 +224,6 @@ async function upload_collection(file, name) { endpoint: `https://${process.env.CLOUDFLARE_ACCOUNT_ID}.r2.cloudflarestorage.com` }); - const r2uploader = new Upload({ client: r2, params: { @@ -231,7 +237,45 @@ async function upload_collection(file, name) { await r2uploader.done(); console.error(`ok - uploaded: r2://${process.env.R2Bucket}/v2.openaddresses.io/${process.env.StackName}/collection-${name}.zip`); +} + +async function upload_parquet_collection(file, name) { + const s3uploader = new Upload({ + client: s3, + params: { + ContentType: 'application/vnd.apache.parquet', + Body: fs.createReadStream(file), + Bucket: process.env.Bucket, + Key: `${process.env.StackName}/collection-${name}.parquet` + } + }); + + await s3uploader.done(); + + console.error(`ok - s3://${process.env.Bucket}/${process.env.StackName}/collection-${name}.parquet`); + + const r2 = new S3.S3Client({ + region: 'auto', + credentials: { + accessKeyId: process.env.R2_ACCESS_KEY_ID, + secretAccessKey: process.env.R2_SECRET_ACCESS_KEY + }, + endpoint: `https://${process.env.CLOUDFLARE_ACCOUNT_ID}.r2.cloudflarestorage.com` + }); + + const r2uploader = new Upload({ + client: r2, + params: { + ContentType: 'application/vnd.apache.parquet', + Body: fs.createReadStream(file), + Bucket: process.env.R2Bucket, + Key: `v2.openaddresses.io/${process.env.StackName}/collection-${name}.parquet` + } + }); + + await r2uploader.done(); + console.error(`ok - uploaded: r2://${process.env.R2Bucket}/v2.openaddresses.io/${process.env.StackName}/collection-${name}.parquet`); } function zip_datas(tmp, datas, name) { @@ -273,3 +317,57 @@ function zip_datas(tmp, datas, name) { archive.finalize(); }); } + +function parquet_datas(tmp, datas, name) { + return new Promise((resolve, reject) => { + const schema = { + source_name: { type: 'UTF8' }, + geometry: { type: 'blob' }, + id: { type: 'UTF8' }, + pid: { type: 'UTF8' }, + number: { type: 'UTF8' }, + street: { type: 'UTF8' }, + unit: { type: 'UTF8' }, + city: { type: 'UTF8' }, + postcode: { type: 'UTF8' }, + district: { type: 'UTF8' }, + region: { type: 'UTF8' }, + addrtype: { type: 'UTF8' }, + notes: { type: 'UTF8' }, + }; + const writer = parquet.ParquetWriter.openFile(schema, path.resolve(tmp, `${name}.parquet`)); + + for (const data of datas) { + const resolved_data_filename = path.resolve(tmp, 'sources', data); + + // Read the file and parse it as linefeed-delimited JSON + const data_stream = fs.createReadStream(resolved_data_filename); + const data_lines = data_stream.pipe(split()); + data_lines.on('data', (line) => { + const record = JSON.parse(line); + const properties = record.properties; + writer.appendRow({ + source_name: data, + geometry: record.geometry, // TODO: Convert to WKB + id: properties.id, + pid: properties.pid, + number: properties.number, + street: properties.street, + unit: properties.unit, + city: properties.city, + postcode: properties.postcode, + district: properties.district, + region: properties.region, + addrtype: properties.addrtype, + notes: properties.notes, + }); + }); + data_lines.on('end', () => { + console.error(`ok - ${resolved_data_filename} processed and appended to parquet file`); + }); + } + + writer.close(); + return resolve(path.resolve(tmp, `${name}.parquet`)); + }); +} From 3d0a3a95ff605ab7b43834b333f684c8e3ff1373 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Sun, 17 Nov 2024 11:35:05 -0600 Subject: [PATCH 02/33] Update batch-machine image --- task/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task/Dockerfile b/task/Dockerfile index ccb94ecd..a0e774cd 100644 --- a/task/Dockerfile +++ b/task/Dockerfile @@ -1,5 +1,5 @@ FROM node:18-alpine3.17 AS node -FROM 847904970422.dkr.ecr.us-east-1.amazonaws.com/batch-machine:9.2.0 +FROM 847904970422.dkr.ecr.us-east-1.amazonaws.com/batch-machine:9.3.0 COPY --from=node /usr/lib /usr/lib COPY --from=node /usr/local/share /usr/local/share From a6d16bd39769be94222264a739c7cdaef28338fe Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Sun, 17 Nov 2024 11:55:16 -0600 Subject: [PATCH 03/33] Try fixing eslint errors --- eslint.config.js | 64 ++++++++++++++++++++++++------------------------ task/collect.js | 8 +++--- task/export.js | 4 +-- task/fabric.js | 6 ++--- 4 files changed, 39 insertions(+), 43 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index d85f4a42..e5a6fd35 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,38 +1,38 @@ -import js from "@eslint/js"; -import nodePlugin from "eslint-plugin-n"; +import js from '@eslint/js'; +import nodePlugin from 'eslint-plugin-n'; export default [ js.configs.recommended, - nodePlugin.configs["flat/recommended-module"], + nodePlugin.configs['flat/recommended-module'], { - "rules": { - "no-console": 0, - "arrow-parens": [ "error", "always" ], - "no-var": "error", - "prefer-const": "error", - "array-bracket-spacing": [ "error", "never" ], - "comma-dangle": [ "error", "never" ], - "computed-property-spacing": [ "error", "never" ], - "eol-last": "error", - "eqeqeq": [ "error", "smart" ], - "indent": [ "error", 4, { "SwitchCase": 1 } ], - "no-confusing-arrow": [ "error", { "allowParens": false } ], - "no-extend-native": "error", - "no-mixed-spaces-and-tabs": "error", - "func-call-spacing": [ "error", "never" ], - "no-trailing-spaces": "error", - "no-unused-vars": "error", - "no-use-before-define": [ "error", "nofunc" ], - "object-curly-spacing": [ "error", "always" ], - "prefer-arrow-callback": "error", - "quotes": [ "error", "single", "avoid-escape" ], - "semi": [ "error", "always" ], - "space-infix-ops": "error", - "spaced-comment": [ "error", "always" ], - "keyword-spacing": [ "error", { "before": true, "after": true } ], - "template-curly-spacing": [ "error", "never" ], - "semi-spacing": "error", - "strict": "error", + 'rules': { + 'no-console': 0, + 'arrow-parens': ['error', 'always'], + 'no-var': 'error', + 'prefer-const': 'error', + 'array-bracket-spacing': ['error', 'never'], + 'comma-dangle': ['error', 'never'], + 'computed-property-spacing': ['error', 'never'], + 'eol-last': 'error', + 'eqeqeq': ['error', 'smart'], + 'indent': ['error', 4, { 'SwitchCase': 1 }], + 'no-confusing-arrow': ['error', { 'allowParens': false }], + 'no-extend-native': 'error', + 'no-mixed-spaces-and-tabs': 'error', + 'func-call-spacing': ['error', 'never'], + 'no-trailing-spaces': 'error', + 'no-unused-vars': 'error', + 'no-use-before-define': ['error', 'nofunc'], + 'object-curly-spacing': ['error', 'always'], + 'prefer-arrow-callback': 'error', + 'quotes': ['error', 'single', 'avoid-escape'], + 'semi': ['error', 'always'], + 'space-infix-ops': 'error', + 'spaced-comment': ['error', 'always'], + 'keyword-spacing': ['error', { 'before': true, 'after': true }], + 'template-curly-spacing': ['error', 'never'], + 'semi-spacing': 'error', + 'strict': 'error' } } -] +]; diff --git a/task/collect.js b/task/collect.js index ea8ffdc2..53fb7ee5 100755 --- a/task/collect.js +++ b/task/collect.js @@ -1,5 +1,3 @@ -#!/usr/bin/env node - // Does not need to mark instance // as protected as it runs on a managed queue import { interactive } from './lib/pre.js'; @@ -66,7 +64,7 @@ async function cli() { tmp = path.resolve(DRIVE, Math.random().toString(36).substring(2, 15)); } catch (err) { - console.error(`ok - could not find ${DRIVE}`); + console.error(`ok - could not find ${DRIVE}: ${err}`); } fs.mkdirSync(tmp); @@ -87,7 +85,7 @@ async function cli() { } } catch (err) { console.error(err); - process.exit(1); + throw err; } } @@ -171,7 +169,7 @@ async function get_source(oa, tmp, data, stats) { Bucket: process.env.Bucket, Key: `${process.env.StackName}/job/${data.job}/source.geojson.gz` }))).Body, - Unzip(), + new Unzip(), split(), new Transform({ objectMode: true, diff --git a/task/export.js b/task/export.js index a2e9a055..d6e979f5 100755 --- a/task/export.js +++ b/task/export.js @@ -1,4 +1,3 @@ -#!/usr/bin/env node import { interactive } from './lib/pre.js'; import Meta from './lib/meta.js'; @@ -151,6 +150,7 @@ async function cli() { }); } finally { await meta.protection(false); + // eslint-disable-next-line n/no-process-exit process.exit(1); } } @@ -247,7 +247,7 @@ async function get_source(tmp, jobid) { Bucket: process.env.Bucket, Key: `${process.env.StackName}/job/${jobid}/source.geojson.gz` }))).Body, - Unzip(), + new Unzip(), fs.createWriteStream(path.resolve(tmp, 'source.geojson')) ); diff --git a/task/fabric.js b/task/fabric.js index 09c43139..e93fd4c9 100755 --- a/task/fabric.js +++ b/task/fabric.js @@ -1,5 +1,3 @@ -#!/usr/bin/env node - // Does not need to mark instance // as protected as it runs on a managed queue import { interactive } from './lib/pre.js'; @@ -183,7 +181,7 @@ async function cli() { } catch (err) { await meta.protection(false); console.error(err); - process.exit(); + throw err; } } @@ -195,7 +193,7 @@ async function get_source(out, data) { Bucket: process.env.Bucket, Key: `${process.env.StackName}/job/${data.job}/source.geojson.gz` }))).Body, - Unzip(), + new Unzip(), fs.createWriteStream(path.resolve(DRIVE, `${data.layer}.geojson`), { flags: 'a' }) ); } From 223d44a36845af731d9bed6bdf767730b29b05a8 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Sun, 17 Nov 2024 11:57:40 -0600 Subject: [PATCH 04/33] Try fixing eslint errors --- task/lib/tippecanoe.js | 2 +- task/sources.js | 4 +--- task/task.js | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/task/lib/tippecanoe.js b/task/lib/tippecanoe.js index fe7374b0..dbe66f1f 100644 --- a/task/lib/tippecanoe.js +++ b/task/lib/tippecanoe.js @@ -12,7 +12,7 @@ export default class Tippecanoe { CP.execSync('tippecanoe --version 2>&1'); CP.execSync('which tile-join'); } catch (err) { - throw new Error('tippecanoe not installed'); + throw new Error('tippecanoe not installed', err); } } diff --git a/task/sources.js b/task/sources.js index b2f1fedf..f125ea2d 100755 --- a/task/sources.js +++ b/task/sources.js @@ -1,5 +1,3 @@ -#!/usr/bin/env node - import { interactive } from './lib/pre.js'; import Meta from './lib/meta.js'; @@ -93,7 +91,7 @@ async function cli() { } catch (err) { console.error(err); await meta.protection(false); - process.exit(1); + throw err; } } diff --git a/task/task.js b/task/task.js index 377870b6..9ae918d1 100755 --- a/task/task.js +++ b/task/task.js @@ -1,4 +1,3 @@ -#!/usr/bin/env node import { interactive } from './lib/pre.js'; import Job from './lib/job.js'; @@ -55,7 +54,7 @@ async function cli() { flow(job).catch((err) => { console.error(err); - process.exit(1); + throw err; }); } @@ -134,6 +133,7 @@ async function flow(job) { console.error(err); } finally { await meta.protection(false); + // eslint-disable-next-line n/no-process-exit process.exit(1); } } From aaa409b32861382736815db7139d24bde3b78ef6 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Sun, 17 Nov 2024 14:51:33 -0600 Subject: [PATCH 05/33] Update Github actions --- .github/workflows/ecr_api.yml | 6 +++--- .github/workflows/ecr_task.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ecr_api.yml b/.github/workflows/ecr_api.yml index ded0c53e..13c0049f 100644 --- a/.github/workflows/ecr_api.yml +++ b/.github/workflows/ecr_api.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest if: github.event.pull_request.draft == false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha || github.sha }} @@ -24,7 +24,7 @@ jobs: run: docker build -t api api/ - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} @@ -32,7 +32,7 @@ jobs: - name: Login to Amazon ECR id: login-ecr - uses: aws-actions/amazon-ecr-login@v1 + uses: aws-actions/amazon-ecr-login@v2 - name: Docker Tag API run: docker tag api ${{secrets.AWS_ACCOUNT_ID}}.dkr.ecr.us-east-1.amazonaws.com/batch:api-${{ github.event.pull_request.head.sha || github.sha }} diff --git a/.github/workflows/ecr_task.yml b/.github/workflows/ecr_task.yml index 78fc10e1..b8136bb3 100644 --- a/.github/workflows/ecr_task.yml +++ b/.github/workflows/ecr_task.yml @@ -17,13 +17,13 @@ jobs: if: github.event.pull_request.draft == false steps: - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: ${{ secrets.AWS_REGION }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha || github.sha }} @@ -33,7 +33,7 @@ jobs: - name: Login to Amazon ECR id: login-ecr - uses: aws-actions/amazon-ecr-login@v1 + uses: aws-actions/amazon-ecr-login@v2 - name: Docker Build Task run: docker build -t task task/ From d53f11ad442bedf519bb316075c94a0f760aedf5 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Sun, 17 Nov 2024 15:01:51 -0600 Subject: [PATCH 06/33] Try updating to a newer node image --- task/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task/Dockerfile b/task/Dockerfile index a0e774cd..4457c2c5 100644 --- a/task/Dockerfile +++ b/task/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine3.17 AS node +FROM node:22-alpine3.19 AS node FROM 847904970422.dkr.ecr.us-east-1.amazonaws.com/batch-machine:9.3.0 COPY --from=node /usr/lib /usr/lib From 498e9f3a5dbe665e896475ceb7f6d374749d04a7 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Sun, 17 Nov 2024 15:02:02 -0600 Subject: [PATCH 07/33] Fix eslint errors in eslint config doc --- task/eslint.config.js | 64 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/task/eslint.config.js b/task/eslint.config.js index d85f4a42..e5a6fd35 100644 --- a/task/eslint.config.js +++ b/task/eslint.config.js @@ -1,38 +1,38 @@ -import js from "@eslint/js"; -import nodePlugin from "eslint-plugin-n"; +import js from '@eslint/js'; +import nodePlugin from 'eslint-plugin-n'; export default [ js.configs.recommended, - nodePlugin.configs["flat/recommended-module"], + nodePlugin.configs['flat/recommended-module'], { - "rules": { - "no-console": 0, - "arrow-parens": [ "error", "always" ], - "no-var": "error", - "prefer-const": "error", - "array-bracket-spacing": [ "error", "never" ], - "comma-dangle": [ "error", "never" ], - "computed-property-spacing": [ "error", "never" ], - "eol-last": "error", - "eqeqeq": [ "error", "smart" ], - "indent": [ "error", 4, { "SwitchCase": 1 } ], - "no-confusing-arrow": [ "error", { "allowParens": false } ], - "no-extend-native": "error", - "no-mixed-spaces-and-tabs": "error", - "func-call-spacing": [ "error", "never" ], - "no-trailing-spaces": "error", - "no-unused-vars": "error", - "no-use-before-define": [ "error", "nofunc" ], - "object-curly-spacing": [ "error", "always" ], - "prefer-arrow-callback": "error", - "quotes": [ "error", "single", "avoid-escape" ], - "semi": [ "error", "always" ], - "space-infix-ops": "error", - "spaced-comment": [ "error", "always" ], - "keyword-spacing": [ "error", { "before": true, "after": true } ], - "template-curly-spacing": [ "error", "never" ], - "semi-spacing": "error", - "strict": "error", + 'rules': { + 'no-console': 0, + 'arrow-parens': ['error', 'always'], + 'no-var': 'error', + 'prefer-const': 'error', + 'array-bracket-spacing': ['error', 'never'], + 'comma-dangle': ['error', 'never'], + 'computed-property-spacing': ['error', 'never'], + 'eol-last': 'error', + 'eqeqeq': ['error', 'smart'], + 'indent': ['error', 4, { 'SwitchCase': 1 }], + 'no-confusing-arrow': ['error', { 'allowParens': false }], + 'no-extend-native': 'error', + 'no-mixed-spaces-and-tabs': 'error', + 'func-call-spacing': ['error', 'never'], + 'no-trailing-spaces': 'error', + 'no-unused-vars': 'error', + 'no-use-before-define': ['error', 'nofunc'], + 'object-curly-spacing': ['error', 'always'], + 'prefer-arrow-callback': 'error', + 'quotes': ['error', 'single', 'avoid-escape'], + 'semi': ['error', 'always'], + 'space-infix-ops': 'error', + 'spaced-comment': ['error', 'always'], + 'keyword-spacing': ['error', { 'before': true, 'after': true }], + 'template-curly-spacing': ['error', 'never'], + 'semi-spacing': 'error', + 'strict': 'error' } } -] +]; From 9bdd8ca9d403ab9af3d86e12e898937b2df0d7d3 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Sun, 17 Nov 2024 15:55:53 -0600 Subject: [PATCH 08/33] Try to resolve more eslint errors. Also ask for Node >=22 --- eslint.config.js | 2 -- package-lock.json | 3 +++ package.json | 3 +++ task/eslint.config.js | 2 -- task/package-lock.json | 3 +++ task/package.json | 3 +++ 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index e5a6fd35..b9fb073f 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,8 +1,6 @@ -import js from '@eslint/js'; import nodePlugin from 'eslint-plugin-n'; export default [ - js.configs.recommended, nodePlugin.configs['flat/recommended-module'], { 'rules': { diff --git a/package-lock.json b/package-lock.json index 49309b57..fb0b2920 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,9 @@ "devDependencies": { "eslint": "^9.0.0", "eslint-plugin-n": "^17.10.2" + }, + "engines": { + "node": ">=22.0.0" } }, "node_modules/@ampproject/remapping": { diff --git a/package.json b/package.json index 6ff60efe..a85ec59d 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,9 @@ "repository": "git@github.com:openaddresses/batch", "author": "ingalls ", "private": false, + "engines": { + "node": ">=22.0.0" + }, "scripts": { "test": "echo 'no tests'", "lint": "eslint cloudformation/" diff --git a/task/eslint.config.js b/task/eslint.config.js index e5a6fd35..b9fb073f 100644 --- a/task/eslint.config.js +++ b/task/eslint.config.js @@ -1,8 +1,6 @@ -import js from '@eslint/js'; import nodePlugin from 'eslint-plugin-n'; export default [ - js.configs.recommended, nodePlugin.configs['flat/recommended-module'], { 'rules': { diff --git a/task/package-lock.json b/task/package-lock.json index 8c5e7e7b..05565bd0 100644 --- a/task/package-lock.json +++ b/task/package-lock.json @@ -41,6 +41,9 @@ "eslint-plugin-n": "^17.10.2", "sinon": "^19.0.0", "tape": "^5.0.0" + }, + "engines": { + "node": ">=22.0.0" } }, "node_modules/@ampproject/remapping": { diff --git a/task/package.json b/task/package.json index e76c0077..66c5547d 100644 --- a/task/package.json +++ b/task/package.json @@ -5,6 +5,9 @@ "main": "index.js", "license": "MIT", "private": true, + "engines": { + "node": ">=22.0.0" + }, "scripts": { "test": "tape test/**.test.js", "lint": "eslint *.js lib/ test/" From b94dc82205dc9ccbed42621c2188a1b5461de2ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:02:29 +0000 Subject: [PATCH 09/33] Bump braces from 3.0.2 to 3.0.3 in /api/web Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] --- api/web/package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/api/web/package-lock.json b/api/web/package-lock.json index 2c75d5c6..fcad2d4e 100644 --- a/api/web/package-lock.json +++ b/api/web/package-lock.json @@ -1271,11 +1271,11 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -1786,9 +1786,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dependencies": { "to-regex-range": "^5.0.1" }, From 295c114203c77c6168299f80edacde89993ab5e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:02:30 +0000 Subject: [PATCH 10/33] Bump rollup from 4.13.0 to 4.27.2 in /api/web Bumps [rollup](https://github.com/rollup/rollup) from 4.13.0 to 4.27.2. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v4.13.0...v4.27.2) --- updated-dependencies: - dependency-name: rollup dependency-type: indirect ... Signed-off-by: dependabot[bot] --- api/web/package-lock.json | 188 ++++++++++++++++++++++++++------------ 1 file changed, 129 insertions(+), 59 deletions(-) diff --git a/api/web/package-lock.json b/api/web/package-lock.json index 2c75d5c6..c372dfa3 100644 --- a/api/web/package-lock.json +++ b/api/web/package-lock.json @@ -664,9 +664,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz", - "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.2.tgz", + "integrity": "sha512-Tj+j7Pyzd15wAdSJswvs5CJzJNV+qqSUcr/aCD+jpQSBtXvGnV0pnrjoc8zFTe9fcKCatkpFpOO7yAzpO998HA==", "cpu": [ "arm" ], @@ -677,9 +677,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz", - "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.27.2.tgz", + "integrity": "sha512-xsPeJgh2ThBpUqlLgRfiVYBEf/P1nWlWvReG+aBWfNv3XEBpa6ZCmxSVnxJgLgkNz4IbxpLy64h2gCmAAQLneQ==", "cpu": [ "arm64" ], @@ -690,9 +690,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz", - "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.27.2.tgz", + "integrity": "sha512-KnXU4m9MywuZFedL35Z3PuwiTSn/yqRIhrEA9j+7OSkji39NzVkgxuxTYg5F8ryGysq4iFADaU5osSizMXhU2A==", "cpu": [ "arm64" ], @@ -703,9 +703,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz", - "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.27.2.tgz", + "integrity": "sha512-Hj77A3yTvUeCIx/Vi+4d4IbYhyTwtHj07lVzUgpUq9YpJSEiGJj4vXMKwzJ3w5zp5v3PFvpJNgc/J31smZey6g==", "cpu": [ "x64" ], @@ -715,10 +715,49 @@ "darwin" ] }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.27.2.tgz", + "integrity": "sha512-RjgKf5C3xbn8gxvCm5VgKZ4nn0pRAIe90J0/fdHUsgztd3+Zesb2lm2+r6uX4prV2eUByuxJNdt647/1KPRq5g==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.27.2.tgz", + "integrity": "sha512-duq21FoXwQtuws+V9H6UZ+eCBc7fxSpMK1GQINKn3fAyd9DFYKPJNcUhdIKOrMFjLEJgQskoMoiuizMt+dl20g==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ] + }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz", - "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.27.2.tgz", + "integrity": "sha512-6npqOKEPRZkLrMcvyC/32OzJ2srdPzCylJjiTJT2c0bwwSGm7nz2F9mNQ1WrAqCBZROcQn91Fno+khFhVijmFA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.27.2.tgz", + "integrity": "sha512-V9Xg6eXtgBtHq2jnuQwM/jr2mwe2EycnopO8cbOvpzFuySCGtKlPCI3Hj9xup/pJK5Q0388qfZZy2DqV2J8ftw==", "cpu": [ "arm" ], @@ -729,9 +768,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz", - "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.27.2.tgz", + "integrity": "sha512-uCFX9gtZJoQl2xDTpRdseYuNqyKkuMDtH6zSrBTA28yTfKyjN9hQ2B04N5ynR8ILCoSDOrG/Eg+J2TtJ1e/CSA==", "cpu": [ "arm64" ], @@ -742,9 +781,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz", - "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.27.2.tgz", + "integrity": "sha512-/PU9P+7Rkz8JFYDHIi+xzHabOu9qEWR07L5nWLIUsvserrxegZExKCi2jhMZRd0ATdboKylu/K5yAXbp7fYFvA==", "cpu": [ "arm64" ], @@ -754,10 +793,23 @@ "linux" ] }, + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.27.2.tgz", + "integrity": "sha512-eCHmol/dT5odMYi/N0R0HC8V8QE40rEpkyje/ZAXJYNNoSfrObOvG/Mn+s1F/FJyB7co7UQZZf6FuWnN6a7f4g==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz", - "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.27.2.tgz", + "integrity": "sha512-DEP3Njr9/ADDln3kNi76PXonLMSSMiCir0VHXxmGSHxCxDfQ70oWjHcJGfiBugzaqmYdTC7Y+8Int6qbnxPBIQ==", "cpu": [ "riscv64" ], @@ -767,10 +819,23 @@ "linux" ] }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.27.2.tgz", + "integrity": "sha512-NHGo5i6IE/PtEPh5m0yw5OmPMpesFnzMIS/lzvN5vknnC1sXM5Z/id5VgcNPgpD+wHmIcuYYgW+Q53v+9s96lQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz", - "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.27.2.tgz", + "integrity": "sha512-PaW2DY5Tan+IFvNJGHDmUrORadbe/Ceh8tQxi8cmdQVCCYsLoQo2cuaSj+AU+YRX8M4ivS2vJ9UGaxfuNN7gmg==", "cpu": [ "x64" ], @@ -781,9 +846,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz", - "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.27.2.tgz", + "integrity": "sha512-dOlWEMg2gI91Qx5I/HYqOD6iqlJspxLcS4Zlg3vjk1srE67z5T2Uz91yg/qA8sY0XcwQrFzWWiZhMNERylLrpQ==", "cpu": [ "x64" ], @@ -794,9 +859,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz", - "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.27.2.tgz", + "integrity": "sha512-euMIv/4x5Y2/ImlbGl88mwKNXDsvzbWUlT7DFky76z2keajCtcbAsN9LUdmk31hAoVmJJYSThgdA0EsPeTr1+w==", "cpu": [ "arm64" ], @@ -807,9 +872,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz", - "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.27.2.tgz", + "integrity": "sha512-RsnE6LQkUHlkC10RKngtHNLxb7scFykEbEwOFDjr3CeCMG+Rr+cKqlkKc2/wJ1u4u990urRHCbjz31x84PBrSQ==", "cpu": [ "ia32" ], @@ -820,9 +885,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz", - "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.27.2.tgz", + "integrity": "sha512-foJM5vv+z2KQmn7emYdDLyTbkoO5bkHZE1oth2tWbQNGW7mX32d46Hz6T0MqXdWS2vBZhaEtHqdy9WYwGfiliA==", "cpu": [ "x64" ], @@ -964,9 +1029,9 @@ } }, "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", "dev": true }, "node_modules/@types/geojson": { @@ -2675,12 +2740,12 @@ } }, "node_modules/rollup": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz", - "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.27.2.tgz", + "integrity": "sha512-KreA+PzWmk2yaFmZVwe6GB2uBD86nXl86OsDkt1bJS9p3vqWuEQ6HnJJ+j/mZi/q0920P99/MVRlB4L3crpF5w==", "dev": true, "dependencies": { - "@types/estree": "1.0.5" + "@types/estree": "1.0.6" }, "bin": { "rollup": "dist/bin/rollup" @@ -2690,19 +2755,24 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.13.0", - "@rollup/rollup-android-arm64": "4.13.0", - "@rollup/rollup-darwin-arm64": "4.13.0", - "@rollup/rollup-darwin-x64": "4.13.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.13.0", - "@rollup/rollup-linux-arm64-gnu": "4.13.0", - "@rollup/rollup-linux-arm64-musl": "4.13.0", - "@rollup/rollup-linux-riscv64-gnu": "4.13.0", - "@rollup/rollup-linux-x64-gnu": "4.13.0", - "@rollup/rollup-linux-x64-musl": "4.13.0", - "@rollup/rollup-win32-arm64-msvc": "4.13.0", - "@rollup/rollup-win32-ia32-msvc": "4.13.0", - "@rollup/rollup-win32-x64-msvc": "4.13.0", + "@rollup/rollup-android-arm-eabi": "4.27.2", + "@rollup/rollup-android-arm64": "4.27.2", + "@rollup/rollup-darwin-arm64": "4.27.2", + "@rollup/rollup-darwin-x64": "4.27.2", + "@rollup/rollup-freebsd-arm64": "4.27.2", + "@rollup/rollup-freebsd-x64": "4.27.2", + "@rollup/rollup-linux-arm-gnueabihf": "4.27.2", + "@rollup/rollup-linux-arm-musleabihf": "4.27.2", + "@rollup/rollup-linux-arm64-gnu": "4.27.2", + "@rollup/rollup-linux-arm64-musl": "4.27.2", + "@rollup/rollup-linux-powerpc64le-gnu": "4.27.2", + "@rollup/rollup-linux-riscv64-gnu": "4.27.2", + "@rollup/rollup-linux-s390x-gnu": "4.27.2", + "@rollup/rollup-linux-x64-gnu": "4.27.2", + "@rollup/rollup-linux-x64-musl": "4.27.2", + "@rollup/rollup-win32-arm64-msvc": "4.27.2", + "@rollup/rollup-win32-ia32-msvc": "4.27.2", + "@rollup/rollup-win32-x64-msvc": "4.27.2", "fsevents": "~2.3.2" } }, From 0fd530ebb70e605ffa28717a4a30e49f1b44e90e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:02:35 +0000 Subject: [PATCH 11/33] Bump cross-spawn from 7.0.3 to 7.0.5 in /task Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.5. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.5) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect ... Signed-off-by: dependabot[bot] --- task/package-lock.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/task/package-lock.json b/task/package-lock.json index 05565bd0..279019d0 100644 --- a/task/package-lock.json +++ b/task/package-lock.json @@ -5772,10 +5772,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "license": "MIT", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz", + "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", From 98b637f46631383320dbb1e6a01b6a6e384e1117 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:02:42 +0000 Subject: [PATCH 12/33] Bump vite from 5.2.6 to 5.4.11 in /api/web Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.2.6 to 5.4.11. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.4.11/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.11/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- api/web/package-lock.json | 418 ++++++++++++++++++++++---------------- api/web/package.json | 2 +- 2 files changed, 247 insertions(+), 173 deletions(-) diff --git a/api/web/package-lock.json b/api/web/package-lock.json index 2c75d5c6..afced36d 100644 --- a/api/web/package-lock.json +++ b/api/web/package-lock.json @@ -28,7 +28,7 @@ "@vitejs/plugin-vue": "^5.0.0", "eslint": "^8.11.0", "eslint-plugin-vue": "^9.0.0", - "vite": "^5.0.0" + "vite": "^5.4.11" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -63,9 +63,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", - "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", + "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", "cpu": [ "ppc64" ], @@ -79,9 +79,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", - "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", + "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", "cpu": [ "arm" ], @@ -95,9 +95,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", - "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", + "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", "cpu": [ "arm64" ], @@ -111,9 +111,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", - "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", + "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", "cpu": [ "x64" ], @@ -127,9 +127,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", - "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", + "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", "cpu": [ "arm64" ], @@ -143,9 +143,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", - "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", + "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", "cpu": [ "x64" ], @@ -159,9 +159,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", - "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", + "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", "cpu": [ "arm64" ], @@ -175,9 +175,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", - "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", + "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", "cpu": [ "x64" ], @@ -191,9 +191,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", - "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", + "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", "cpu": [ "arm" ], @@ -207,9 +207,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", - "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", + "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", "cpu": [ "arm64" ], @@ -223,9 +223,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", - "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", + "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", "cpu": [ "ia32" ], @@ -239,9 +239,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", - "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", + "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", "cpu": [ "loong64" ], @@ -255,9 +255,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", - "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", + "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", "cpu": [ "mips64el" ], @@ -271,9 +271,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", - "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", + "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", "cpu": [ "ppc64" ], @@ -287,9 +287,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", - "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", + "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", "cpu": [ "riscv64" ], @@ -303,9 +303,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", - "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", + "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", "cpu": [ "s390x" ], @@ -319,9 +319,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", - "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", + "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", "cpu": [ "x64" ], @@ -335,9 +335,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", - "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", + "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", "cpu": [ "x64" ], @@ -351,9 +351,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", - "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", + "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", "cpu": [ "x64" ], @@ -367,9 +367,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", - "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", + "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", "cpu": [ "x64" ], @@ -383,9 +383,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", - "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", + "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", "cpu": [ "arm64" ], @@ -399,9 +399,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", - "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", + "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", "cpu": [ "ia32" ], @@ -415,9 +415,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", - "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", + "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", "cpu": [ "x64" ], @@ -664,9 +664,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz", - "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.2.tgz", + "integrity": "sha512-Tj+j7Pyzd15wAdSJswvs5CJzJNV+qqSUcr/aCD+jpQSBtXvGnV0pnrjoc8zFTe9fcKCatkpFpOO7yAzpO998HA==", "cpu": [ "arm" ], @@ -677,9 +677,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz", - "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.27.2.tgz", + "integrity": "sha512-xsPeJgh2ThBpUqlLgRfiVYBEf/P1nWlWvReG+aBWfNv3XEBpa6ZCmxSVnxJgLgkNz4IbxpLy64h2gCmAAQLneQ==", "cpu": [ "arm64" ], @@ -690,9 +690,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz", - "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.27.2.tgz", + "integrity": "sha512-KnXU4m9MywuZFedL35Z3PuwiTSn/yqRIhrEA9j+7OSkji39NzVkgxuxTYg5F8ryGysq4iFADaU5osSizMXhU2A==", "cpu": [ "arm64" ], @@ -703,9 +703,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz", - "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.27.2.tgz", + "integrity": "sha512-Hj77A3yTvUeCIx/Vi+4d4IbYhyTwtHj07lVzUgpUq9YpJSEiGJj4vXMKwzJ3w5zp5v3PFvpJNgc/J31smZey6g==", "cpu": [ "x64" ], @@ -715,10 +715,49 @@ "darwin" ] }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.27.2.tgz", + "integrity": "sha512-RjgKf5C3xbn8gxvCm5VgKZ4nn0pRAIe90J0/fdHUsgztd3+Zesb2lm2+r6uX4prV2eUByuxJNdt647/1KPRq5g==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.27.2.tgz", + "integrity": "sha512-duq21FoXwQtuws+V9H6UZ+eCBc7fxSpMK1GQINKn3fAyd9DFYKPJNcUhdIKOrMFjLEJgQskoMoiuizMt+dl20g==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ] + }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz", - "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.27.2.tgz", + "integrity": "sha512-6npqOKEPRZkLrMcvyC/32OzJ2srdPzCylJjiTJT2c0bwwSGm7nz2F9mNQ1WrAqCBZROcQn91Fno+khFhVijmFA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.27.2.tgz", + "integrity": "sha512-V9Xg6eXtgBtHq2jnuQwM/jr2mwe2EycnopO8cbOvpzFuySCGtKlPCI3Hj9xup/pJK5Q0388qfZZy2DqV2J8ftw==", "cpu": [ "arm" ], @@ -729,9 +768,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz", - "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.27.2.tgz", + "integrity": "sha512-uCFX9gtZJoQl2xDTpRdseYuNqyKkuMDtH6zSrBTA28yTfKyjN9hQ2B04N5ynR8ILCoSDOrG/Eg+J2TtJ1e/CSA==", "cpu": [ "arm64" ], @@ -742,9 +781,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz", - "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.27.2.tgz", + "integrity": "sha512-/PU9P+7Rkz8JFYDHIi+xzHabOu9qEWR07L5nWLIUsvserrxegZExKCi2jhMZRd0ATdboKylu/K5yAXbp7fYFvA==", "cpu": [ "arm64" ], @@ -754,10 +793,23 @@ "linux" ] }, + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.27.2.tgz", + "integrity": "sha512-eCHmol/dT5odMYi/N0R0HC8V8QE40rEpkyje/ZAXJYNNoSfrObOvG/Mn+s1F/FJyB7co7UQZZf6FuWnN6a7f4g==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz", - "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.27.2.tgz", + "integrity": "sha512-DEP3Njr9/ADDln3kNi76PXonLMSSMiCir0VHXxmGSHxCxDfQ70oWjHcJGfiBugzaqmYdTC7Y+8Int6qbnxPBIQ==", "cpu": [ "riscv64" ], @@ -767,10 +819,23 @@ "linux" ] }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.27.2.tgz", + "integrity": "sha512-NHGo5i6IE/PtEPh5m0yw5OmPMpesFnzMIS/lzvN5vknnC1sXM5Z/id5VgcNPgpD+wHmIcuYYgW+Q53v+9s96lQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz", - "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.27.2.tgz", + "integrity": "sha512-PaW2DY5Tan+IFvNJGHDmUrORadbe/Ceh8tQxi8cmdQVCCYsLoQo2cuaSj+AU+YRX8M4ivS2vJ9UGaxfuNN7gmg==", "cpu": [ "x64" ], @@ -781,9 +846,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz", - "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.27.2.tgz", + "integrity": "sha512-dOlWEMg2gI91Qx5I/HYqOD6iqlJspxLcS4Zlg3vjk1srE67z5T2Uz91yg/qA8sY0XcwQrFzWWiZhMNERylLrpQ==", "cpu": [ "x64" ], @@ -794,9 +859,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz", - "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.27.2.tgz", + "integrity": "sha512-euMIv/4x5Y2/ImlbGl88mwKNXDsvzbWUlT7DFky76z2keajCtcbAsN9LUdmk31hAoVmJJYSThgdA0EsPeTr1+w==", "cpu": [ "arm64" ], @@ -807,9 +872,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz", - "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.27.2.tgz", + "integrity": "sha512-RsnE6LQkUHlkC10RKngtHNLxb7scFykEbEwOFDjr3CeCMG+Rr+cKqlkKc2/wJ1u4u990urRHCbjz31x84PBrSQ==", "cpu": [ "ia32" ], @@ -820,9 +885,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz", - "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.27.2.tgz", + "integrity": "sha512-foJM5vv+z2KQmn7emYdDLyTbkoO5bkHZE1oth2tWbQNGW7mX32d46Hz6T0MqXdWS2vBZhaEtHqdy9WYwGfiliA==", "cpu": [ "x64" ], @@ -964,9 +1029,9 @@ } }, "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", "dev": true }, "node_modules/@types/geojson": { @@ -1517,9 +1582,9 @@ } }, "node_modules/esbuild": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", - "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", + "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==", "dev": true, "hasInstallScript": true, "bin": { @@ -1529,29 +1594,29 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.20.2", - "@esbuild/android-arm": "0.20.2", - "@esbuild/android-arm64": "0.20.2", - "@esbuild/android-x64": "0.20.2", - "@esbuild/darwin-arm64": "0.20.2", - "@esbuild/darwin-x64": "0.20.2", - "@esbuild/freebsd-arm64": "0.20.2", - "@esbuild/freebsd-x64": "0.20.2", - "@esbuild/linux-arm": "0.20.2", - "@esbuild/linux-arm64": "0.20.2", - "@esbuild/linux-ia32": "0.20.2", - "@esbuild/linux-loong64": "0.20.2", - "@esbuild/linux-mips64el": "0.20.2", - "@esbuild/linux-ppc64": "0.20.2", - "@esbuild/linux-riscv64": "0.20.2", - "@esbuild/linux-s390x": "0.20.2", - "@esbuild/linux-x64": "0.20.2", - "@esbuild/netbsd-x64": "0.20.2", - "@esbuild/openbsd-x64": "0.20.2", - "@esbuild/sunos-x64": "0.20.2", - "@esbuild/win32-arm64": "0.20.2", - "@esbuild/win32-ia32": "0.20.2", - "@esbuild/win32-x64": "0.20.2" + "@esbuild/aix-ppc64": "0.21.5", + "@esbuild/android-arm": "0.21.5", + "@esbuild/android-arm64": "0.21.5", + "@esbuild/android-x64": "0.21.5", + "@esbuild/darwin-arm64": "0.21.5", + "@esbuild/darwin-x64": "0.21.5", + "@esbuild/freebsd-arm64": "0.21.5", + "@esbuild/freebsd-x64": "0.21.5", + "@esbuild/linux-arm": "0.21.5", + "@esbuild/linux-arm64": "0.21.5", + "@esbuild/linux-ia32": "0.21.5", + "@esbuild/linux-loong64": "0.21.5", + "@esbuild/linux-mips64el": "0.21.5", + "@esbuild/linux-ppc64": "0.21.5", + "@esbuild/linux-riscv64": "0.21.5", + "@esbuild/linux-s390x": "0.21.5", + "@esbuild/linux-x64": "0.21.5", + "@esbuild/netbsd-x64": "0.21.5", + "@esbuild/openbsd-x64": "0.21.5", + "@esbuild/sunos-x64": "0.21.5", + "@esbuild/win32-arm64": "0.21.5", + "@esbuild/win32-ia32": "0.21.5", + "@esbuild/win32-x64": "0.21.5" } }, "node_modules/escape-string-regexp": { @@ -2508,9 +2573,9 @@ } }, "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" }, "node_modules/picomatch": { "version": "2.3.1", @@ -2524,9 +2589,9 @@ } }, "node_modules/postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "version": "8.4.49", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz", + "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==", "funding": [ { "type": "opencollective", @@ -2543,8 +2608,8 @@ ], "dependencies": { "nanoid": "^3.3.7", - "picocolors": "^1.0.0", - "source-map-js": "^1.2.0" + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" }, "engines": { "node": "^10 || ^12 || >=14" @@ -2675,12 +2740,12 @@ } }, "node_modules/rollup": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz", - "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==", + "version": "4.27.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.27.2.tgz", + "integrity": "sha512-KreA+PzWmk2yaFmZVwe6GB2uBD86nXl86OsDkt1bJS9p3vqWuEQ6HnJJ+j/mZi/q0920P99/MVRlB4L3crpF5w==", "dev": true, "dependencies": { - "@types/estree": "1.0.5" + "@types/estree": "1.0.6" }, "bin": { "rollup": "dist/bin/rollup" @@ -2690,19 +2755,24 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.13.0", - "@rollup/rollup-android-arm64": "4.13.0", - "@rollup/rollup-darwin-arm64": "4.13.0", - "@rollup/rollup-darwin-x64": "4.13.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.13.0", - "@rollup/rollup-linux-arm64-gnu": "4.13.0", - "@rollup/rollup-linux-arm64-musl": "4.13.0", - "@rollup/rollup-linux-riscv64-gnu": "4.13.0", - "@rollup/rollup-linux-x64-gnu": "4.13.0", - "@rollup/rollup-linux-x64-musl": "4.13.0", - "@rollup/rollup-win32-arm64-msvc": "4.13.0", - "@rollup/rollup-win32-ia32-msvc": "4.13.0", - "@rollup/rollup-win32-x64-msvc": "4.13.0", + "@rollup/rollup-android-arm-eabi": "4.27.2", + "@rollup/rollup-android-arm64": "4.27.2", + "@rollup/rollup-darwin-arm64": "4.27.2", + "@rollup/rollup-darwin-x64": "4.27.2", + "@rollup/rollup-freebsd-arm64": "4.27.2", + "@rollup/rollup-freebsd-x64": "4.27.2", + "@rollup/rollup-linux-arm-gnueabihf": "4.27.2", + "@rollup/rollup-linux-arm-musleabihf": "4.27.2", + "@rollup/rollup-linux-arm64-gnu": "4.27.2", + "@rollup/rollup-linux-arm64-musl": "4.27.2", + "@rollup/rollup-linux-powerpc64le-gnu": "4.27.2", + "@rollup/rollup-linux-riscv64-gnu": "4.27.2", + "@rollup/rollup-linux-s390x-gnu": "4.27.2", + "@rollup/rollup-linux-x64-gnu": "4.27.2", + "@rollup/rollup-linux-x64-musl": "4.27.2", + "@rollup/rollup-win32-arm64-msvc": "4.27.2", + "@rollup/rollup-win32-ia32-msvc": "4.27.2", + "@rollup/rollup-win32-x64-msvc": "4.27.2", "fsevents": "~2.3.2" } }, @@ -2887,9 +2957,9 @@ } }, "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "engines": { "node": ">=0.10.0" } @@ -3061,14 +3131,14 @@ "dev": true }, "node_modules/vite": { - "version": "5.2.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.6.tgz", - "integrity": "sha512-FPtnxFlSIKYjZ2eosBQamz4CbyrTizbZ3hnGJlh/wMtCrlp1Hah6AzBLjGI5I2urTfNnpovpHdrL6YRuBOPnCA==", + "version": "5.4.11", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz", + "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==", "dev": true, "dependencies": { - "esbuild": "^0.20.1", - "postcss": "^8.4.36", - "rollup": "^4.13.0" + "esbuild": "^0.21.3", + "postcss": "^8.4.43", + "rollup": "^4.20.0" }, "bin": { "vite": "bin/vite.js" @@ -3087,6 +3157,7 @@ "less": "*", "lightningcss": "^1.21.0", "sass": "*", + "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.4.0" @@ -3104,6 +3175,9 @@ "sass": { "optional": true }, + "sass-embedded": { + "optional": true + }, "stylus": { "optional": true }, diff --git a/api/web/package.json b/api/web/package.json index 44f261bf..d79902c0 100644 --- a/api/web/package.json +++ b/api/web/package.json @@ -28,7 +28,7 @@ "@vitejs/plugin-vue": "^5.0.0", "eslint": "^8.11.0", "eslint-plugin-vue": "^9.0.0", - "vite": "^5.0.0" + "vite": "^5.4.11" }, "eslintConfig": { "root": true, From 951f124f123d35c2159064b73287f2690098137b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:06:11 +0000 Subject: [PATCH 13/33] Bump @octokit/webhooks from 11.0.0 to 11.1.2 in /api Bumps [@octokit/webhooks](https://github.com/octokit/webhooks.js) from 11.0.0 to 11.1.2. - [Release notes](https://github.com/octokit/webhooks.js/releases) - [Commits](https://github.com/octokit/webhooks.js/compare/v11.0.0...v11.1.2) --- updated-dependencies: - dependency-name: "@octokit/webhooks" dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- api/package-lock.json | 18 ++++++++---------- api/package.json | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/api/package-lock.json b/api/package-lock.json index 9308a5b5..23936d62 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -19,7 +19,7 @@ "@mapbox/sphericalmercator": "^1.1.0", "@octokit/auth-app": "^4.0.6", "@octokit/rest": "^19.0.4", - "@octokit/webhooks": "11.0.0", + "@octokit/webhooks": "11.1.2", "@openaddresses/batch-error": "^2.1.0", "@openaddresses/batch-generic": "^14.0.0", "@openaddresses/batch-schema": "^9.0.0", @@ -2579,14 +2579,13 @@ } }, "node_modules/@octokit/webhooks": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-11.0.0.tgz", - "integrity": "sha512-+cn1O4+ItqXwc9Yo0DVfcfxPgeIRjV2AGDOkG6fwNRwXHw2IIUE/HEaNaHLUTiVCvXbL/pv6swqd+bM/Eylu5Q==", - "license": "MIT", + "version": "11.1.2", + "resolved": "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-11.1.2.tgz", + "integrity": "sha512-vbZvWXp9ypL8TU0DW9Pr2Fdxpu3PZOnS7oN27feqiWyKL5bsUIXw/BrY4cOTadxeWRpBdaXGY1O5Ek/Xlpus5w==", "dependencies": { "@octokit/request-error": "^3.0.0", "@octokit/webhooks-methods": "^3.0.0", - "@octokit/webhooks-types": "6.11.0", + "@octokit/webhooks-types": "7.0.3", "aggregate-error": "^3.1.0" }, "engines": { @@ -2603,10 +2602,9 @@ } }, "node_modules/@octokit/webhooks-types": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-6.11.0.tgz", - "integrity": "sha512-AanzbulOHljrku1NGfafxdpTCfw2ENaWzH01N2vqQM+cUFbk868Cgh0xylz0JIM9BoKbfI++bdD6EYX0Q/UTEw==", - "license": "MIT" + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-7.0.3.tgz", + "integrity": "sha512-yDw/89TBaMotdT1/4gxVaiemBhswBd+jPazhL60/rS5WqXC6JZuj5CkDql7Dhc9vAbbkrJBkWsa2sppM/g8jxQ==" }, "node_modules/@openaddresses/batch-error": { "version": "2.8.0", diff --git a/api/package.json b/api/package.json index 5783cec0..46fc762e 100644 --- a/api/package.json +++ b/api/package.json @@ -28,7 +28,7 @@ "@mapbox/sphericalmercator": "^1.1.0", "@octokit/auth-app": "^4.0.6", "@octokit/rest": "^19.0.4", - "@octokit/webhooks": "11.0.0", + "@octokit/webhooks": "11.1.2", "@openaddresses/batch-error": "^2.1.0", "@openaddresses/batch-generic": "^14.0.0", "@openaddresses/batch-schema": "^9.0.0", From a87b43b4c9cbe7536cb39ea151a0a777fd0849fe Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Sun, 17 Nov 2024 23:00:56 -0600 Subject: [PATCH 14/33] Eslint complained about shebang, so run these scripts with node --- api/lib/batch.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/api/lib/batch.js b/api/lib/batch.js index 7c233e2e..50ebac13 100644 --- a/api/lib/batch.js +++ b/api/lib/batch.js @@ -104,7 +104,7 @@ export async function trigger(event) { jobQueue: event.type === 'job' ? t3_queue : t3_priority_queue, jobName: `OA_Job_${event.job}`, containerOverrides: { - command: ['./task.js'], + command: ['node', 'task.js'], environment: [ { name: 'OA_JOB_ID', value: String(event.job) } ] @@ -121,7 +121,7 @@ export async function trigger(event) { jobQueue: t3_priority_queue, jobName: `OA_Export_${event.id}`, containerOverrides: { - command: ['./export.js'], + command: ['node', 'export.js'], environment: [ { name: 'OA_EXPORT_ID', value: String(event.id) } ] @@ -136,7 +136,7 @@ export async function trigger(event) { jobQueue: mega_queue, jobName: 'OA_Collect', containerOverrides: { - command: ['./collect.js'], + command: ['node', 'collect.js'], environment: [] } }; @@ -146,7 +146,7 @@ export async function trigger(event) { jobQueue: mega_queue, jobName: 'OA_Fabric', containerOverrides: { - command: ['./fabric.js'], + command: ['node', 'fabric.js'], environment: [] } }; @@ -156,7 +156,7 @@ export async function trigger(event) { jobQueue: t3_queue, jobName: 'OA_Sources', containerOverrides: { - command: ['./sources.js'], + command: ['node', 'sources.js'], environment: [] } }; From db13ec5edda15a8fb3436506111f803f1dba0b97 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Mon, 18 Nov 2024 00:13:07 -0600 Subject: [PATCH 15/33] Increase the body size limit for the Github webhook --- api/routes/github.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/routes/github.js b/api/routes/github.js index 7a1d23f2..1bf2cba6 100644 --- a/api/routes/github.js +++ b/api/routes/github.js @@ -9,7 +9,7 @@ export default async function router(schema, config) { group: 'Github', auth: 'admin', description: 'Callback endpoint for GitHub Webhooks. Should not be called by user functions' - }, bodyparser.raw({ type: '*/*' }), async (req, res) => { + }, bodyparser.raw({ type: '*/*', limit: '500kb' }), async (req, res) => { if (!process.env.GithubSecret) return res.status(400).send('Invalid X-Hub-Signature'); const ci = new CI(config); From d024864641e89651b2bceb90dbb763b978255475 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 00:00:20 +0000 Subject: [PATCH 16/33] Bump cross-spawn from 7.0.3 to 7.0.5 in /task Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.5. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.5) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect ... Signed-off-by: dependabot[bot] --- task/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/task/package-lock.json b/task/package-lock.json index 279019d0..d0e3db7e 100644 --- a/task/package-lock.json +++ b/task/package-lock.json @@ -5772,9 +5772,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz", - "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", From e55a69745d890d4edba896855e7fb168c8596fa0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 00:11:20 +0000 Subject: [PATCH 17/33] Bump cross-spawn from 7.0.3 to 7.0.6 in /api Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect ... Signed-off-by: dependabot[bot] --- api/package-lock.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/api/package-lock.json b/api/package-lock.json index 23936d62..37f077c8 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -6559,10 +6559,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "license": "MIT", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", From 601a56ed3a50c7ac8ac16ff5ef10f59e12dfd21e Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Mon, 18 Nov 2024 23:18:35 -0600 Subject: [PATCH 18/33] Update batch-machine image --- task/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task/Dockerfile b/task/Dockerfile index 4457c2c5..67455281 100644 --- a/task/Dockerfile +++ b/task/Dockerfile @@ -1,5 +1,5 @@ FROM node:22-alpine3.19 AS node -FROM 847904970422.dkr.ecr.us-east-1.amazonaws.com/batch-machine:9.3.0 +FROM 847904970422.dkr.ecr.us-east-1.amazonaws.com/batch-machine:9.5.0 COPY --from=node /usr/lib /usr/lib COPY --from=node /usr/local/share /usr/local/share From fc0b3393f34a0c15844c747941497541c39f4c17 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Tue, 19 Nov 2024 18:50:53 -0600 Subject: [PATCH 19/33] Use Protomaps for fabric map --- README.md | 4 ++-- api/lib/config.js | 4 ++-- api/lib/types/map.js | 2 +- api/web/src/components/Fabric.vue | 3 +-- cloudformation/batch.template.js | 4 ++-- cloudformation/lib/api.js | 2 +- cloudformation/lib/batch.js | 2 +- docker-compose.yml | 2 +- task/Dockerfile | 2 +- task/task.js | 2 +- 10 files changed, 13 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d1f9e63d..01a2eb72 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,9 @@ On every commit, GitHub actions will build the latest Docker image and push it t This parameter will be populated automatically by the `deploy` cli and simply points the stack to use the correspondingly Docker image from ECR. -#### MapboxToken +#### ProtomapsKey -A read-only Mapbox API token for displaying base maps underneath our address data. (Token should start with `pk.`) +A Protomaps API key ([from here](https://protomaps.com/dashboard)) for displaying base maps underneath our address data. #### Bucket diff --git a/api/lib/config.js b/api/lib/config.js index 49e9daa9..608b0a21 100644 --- a/api/lib/config.js +++ b/api/lib/config.js @@ -83,8 +83,8 @@ export default class Config { this.R2Bucket = process.env.R2Bucket; } - if (!process.env.MAPBOX_TOKEN) { - throw new Error('not ok - MAPBOX_TOKEN env var required'); + if (!process.env.PROTOMAPS_KEY) { + throw new Error('not ok - PROTOMAPS_KEY env var required'); } if (!process.env.CLOUDFLARE_ACCOUNT_ID) { diff --git a/api/lib/types/map.js b/api/lib/types/map.js index 6c7e2c19..7c3c549a 100644 --- a/api/lib/types/map.js +++ b/api/lib/types/map.js @@ -31,7 +31,7 @@ export default class Map extends Generic { static map() { return { - token: process.env.MAPBOX_TOKEN + protomaps_key: process.env.PROTOMAPS_KEY }; } diff --git a/api/web/src/components/Fabric.vue b/api/web/src/components/Fabric.vue index 1990e4f4..d92b9869 100644 --- a/api/web/src/components/Fabric.vue +++ b/api/web/src/components/Fabric.vue @@ -85,13 +85,12 @@ export default { init: async function() { try { const res = await window.std('/api/map'); - mapboxgl.accessToken = res.token; this.map = new mapboxgl.Map({ container: 'map', center: this.tilejson.center, zoom: this.tilejson.minzoom, - style: 'mapbox://styles/ingalls/ckvh0wwm8g2cw15r05ozt0ybr' + style: 'https://api.protomaps.com/styles/v2/grayscale.json?key=' + res.protomaps_key }); this.map.addControl(new mapboxgl.NavigationControl(), 'bottom-right'); diff --git a/cloudformation/batch.template.js b/cloudformation/batch.template.js index d405e5d6..903ba9f3 100644 --- a/cloudformation/batch.template.js +++ b/cloudformation/batch.template.js @@ -19,9 +19,9 @@ const stack = { Type: 'String', Description: 'Gitsha to Deploy' }, - MapboxToken: { + ProtomapsKey: { Type: 'String', - Description: '[secure] Mapbox API Token to create Slippy Maps With' + Description: '[secure] Protomaps API Key to create Slippy Maps With' }, Bucket: { Type: 'String', diff --git a/cloudformation/lib/api.js b/cloudformation/lib/api.js index 06ad7c7c..1f6d2b9c 100644 --- a/cloudformation/lib/api.js +++ b/cloudformation/lib/api.js @@ -233,7 +233,7 @@ export default { { Name: 'T3_CLUSTER_ASG', Value: cf.importValue('t3-cluster-asg') }, { Name: 'MEGA_QUEUE', Value: cf.importValue('mega-queue') }, { Name: 'ECS_LOG_LEVEL', Value: 'debug' }, - { Name: 'MAPBOX_TOKEN', Value: cf.ref('MapboxToken') }, + { Name: 'PROTOMAPS_KEY', Value: cf.ref('ProtomapsKey') }, { Name: 'OPENCOLLECTIVE_API_KEY', Value: cf.ref('OpenCollective') }, { Name: 'POSTGRES', Value: cf.join(['postgresql://openaddresses:', cf.ref('DatabasePassword'), '@', cf.getAtt('DBInstanceVPC', 'Endpoint.Address'), ':5432/openaddresses?sslmode=no-verify']) }, { Name: 'SharedSecret', Value: cf.sub('{{resolve:secretsmanager:${AWS::StackName}/api/signing-secret:SecretString::AWSCURRENT}}') }, diff --git a/cloudformation/lib/batch.js b/cloudformation/lib/batch.js index 26bf7c54..c2d9f82b 100644 --- a/cloudformation/lib/batch.js +++ b/cloudformation/lib/batch.js @@ -52,7 +52,7 @@ export default { ContainerProperties: { Environment: [ { Name: 'T3_CLUSTER_ASG', Value: cf.importValue('t3-cluster-asg') }, - { Name: 'MAPBOX_TOKEN', Value: cf.ref('MapboxToken') }, + { Name: 'PROTOMAPS_KEY', Value: cf.ref('ProtomapsKey') }, { Name: 'R2_ACCESS_KEY_ID', Value: cf.ref('R2AccessKeyID') }, { Name: 'R2_SECRET_ACCESS_KEY', Value: cf.ref('R2SecretAccessKey') }, { Name: 'CLOUDFLARE_ACCOUNT_ID', Value: cf.ref('CloudflareAccountID') }, diff --git a/docker-compose.yml b/docker-compose.yml index 993bef51..8173dc21 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: - 5001:5000 environment: - POSTGRES=postgres://docker:docker@postgis:5432/gis - - MAPBOX_TOKEN + - PROTOMAPS_KEY postgis: image: kartoza/postgis:13.0 diff --git a/task/Dockerfile b/task/Dockerfile index 67455281..c116bbfe 100644 --- a/task/Dockerfile +++ b/task/Dockerfile @@ -1,5 +1,5 @@ FROM node:22-alpine3.19 AS node -FROM 847904970422.dkr.ecr.us-east-1.amazonaws.com/batch-machine:9.5.0 +FROM 847904970422.dkr.ecr.us-east-1.amazonaws.com/batch-machine:9.6.0 COPY --from=node /usr/lib /usr/lib COPY --from=node /usr/local/share /usr/local/share diff --git a/task/task.js b/task/task.js index 9ae918d1..5eac2662 100755 --- a/task/task.js +++ b/task/task.js @@ -150,7 +150,7 @@ function process_job(job) { '--layer', job.layer, '--layersource', job.name, '--render-preview', - '--mapbox-key', process.env.MAPBOX_TOKEN, + '--protomaps-key', process.env.PROTOMAPS_KEY, '--verbose' ],{ env: process.env From 5e29d37ce93ec9161686c5842e596b170487c837 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Tue, 19 Nov 2024 19:58:29 -0600 Subject: [PATCH 20/33] Use a newer protomaps style --- api/web/src/components/Fabric.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/web/src/components/Fabric.vue b/api/web/src/components/Fabric.vue index d92b9869..b1878350 100644 --- a/api/web/src/components/Fabric.vue +++ b/api/web/src/components/Fabric.vue @@ -90,7 +90,7 @@ export default { container: 'map', center: this.tilejson.center, zoom: this.tilejson.minzoom, - style: 'https://api.protomaps.com/styles/v2/grayscale.json?key=' + res.protomaps_key + style: 'https://api.protomaps.com/styles/v4/grayscale/en.json?key=' + res.protomaps_key }); this.map.addControl(new mapboxgl.NavigationControl(), 'bottom-right'); From 8cc05050d6e45c89373e40d42ca46c76ddb0a216 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Tue, 19 Nov 2024 20:33:09 -0600 Subject: [PATCH 21/33] Missed a couple spots that need the new map style --- api/web/src/components/job/JobMap.vue | 31 +------------------ api/web/src/components/util/Coverage.vue | 38 +----------------------- 2 files changed, 2 insertions(+), 67 deletions(-) diff --git a/api/web/src/components/job/JobMap.vue b/api/web/src/components/job/JobMap.vue index 7214cd5e..8f0b24ab 100644 --- a/api/web/src/components/job/JobMap.vue +++ b/api/web/src/components/job/JobMap.vue @@ -36,44 +36,15 @@ export default { container: this.$refs.map, hash: "map", zoom: 1, - attributionControl: false, bounds: [ bounds[0][0][0], bounds[0][0][1], bounds[0][2][0], bounds[0][2][1] ], - style: { - version: 8, - sources: { - basemap: { - type: 'raster', - tileSize: 256, - tiles: [ - `https://api.mapbox.com/styles/v1/ingalls/ckvh0wwm8g2cw15r05ozt0ybr/tiles/256/{z}/{x}/{y}@2x?access_token=${res.token}` - ] - } - }, - layers: [{ - id: 'background', - type: 'background', - paint: { - 'background-color': 'rgb(4,7,14)' - } - },{ - id: 'basemap', - type: 'raster', - source: 'basemap', - minzoom: 0, - maxzoom: 15 - }] - } - + style: 'https://api.protomaps.com/styles/v4/grayscale/en.json?key=' + res.protomaps_key, }); - tmpmap.addControl(new mapgl.AttributionControl({ - customAttribution: '© Mapbox | © OpenStreetMap Contributors' - })); tmpmap.addControl(new mapgl.NavigationControl(), 'bottom-right'); tmpmap.once('load', () => { diff --git a/api/web/src/components/util/Coverage.vue b/api/web/src/components/util/Coverage.vue index 7468862e..8a2d4471 100644 --- a/api/web/src/components/util/Coverage.vue +++ b/api/web/src/components/util/Coverage.vue @@ -112,40 +112,7 @@ export default { const opts = { container: this.$refs.map, hash: "map", - attributionControl: false, - style: { - version: 8, - sources: { - basemap: { - type: 'raster', - tileSize: 256, - tiles: [ - `https://api.mapbox.com/styles/v1/ingalls/ckvh0wwm8g2cw15r05ozt0ybr/tiles/256/{z}/{x}/{y}@2x?access_token=${res.token}` - ] - }, - coverage: { - type: 'vector', - tiles: [ - String(window.stdurl('/api')) + '/map/{z}/{x}/{y}.mvt' - ], - minzoom: 0, - maxzoom: 6 - }, - }, - layers: [{ - id: 'background', - type: 'background', - paint: { - 'background-color': 'rgb(4,7,14)' - } - },{ - id: 'basemap', - type: 'raster', - source: 'basemap', - minzoom: 0, - maxzoom: 15 - }] - } + style: 'https://api.protomaps.com/styles/v4/grayscale/en.json?key=' + res.protomaps_key, } @@ -153,9 +120,6 @@ export default { opts.zoom = 0; const tmpmap = new mapgl.Map(opts); - tmpmap.addControl(new mapgl.AttributionControl({ - customAttribution: '© Mapbox | © OpenStreetMap Contributors' - })); tmpmap.addControl(new mapgl.NavigationControl(), 'bottom-right'); tmpmap.once('idle', () => { map = tmpmap; From b15a035d5904acfb69b3e7fa201636e6065f2117 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Tue, 19 Nov 2024 21:27:04 -0600 Subject: [PATCH 22/33] Add back the coverage layer that I accidentally deleted --- api/web/src/components/util/Coverage.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/api/web/src/components/util/Coverage.vue b/api/web/src/components/util/Coverage.vue index 8a2d4471..811064c9 100644 --- a/api/web/src/components/util/Coverage.vue +++ b/api/web/src/components/util/Coverage.vue @@ -113,7 +113,6 @@ export default { container: this.$refs.map, hash: "map", style: 'https://api.protomaps.com/styles/v4/grayscale/en.json?key=' + res.protomaps_key, - } opts.center = [0, 0]; @@ -125,6 +124,15 @@ export default { map = tmpmap; if (this.bbox) map.fitBounds(this.bbox); + map.addSource('coverage', { + type: 'vector', + tiles: [ + String(window.stdurl('/api')) + '/map/{z}/{x}/{y}.mvt' + ], + minzoom: 0, + maxzoom: 6 + }) + map.addSource('features', { type: 'geojson', data: JSON.parse(JSON.stringify(this.features)) From 13adba0ef05998bd209e730e4e0f5bc8f66462e4 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Wed, 20 Nov 2024 22:57:32 -0600 Subject: [PATCH 23/33] Update batch-machine image --- task/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task/Dockerfile b/task/Dockerfile index c116bbfe..85d813a5 100644 --- a/task/Dockerfile +++ b/task/Dockerfile @@ -1,5 +1,5 @@ FROM node:22-alpine3.19 AS node -FROM 847904970422.dkr.ecr.us-east-1.amazonaws.com/batch-machine:9.6.0 +FROM 847904970422.dkr.ecr.us-east-1.amazonaws.com/batch-machine:9.7.0 COPY --from=node /usr/lib /usr/lib COPY --from=node /usr/local/share /usr/local/share From 8c3be8bddef4f0a6602b12819f31fb89a8895279 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Sat, 23 Nov 2024 10:06:01 -0600 Subject: [PATCH 24/33] Update batch-machine image --- task/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task/Dockerfile b/task/Dockerfile index 85d813a5..ad09b13e 100644 --- a/task/Dockerfile +++ b/task/Dockerfile @@ -1,5 +1,5 @@ FROM node:22-alpine3.19 AS node -FROM 847904970422.dkr.ecr.us-east-1.amazonaws.com/batch-machine:9.7.0 +FROM 847904970422.dkr.ecr.us-east-1.amazonaws.com/batch-machine:9.8.0 COPY --from=node /usr/lib /usr/lib COPY --from=node /usr/local/share /usr/local/share From d185ea5814ffd320b9935cf139460cf21763e676 Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Wed, 27 Nov 2024 20:57:28 -0600 Subject: [PATCH 25/33] Update oa package dependency to pull in updated schema --- task/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task/package.json b/task/package.json index 66c5547d..e81bcc6f 100644 --- a/task/package.json +++ b/task/package.json @@ -32,7 +32,7 @@ "minimist": "^1.2.5", "mkdirp": "^3.0.0", "npm": "^10.1.0", - "oa": "^5.5.0", + "oa": "^5.6.0", "ogr2ogr": "^2.1.1", "prompts": "^2.4.0", "request": "^2.88.2", From 548c892c0a1d71713417ed679db98640bedbbed9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 23:54:11 +0000 Subject: [PATCH 26/33] Bump path-to-regexp and express in /api Bumps [path-to-regexp](https://github.com/pillarjs/path-to-regexp) to 6.3.0 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together. Updates `path-to-regexp` from 0.1.10 to 6.3.0 - [Release notes](https://github.com/pillarjs/path-to-regexp/releases) - [Changelog](https://github.com/pillarjs/path-to-regexp/blob/master/History.md) - [Commits](https://github.com/pillarjs/path-to-regexp/compare/v0.1.10...v6.3.0) Updates `express` from 4.21.1 to 4.21.2 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.2/History.md) - [Commits](https://github.com/expressjs/express/compare/4.21.1...4.21.2) --- updated-dependencies: - dependency-name: path-to-regexp dependency-type: indirect - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- api/package-lock.json | 20 ++++++++++++-------- api/package.json | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/api/package-lock.json b/api/package-lock.json index 37f077c8..cf5c2922 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -31,7 +31,7 @@ "cors": "^2.8.5", "csv-stringify": "^6.0.0", "d3-queue": "^3.0.7", - "express": "^4.17.1", + "express": "^4.21.2", "express-minify": "^1.0.0", "json-schema-ref-parser": "^9.0.9", "jsonwebtoken": "^9.0.0", @@ -7676,9 +7676,9 @@ } }, "node_modules/express": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", - "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "license": "MIT", "dependencies": { "accepts": "~1.3.8", @@ -7700,7 +7700,7 @@ "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.10", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", "qs": "6.13.0", "range-parser": "~1.2.1", @@ -7715,6 +7715,10 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express-json-validator-middleware": { @@ -7747,9 +7751,9 @@ } }, "node_modules/express/node_modules/path-to-regexp": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", "license": "MIT" }, "node_modules/extend": { diff --git a/api/package.json b/api/package.json index 46fc762e..7b86f829 100644 --- a/api/package.json +++ b/api/package.json @@ -40,7 +40,7 @@ "cors": "^2.8.5", "csv-stringify": "^6.0.0", "d3-queue": "^3.0.7", - "express": "^4.17.1", + "express": "^4.21.2", "express-minify": "^1.0.0", "json-schema-ref-parser": "^9.0.9", "jsonwebtoken": "^9.0.0", From 6ea4cdc6991ece51d33d3f2c6f4ce394172c5d12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Dec 2024 12:20:58 +0000 Subject: [PATCH 27/33] Bump nanoid from 3.3.7 to 3.3.8 Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index fb0b2920..67b927d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4360,16 +4360,15 @@ "license": "MIT" }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "optional": true, "bin": { "nanoid": "bin/nanoid.cjs" From 551ebdd5924a23067b0d36241b122a030030431a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Dec 2024 13:29:29 +0000 Subject: [PATCH 28/33] Bump nanoid from 3.3.7 to 3.3.8 in /api/web Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] --- api/web/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/web/package-lock.json b/api/web/package-lock.json index 52602d4d..29bf05a6 100644 --- a/api/web/package-lock.json +++ b/api/web/package-lock.json @@ -2418,9 +2418,9 @@ "integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==" }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "funding": [ { "type": "github", From 0ef9ecdcb4b8bb7aaccbdfe1869c245066c1337e Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Sun, 19 Jan 2025 16:16:38 -0600 Subject: [PATCH 29/33] Convert the GeoJSON geometry to WKB --- api/package-lock.json | 4 +++- api/package.json | 3 ++- task/collect.js | 7 +++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/api/package-lock.json b/api/package-lock.json index 6633e00b..e6f61732 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -49,7 +49,8 @@ "swagger-ui-express": "^5.0.0", "tape": "^5.6.1", "tilebase": "^4.0.0", - "undici": "^6.0.0" + "undici": "^6.0.0", + "wkx": "^0.5.0" }, "devDependencies": { "@mapbox/mock-aws-sdk-js": "^1.0.0", @@ -13210,6 +13211,7 @@ "version": "0.5.0", "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.5.0.tgz", "integrity": "sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==", + "license": "MIT", "dependencies": { "@types/node": "*" } diff --git a/api/package.json b/api/package.json index 5b754c73..cebf6408 100644 --- a/api/package.json +++ b/api/package.json @@ -58,7 +58,8 @@ "swagger-ui-express": "^5.0.0", "tape": "^5.6.1", "tilebase": "^4.0.0", - "undici": "^6.0.0" + "undici": "^6.0.0", + "wkx": "^0.5.0" }, "devDependencies": { "@mapbox/mock-aws-sdk-js": "^1.0.0", diff --git a/task/collect.js b/task/collect.js index f97994d2..55b58673 100755 --- a/task/collect.js +++ b/task/collect.js @@ -19,6 +19,7 @@ import archiver from 'archiver'; import parquetjs from '@dsnp/parquetjs'; import minimist from 'minimist'; import { Transform } from 'stream'; +import wkx from 'wkx'; const s3 = new S3.S3Client({ region: process.env.AWS_DEFAULT_REGION @@ -322,7 +323,7 @@ function parquet_datas(tmp, datas, name) { return new Promise((resolve, reject) => { const schema = { source_name: { type: 'UTF8' }, - geometry: { type: 'blob' }, + geometry: { type: 'BINARY' }, id: { type: 'UTF8' }, pid: { type: 'UTF8' }, number: { type: 'UTF8' }, @@ -346,9 +347,11 @@ function parquet_datas(tmp, datas, name) { data_lines.on('data', (line) => { const record = JSON.parse(line); const properties = record.properties; + const wkbGeometry = wkx.Geometry.parseGeoJSON(record.geometry).toWkb(); + writer.appendRow({ source_name: data, - geometry: record.geometry, // TODO: Convert to WKB + geometry: wkbGeometry, id: properties.id, pid: properties.pid, number: properties.number, From 7dccb53e2da9d6e0069bcd0aacc0d31b1942d09b Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Mon, 20 Jan 2025 16:42:02 -0600 Subject: [PATCH 30/33] Add wkx to the base package.json too --- task/package-lock.json | 49 +++++++++++++++++++++++++++++++++++++----- task/package.json | 3 ++- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/task/package-lock.json b/task/package-lock.json index d0e3db7e..3d6d668f 100644 --- a/task/package-lock.json +++ b/task/package-lock.json @@ -28,13 +28,14 @@ "minimist": "^1.2.5", "mkdirp": "^3.0.0", "npm": "^10.1.0", - "oa": "^5.5.0", + "oa": "^5.6.0", "ogr2ogr": "^2.1.1", "prompts": "^2.4.0", "request": "^2.88.2", "split2": "^4.1.0", "tilebase": "^4.0.0", - "wellknown": "^0.5.0" + "wellknown": "^0.5.0", + "wkx": "^0.5.0" }, "devDependencies": { "eslint": "^9.0.0", @@ -4612,6 +4613,15 @@ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "license": "MIT" }, + "node_modules/@types/node": { + "version": "22.10.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz", + "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==", + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, "node_modules/abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -10311,6 +10321,8 @@ }, "node_modules/npm/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==", "inBundle": true, "license": "MIT", "dependencies": { @@ -10322,6 +10334,8 @@ }, "node_modules/npm/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==", "inBundle": true, "license": "MIT" }, @@ -10557,6 +10571,8 @@ }, "node_modules/npm/node_modules/imurmurhash": { "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "inBundle": true, "license": "MIT", "engines": { @@ -10645,6 +10661,8 @@ }, "node_modules/npm/node_modules/isexe": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "inBundle": true, "license": "ISC" }, @@ -11484,6 +11502,8 @@ }, "node_modules/npm/node_modules/path-key": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "inBundle": true, "license": "MIT", "engines": { @@ -11656,6 +11676,8 @@ }, "node_modules/npm/node_modules/shebang-command": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "inBundle": true, "license": "MIT", "dependencies": { @@ -11667,6 +11689,8 @@ }, "node_modules/npm/node_modules/shebang-regex": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "inBundle": true, "license": "MIT", "engines": { @@ -12418,9 +12442,9 @@ "license": "ISC" }, "node_modules/oa": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/oa/-/oa-5.5.0.tgz", - "integrity": "sha512-VMvkST5zJfa7Yy8wtvvSBzwCAwd/vJGm6jaEvFFIsV6OGufh2JJ5UgRDyMjXA4tBXA889OIDxfRDeIalmaXedw==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/oa/-/oa-5.7.0.tgz", + "integrity": "sha512-BUTmUJYVx7sxea5lFQdB2xrknu5oWjJDKwdKJOgWi5c0vzE1TbIgNWw0a1IPKvc3Vt/3C43TCuncsvopzRZDmg==", "license": "BSD", "dependencies": { "@apidevtools/json-schema-ref-parser": "^11.7.0", @@ -14904,6 +14928,12 @@ "through": "^2.3.8" } }, + "node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "license": "MIT" + }, "node_modules/unique-filename": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", @@ -15133,6 +15163,15 @@ "string-width": "^1.0.2 || 2 || 3 || 4" } }, + "node_modules/wkx": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.5.0.tgz", + "integrity": "sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==", + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", diff --git a/task/package.json b/task/package.json index e81bcc6f..94527970 100644 --- a/task/package.json +++ b/task/package.json @@ -38,7 +38,8 @@ "request": "^2.88.2", "split2": "^4.1.0", "tilebase": "^4.0.0", - "wellknown": "^0.5.0" + "wellknown": "^0.5.0", + "wkx": "^0.5.0" }, "devDependencies": { "eslint": "^9.0.0", From fb01c6dd645b8d71182340271a8e013047ff5c7c Mon Sep 17 00:00:00 2001 From: Ian Dees Date: Mon, 20 Jan 2025 16:57:47 -0600 Subject: [PATCH 31/33] Move dependencies to the right spot --- api/package.json | 3 +- task/collect.js | 8 +- task/package-lock.json | 396 +++++++++++++++++++++++++++++++++++++++++ task/package.json | 1 + 4 files changed, 402 insertions(+), 6 deletions(-) diff --git a/api/package.json b/api/package.json index b25809bc..7b86f829 100644 --- a/api/package.json +++ b/api/package.json @@ -58,8 +58,7 @@ "swagger-ui-express": "^5.0.0", "tape": "^5.6.1", "tilebase": "^4.0.0", - "undici": "^6.0.0", - "wkx": "^0.5.0" + "undici": "^6.0.0" }, "devDependencies": { "@mapbox/mock-aws-sdk-js": "^1.0.0", diff --git a/task/collect.js b/task/collect.js index 64aecee7..bb9dfd0f 100755 --- a/task/collect.js +++ b/task/collect.js @@ -14,7 +14,7 @@ import { mkdirp } from 'mkdirp'; import S3 from '@aws-sdk/client-s3'; import { Upload } from '@aws-sdk/lib-storage'; import archiver from 'archiver'; -import parquetjs from '@dsnp/parquetjs'; +import parquet from '@dsnp/parquetjs'; import minimist from 'minimist'; import { Transform } from 'stream'; import wkx from 'wkx'; @@ -318,7 +318,7 @@ function zip_datas(tmp, datas, name) { } function parquet_datas(tmp, datas, name) { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { const schema = { source_name: { type: 'UTF8' }, geometry: { type: 'BINARY' }, @@ -332,7 +332,7 @@ function parquet_datas(tmp, datas, name) { district: { type: 'UTF8' }, region: { type: 'UTF8' }, addrtype: { type: 'UTF8' }, - notes: { type: 'UTF8' }, + notes: { type: 'UTF8' } }; const writer = parquet.ParquetWriter.openFile(schema, path.resolve(tmp, `${name}.parquet`)); @@ -360,7 +360,7 @@ function parquet_datas(tmp, datas, name) { district: properties.district, region: properties.region, addrtype: properties.addrtype, - notes: properties.notes, + notes: properties.notes }); }); data_lines.on('end', () => { diff --git a/task/package-lock.json b/task/package-lock.json index 3d6d668f..313714cc 100644 --- a/task/package-lock.json +++ b/task/package-lock.json @@ -15,6 +15,7 @@ "@aws-sdk/client-s3": "^3.405.0", "@aws-sdk/client-secrets-manager": "^3.363.0", "@aws-sdk/lib-storage": "^3.405.0", + "@dsnp/parquetjs": "^1.8.5", "@openaddresses/lib": "^4.4.0", "@supercharge/promise-pool": "^3.0.0", "@turf/turf": "^6.3.0", @@ -1565,6 +1566,30 @@ "node": ">=6.9.0" } }, + "node_modules/@dsnp/parquetjs": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@dsnp/parquetjs/-/parquetjs-1.8.5.tgz", + "integrity": "sha512-7Vei5hvJ7LGpU+ZnQI7wgqaTNq47PI5YGap8f1p1OScpZ4Psh78xqzp1LByW6NREAiyUUBwNkypWaUpTYV73jg==", + "license": "MIT", + "dependencies": { + "@aws-sdk/client-s3": "^3.665.0", + "@types/node-int64": "^0.4.32", + "@types/thrift": "^0.10.17", + "@zenfs/core": "^1.0.2", + "brotli-wasm": "^3.0.1", + "bson": "6.8.0", + "int53": "^1.0.0", + "long": "^5.2.3", + "node-int64": "^0.4.0", + "snappyjs": "^0.7.0", + "thrift": "0.21.0", + "varint": "^6.0.0", + "xxhash-wasm": "^1.0.2" + }, + "engines": { + "node": ">=18.18.2" + } + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -4622,12 +4647,139 @@ "undici-types": "~6.20.0" } }, + "node_modules/@types/node-int64": { + "version": "0.4.32", + "resolved": "https://registry.npmjs.org/@types/node-int64/-/node-int64-0.4.32.tgz", + "integrity": "sha512-xf/JsSlnXQ+mzvc0IpXemcrO4BrCfpgNpMco+GLcXkFk01k/gW9lGJu+Vof0ZSvHK6DsHJDPSbjFPs36QkWXqw==", + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/q": { + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.8.tgz", + "integrity": "sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw==", + "license": "MIT" + }, + "node_modules/@types/readable-stream": { + "version": "4.0.18", + "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.18.tgz", + "integrity": "sha512-21jK/1j+Wg+7jVw1xnSwy/2Q1VgVjWuFssbYGTREPUBeZ+rqVFl2udq0IkxzPC0ZhOzVceUbyIACFZKLqKEBlA==", + "license": "MIT", + "dependencies": { + "@types/node": "*", + "safe-buffer": "~5.1.1" + } + }, + "node_modules/@types/readable-stream/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "license": "MIT" + }, + "node_modules/@types/thrift": { + "version": "0.10.17", + "resolved": "https://registry.npmjs.org/@types/thrift/-/thrift-0.10.17.tgz", + "integrity": "sha512-bDX6d5a5ZDWC81tgDv224n/3PKNYfIQJTPHzlbk4vBWJrYXF6Tg1ncaVmP/c3JbGN2AK9p7zmHorJC2D6oejGQ==", + "license": "MIT", + "dependencies": { + "@types/node": "*", + "@types/node-int64": "*", + "@types/q": "*" + } + }, + "node_modules/@xterm/xterm": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz", + "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==", + "license": "MIT", + "optional": true + }, + "node_modules/@zenfs/core": { + "version": "1.8.7", + "resolved": "https://registry.npmjs.org/@zenfs/core/-/core-1.8.7.tgz", + "integrity": "sha512-u4tHnTK30h0Ll5bqGZAbqrPiRAqtWicmN01rJ5zFiH539vtn0PiSKBidxYWVwoFVLut5t9EK5pAoucSnq++E2g==", + "license": "MIT", + "dependencies": { + "@types/node": "^22.10.1", + "@types/readable-stream": "^4.0.10", + "buffer": "^6.0.3", + "eventemitter3": "^5.0.1", + "readable-stream": "^4.5.2", + "utilium": "^1.1.1" + }, + "bin": { + "make-index": "scripts/make-index.js", + "zci": "scripts/ci-cli.js", + "zenfs-test": "scripts/test.js" + }, + "engines": { + "node": ">= 16" + }, + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/james-pre" + } + }, + "node_modules/@zenfs/core/node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, + "node_modules/@zenfs/core/node_modules/readable-stream": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", + "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", + "license": "MIT", + "dependencies": { + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10", + "string_decoder": "^1.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, "node_modules/abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "license": "ISC" }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "license": "MIT", + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, "node_modules/acorn": { "version": "8.12.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", @@ -5008,6 +5160,12 @@ "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", "license": "MIT" }, + "node_modules/async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", + "license": "MIT" + }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -5204,6 +5362,21 @@ "concat-map": "0.0.1" } }, + "node_modules/brotli-wasm": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/brotli-wasm/-/brotli-wasm-3.0.1.tgz", + "integrity": "sha512-U3K72/JAi3jITpdhZBqzSUq+DUY697tLxOuFXB+FpAE/Ug+5C3VZrv4uA674EUZHxNAuQ9wETXNqQkxZD6oL4A==", + "license": "Apache-2.0", + "engines": { + "node": ">=v18.0.0" + } + }, + "node_modules/browser-or-node": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/browser-or-node/-/browser-or-node-1.3.0.tgz", + "integrity": "sha512-0F2z/VSnLbmEeBcUrSuDH5l0HxTXdQQzLjkmBR4cYfvg1zJrKSlmIZFqyFR8oX0NrwPhy3c3HQ6i3OxMbew4Tg==", + "license": "MIT" + }, "node_modules/browserslist": { "version": "4.24.0", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz", @@ -5236,6 +5409,15 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, + "node_modules/bson": { + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.8.0.tgz", + "integrity": "sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==", + "license": "Apache-2.0", + "engines": { + "node": ">=16.20.1" + } + }, "node_modules/buffer": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz", @@ -6903,6 +7085,21 @@ "node": ">=0.10.0" } }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/eventemitter3": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", + "license": "MIT" + }, "node_modules/events": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", @@ -7912,6 +8109,12 @@ "node": ">=18" } }, + "node_modules/int53": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/int53/-/int53-1.0.0.tgz", + "integrity": "sha512-u8BMiMa05OPBgd32CKTead0CVTsFVgwFk23nNXo1teKPF6Sxcu0lXxEzP//zTcaKzXbGgPDXGmj/woyv+I4C5w==", + "license": "BSD-3-Clause" + }, "node_modules/internal-slot": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", @@ -8365,6 +8568,15 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "license": "ISC" }, + "node_modules/isomorphic-ws": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz", + "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==", + "license": "MIT", + "peerDependencies": { + "ws": "*" + } + }, "node_modules/isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", @@ -8802,6 +9014,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/long": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.4.tgz", + "integrity": "sha512-qtzLbJE8hq7VabR3mISmVGtoXP8KGc2Z/AT8OuqlYD7JTR3oqrgwdjnk07wpj1twXxYmgDXgoKVWUG/fReSzHg==", + "license": "Apache-2.0" + }, "node_modules/lru-cache": { "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", @@ -9322,6 +9540,12 @@ "node": ">=10" } }, + "node_modules/node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "license": "MIT" + }, "node_modules/node-preload": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", @@ -9523,6 +9747,8 @@ }, "node_modules/npm/node_modules/@isaacs/cliui": { "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", "inBundle": true, "license": "ISC", "dependencies": { @@ -9550,6 +9776,8 @@ }, "node_modules/npm/node_modules/@isaacs/cliui/node_modules/emoji-regex": { "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "inBundle": true, "license": "MIT" }, @@ -9571,6 +9799,8 @@ }, "node_modules/npm/node_modules/@isaacs/cliui/node_modules/strip-ansi": { "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "inBundle": true, "license": "MIT", "dependencies": { @@ -9835,6 +10065,8 @@ }, "node_modules/npm/node_modules/@pkgjs/parseargs": { "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", "inBundle": true, "license": "MIT", "optional": true, @@ -10078,6 +10310,8 @@ }, "node_modules/npm/node_modules/aggregate-error": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "inBundle": true, "license": "MIT", "dependencies": { @@ -10090,6 +10324,8 @@ }, "node_modules/npm/node_modules/ansi-regex": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "inBundle": true, "license": "MIT", "engines": { @@ -10098,6 +10334,8 @@ }, "node_modules/npm/node_modules/ansi-styles": { "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", "inBundle": true, "license": "MIT", "engines": { @@ -10119,6 +10357,8 @@ }, "node_modules/npm/node_modules/balanced-match": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "inBundle": true, "license": "MIT" }, @@ -10150,6 +10390,8 @@ }, "node_modules/npm/node_modules/brace-expansion": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "inBundle": true, "license": "MIT", "dependencies": { @@ -10260,6 +10502,8 @@ }, "node_modules/npm/node_modules/chownr": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", "inBundle": true, "license": "ISC", "engines": { @@ -10293,6 +10537,8 @@ }, "node_modules/npm/node_modules/clean-stack": { "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", "inBundle": true, "license": "MIT", "engines": { @@ -10413,11 +10659,15 @@ }, "node_modules/npm/node_modules/eastasianwidth": { "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", "inBundle": true, "license": "MIT" }, "node_modules/npm/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==", "inBundle": true, "license": "MIT" }, @@ -10432,6 +10682,8 @@ }, "node_modules/npm/node_modules/env-paths": { "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", "inBundle": true, "license": "MIT", "engines": { @@ -10440,6 +10692,8 @@ }, "node_modules/npm/node_modules/err-code": { "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", "inBundle": true, "license": "MIT" }, @@ -10458,6 +10712,8 @@ }, "node_modules/npm/node_modules/foreground-child": { "version": "3.3.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", "inBundle": true, "license": "ISC", "dependencies": { @@ -10503,6 +10759,8 @@ }, "node_modules/npm/node_modules/graceful-fs": { "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "inBundle": true, "license": "ISC" }, @@ -10548,6 +10806,8 @@ }, "node_modules/npm/node_modules/iconv-lite": { "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "inBundle": true, "license": "MIT", "optional": true, @@ -10581,6 +10841,8 @@ }, "node_modules/npm/node_modules/indent-string": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "inBundle": true, "license": "MIT", "engines": { @@ -10614,6 +10876,8 @@ }, "node_modules/npm/node_modules/ip-address": { "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", "inBundle": true, "license": "MIT", "dependencies": { @@ -10648,6 +10912,8 @@ }, "node_modules/npm/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==", "inBundle": true, "license": "MIT", "engines": { @@ -10656,6 +10922,8 @@ }, "node_modules/npm/node_modules/is-lambda": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", "inBundle": true, "license": "MIT" }, @@ -10668,6 +10936,8 @@ }, "node_modules/npm/node_modules/jackspeak": { "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", "inBundle": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -10682,6 +10952,8 @@ }, "node_modules/npm/node_modules/jsbn": { "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", "inBundle": true, "license": "MIT" }, @@ -10876,6 +11148,8 @@ }, "node_modules/npm/node_modules/lru-cache": { "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "inBundle": true, "license": "ISC" }, @@ -10902,6 +11176,8 @@ }, "node_modules/npm/node_modules/minimatch": { "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "inBundle": true, "license": "ISC", "dependencies": { @@ -10916,6 +11192,8 @@ }, "node_modules/npm/node_modules/minipass": { "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "inBundle": true, "license": "ISC", "engines": { @@ -10963,6 +11241,8 @@ }, "node_modules/npm/node_modules/minipass-flush": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", "inBundle": true, "license": "ISC", "dependencies": { @@ -10985,6 +11265,8 @@ }, "node_modules/npm/node_modules/minipass-pipeline": { "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", "inBundle": true, "license": "ISC", "dependencies": { @@ -11007,6 +11289,8 @@ }, "node_modules/npm/node_modules/minipass-sized": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", "inBundle": true, "license": "ISC", "dependencies": { @@ -11029,6 +11313,8 @@ }, "node_modules/npm/node_modules/minizlib": { "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "inBundle": true, "license": "MIT", "dependencies": { @@ -11052,6 +11338,8 @@ }, "node_modules/npm/node_modules/mkdirp": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "inBundle": true, "license": "MIT", "bin": { @@ -11440,6 +11728,8 @@ }, "node_modules/npm/node_modules/p-map": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "inBundle": true, "license": "MIT", "dependencies": { @@ -11512,6 +11802,8 @@ }, "node_modules/npm/node_modules/path-scurry": { "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "inBundle": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -11571,11 +11863,15 @@ }, "node_modules/npm/node_modules/promise-inflight": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", + "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", "inBundle": true, "license": "ISC" }, "node_modules/npm/node_modules/promise-retry": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", "inBundle": true, "license": "MIT", "dependencies": { @@ -11637,6 +11933,8 @@ }, "node_modules/npm/node_modules/retry": { "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", "inBundle": true, "license": "MIT", "engines": { @@ -11659,12 +11957,16 @@ }, "node_modules/npm/node_modules/safer-buffer": { "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "inBundle": true, "license": "MIT", "optional": true }, "node_modules/npm/node_modules/semver": { "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "inBundle": true, "license": "ISC", "bin": { @@ -11699,6 +12001,8 @@ }, "node_modules/npm/node_modules/signal-exit": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "inBundle": true, "license": "ISC", "engines": { @@ -11726,6 +12030,8 @@ }, "node_modules/npm/node_modules/smart-buffer": { "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", "inBundle": true, "license": "MIT", "engines": { @@ -11798,6 +12104,8 @@ }, "node_modules/npm/node_modules/sprintf-js": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", "inBundle": true, "license": "BSD-3-Clause" }, @@ -11814,6 +12122,8 @@ }, "node_modules/npm/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==", "inBundle": true, "license": "MIT", "dependencies": { @@ -11828,6 +12138,8 @@ "node_modules/npm/node_modules/string-width-cjs": { "name": "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==", "inBundle": true, "license": "MIT", "dependencies": { @@ -11841,6 +12153,8 @@ }, "node_modules/npm/node_modules/strip-ansi": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "inBundle": true, "license": "MIT", "dependencies": { @@ -11853,6 +12167,8 @@ "node_modules/npm/node_modules/strip-ansi-cjs": { "name": "strip-ansi", "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "inBundle": true, "license": "MIT", "dependencies": { @@ -11875,6 +12191,8 @@ }, "node_modules/npm/node_modules/tar": { "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "inBundle": true, "license": "ISC", "dependencies": { @@ -12159,6 +12477,8 @@ }, "node_modules/npm/node_modules/wrap-ansi": { "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", "inBundle": true, "license": "MIT", "dependencies": { @@ -12176,6 +12496,8 @@ "node_modules/npm/node_modules/wrap-ansi-cjs": { "name": "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==", "inBundle": true, "license": "MIT", "dependencies": { @@ -12217,6 +12539,8 @@ }, "node_modules/npm/node_modules/wrap-ansi/node_modules/emoji-regex": { "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "inBundle": true, "license": "MIT" }, @@ -12238,6 +12562,8 @@ }, "node_modules/npm/node_modules/wrap-ansi/node_modules/strip-ansi": { "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "inBundle": true, "license": "MIT", "dependencies": { @@ -12264,6 +12590,8 @@ }, "node_modules/npm/node_modules/yallist": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "inBundle": true, "license": "ISC" }, @@ -13249,6 +13577,15 @@ "node": ">= 0.8.0" } }, + "node_modules/process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "license": "MIT", + "engines": { + "node": ">= 0.6.0" + } + }, "node_modules/process-nextick-args": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", @@ -13933,6 +14270,12 @@ "npm": ">= 3.0.0" } }, + "node_modules/snappyjs": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/snappyjs/-/snappyjs-0.7.0.tgz", + "integrity": "sha512-u5iEEXkMe2EInQio6Wv9LWHOQYRDbD2O9hzS27GpT/lwfIQhTCnHCTqedqHIHe9ZcvQo+9au6vngQayipz1NYw==", + "license": "MIT" + }, "node_modules/socks": { "version": "2.8.3", "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", @@ -14588,6 +14931,22 @@ "dev": true, "license": "MIT" }, + "node_modules/thrift": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/thrift/-/thrift-0.21.0.tgz", + "integrity": "sha512-AW8rwHYjeqXisS8B1iwko2gkNMFwSRJ+bO/W0xTGqRspTD3lGHwZx438+pHdOJ3GwpRAnK7TKbjqPOrHAa7ZwQ==", + "license": "Apache-2.0", + "dependencies": { + "browser-or-node": "^1.2.1", + "isomorphic-ws": "^4.0.1", + "node-int64": "^0.4.0", + "q": "^1.5.0", + "ws": "^5.2.3" + }, + "engines": { + "node": ">= 10.18.0" + } + }, "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -15028,6 +15387,22 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "license": "MIT" }, + "node_modules/utilium": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/utilium/-/utilium-1.1.3.tgz", + "integrity": "sha512-Gip5dgsVHMy+7lf6m1l/2HJkUropZ4pIBRKxBqxw0Dtz8czcuhNyXFXywqdVnNekDaTzV7/CHYsnLPrPrvzMUA==", + "license": "MIT", + "dependencies": { + "eventemitter3": "^5.0.1" + }, + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/james-pre" + }, + "optionalDependencies": { + "@xterm/xterm": "^5.5.0" + } + }, "node_modules/uuid": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", @@ -15041,6 +15416,12 @@ "uuid": "dist/bin/uuid" } }, + "node_modules/varint": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz", + "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==", + "license": "MIT" + }, "node_modules/verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", @@ -15238,6 +15619,15 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "license": "ISC" }, + "node_modules/ws": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.4.tgz", + "integrity": "sha512-fFCejsuC8f9kOSu9FYaOw8CdO68O3h5v0lg4p74o8JqWpwTf9tniOD+nOB78aWoVSS6WptVUmDrp/KPsMVBWFQ==", + "license": "MIT", + "dependencies": { + "async-limiter": "~1.0.0" + } + }, "node_modules/xml2js": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz", @@ -15269,6 +15659,12 @@ "node": ">=0.4" } }, + "node_modules/xxhash-wasm": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-1.1.0.tgz", + "integrity": "sha512-147y/6YNh+tlp6nd/2pWq38i9h6mz/EuQ6njIrmW8D1BS5nCqs0P6DG+m6zTGnNz5I+uhZ0SHxBs9BsPrwcKDA==", + "license": "MIT" + }, "node_modules/y18n": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", diff --git a/task/package.json b/task/package.json index 94527970..a7f89537 100644 --- a/task/package.json +++ b/task/package.json @@ -19,6 +19,7 @@ "@aws-sdk/client-s3": "^3.405.0", "@aws-sdk/client-secrets-manager": "^3.363.0", "@aws-sdk/lib-storage": "^3.405.0", + "@dsnp/parquetjs": "^1.8.5", "@openaddresses/lib": "^4.4.0", "@supercharge/promise-pool": "^3.0.0", "@turf/turf": "^6.3.0", From 36ba9b91dd5198d1a939524b6d9b700470e4b676 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jan 2025 22:22:36 +0000 Subject: [PATCH 32/33] Bump undici from 6.20.1 to 6.21.1 in /api Bumps [undici](https://github.com/nodejs/undici) from 6.20.1 to 6.21.1. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](https://github.com/nodejs/undici/compare/v6.20.1...v6.21.1) --- updated-dependencies: - dependency-name: undici dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- api/package-lock.json | 8 ++++---- api/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/package-lock.json b/api/package-lock.json index cf5c2922..619a4a89 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -49,7 +49,7 @@ "swagger-ui-express": "^5.0.0", "tape": "^5.6.1", "tilebase": "^4.0.0", - "undici": "^6.0.0" + "undici": "^6.21.1" }, "devDependencies": { "@mapbox/mock-aws-sdk-js": "^1.0.0", @@ -14159,9 +14159,9 @@ "license": "MIT" }, "node_modules/undici": { - "version": "6.20.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.20.1.tgz", - "integrity": "sha512-AjQF1QsmqfJys+LXfGTNum+qw4S88CojRInG/6t31W/1fk6G59s92bnAvGz5Cmur+kQv2SURXEvvudLmbrE8QA==", + "version": "6.21.1", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.1.tgz", + "integrity": "sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==", "license": "MIT", "engines": { "node": ">=18.17" diff --git a/api/package.json b/api/package.json index 7b86f829..863e2e31 100644 --- a/api/package.json +++ b/api/package.json @@ -58,7 +58,7 @@ "swagger-ui-express": "^5.0.0", "tape": "^5.6.1", "tilebase": "^4.0.0", - "undici": "^6.0.0" + "undici": "^6.21.1" }, "devDependencies": { "@mapbox/mock-aws-sdk-js": "^1.0.0", From fb1c8e23769a6fc046cb68e78e6b5939338e438d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jan 2025 22:43:03 +0000 Subject: [PATCH 33/33] Bump vite from 5.4.11 to 5.4.14 in /api/web Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.11 to 5.4.14. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.4.14/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.14/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- api/web/package-lock.json | 9 +++++---- api/web/package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/api/web/package-lock.json b/api/web/package-lock.json index 29bf05a6..500f8187 100644 --- a/api/web/package-lock.json +++ b/api/web/package-lock.json @@ -28,7 +28,7 @@ "@vitejs/plugin-vue": "^5.0.0", "eslint": "^8.11.0", "eslint-plugin-vue": "^9.0.0", - "vite": "^5.4.11" + "vite": "^5.4.14" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -3131,10 +3131,11 @@ "dev": true }, "node_modules/vite": { - "version": "5.4.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz", - "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==", + "version": "5.4.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz", + "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==", "dev": true, + "license": "MIT", "dependencies": { "esbuild": "^0.21.3", "postcss": "^8.4.43", diff --git a/api/web/package.json b/api/web/package.json index d79902c0..d6f7fea3 100644 --- a/api/web/package.json +++ b/api/web/package.json @@ -28,7 +28,7 @@ "@vitejs/plugin-vue": "^5.0.0", "eslint": "^8.11.0", "eslint-plugin-vue": "^9.0.0", - "vite": "^5.4.11" + "vite": "^5.4.14" }, "eslintConfig": { "root": true,