From ca665c5382ab6d547f270c3f163d635fcd4fe141 Mon Sep 17 00:00:00 2001 From: wukko Date: Sat, 2 Nov 2024 21:19:19 +0600 Subject: [PATCH] api: replace psl with homegrown & up-to-date fork finally no more punycode warning --- api/package.json | 4 ++-- api/src/processing/services/tumblr.js | 2 +- api/src/processing/url.js | 2 +- pnpm-lock.yaml | 18 ++++++++++-------- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/api/package.json b/api/package.json index 46fbd3fe..beeea330 100644 --- a/api/package.json +++ b/api/package.json @@ -1,7 +1,7 @@ { "name": "@imput/cobalt-api", "description": "save what you love", - "version": "10.3", + "version": "10.3.1", "author": "imput", "exports": "./src/cobalt.js", "type": "module", @@ -25,6 +25,7 @@ "homepage": "https://github.com/imputnet/cobalt#readme", "dependencies": { "@datastructures-js/priority-queue": "^6.3.1", + "@imput/psl": "^2.0.4", "@imput/version-info": "workspace:^", "content-disposition-header": "0.6.0", "cors": "^2.8.5", @@ -37,7 +38,6 @@ "ipaddr.js": "2.2.0", "nanoid": "^4.0.2", "node-cache": "^5.1.2", - "psl": "1.9.0", "set-cookie-parser": "2.6.0", "undici": "^5.19.1", "url-pattern": "1.0.3", diff --git a/api/src/processing/services/tumblr.js b/api/src/processing/services/tumblr.js index b361b98c..2b8aa4ce 100644 --- a/api/src/processing/services/tumblr.js +++ b/api/src/processing/services/tumblr.js @@ -1,4 +1,4 @@ -import psl from "psl"; +import psl from "@imput/psl"; const API_KEY = 'jrsCWX1XDuVxAFO4GkK147syAoN8BJZ5voz8tS80bPcj26Vc5Z'; const API_BASE = 'https://api-http2.tumblr.com'; diff --git a/api/src/processing/url.js b/api/src/processing/url.js index 034a5d73..899005c0 100644 --- a/api/src/processing/url.js +++ b/api/src/processing/url.js @@ -1,4 +1,4 @@ -import psl from "psl"; +import psl from "@imput/psl"; import { strict as assert } from "node:assert"; import { env } from "../config.js"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef6b2538..5a96ed57 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,6 +13,9 @@ importers: '@datastructures-js/priority-queue': specifier: ^6.3.1 version: 6.3.1 + '@imput/psl': + specifier: ^2.0.4 + version: 2.0.4 '@imput/version-info': specifier: workspace:^ version: link:../packages/version-info @@ -49,9 +52,6 @@ importers: node-cache: specifier: ^5.1.2 version: 5.1.2 - psl: - specifier: 1.9.0 - version: 1.9.0 set-cookie-parser: specifier: 2.6.0 version: 2.6.0 @@ -543,6 +543,9 @@ packages: '@imput/libav.js-remux-cli@5.5.6': resolution: {integrity: sha512-XdAab90EZKf6ULtD/x9Y2bnlmNJodXSO6w8aWrn97+N2IRuOS8zv3tAFPRC69SWKa8Utjeu5YTYuTolnX3QprQ==} + '@imput/psl@2.0.4': + resolution: {integrity: sha512-vuy76JX78/DnJegLuJoLpMmw11JTA/9HvlIADg/f8dDVXyxbh0jnObL0q13h+WvlBO4Gk26Pu8sUa7/h0JGQig==} + '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} @@ -1866,9 +1869,6 @@ packages: resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==} engines: {node: '>= 0.10'} - psl@1.9.0: - resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} - punycode@2.3.1: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} @@ -2581,6 +2581,10 @@ snapshots: '@imput/libav.js-remux-cli@5.5.6': {} + '@imput/psl@2.0.4': + dependencies: + punycode: 2.3.1 + '@isaacs/cliui@8.0.2': dependencies: string-width: 5.1.2 @@ -3871,8 +3875,6 @@ snapshots: forwarded: 0.2.0 ipaddr.js: 1.9.1 - psl@1.9.0: {} - punycode@2.3.1: {} qs@6.13.0: