netlify-cli 17.3.1 → 17.4.0

package/src/utils/sites/utils.mjs

@@ -1,58 +1,51 @@
-import fetch from 'node-fetch'
-
+// @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';
+// @ts-expect-error TS(7006) FIXME: Parameter 'token' implicitly has an 'any' type.
 export const getTemplatesFromGitHub = async (token) => {
-  const getPublicGitHubReposFromOrg = new URL(`https://api.github.com/orgs/netlify-templates/repos`)
-  // GitHub returns 30 by default and we want to avoid our limit
-  // due to our archived repositories at any given time
-  const REPOS_PER_PAGE = 70
-
-  getPublicGitHubReposFromOrg.searchParams.set('type', 'public')
-  getPublicGitHubReposFromOrg.searchParams.set('sort', 'full_name')
-  getPublicGitHubReposFromOrg.searchParams.set('per_page', REPOS_PER_PAGE)
-
-  const templates = await fetch(getPublicGitHubReposFromOrg, {
-    method: 'GET',
-    headers: {
-      Authorization: `token ${token}`,
-    },
-  })
-  const allTemplates = await templates.json()
-
-  return allTemplates
-}
-
+    const getPublicGitHubReposFromOrg = new URL(`https://api.github.com/orgs/netlify-templates/repos`);
+    // GitHub returns 30 by default and we want to avoid our limit
+    // due to our archived repositories at any given time
+    const REPOS_PER_PAGE = 70;
+    getPublicGitHubReposFromOrg.searchParams.set('type', 'public');
+    getPublicGitHubReposFromOrg.searchParams.set('sort', 'full_name');
+    // @ts-expect-error TS(2345) FIXME: Argument of type 'number' is not assignable to par... Remove this comment to see the full error message
+    getPublicGitHubReposFromOrg.searchParams.set('per_page', REPOS_PER_PAGE);
+    const templates = await fetch(getPublicGitHubReposFromOrg, {
+        method: 'GET',
+        headers: {
+            Authorization: `token ${token}`,
+        },
+    });
+    const allTemplates = await templates.json();
+    return allTemplates;
+};
+// @ts-expect-error TS(7031) FIXME: Binding element 'ghToken' implicitly has an 'any' ... Remove this comment to see the full error message
 export const validateTemplate = async ({ ghToken, templateName }) => {
-  const response = await fetch(`https://api.github.com/repos/${templateName}`, {
-    headers: {
-      Authorization: `token ${ghToken}`,
-    },
-  })
-
-  if (response.status === 404) {
-    return { exists: false }
-  }
-
-  if (!response.ok) {
-    throw new Error(`Error fetching template ${templateName}: ${await response.text()}`)
-  }
-
-  const data = await response.json()
-
-  return { exists: true, isTemplate: data.is_template }
-}
-
+    const response = await fetch(`https://api.github.com/repos/${templateName}`, {
+        headers: {
+            Authorization: `token ${ghToken}`,
+        },
+    });
+    if (response.status === 404) {
+        return { exists: false };
+    }
+    if (!response.ok) {
+        throw new Error(`Error fetching template ${templateName}: ${await response.text()}`);
+    }
+    const data = await response.json();
+    return { exists: true, isTemplate: data.is_template };
+};
+// @ts-expect-error TS(7006) FIXME: Parameter 'templateName' implicitly has an 'any' t... Remove this comment to see the full error message
 export const createRepo = async (templateName, ghToken, siteName) => {
-  const resp = await fetch(`https://api.github.com/repos/${templateName}/generate`, {
-    method: 'POST',
-    headers: {
-      Authorization: `token ${ghToken}`,
-    },
-    body: JSON.stringify({
-      name: siteName,
-    }),
-  })
-
-  const data = await resp.json()
-
-  return data
-}
+    const resp = await fetch(`https://api.github.com/repos/${templateName}/generate`, {
+        method: 'POST',
+        headers: {
+            Authorization: `token ${ghToken}`,
+        },
+        body: JSON.stringify({
+            name: siteName,
+        }),
+    });
+    const data = await resp.json();
+    return data;
+};

package/src/utils/state-config.mjs

