netlify-cli 17.3.1 → 17.4.0

package/src/utils/read-repo-url.mjs

@@ -1,61 +1,62 @@
-// @ts-check
-import url from 'url'
-
-import fetch from 'node-fetch'
-
+import url from 'url';
+// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'node... Remove this comment to see the full error message
+import fetch from 'node-fetch';
 // supported repo host types
-const GITHUB = 'GitHub'
-
+const GITHUB = 'GitHub';
 /**
  * @param {string} _url
  * Takes a url like https://github.com/netlify-labs/all-the-functions/tree/master/functions/9-using-middleware
  * and returns https://api.github.com/repos/netlify-labs/all-the-functions/contents/functions/9-using-middleware
  */
+// @ts-expect-error TS(7006) FIXME: Parameter '_url' implicitly has an 'any' type.
 export const readRepoURL = async function (_url) {
-  // TODO: use `url.URL()` instead
-  // eslint-disable-next-line n/no-deprecated-api
-  const URL = url.parse(_url)
-  const repoHost = validateRepoURL(_url)
-  if (repoHost !== GITHUB) throw new Error('only GitHub repos are supported for now')
-  const [ownerAndRepo, contentsPath] = parseRepoURL(repoHost, URL)
-  const folderContents = await getRepoURLContents(repoHost, ownerAndRepo, contentsPath)
-  return folderContents
-}
-
+    // TODO: use `url.URL()` instead
+    // eslint-disable-next-line n/no-deprecated-api
+    const URL = url.parse(_url);
+    const repoHost = validateRepoURL(_url);
+    if (repoHost !== GITHUB)
+        throw new Error('only GitHub repos are supported for now');
+    const [ownerAndRepo, contentsPath] = parseRepoURL(repoHost, URL);
+    const folderContents = await getRepoURLContents(repoHost, ownerAndRepo, contentsPath);
+    return folderContents;
+};
+// @ts-expect-error TS(7006) FIXME: Parameter 'repoHost' implicitly has an 'any' type.
 const getRepoURLContents = async function (repoHost, ownerAndRepo, contentsPath) {
-  // naive joining strategy for now
-  if (repoHost === GITHUB) {
-    // https://developer.github.com/v3/repos/contents/#get-contents
-    const APIURL = `https://api.github.com/repos/${ownerAndRepo}/contents/${contentsPath}`
-    try {
-      const res = await fetch(APIURL)
-      return await res.json()
-    } catch (error) {
-      console.error(`Error occurred while fetching ${APIURL}`, error)
+    // naive joining strategy for now
+    if (repoHost === GITHUB) {
+        // https://developer.github.com/v3/repos/contents/#get-contents
+        const APIURL = `https://api.github.com/repos/${ownerAndRepo}/contents/${contentsPath}`;
+        try {
+            const res = await fetch(APIURL);
+            return await res.json();
+        }
+        catch (error) {
+            console.error(`Error occurred while fetching ${APIURL}`, error);
+        }
     }
-  }
-  throw new Error('unsupported host ', repoHost)
-}
-
+    throw new Error('unsupported host ', repoHost);
+};
 /**
  * @param {string} _url
  */
+// @ts-expect-error TS(7006) FIXME: Parameter '_url' implicitly has an 'any' type.
 export const validateRepoURL = function (_url) {
-  // TODO: use `url.URL()` instead
-  // eslint-disable-next-line n/no-deprecated-api
-  const URL = url.parse(_url)
-  if (URL.host !== 'github.com') return null
-  // other validation logic here
-  return GITHUB
-}
-
+    // TODO: use `url.URL()` instead
+    // eslint-disable-next-line n/no-deprecated-api
+    const URL = url.parse(_url);
+    if (URL.host !== 'github.com')
+        return null;
+    // other validation logic here
+    return GITHUB;
+};
+// @ts-expect-error TS(7006) FIXME: Parameter 'repoHost' implicitly has an 'any' type.
 export const parseRepoURL = function (repoHost, URL) {
-  // naive splitting strategy for now
-  if (repoHost === GITHUB) {
-    // https://developer.github.com/v3/repos/contents/#get-contents
-    // what if it's not master? note that our contents retrieval may assume it is master
-    const [ownerAndRepo, contentsPath] = URL.path.slice(1).split('/tree/master/')
-    return [ownerAndRepo, contentsPath]
-  }
-  throw new Error(`Unsupported host ${repoHost}`)
-}
+    // naive splitting strategy for now
+    if (repoHost === GITHUB) {
+        // https://developer.github.com/v3/repos/contents/#get-contents
+        // what if it's not master? note that our contents retrieval may assume it is master
+        const [ownerAndRepo, contentsPath] = URL.path.slice(1).split('/tree/master/');
+        return [ownerAndRepo, contentsPath];
+    }
+    throw new Error(`Unsupported host ${repoHost}`);
+};

