diff --git a/data/synonyms.csv b/data/synonyms.csv index 60ac9a4..12333a5 100644 --- a/data/synonyms.csv +++ b/data/synonyms.csv @@ -640,6 +640,7 @@ Elytrigia intermedia,Elymus hispidus Elytrigia pontica subsp. pontica,Elymus ponticus Elytrigia pontica,Elymus ponticus Emmenanthe penduliflora var. rosea,Emmenanthe rosea,INAT +Emmenanthe rosea,Emmenanthe rosea,INAT Ephedra nevadensis subvar. pluribracteata,Ephedra viridis Ephedra nevadensis var. viridis,Ephedra viridis Epilobium adenocaulon var. holosericeum,Epilobium ciliatum subsp. ciliatum @@ -2022,6 +2023,7 @@ Taxus brevifolia var. reptaneta,Taxus brevifolia Tetragonia expansa,Tetragonia tetragonoides Teutliopsis patula,Atriplex patula Thalictrum polycarpum,Thalictrum fendleri var. polycarpum +Thalictrum polycarpum,Thalictrum fendleri var. polycarpum,INAT Thelypodium flavescens,Caulanthus flavescens Thelypodium lasiophyllum var. inalienum,Caulanthus lasiophyllus Thelypodium lasiophyllum var. lasiophyllum,Caulanthus lasiophyllus diff --git a/data/taxa.csv b/data/taxa.csv index 8efafff..43709db 100644 --- a/data/taxa.csv +++ b/data/taxa.csv @@ -249,7 +249,7 @@ Bromus madritensis,Spanish brome,X,16263,1207,52707 Bromus pseudolaevipes,woodland brome,N,16275,1211,75908,Coast Range Brome Bromus racemosus,smooth brome,X,16278,11440,75909 Bromus rubens,foxtail chess,X,16281,13634,59210 -Bromus sitchensis var. carinatus,California brome,N,108589,13623,52700 +Bromus sitchensis var. carinatus,California brome,N,108589,13623,52700,Sitka Brome Bromus sitchensis var. marginatus,mountain brome,N,108590,13624,159467 Bromus sitchensis var. maritimus,maritime brome,N,108591,13625,71142 Bromus sterilis,poverty brome,X,16288,1216,57163 @@ -644,7 +644,7 @@ Elymus stebbinsii,,N,101964,2944,63331,Stebbins' Wheat Grass Elymus trachycaulus subsp. trachycaulus,slender wheatgrass,N,50280,2947,636557,Slender Wheatgrass Elymus triticoides,,N,24181,11648,57184,Creeping Wild Rye Emmenanthe penduliflora,whispering bells,N,24223,2956,58173,Whispering Bells,annual,"white,yellow",4,7 -Emmenanthe rosea,,N,24224,14564,58919 +Emmenanthe rosea,,N,24224,14564,1597339 Enemion occidentale,,N,24250,9551,76818,Western Rue-anemone Enemion stipitatum,,N,24252,9552,76819,Siskiyou Rue-anemone Ephedra californica,,N,24275,2972,57890,California Jointfir @@ -1534,7 +1534,7 @@ Rhamnus crocea,spiny redberry,N,41069,7075,57243,Spiny Redberry Rhamnus ilicifolia,holly-leaf redberry,N,41070,7076,58308,Hollyleaf Redberry Rhaponticum repens,Russian knapweed,X,103802,13621,339502 Rhinotropis californica,California milkwort,N,107535,14636,876453 -Rhus aromatica,skunkbrush,N,41175,11056,58738,Sourberry +Rhus aromatica,skunkbrush,N,41175,11056,58738,Fragrant Sumac Ribes amarum,bitter gooseberry,N,41372,7099,53433,Bitter Gooseberry Ribes aureum var. gracillimum,golden currant,N,65126,7104,55547,Golden Currant,perennial,yellow,2,5 Ribes californicum var. californicum,hillside gooseberry,N,65128,7108,47128,Hillside Gooseberry,perennial,white,2,3 @@ -1765,7 +1765,7 @@ Taxus brevifolia,,N,46109,7929,55209,Pacific Yew Tellima grandiflora,fringe cups,N,46142,7931,51655,Bigflower Tellima Tetragonia tetragonoides,New Zealand spinach,X,99693,13131,418653 Tetrapteron graciliflorum,hill suncup,N,89236,12088,79338,Hill Sun Cup -Thalictrum fendleri var. polycarpum,meadow-rue,N,67038,7951,53301,Torrey's Meadow Rue +Thalictrum fendleri var. polycarpum,meadow-rue,N,67038,7951,1597704,Torrey's Meadow Rue Thermopsis californica var. californica,,N,80225,9256,81420,California Goldenbanner,perennial,yellow,5,6 Thysanocarpus curvipes,fringepod,N,46552,7984,58088,Hairy Lacepod,,white,2,6 Thysanocarpus laciniatus,lacepod,N,46555,7985,58090,Narrowleaf Fringe Pod,,white,3,5 diff --git a/lib/tools/rpi.js b/lib/tools/rpi.js index 038ad35..26ba541 100644 --- a/lib/tools/rpi.js +++ b/lib/tools/rpi.js @@ -57,7 +57,7 @@ class RPI { const options = { headers: { cookie: headers.get("set-cookie") } }; await Files.fetch( - "https://rareplants.cnps.org/PlantExport/SearchResults", + "https://rareplants.cnps.org/PlantExport/ExportResults", filePath, options, ); diff --git a/package-lock.json b/package-lock.json index f27cafc..f284c34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,40 +1,41 @@ { "name": "@ca-plant-list/ca-plant-list", - "version": "0.4.14", + "version": "0.4.16", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@ca-plant-list/ca-plant-list", - "version": "0.4.14", + "version": "0.4.16", "license": "MIT", "dependencies": { "archiver": "^5.3.1", "cli-progress": "^3.12.0", "commander": "^12.1.0", - "csv-parse": "^5.3.1", - "csv-stringify": "^6.5.1", + "csv-parse": "^5.6.0", + "csv-stringify": "^6.5.2", + "exceljs": "^4.4.0", "image-size": "^1.1.1", "markdown-it": "^14.1.0", "sharp": "^0.33.5", "svgo-ll": "^5.6.0", - "unzipper": "^0.10.11" + "unzipper": "^0.12.3" }, "bin": { "ca-plant-book": "scripts/build-ebook.js", "ca-plant-list": "scripts/build-site.js", "cpl-photos": "scripts/cpl-photos.js", - "cpl-tools": "scripts/cpl-tools.js" + "cpl-tools": "scripts/cpl-tools.js", + "inatobsphotos": "scripts/inatobsphotos.js" }, "devDependencies": { "@htmltools/scrape": "^0.1.0", "@types/archiver": "^6.0.2", "@types/cli-progress": "^3.11.6", "@types/markdown-it": "^14.1.2", - "@types/node": "^22.10.2", + "@types/node": "^22.10.3", "@types/unzipper": "^0.10.9", "eslint": "^9.17.0", - "exceljs": "^4.4.0", "prettier": "^3.4.2", "typescript": "^5.7.2" } @@ -221,7 +222,6 @@ "version": "4.3.5", "resolved": "https://registry.npmjs.org/@fast-csv/format/-/format-4.3.5.tgz", "integrity": "sha512-8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A==", - "dev": true, "license": "MIT", "dependencies": { "@types/node": "^14.0.1", @@ -236,14 +236,12 @@ "version": "14.18.63", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz", "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==", - "dev": true, "license": "MIT" }, "node_modules/@fast-csv/parse": { "version": "4.3.6", "resolved": "https://registry.npmjs.org/@fast-csv/parse/-/parse-4.3.6.tgz", "integrity": "sha512-uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA==", - "dev": true, "license": "MIT", "dependencies": { "@types/node": "^14.0.1", @@ -259,7 +257,6 @@ "version": "14.18.63", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz", "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==", - "dev": true, "license": "MIT" }, "node_modules/@htmltools/scrape": { @@ -770,9 +767,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.10.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz", - "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==", + "version": "22.10.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.3.tgz", + "integrity": "sha512-DifAyw4BkrufCILvD3ucnuN8eydUfc/C1GlyrnI+LK6543w5/L3VeVgf05o3B4fqSXP1dKYLOZsKfutpxPzZrw==", "dev": true, "license": "MIT", "dependencies": { @@ -989,9 +986,9 @@ } }, "node_modules/bluebird": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", - "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==", + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", "license": "MIT" }, "node_modules/boolbase": { @@ -1314,22 +1311,21 @@ "license": "CC0-1.0" }, "node_modules/csv-parse": { - "version": "5.5.6", - "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-5.5.6.tgz", - "integrity": "sha512-uNpm30m/AGSkLxxy7d9yRXpJQFrZzVWLFBkS+6ngPcZkw/5k3L/jjFuj7tVnEpRn+QgmiXr21nDlhCiUK4ij2A==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-5.6.0.tgz", + "integrity": "sha512-l3nz3euub2QMg5ouu5U09Ew9Wf6/wQ8I++ch1loQ0ljmzhmfZYrH9fflS22i/PQEvsPvxCwxgz5q7UB8K1JO4Q==", "license": "MIT" }, "node_modules/csv-stringify": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-6.5.1.tgz", - "integrity": "sha512-+9lpZfwpLntpTIEpFbwQyWuW/hmI/eHuJZD1XzeZpfZTqkf1fyvBbBLXTJJMsBuuS11uTShMqPwzx4A6ffXgRQ==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-6.5.2.tgz", + "integrity": "sha512-RFPahj0sXcmUyjrObAK+DOWtMvMIFV328n4qZJhgX3x2RqkQgOTU2mCUmiFR0CzM6AzChlRSUErjiJeEt8BaQA==", "license": "MIT" }, "node_modules/dayjs": { "version": "1.11.13", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==", - "dev": true, "license": "MIT" }, "node_modules/debug": { @@ -1706,7 +1702,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/exceljs/-/exceljs-4.4.0.tgz", "integrity": "sha512-XctvKaEMaj1Ii9oDOqbW/6e1gXknSY4g/aLCDicOXqBE4M0nRWkUu0PTp++UPNzoFY12BNHMfs/VadKIS6llvg==", - "dev": true, "license": "MIT", "dependencies": { "archiver": "^5.0.0", @@ -1723,11 +1718,64 @@ "node": ">=8.3.0" } }, + "node_modules/exceljs/node_modules/bluebird": { + "version": "3.4.7", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", + "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==", + "license": "MIT" + }, + "node_modules/exceljs/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/exceljs/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/exceljs/node_modules/unzipper": { + "version": "0.10.14", + "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.14.tgz", + "integrity": "sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==", + "license": "MIT", + "dependencies": { + "big-integer": "^1.6.17", + "binary": "~0.3.0", + "bluebird": "~3.4.1", + "buffer-indexof-polyfill": "~1.0.0", + "duplexer2": "~0.1.4", + "fstream": "^1.0.12", + "graceful-fs": "^4.2.2", + "listenercount": "~1.0.1", + "readable-stream": "~2.3.6", + "setimmediate": "~1.0.4" + } + }, + "node_modules/exceljs/node_modules/unzipper/node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, "node_modules/fast-csv": { "version": "4.3.6", "resolved": "https://registry.npmjs.org/fast-csv/-/fast-csv-4.3.6.tgz", "integrity": "sha512-2RNSpuwwsJGP0frGsOmTb9oUF+VkFSM4SyLTDgwf2ciHWTarN0lQTC+F2f/t5J9QjW+c65VFIAAu85GsvMIusw==", - "dev": true, "license": "MIT", "dependencies": { "@fast-csv/format": "4.3.5", @@ -1815,6 +1863,20 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "license": "MIT" }, + "node_modules/fs-extra": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -2021,7 +2083,6 @@ "version": "3.0.6", "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", - "dev": true, "license": "MIT" }, "node_modules/import-fresh": { @@ -2133,11 +2194,22 @@ "dev": true, "license": "MIT" }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "license": "MIT", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, "node_modules/jszip": { "version": "3.10.1", "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", - "dev": true, "license": "(MIT OR GPL-3.0-or-later)", "dependencies": { "lie": "~3.3.0", @@ -2150,7 +2222,6 @@ "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", @@ -2166,14 +2237,12 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, "license": "MIT" }, "node_modules/jszip/node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" @@ -2249,7 +2318,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", - "dev": true, "license": "MIT", "dependencies": { "immediate": "~3.0.5" @@ -2302,7 +2370,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==", - "dev": true, "license": "MIT" }, "node_modules/lodash.flatten": { @@ -2315,35 +2382,30 @@ "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz", "integrity": "sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==", - "dev": true, "license": "MIT" }, "node_modules/lodash.isboolean": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==", - "dev": true, "license": "MIT" }, "node_modules/lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", - "dev": true, "license": "MIT" }, "node_modules/lodash.isfunction": { "version": "3.0.9", "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==", - "dev": true, "license": "MIT" }, "node_modules/lodash.isnil": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/lodash.isnil/-/lodash.isnil-4.0.0.tgz", "integrity": "sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng==", - "dev": true, "license": "MIT" }, "node_modules/lodash.isplainobject": { @@ -2356,7 +2418,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz", "integrity": "sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA==", - "dev": true, "license": "MIT" }, "node_modules/lodash.merge": { @@ -2376,7 +2437,6 @@ "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==", - "dev": true, "license": "MIT" }, "node_modules/markdown-it": { @@ -2461,6 +2521,12 @@ "dev": true, "license": "MIT" }, + "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/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -2545,7 +2611,6 @@ "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "dev": true, "license": "(MIT AND Zlib)" }, "node_modules/parent-module": { @@ -2777,7 +2842,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", - "dev": true, "license": "ISC", "dependencies": { "xmlchars": "^2.2.0" @@ -2996,7 +3060,6 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", - "dev": true, "license": "MIT", "engines": { "node": ">=14.14" @@ -3117,52 +3180,26 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/unzipper": { - "version": "0.10.14", - "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.14.tgz", - "integrity": "sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==", - "license": "MIT", - "dependencies": { - "big-integer": "^1.6.17", - "binary": "~0.3.0", - "bluebird": "~3.4.1", - "buffer-indexof-polyfill": "~1.0.0", - "duplexer2": "~0.1.4", - "fstream": "^1.0.12", - "graceful-fs": "^4.2.2", - "listenercount": "~1.0.1", - "readable-stream": "~2.3.6", - "setimmediate": "~1.0.4" - } - }, - "node_modules/unzipper/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "engines": { + "node": ">= 10.0.0" } }, - "node_modules/unzipper/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/unzipper/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "node_modules/unzipper": { + "version": "0.12.3", + "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.12.3.tgz", + "integrity": "sha512-PZ8hTS+AqcGxsaQntl3IRBw65QrBI6lxzqDEL7IAo/XCEqRTKGfOX56Vea5TH9SZczRVxuzk1re04z/YjuYCJA==", "license": "MIT", "dependencies": { - "safe-buffer": "~5.1.0" + "bluebird": "~3.7.2", + "duplexer2": "~0.1.4", + "fs-extra": "^11.2.0", + "graceful-fs": "^4.2.2", + "node-int64": "^0.4.0" } }, "node_modules/uri-js": { @@ -3185,7 +3222,6 @@ "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true, "license": "MIT", "bin": { "uuid": "dist/bin/uuid" @@ -3283,7 +3319,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", - "dev": true, "license": "MIT" }, "node_modules/yocto-queue": { diff --git a/package.json b/package.json index 70205c1..0da56f4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ca-plant-list/ca-plant-list", - "version": "0.4.16", + "version": "0.4.17", "description": "Tools to create Jekyll files for a website listing plants in an area of California.", "license": "MIT", "repository": { @@ -38,23 +38,23 @@ "archiver": "^5.3.1", "cli-progress": "^3.12.0", "commander": "^12.1.0", - "csv-parse": "^5.3.1", - "csv-stringify": "^6.5.1", + "csv-parse": "^5.6.0", + "csv-stringify": "^6.5.2", + "exceljs": "^4.4.0", "image-size": "^1.1.1", "markdown-it": "^14.1.0", "sharp": "^0.33.5", "svgo-ll": "^5.6.0", - "unzipper": "^0.10.11" + "unzipper": "^0.12.3" }, "devDependencies": { "@htmltools/scrape": "^0.1.0", "@types/archiver": "^6.0.2", "@types/cli-progress": "^3.11.6", "@types/markdown-it": "^14.1.2", - "@types/node": "^22.10.2", + "@types/node": "^22.10.3", "@types/unzipper": "^0.10.9", "eslint": "^9.17.0", - "exceljs": "^4.4.0", "prettier": "^3.4.2", "typescript": "^5.7.2" }