@@ -1,113 +1,113 @@
-import fs from 'fs'
-import path from 'path'
-import process from 'process'
-
-import { deleteProperty, getProperty, hasProperty, setProperty } from 'dot-prop'
-import { findUpSync } from 'find-up'
-import writeFileAtomic from 'write-file-atomic'
-
-import { getPathInProject } from '../lib/settings.mjs'
-
-const STATE_PATH = getPathInProject(['state.json'])
-const permissionError = "You don't have access to this file."
-
+import fs from 'fs';
+import path from 'path';
+import process from 'process';
+import { deleteProperty, getProperty, hasProperty, setProperty } from 'dot-prop';
+import { findUpSync } from 'find-up';
+// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'writ... Remove this comment to see the full error message
+import writeFileAtomic from 'write-file-atomic';
+import { getPathInProject } from '../lib/settings.mjs';
+const STATE_PATH = getPathInProject(['state.json']);
+const permissionError = "You don't have access to this file.";
 /**
  * Finds location of `.netlify/state.json`
  * @param {string} cwd
  * @returns {string}
  */
+// @ts-expect-error TS(7006) FIXME: Parameter 'cwd' implicitly has an 'any' type.
 const findStatePath = (cwd) => {
-  const statePath = findUpSync([STATE_PATH], { cwd })
-
-  if (!statePath) {
-    return path.join(cwd, STATE_PATH)
-  }
-
-  return statePath
-}
-
+    const statePath = findUpSync([STATE_PATH], { cwd });
+    if (!statePath) {
+        return path.join(cwd, STATE_PATH);
+    }
+    return statePath;
+};
 export default class StateConfig {
-  constructor(cwd) {
-    this.path = findStatePath(cwd)
-  }
-
-  get all() {
-    try {
-      return JSON.parse(fs.readFileSync(this.path))
-    } catch (error) {
-      // Don't create if it doesn't exist
-      if (error.code === 'ENOENT' || error.code === 'ENOTDIR') {
-        return {}
-      }
-
-      // Improve the message of permission errors
-      if (error.code === 'EACCES') {
-        error.message = `${error.message}\n${permissionError}\n`
-      }
-
-      // Empty the file if it encounters invalid JSON
-      if (error.name === 'SyntaxError') {
-        writeFileAtomic.sync(this.path, '')
-        return {}
-      }
-
-      throw error
+    // @ts-expect-error TS(7006) FIXME: Parameter 'cwd' implicitly has an 'any' type.
+    constructor(cwd) {
+        // @ts-expect-error TS(2339) FIXME: Property 'path' does not exist on type 'StateConfi... Remove this comment to see the full error message
+        this.path = findStatePath(cwd);
+    }
+    get all() {
+        try {
+            // @ts-expect-error TS(2345) FIXME: Argument of type 'Buffer' is not assignable to par... Remove this comment to see the full error message
+            return JSON.parse(fs.readFileSync(this.path));
+        }
+        catch (error) {
+            // Don't create if it doesn't exist
+            // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+            if (error.code === 'ENOENT' || error.code === 'ENOTDIR') {
+                return {};
+            }
+            // Improve the message of permission errors
+            // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+            if (error.code === 'EACCES') {
+                // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+                error.message = `${error.message}\n${permissionError}\n`;
+            }
+            // Empty the file if it encounters invalid JSON
+            // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+            if (error.name === 'SyntaxError') {
+                // @ts-expect-error TS(2339) FIXME: Property 'path' does not exist on type 'StateConfi... Remove this comment to see the full error message
+                writeFileAtomic.sync(this.path, '');
+                return {};
+            }
+            throw error;
+        }
+    }
+    set all(val) {
+        try {
+            // Make sure the folder exists as it could have been deleted in the meantime
+            // @ts-expect-error TS(2339) FIXME: Property 'path' does not exist on type 'StateConfi... Remove this comment to see the full error message
+            fs.mkdirSync(path.dirname(this.path), { recursive: true });
+            // @ts-expect-error TS(2339) FIXME: Property 'path' does not exist on type 'StateConfi... Remove this comment to see the full error message
+            writeFileAtomic.sync(this.path, JSON.stringify(val, null, '\t'));
+        }
+        catch (error) {
+            // Improve the message of permission errors
+            // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+            if (error.code === 'EACCES') {
+                // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+                error.message = `${error.message}\n${permissionError}\n`;
+            }
+            throw error;
+        }
+    }
+    get size() {
+        return Object.keys(this.all || {}).length;
+    }
+    // @ts-expect-error TS(7006) FIXME: Parameter 'key' implicitly has an 'any' type.
+    get(key) {
+        if (key === 'siteId' && process.env.NETLIFY_SITE_ID) {
+            // TODO figure out cleaner way of grabbing ENV vars
+            return process.env.NETLIFY_SITE_ID;
+        }
+        return getProperty(this.all, key);
+    }
+    // @ts-expect-error TS(7019) FIXME: Rest parameter 'args' implicitly has an 'any[]' ty... Remove this comment to see the full error message
+    set(...args) {
+        const [key, val] = args;
+        const config = this.all;
+        if (args.length === 1) {
+            Object.entries(key).forEach(([keyPart, value]) => {
+                setProperty(config, keyPart, value);
+            });
+        }
+        else {
+            setProperty(config, key, val);
+        }
+        this.all = config;
     }