package/src/utils/redirects.mjs

@@ -1,58 +1,58 @@
-// @ts-check
-import { parseAllRedirects } from 'netlify-redirect-parser'
-
-import { NETLIFYDEVERR, log } from './command-helpers.mjs'
-
+import { parseAllRedirects } from 'netlify-redirect-parser';
+import { NETLIFYDEVERR, log } from './command-helpers.mjs';
 // Parse, normalize and validate all redirects from `_redirects` files
 // and `netlify.toml`
+// @ts-expect-error TS(7031) FIXME: Binding element 'configPath' implicitly has an 'an... Remove this comment to see the full error message
 export const parseRedirects = async function ({ configPath, redirectsFiles }) {
-  const { errors, redirects } = await parseAllRedirects({
-    redirectsFiles,
-    netlifyConfigPath: configPath,
-    minimal: false,
-  })
-  handleRedirectParsingErrors(errors)
-  return redirects.map(normalizeRedirect)
-}
-
+    // @ts-expect-error TS(2345) FIXME: Argument of type '{ redirectsFiles: any; netlifyCo... Remove this comment to see the full error message
+    const { errors, redirects } = await parseAllRedirects({
+        redirectsFiles,
+        netlifyConfigPath: configPath,
+        minimal: false,
+    });
+    handleRedirectParsingErrors(errors);
+    // @ts-expect-error TS(2345) FIXME: Argument of type '({ conditions: { country, langua... Remove this comment to see the full error message
+    return redirects.map(normalizeRedirect);
+};
+// @ts-expect-error TS(7006) FIXME: Parameter 'errors' implicitly has an 'any' type.
 const handleRedirectParsingErrors = function (errors) {
-  if (errors.length === 0) {
-    return
-  }
-
-  const errorMessage = errors.map(getErrorMessage).join('\n\n')
-  log(NETLIFYDEVERR, `Redirects syntax errors:\n${errorMessage}`)
-}
-
+    if (errors.length === 0) {
+        return;
+    }
+    const errorMessage = errors.map(getErrorMessage).join('\n\n');
+    log(NETLIFYDEVERR, `Redirects syntax errors:\n${errorMessage}`);
+};
+// @ts-expect-error TS(7031) FIXME: Binding element 'message' implicitly has an 'any' ... Remove this comment to see the full error message
 const getErrorMessage = function ({ message }) {
-  return message
-}
-
+    return message;
+};
 // `netlify-redirector` does not handle the same shape as the backend:
 //  - `from` is called `origin`
 //  - `query` is called `params`
 //  - `conditions.role|country|language` are capitalized
-const normalizeRedirect = function ({
-  conditions: { country, language, role, ...conditions },
-  from,
-  query,
-  signed,
-  ...redirect
-}) {
-  return {
-    ...redirect,
-    origin: from,
-    params: query,
-    conditions: {
-      ...conditions,
-      ...(role && { Role: role }),
-      ...(country && { Country: country }),
-      ...(language && { Language: language }),
-    },
-    ...(signed && {
-      sign: {
-        jwt_secret: signed,
-      },
-    }),
-  }
-}
+const normalizeRedirect = function ({ 
+// @ts-expect-error TS(7031) FIXME: Binding element 'country' implicitly has an 'any' ... Remove this comment to see the full error message
+conditions: { country, language, role, ...conditions }, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'from' implicitly has an 'any' typ... Remove this comment to see the full error message
+from, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'query' implicitly has an 'any' ty... Remove this comment to see the full error message
+query, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'signed' implicitly has an 'any' t... Remove this comment to see the full error message
+signed, ...redirect }) {
+    return {
+        ...redirect,
+        origin: from,
+        params: query,
+        conditions: {
+            ...conditions,
+            ...(role && { Role: role }),
+            ...(country && { Country: country }),
+            ...(language && { Language: language }),
+        },
+        ...(signed && {
+            sign: {
+                jwt_secret: signed,
+            },
+        }),
+    };
+};

package/src/utils/request-id.mjs

