netlify-cli 7.0.2 → 7.1.0

package/src/functions-templates/typescript/hello-world/package-lock.json

@@ -9,15 +9,15 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@netlify/functions": "^0.9.0",
+        "@netlify/functions": "^0.10.0",
         "@types/node": "^14.0.0",
         "typescript": "^4.0.0"
       }
     },
     "node_modules/@netlify/functions": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-0.9.0.tgz",
-      "integrity": "sha512-CQ2L2MEA/hfcZrVl7yJrNCqTGjXDIrdcgF4NX/OwzU5QAmSQmjQWI890nMHf98Q7++K8ljTFyICpq26HDLKbDg==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-0.10.0.tgz",
+      "integrity": "sha512-NNFADTPnokuoMY1OUhaXlE/Jrzk5lHOl1uB4L/8pw1UJ/CaectZJACMExijbJnqaKIhOQG0WmbBQUh1lgnK/Qg==",
       "dependencies": {
         "is-promise": "^4.0.0"
       },
@@ -26,9 +26,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.17.33",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.33.tgz",
-      "integrity": "sha512-noEeJ06zbn3lOh4gqe2v7NMGS33jrulfNqYFDjjEbhpDEHR5VTxgYNQSBqBlJIsBJW3uEYDgD6kvMnrrhGzq8g=="
+      "version": "14.17.34",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.34.tgz",
+      "integrity": "sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg=="
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
@@ -36,9 +36,9 @@
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
     },
     "node_modules/typescript": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
-      "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
+      "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -50,17 +50,17 @@
   },
   "dependencies": {
     "@netlify/functions": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-0.9.0.tgz",
-      "integrity": "sha512-CQ2L2MEA/hfcZrVl7yJrNCqTGjXDIrdcgF4NX/OwzU5QAmSQmjQWI890nMHf98Q7++K8ljTFyICpq26HDLKbDg==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-0.10.0.tgz",
+      "integrity": "sha512-NNFADTPnokuoMY1OUhaXlE/Jrzk5lHOl1uB4L/8pw1UJ/CaectZJACMExijbJnqaKIhOQG0WmbBQUh1lgnK/Qg==",
       "requires": {
         "is-promise": "^4.0.0"
       }
     },
     "@types/node": {
-      "version": "14.17.33",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.33.tgz",
-      "integrity": "sha512-noEeJ06zbn3lOh4gqe2v7NMGS33jrulfNqYFDjjEbhpDEHR5VTxgYNQSBqBlJIsBJW3uEYDgD6kvMnrrhGzq8g=="
+      "version": "14.17.34",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.34.tgz",
+      "integrity": "sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg=="
     },
     "is-promise": {
       "version": "4.0.0",
@@ -68,9 +68,9 @@
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
     },
     "typescript": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
-      "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA=="
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
+      "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw=="
     }
   }
 }

package/src/functions-templates/typescript/hello-world/package.json

@@ -14,7 +14,7 @@
   "author": "Netlify",
   "license": "MIT",
   "dependencies": {
-    "@netlify/functions": "^0.9.0",
+    "@netlify/functions": "^0.10.0",
     "@types/node": "^14.0.0",
     "typescript": "^4.0.0"
   }

package/src/utils/detect-server-settings.js

@@ -1,3 +1,4 @@
+// @ts-check
 const { EOL } = require('os')
 const path = require('path')
 const process = require('process')
@@ -101,6 +102,14 @@ const getDefaultDist = () => {
   return process.cwd()
 }
 
+/**
+ *
+ * @param {object} param0
+ * @param {import('../commands/dev/types').DevConfig} param0.devConfig
+ * @param {Record<string, string>} param0.flags
+ * @param {string} param0.projectDir
+ * @returns {Promise<import('./types').BaseServerSettings>}
+ */
 const handleStaticServer = async ({ devConfig, flags, projectDir }) => {
   validateNumberProperty({ devConfig, property: 'staticServerPort' })
 
@@ -114,14 +123,6 @@ const handleStaticServer = async ({ devConfig, flags, projectDir }) => {
     )
   }
 