-  }
-
-  set all(val) {
-    try {
-      // Make sure the folder exists as it could have been deleted in the meantime
-      fs.mkdirSync(path.dirname(this.path), { recursive: true })
-      writeFileAtomic.sync(this.path, JSON.stringify(val, null, '\t'))
-    } catch (error) {
-      // Improve the message of permission errors
-      if (error.code === 'EACCES') {
-        error.message = `${error.message}\n${permissionError}\n`
-      }
-
-      throw error
+    // @ts-expect-error TS(7006) FIXME: Parameter 'key' implicitly has an 'any' type.
+    has(key) {
+        return hasProperty(this.all, key);
     }
-  }
-
-  get size() {
-    return Object.keys(this.all || {}).length
-  }
-
-  get(key) {
-    if (key === 'siteId' && process.env.NETLIFY_SITE_ID) {
-      // TODO figure out cleaner way of grabbing ENV vars
-      return process.env.NETLIFY_SITE_ID
+    // @ts-expect-error TS(7006) FIXME: Parameter 'key' implicitly has an 'any' type.
+    delete(key) {
+        const config = this.all;
+        deleteProperty(config, key);
+        this.all = config;
     }
-    return getProperty(this.all, key)
-  }
-
-  set(...args) {
-    const [key, val] = args
-    const config = this.all
-
-    if (args.length === 1) {
-      Object.entries(key).forEach(([keyPart, value]) => {
-        setProperty(config, keyPart, value)
-      })
-    } else {
-      setProperty(config, key, val)
+    clear() {
+        this.all = {};
     }
-
-    this.all = config
-  }
-
-  has(key) {
-    return hasProperty(this.all, key)
-  }
-
-  delete(key) {
-    const config = this.all
-    deleteProperty(config, key)
-    this.all = config
-  }
-
-  clear() {
-    this.all = {}
-  }
 }

package/src/utils/static-server.mjs

@@ -1,39 +1,33 @@
-// @ts-check
-import path from 'path'
-
-import fastifyStatic from '@fastify/static'
-import Fastify from 'fastify'
-
-import { log, NETLIFYDEVLOG } from './command-helpers.mjs'
-
+import path from 'path';
+import fastifyStatic from '@fastify/static';
+import Fastify from 'fastify';
+import { log, NETLIFYDEVLOG } from './command-helpers.mjs';
 /**
  * @param {object} config
  * @param {import('./types.js').ServerSettings} config.settings
  */
+// @ts-expect-error TS(7031) FIXME: Binding element 'settings' implicitly has an 'any'... Remove this comment to see the full error message
 export const startStaticServer = async ({ settings }) => {
-  const server = Fastify()
-  const rootPath = path.resolve(settings.dist)
-  server.register(fastifyStatic, {
-    root: rootPath,
-    etag: false,
-    acceptRanges: false,
-    lastModified: false,
-  })
-
-  server.setNotFoundHandler((_req, res) => {
-    res.code(404).sendFile('404.html', rootPath)
-  })
-
-  server.addHook('onRequest', (req, reply, done) => {
-    reply.header('age', '0')
-    reply.header('cache-control', 'public, max-age=0, must-revalidate')
-    const validMethods = ['GET', 'HEAD']
-    if (!validMethods.includes(req.method)) {
-      reply.code(405).send('Method Not Allowed')
-    }
-    done()
-  })
-
-  await server.listen({ port: settings.frameworkPort })
-  log(`\n${NETLIFYDEVLOG} Static server listening to`, settings.frameworkPort)
-}
+    const server = Fastify();
+    const rootPath = path.resolve(settings.dist);
+    server.register(fastifyStatic, {
+        root: rootPath,
+        etag: false,
+        acceptRanges: false,
+        lastModified: false,
+    });
+    server.setNotFoundHandler((_req, res) => {
+        res.code(404).sendFile('404.html', rootPath);
+    });
+    server.addHook('onRequest', (req, reply, done) => {
+        reply.header('age', '0');
+        reply.header('cache-control', 'public, max-age=0, must-revalidate');
+        const validMethods = ['GET', 'HEAD'];
+        if (!validMethods.includes(req.method)) {
+            reply.code(405).send('Method Not Allowed');
+        }
+        done();
+    });
+    await server.listen({ port: settings.frameworkPort });
+    log(`\n${NETLIFYDEVLOG} Static server listening to`, settings.frameworkPort);
+};

package/src/utils/telemetry/index.mjs

@@ -1,2 +1,2 @@
-export { track, identify } from './telemetry.mjs'
-export { reportError } from './report-error.mjs'
+export { track, identify } from './telemetry.mjs';
+export { reportError } from './report-error.mjs';

package/src/utils/telemetry/report-error.mjs

@@ -1,17 +1,13 @@
-import os from 'os'
-import { dirname, join } from 'path'
-import process, { version as nodejsVersion } from 'process'
-import { fileURLToPath } from 'url'
-
-import { isCI } from 'ci-info'
-
-import execa from '../execa.mjs'
-import getGlobalConfig from '../get-global-config.mjs'
-
-import { cliVersion } from './utils.mjs'
-
-const dirPath = dirname(fileURLToPath(import.meta.url))
-
+import os from 'os';
+import { dirname, join } from 'path';
+import process, { version as nodejsVersion } from 'process';
+import { fileURLToPath } from 'url';
+import { isCI } from 'ci-info';
+// @ts-expect-error TS(7034) FIXME: Variable 'execa' implicitly has type 'any' in some... Remove this comment to see the full error message
+import execa from '../execa.mjs';
+import getGlobalConfig from '../get-global-config.mjs';
+import { cliVersion } from './utils.mjs';
+const dirPath = dirname(fileURLToPath(import.meta.url));
 /**
  *
  * @param {import('@bugsnag/js').NotifiableError} error
@@ -20,39 +16,39 @@ const dirPath = dirname(fileURLToPath(import.meta.url))
  * @param {Record<string, Record<string, any>>} [config.metadata]
  * @returns {Promise<void>}
  */
+// @ts-expect-error TS(7006) FIXME: Parameter 'error' implicitly has an 'any' type.
 export const reportError = async function (error, config = {}) {
-  if (isCI) {
-    return
-  }
-
-  // convert a NotifiableError to an error class
-  // eslint-disable-next-line unicorn/no-nested-ternary
-  const err = error instanceof Error ? error : typeof error === 'string' ? new Error(error) : error
-
-  const globalConfig = await getGlobalConfig()
-
-  const options = JSON.stringify({
-    type: 'error',
-    data: {
-      message: err.message,
-      name: err.name,
-      stack: err.stack,
-      cause: err.cause,
-      severity: config.severity,
-      user: {
-        id: globalConfig.get('userId'),
-      },
-      metadata: config.metadata,
-      osName: `${os.platform()}-${os.arch()}`,
-      cliVersion,
-      nodejsVersion,
-    },
-  })
-
-  // spawn detached child process to handle send and wait for the http request to finish
-  // otherwise it can get canceled
-  await execa(process.execPath, [join(dirPath, 'request.mjs'), options], {
-    detached: true,
-    stdio: 'ignore',
-  })
-}
+    if (isCI) {
+        return;
+    }
+    // convert a NotifiableError to an error class
+    // eslint-disable-next-line unicorn/no-nested-ternary
+    const err = error instanceof Error ? error : typeof error === 'string' ? new Error(error) : error;
+    const globalConfig = await getGlobalConfig();
+    const options = JSON.stringify({
+        type: 'error',
+        data: {
+            message: err.message,
+            name: err.name,
+            stack: err.stack,
+            cause: err.cause,
+            // @ts-expect-error TS(2339) FIXME: Property 'severity' does not exist on type '{}'.
+            severity: config.severity,
+            user: {
+                id: globalConfig.get('userId'),
+            },
+            // @ts-expect-error TS(2339) FIXME: Property 'metadata' does not exist on type '{}'.
+            metadata: config.metadata,
+            osName: `${os.platform()}-${os.arch()}`,
+            cliVersion,
+            nodejsVersion,
+        },
+    });
+    // spawn detached child process to handle send and wait for the http request to finish
+    // otherwise it can get canceled
+    // @ts-expect-error TS(7005) FIXME: Variable 'execa' implicitly has an 'any' type.
+    await execa(process.execPath, [join(dirPath, 'request.mjs'), options], {
+        detached: true,
+        stdio: 'ignore',
+    });
+};

