chore(deps): update dependency eslint-plugin-sort-destructure-keys to…

… v1.5.0 (#5507) * chore(deps): update dependency eslint-plugin-sort-destructure-keys to v1.5.0 * chore: fix lint --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel Tschinder <[email protected]> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
netlify · Feb 27, 2023 · 046e6b9 · 046e6b9 · github-actions · Feb 27, 2023
1 parent 0c3fd0a
commit 046e6b9
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 41 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/site/src/_layout.js b/site/src/_layout.js
@@ -367,7 +367,7 @@ export default class Layout extends React.Component {
   }
 
   render() {
-    const { routes = [], children, route, title = 'Netlify CLI', logo } = this.props
+    const { children, logo, route, routes = [], title = 'Netlify CLI' } = this.props
 
     const { menu, update } = this.state
 

diff --git a/src/commands/deploy/deploy.mjs b/src/commands/deploy/deploy.mjs
@@ -567,7 +567,7 @@ const deploy = async (options, command) => {
     return triggerDeploy({ api, options, siteData, siteId })
   }
 
-  const { newConfig, configMutations = [] } = await handleBuild({
+  const { configMutations = [], newConfig } = await handleBuild({
     cachedConfig: command.netlify.cachedConfig,
     options,
   })

diff --git a/src/commands/functions/functions-create.mjs b/src/commands/functions/functions-create.mjs
@@ -361,7 +361,7 @@ const downloadFromURL = async function (command, options, argumentName, function
   const fnTemplateFile = path.join(fnFolder, '.netlify-function-template.mjs')
   if (await fileExistsAsync(fnTemplateFile)) {
     const {
-      default: { onComplete, addons = [] },
+      default: { addons = [], onComplete },
       // eslint-disable-next-line import/no-dynamic-require
     } = await import(pathToFileURL(fnTemplateFile).href)
 
@@ -463,7 +463,7 @@ const scaffoldFromTemplate = async function (command, options, argumentName, fun
   } else if (chosenTemplate === 'report') {
     log(`${NETLIFYDEVLOG} Open in browser: https://github.com/netlify/cli/issues/new`)
   } else {
-    const { onComplete, name: templateName, lang, addons = [] } = chosenTemplate
+    const { addons = [], lang, name: templateName, onComplete } = chosenTemplate
     const pathToTemplate = path.join(templatesDir, lang, templateName)
     if (!fs.existsSync(pathToTemplate)) {
       throw new Error(

diff --git a/src/lib/api.mjs b/src/lib/api.mjs
@@ -12,7 +12,7 @@ const FIRST_PAGE = 1
 const MAX_PAGES = 10
 const MAX_PER_PAGE = 100
 export const listSites = async ({ api, options }) => {
-  const { page = FIRST_PAGE, maxPages = MAX_PAGES, ...rest } = options
+  const { maxPages = MAX_PAGES, page = FIRST_PAGE, ...rest } = options
   const sites = await api.listSites({ page, per_page: MAX_PER_PAGE, ...rest })
   // TODO: use pagination headers when js-client returns them
   if (sites.length === MAX_PER_PAGE && page + 1 <= maxPages) {

diff --git a/src/utils/deploy/deploy-site.mjs b/src/utils/deploy/deploy-site.mjs
@@ -39,14 +39,14 @@ export const deploySite = async (
     maxRetry = DEFAULT_MAX_RETRY,
     // API calls this the 'title'
     message: title,
+    rootDir,
     siteEnv,
     skipFunctionsCache,
     statusCb = () => {
       /* default to noop */
     },
     syncFileLimit = DEFAULT_SYNC_LIMIT,
     tmpDir = temporaryDirectory(),
-    rootDir,
   } = {},
 ) => {
   statusCb({

diff --git a/src/utils/detect-server-settings.mjs b/src/utils/detect-server-settings.mjs
@@ -160,13 +160,13 @@ const getSettingsFromFramework = (framework) => {
     build: { directory: dist },
     dev: {
       commands: [command],
-      port: frameworkPort,
       pollingStrategies = [],
+      port: frameworkPort,
     },
-    name: frameworkName,
-    staticAssetsDirectory: staticDir,
     env = {},
+    name: frameworkName,
     plugins,
+    staticAssetsDirectory: staticDir,
   } = framework
 
   return {
@@ -246,10 +246,10 @@ const handleCustomFramework = ({ devConfig }) => {
 const mergeSettings = async ({ devConfig, frameworkSettings = {} }) => {
   const {
     command: frameworkCommand,
-    frameworkPort: frameworkDetectedPort,
     dist,
-    framework,
     env,
+    framework,
+    frameworkPort: frameworkDetectedPort,
     pollingStrategies = [],
   } = frameworkSettings
 

diff --git a/src/utils/dev.mjs b/src/utils/dev.mjs
@@ -132,7 +132,7 @@ export const getSiteInformation = async ({ api, offline, site, siteInfo }) => {
 }
 
 const getEnvSourceName = (source) => {
-  const { printFn = chalk.green, name = source } = ENV_VAR_SOURCES[source] || {}
+  const { name = source, printFn = chalk.green } = ENV_VAR_SOURCES[source] || {}
 
   return printFn(name)
 }

diff --git a/src/utils/dot-env.mjs b/src/utils/dot-env.mjs
@@ -22,7 +22,7 @@ export const loadDotEnvFiles = async function ({ envFiles, projectDir }) {
 // in the user configuration, the order is highest to lowest
 const defaultEnvFiles = ['.env.development.local', '.env.local', '.env.development', '.env']
 
-export const tryLoadDotEnvFiles = async ({ projectDir, dotenvFiles = defaultEnvFiles }) => {
+export const tryLoadDotEnvFiles = async ({ dotenvFiles = defaultEnvFiles, projectDir }) => {
   const results = await Promise.all(
     dotenvFiles.map(async (file) => {
       const filepath = path.resolve(projectDir, file)

diff --git a/src/utils/init/utils.mjs b/src/utils/init/utils.mjs
@@ -40,8 +40,8 @@ const getDefaultSettings = ({
   const recommendedPlugins = getRecommendPlugins(frameworkPlugins, config)
   const {
     command: defaultBuildCmd = frameworkBuildCommand,
-    publish: defaultBuildDir = frameworkBuildDir,
     functions: defaultFunctionsDir,
+    publish: defaultBuildDir = frameworkBuildDir,
   } = config.build
 
   return {
@@ -87,9 +87,9 @@ export const getBuildSettings = async ({ config, env, repositoryRoot, siteRoot }
   const baseDirectory = getBaseDirectory({ repositoryRoot, siteRoot })
   const nodeVersion = await detectNodeVersion({ baseDirectory, env })
   const {
-    frameworkName,
     frameworkBuildCommand,
     frameworkBuildDir,
+    frameworkName,
     frameworkPlugins = [],
   } = await getFrameworkInfo({
     baseDirectory,

diff --git a/tests/integration/110.command.build.test.cjs b/tests/integration/110.command.build.test.cjs
@@ -18,7 +18,7 @@ const defaultEnvs = {
 const runBuildCommand = async function (
   t,
   cwd,
-  { apiUrl, exitCode: expectedExitCode = 0, output: outputs, flags = [], env = defaultEnvs } = {},
+  { apiUrl, env = defaultEnvs, exitCode: expectedExitCode = 0, flags = [], output: outputs } = {},
 ) {
   const { all, exitCode } = await execa(cliPath, ['build', ...flags], {
     reject: false,

diff --git a/tests/integration/20.command.functions.test.cjs b/tests/integration/20.command.functions.test.cjs
@@ -16,7 +16,7 @@ const test = isCI ? avaTest.serial.bind(avaTest) : avaTest
 const DEFAULT_PORT = 9999
 const SERVE_TIMEOUT = 180_000
 
-const withFunctionsServer = async ({ builder, args = [], port = DEFAULT_PORT }, testHandler) => {
+const withFunctionsServer = async ({ args = [], builder, port = DEFAULT_PORT }, testHandler) => {
   let ps
   try {
     ps = execa(cliPath, ['functions:serve', ...args], {

diff --git a/tests/integration/utils/dev-server.cjs b/tests/integration/utils/dev-server.cjs
@@ -23,14 +23,14 @@ const getExecaOptions = ({ cwd, env }) => {
 }
 
 const startServer = async ({
-  cwd,
+  args = [],
   context = 'dev',
-  offline = true,
+  cwd,
   env = {},
-  args = [],
   expectFailure = false,
-  serve = false,
+  offline = true,
   prompt,
+  serve = false,
 }) => {
   const port = await getPort()
   const staticPort = await getPort()

diff --git a/tests/integration/utils/mock-api.cjs b/tests/integration/utils/mock-api.cjs
@@ -18,7 +18,7 @@ const startMockApi = ({ routes, silent }) => {
   app.use(express.json())
   app.use(express.raw())
 
-  routes.forEach(({ method = 'get', path, response = {}, status = 200, requestBody }) => {
+  routes.forEach(({ method = 'get', path, requestBody, response = {}, status = 200 }) => {
     app[method.toLowerCase()](`/api/v1/${path}`, function onRequest(req, res) {
       // validate request body
       if (requestBody !== undefined && !isDeepStrictEqual(requestBody, req.body)) {
@@ -73,7 +73,7 @@ const getEnvironmentVariables = ({ apiUrl }) => ({
   NETLIFY_API_URL: apiUrl,
 })
 
-const getCLIOptions = ({ apiUrl, builder: { directory: cwd }, extendEnv = true, env = {} }) => ({
+const getCLIOptions = ({ apiUrl, builder: { directory: cwd }, env = {}, extendEnv = true }) => ({
   cwd,
   env: { ...getEnvironmentVariables({ apiUrl }), ...env },
   extendEnv,

diff --git a/tests/integration/utils/site-builder.cjs b/tests/integration/utils/site-builder.cjs
@@ -88,7 +88,7 @@ const createSiteBuilder = ({ siteName }) => {
       })
       return builder
     },
-    withRedirectsFile: ({ redirects = [], pathPrefix = '' }) => {
+    withRedirectsFile: ({ pathPrefix = '', redirects = [] }) => {
       const dest = path.join(directory, pathPrefix, '_redirects')
       tasks.push(async () => {
         const content = redirects
@@ -133,7 +133,7 @@ const createSiteBuilder = ({ siteName }) => {
       files.forEach(builder.withContentFile)
       return builder
     },
-    withEnvFile: ({ path: filePath = '.env', pathPrefix = '', env = {} }) => {
+    withEnvFile: ({ env = {}, path: filePath = '.env', pathPrefix = '' }) => {
       const dest = path.join(directory, pathPrefix, filePath)
       tasks.push(async () => {
         await ensureDir(path.dirname(dest))