-  if (devConfig.command) {
-    log(
-      `${NETLIFYDEVWARN} Ignoring command setting since using a simple static server. Configure ${formatProperty(
-        'command',
-      )} ${chalk.bold('and')} ${formatProperty('targetPort')} for a custom setup`,
-    )
-  }
-
   if (devConfig.targetPort) {
     log(
       `${NETLIFYDEVWARN} Ignoring ${formatProperty(
@@ -139,12 +140,18 @@ const handleStaticServer = async ({ devConfig, flags, projectDir }) => {
     errorMessage: 'Could not acquire configured static server port',
   })
   return {
+    ...(devConfig.command && { command: devConfig.command }),
     useStaticServer: true,
     frameworkPort,
     dist,
   }
 }
 
+/**
+ * Retrieves the settings from a framework
+ * @param {import('./types').FrameworkInfo} framework
+ * @returns {import('./types').BaseServerSettings}
+ */
 const getSettingsFromFramework = (framework) => {
   const {
     build: { directory: dist },
@@ -171,7 +178,8 @@ const getSettingsFromFramework = (framework) => {
 const hasDevCommand = (framework) => Array.isArray(framework.dev.commands) && framework.dev.commands.length !== 0
 
 const detectFrameworkSettings = async ({ projectDir }) => {
-  const frameworks = (await listFrameworks({ projectDir })).filter((framework) => hasDevCommand(framework))
+  const projectFrameworks = await listFrameworks({ projectDir })
+  const frameworks = projectFrameworks.filter((framework) => hasDevCommand(framework))
 
   if (frameworks.length === 1) {
     return getSettingsFromFramework(frameworks[0])
@@ -210,6 +218,11 @@ const detectFrameworkSettings = async ({ projectDir }) => {
 
 const hasCommandAndTargetPort = ({ devConfig }) => devConfig.command && devConfig.targetPort
 
+/**
+ * Creates settings for the custom framework
+ * @param {*} param0
+ * @returns {import('./types').BaseServerSettings}
+ */
 const handleCustomFramework = ({ devConfig }) => {
   if (!hasCommandAndTargetPort({ devConfig })) {
     throw new Error(
@@ -227,6 +240,11 @@ const handleCustomFramework = ({ devConfig }) => {
   }
 }
 
+/**
+ * Handles a forced framework and retrieves the settings for it
+ * @param {*} param0
+ * @returns {Promise<import('./types').BaseServerSettings>}
+ */
 const handleForcedFramework = async ({ devConfig, projectDir }) => {
   // this throws if `devConfig.framework` is not a supported framework
   const { command, dist, env, framework, frameworkPort, pollingStrategies } = getSettingsFromFramework(
@@ -242,9 +260,17 @@ const handleForcedFramework = async ({ devConfig, projectDir }) => {
   }
 }
 
+/**
+ * Get the server settings based on the flags and the devConfig
+ * @param {import('../commands/dev/types').DevConfig} devConfig
+ * @param {Record<string, string>} flags
+ * @param {string} projectDir
+ * @returns {Promise<import('./types').ServerSettings>}
+ */
 const detectServerSettings = async (devConfig, flags, projectDir) => {
   validateStringProperty({ devConfig, property: 'framework' })
 
+  /** @type {Partial<import('./types').BaseServerSettings>} */
   let settings = {}
 
   if (flags.dir || devConfig.framework === '#static') {
@@ -253,7 +279,6 @@ const detectServerSettings = async (devConfig, flags, projectDir) => {
   } else if (devConfig.framework === '#auto') {
     // this is the default CLI behavior
 
-    // we don't need to run the detection if both command and targetPort are configured
     const runDetection = !hasCommandAndTargetPort({ devConfig })
     const frameworkSettings = runDetection ? await detectFrameworkSettings({ projectDir }) : undefined
 

package/src/utils/proxy.js

@@ -286,9 +286,10 @@ const initializeProxy = async function ({ configPath, distDir, port, projectDir
 
   const watchedHeadersFiles = configPath === undefined ? headersFiles : [...headersFiles, configPath]
   onChanges(watchedHeadersFiles, async () => {
+    const existingHeadersFiles = await pFilter(watchedHeadersFiles, fileExistsAsync)
     console.log(
       `${NETLIFYDEVLOG} Reloading headers files from`,
-      (await pFilter(watchedHeadersFiles, fileExistsAsync)).map((headerFile) => path.relative(projectDir, headerFile)),
+      existingHeadersFiles.map((headerFile) => path.relative(projectDir, headerFile)),
     )
     headers = await parseHeaders({ headersFiles, configPath })
   })

package/src/utils/rules-proxy.js

@@ -37,11 +37,10 @@ const createRewriter = async function ({ configPath, distDir, jwtRoleClaim, jwtS
 
   const watchedRedirectFiles = configPath === undefined ? redirectsFiles : [...redirectsFiles, configPath]
   onChanges(watchedRedirectFiles, async () => {
+    const existingRedirectsFiles = await pFilter(watchedRedirectFiles, fileExistsAsync)
     console.log(
       `${NETLIFYDEVLOG} Reloading redirect rules from`,
-      (await pFilter(watchedRedirectFiles, fileExistsAsync)).map((redirectFile) =>
-        path.relative(projectDir, redirectFile),
-      ),
+      existingRedirectsFiles.map((redirectFile) => path.relative(projectDir, redirectFile)),
     )
     redirects = await parseRedirects({ redirectsFiles, configPath })
     matcher = null