package/src/utils/telemetry/request.mjs

@@ -1,48 +1,41 @@
-// @ts-check
 // This file is being called by `src/utils/telemetry/telemetry.js` as a child process
 // to run a s a detached process
-import process from 'process'
-
-import fetch from 'node-fetch'
-
-import getPackageJson from '../get-package-json.mjs'
-
-const { name, version } = await getPackageJson()
-
-const options = JSON.parse(process.argv[2])
-
-const CLIENT_ID = 'NETLIFY_CLI'
-const TRACK_URL = process.env.NETLIFY_TEST_TRACK_URL || 'https://cli.netlify.com/telemetry/track'
-const IDENTIFY_URL = process.env.NETLIFY_TEST_IDENTIFY_URL || 'https://cli.netlify.com/telemetry/identify'
-const REPORT_ERROR_URL = process.env.NETLIFY_TEST_ERROR_REPORT_URL || 'https://cli.netlify.com/report-error'
-
+import process from 'process';
+// @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';
+import getPackageJson from '../get-package-json.mjs';
+const { name, version } = await getPackageJson();
+const options = JSON.parse(process.argv[2]);
+const CLIENT_ID = 'NETLIFY_CLI';
+const TRACK_URL = process.env.NETLIFY_TEST_TRACK_URL || 'https://cli.netlify.com/telemetry/track';
+const IDENTIFY_URL = process.env.NETLIFY_TEST_IDENTIFY_URL || 'https://cli.netlify.com/telemetry/identify';
+const REPORT_ERROR_URL = process.env.NETLIFY_TEST_ERROR_REPORT_URL || 'https://cli.netlify.com/report-error';
 const getApiUrl = () => {
-  switch (options.type) {
-    case 'track':
-      return TRACK_URL
-    case 'error':
-      return REPORT_ERROR_URL
-    default:
-      return IDENTIFY_URL
-  }
-}
-
+    switch (options.type) {
+        case 'track':
+            return TRACK_URL;
+        case 'error':
+            return REPORT_ERROR_URL;
+        default:
+            return IDENTIFY_URL;
+    }
+};
 // Make telemetry call
 const makeRequest = async function () {
-  try {
-    await fetch(getApiUrl(), {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'X-Netlify-Client': CLIENT_ID,
-        'User-Agent': `${name}/${version}`,
-      },
-      body: JSON.stringify(options.data),
-    })
-    process.exit()
-  } catch {
-    process.exit(1)
-  }
-}
-
-makeRequest()
+    try {
+        await fetch(getApiUrl(), {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'X-Netlify-Client': CLIENT_ID,
+                'User-Agent': `${name}/${version}`,
+            },
+            body: JSON.stringify(options.data),
+        });
+        process.exit();
+    }
+    catch {
+        process.exit(1);
+    }
+};
+makeRequest();