[cli] Replace psl with tldts (#12174)

`psl` is one of the deps causing the `punycode` deprecation warning on
Node 22. [The newest version includes the deprecation
warning](lupomontero/psl#323), so we can't
just update `psl`.

Inspired by salesforce/tough-cookie#346.

.changeset/itchy-books-switch.md

@@ -0,0 +1,5 @@
+---
+'vercel': patch
+---
+
+Replace `psl` with `tldts` for domain parsing

packages/cli/package.json

@@ -82,7 +82,6 @@
     "@types/node-fetch": "2.5.10",
     "@types/npm-package-arg": "6.1.0",
     "@types/pluralize": "0.0.29",
-    "@types/psl": "1.1.0",
     "@types/qs": "6.9.7",
     "@types/semver": "6.0.1",
     "@types/split2": "4.2.3",
@@ -155,7 +154,6 @@
     "promisepipe": "3.0.0",
     "proxy": "2.0.0",
     "proxy-agent": "6.3.0",
-    "psl": "1.1.31",
     "qr-image": "3.2.0",
     "raw-body": "2.4.1",
     "rimraf": "3.0.2",
@@ -166,6 +164,7 @@
     "supports-hyperlinks": "3.0.0",
     "tar-fs": "1.16.3",
     "title": "3.4.1",
+    "tldts": "6.1.47",
     "tmp-promise": "1.0.3",
     "tree-kill": "1.2.2",
     "ts-node": "10.9.1",

packages/cli/src/commands/certs/issue.ts

@@ -1,4 +1,4 @@
-import { parse } from 'psl';
+import { getSubdomain } from 'tldts';
 import chalk from 'chalk';
 
 import { Output } from '../../util/output';
@@ -175,14 +175,12 @@ async function runStartOrder(
   );
   const [header, ...rows] = dnsTable(
     pendingChallenges.map(challenge => {
-      const parsedDomain = parse(challenge.domain);
-      if (parsedDomain.error) {
+      const subdomain = getSubdomain(challenge.domain);
+      if (!subdomain) {
         throw new ERRORS.InvalidDomain(challenge.domain);
       }
       return [
-        parsedDomain.subdomain
-          ? `_acme-challenge.${parsedDomain.subdomain}`
-          : `_acme-challenge`,
+        subdomain ? `_acme-challenge.${subdomain}` : `_acme-challenge`,
         'TXT',
         challenge.value,
       ];

packages/cli/src/commands/domains/buy.ts

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import psl from 'psl';
+import { parse } from 'tldts';
 
 import * as ERRORS from '../../util/errors-ts';
 import Client from '../../util/client';
@@ -33,11 +33,7 @@ export default async function buy(
     return 1;
   }
 
-  const parsedDomain = psl.parse(domainName);
-  if (parsedDomain.error) {
-    output.error(`The provided domain name ${param(domainName)} is invalid`);
-    return 1;
-  }
+  const parsedDomain = parse(domainName);
 
   const { domain: rootDomain, subdomain } = parsedDomain;
   if (subdomain || !rootDomain) {

packages/cli/src/util/certs/get-wildcard-cns-for-alias.ts

@@ -1,4 +1,4 @@
-import psl from 'psl';
+import { parse } from 'tldts';
 import { InvalidDomain } from '../errors-ts';
 import isWildcardAlias from '../alias/is-wildcard-alias';
 import extractDomain from '../alias/extract-domain';
@@ -8,10 +8,7 @@ export default function getWildcardCNSForAlias(alias: string) {
     return [extractDomain(alias), alias];
   }
 
-  const parsedDomain = psl.parse(alias);
-  if (parsedDomain.error) {
-    throw new InvalidDomain(alias);
-  }
+  const parsedDomain = parse(alias);
 
   const { domain, subdomain } = parsedDomain;
   if (!domain) {

packages/cli/src/util/certs/handle-cert-error.ts

@@ -1,5 +1,5 @@
 import ms from 'ms';
-import { parse } from 'psl';
+import { parse } from 'tldts';
 import chalk from 'chalk';
 import * as ERRORS from '../errors-ts';
 import { Output } from '../output';
@@ -55,7 +55,7 @@ export default function handleCertError<T>(
         `${dnsTable(
           cns.map(cn => {
             const parsed = parse(cn);
-            return !parsed.error && parsed.subdomain
+            return parsed.subdomain
               ? [parsed.subdomain, 'ALIAS', 'alias.vercel.com']
               : ['', 'ALIAS', 'alias.vercel.com'];
           })

packages/cli/src/util/deploy/generate-cert-for-deploy.ts

@@ -1,4 +1,4 @@
-import psl from 'psl';
+import { parse } from 'tldts';
 import { NowError } from '../now-error';
 import Client from '../client';
 import createCertForCns from '../certs/create-cert-for-cns';
@@ -11,11 +11,7 @@ export default async function generateCertForDeploy(
   deployURL: string
 ) {
   const { output } = client;
-  const parsedDomain = psl.parse(deployURL);
-  if (parsedDomain.error) {
-    return new InvalidDomain(deployURL, parsedDomain.error.message);
-  }
-
+  const parsedDomain = parse(deployURL);
   const { domain } = parsedDomain;
   if (!domain) {
     return new InvalidDomain(deployURL);

packages/cli/src/util/domains/setup-domain.ts

@@ -1,4 +1,4 @@
-import psl from 'psl';
+import { parse } from 'tldts';
 import { NowError } from '../now-error';
 import type { Domain } from '@vercel-internals/types';
 import { Output } from '../output';
@@ -45,10 +45,7 @@ export default async function setupDomain(
     output.debug(
       `Domain ${aliasDomain} is not available to be purchased. Trying to add it`
     );
-    const parsedDomain = psl.parse(aliasDomain);
-    if (parsedDomain.error) {
-      return new ERRORS.InvalidDomain(alias, parsedDomain.error.message);
-    }
+    const parsedDomain = parse(aliasDomain);
     if (!parsedDomain.domain) {
       return new ERRORS.InvalidDomain(alias);
     }

packages/cli/src/util/is-root-domain.ts

@@ -1,10 +1,7 @@
-import psl from 'psl';
+import { parse } from 'tldts';
 
 export default function isRootDomain(domainName: string) {
-  const parsedDomain = psl.parse(domainName);
-  if (parsedDomain.error) {
-    return false;
-  }
+  const parsedDomain = parse(domainName);
   const { domain: rootDomain, subdomain } = parsedDomain;
   return Boolean(!subdomain && rootDomain);
 }