@@ -1,4 +1,2 @@
-// @ts-check
-import { ulid } from 'ulid'
-
-export const generateRequestID = () => ulid()
+import { ulid } from 'ulid';
+export const generateRequestID = () => ulid();

package/src/utils/rules-proxy.mjs

@@ -1,104 +1,100 @@
-// @ts-check
-import path from 'path'
-
-import chokidar from 'chokidar'
-import cookie from 'cookie'
-import redirector from 'netlify-redirector'
-import pFilter from 'p-filter'
-
-import { fileExistsAsync } from '../lib/fs.mjs'
-
-import { NETLIFYDEVLOG } from './command-helpers.mjs'
-import { parseRedirects } from './redirects.mjs'
-
-const watchers = []
-
+import path from 'path';
+import chokidar from 'chokidar';
+// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'cook... Remove this comment to see the full error message
+import cookie from 'cookie';
+// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'netl... Remove this comment to see the full error message
+import redirector from 'netlify-redirector';
+import pFilter from 'p-filter';
+import { fileExistsAsync } from '../lib/fs.mjs';
+import { NETLIFYDEVLOG } from './command-helpers.mjs';
+import { parseRedirects } from './redirects.mjs';
+// @ts-expect-error TS(7034) FIXME: Variable 'watchers' implicitly has type 'any[]' in... Remove this comment to see the full error message
+const watchers = [];
+// @ts-expect-error TS(7006) FIXME: Parameter 'files' implicitly has an 'any' type.
 export const onChanges = function (files, listener) {
-  files.forEach((file) => {
-    const watcher = chokidar.watch(file)
-    watcher.on('change', listener)
-    watcher.on('unlink', listener)
-    watchers.push(watcher)
-  })
-}
-
+    // @ts-expect-error TS(7006) FIXME: Parameter 'file' implicitly has an 'any' type.
+    files.forEach((file) => {
+        const watcher = chokidar.watch(file);
+        watcher.on('change', listener);
+        watcher.on('unlink', listener);
+        watchers.push(watcher);
+    });
+};
 export const getWatchers = function () {
-  return watchers
-}
-
+    // @ts-expect-error TS(7005) FIXME: Variable 'watchers' implicitly has an 'any[]' type... Remove this comment to see the full error message
+    return watchers;
+};
+// @ts-expect-error TS(7006) FIXME: Parameter 'headers' implicitly has an 'any' type.
 export const getLanguage = function (headers) {
-  if (headers['accept-language']) {
-    return headers['accept-language'].split(',')[0].slice(0, 2)
-  }
-  return 'en'
-}
-
-export const createRewriter = async function ({
-  configPath,
-  distDir,
-  geoCountry,
-  jwtRoleClaim,
-  jwtSecret,
-  projectDir,
-}) {
-  let matcher = null
-  const redirectsFiles = [...new Set([path.resolve(distDir, '_redirects'), path.resolve(projectDir, '_redirects')])]
-  let redirects = await parseRedirects({ redirectsFiles, configPath })
-
-  const watchedRedirectFiles = configPath === undefined ? redirectsFiles : [...redirectsFiles, configPath]
-  onChanges(watchedRedirectFiles, async () => {
-    const existingRedirectsFiles = await pFilter(watchedRedirectFiles, fileExistsAsync)
-    console.log(
-      `${NETLIFYDEVLOG} Reloading redirect rules from`,
-      existingRedirectsFiles.map((redirectFile) => path.relative(projectDir, redirectFile)),
-    )
-    redirects = await parseRedirects({ redirectsFiles, configPath })
-    matcher = null
-  })
-
-  const getMatcher = async () => {
-    if (matcher) return matcher
-
-    if (redirects.length !== 0) {
-      return (matcher = await redirector.parseJSON(JSON.stringify(redirects), {
-        jwtSecret,
-        jwtRoleClaim,
-      }))
+    if (headers['accept-language']) {
+        return headers['accept-language'].split(',')[0].slice(0, 2);
     }
-    return {
-      match() {
-        return null
-      },
-    }
-  }
-
-  return async function rewriter(req) {
-    const matcherFunc = await getMatcher()
-    const reqUrl = new URL(
-      req.url,
-      `${req.protocol || (req.headers.scheme && `${req.headers.scheme}:`) || 'http:'}//${
-        req.hostname || req.headers.host
-      }`,
-    )
-    const cookieValues = cookie.parse(req.headers.cookie || '')
-    const headers = {
-      'x-language': cookieValues.nf_lang || getLanguage(req.headers),
-      'x-country': cookieValues.nf_country || geoCountry || 'us',
-      ...req.headers,
-    }
-
-    // Definition: https://github.com/netlify/libredirect/blob/e81bbeeff9f7c260a5fb74cad296ccc67a92325b/node/src/redirects.cpp#L28-L60
-    const matchReq = {
-      scheme: reqUrl.protocol.replace(/:.*$/, ''),
-      host: reqUrl.hostname,
-      path: decodeURIComponent(reqUrl.pathname),
-      query: reqUrl.search.slice(1),
-      headers,
-      cookieValues,
-      getHeader: (name) => headers[name.toLowerCase()] || '',
-      getCookie: (key) => cookieValues[key] || '',
-    }
-    const match = matcherFunc.match(matchReq)
-    return match
-  }
-}
+    return 'en';
+};
+export const createRewriter = async function ({ 
+// @ts-expect-error TS(7031) FIXME: Binding element 'configPath' implicitly has an 'an... Remove this comment to see the full error message
+configPath, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'distDir' implicitly has an 'any' ... Remove this comment to see the full error message
+distDir, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'geoCountry' implicitly has an 'an... Remove this comment to see the full error message
+geoCountry, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'jwtRoleClaim' implicitly has an '... Remove this comment to see the full error message
+jwtRoleClaim, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'jwtSecret' implicitly has an 'any... Remove this comment to see the full error message
+jwtSecret, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'projectDir' implicitly has an 'an... Remove this comment to see the full error message
+projectDir, }) {
+    // @ts-expect-error TS(7034) FIXME: Variable 'matcher' implicitly has type 'any' in so... Remove this comment to see the full error message
+    let matcher = null;
+    const redirectsFiles = [...new Set([path.resolve(distDir, '_redirects'), path.resolve(projectDir, '_redirects')])];
+    let redirects = await parseRedirects({ redirectsFiles, configPath });
+    const watchedRedirectFiles = configPath === undefined ? redirectsFiles : [...redirectsFiles, configPath];
+    onChanges(watchedRedirectFiles, async () => {
+        const existingRedirectsFiles = await pFilter(watchedRedirectFiles, fileExistsAsync);
+        console.log(`${NETLIFYDEVLOG} Reloading redirect rules from`, existingRedirectsFiles.map((redirectFile) => path.relative(projectDir, redirectFile)));
+        redirects = await parseRedirects({ redirectsFiles, configPath });
+        matcher = null;
+    });
+    const getMatcher = async () => {
+        // @ts-expect-error TS(7005) FIXME: Variable 'matcher' implicitly has an 'any' type.
+        if (matcher)
+            return matcher;
+        if (redirects.length !== 0) {
+            return (matcher = await redirector.parseJSON(JSON.stringify(redirects), {
+                jwtSecret,
+                jwtRoleClaim,
+            }));
+        }
+        return {
+            match() {
+                return null;
+            },
+        };
+    };
+    // @ts-expect-error TS(7006) FIXME: Parameter 'req' implicitly has an 'any' type.
+    return async function rewriter(req) {
+        const matcherFunc = await getMatcher();
+        const reqUrl = new URL(req.url, `${req.protocol || (req.headers.scheme && `${req.headers.scheme}:`) || 'http:'}//${req.hostname || req.headers.host}`);
+        const cookieValues = cookie.parse(req.headers.cookie || '');
+        const headers = {
+            'x-language': cookieValues.nf_lang || getLanguage(req.headers),
+            'x-country': cookieValues.nf_country || geoCountry || 'us',
+            ...req.headers,
+        };
+        // Definition: https://github.com/netlify/libredirect/blob/e81bbeeff9f7c260a5fb74cad296ccc67a92325b/node/src/redirects.cpp#L28-L60
+        const matchReq = {
+            scheme: reqUrl.protocol.replace(/:.*$/, ''),
+            host: reqUrl.hostname,
+            path: decodeURIComponent(reqUrl.pathname),
+            query: reqUrl.search.slice(1),
+            headers,
+            cookieValues,
+            // @ts-expect-error TS(7006) FIXME: Parameter 'name' implicitly has an 'any' type.
+            getHeader: (name) => headers[name.toLowerCase()] || '',
+            // @ts-expect-error TS(7006) FIXME: Parameter 'key' implicitly has an 'any' type.
+            getCookie: (key) => cookieValues[key] || '',
+        };
+        const match = matcherFunc.match(matchReq);
+        return match;
+    };
+};