netlify-cli 12.0.1 → 12.0.2

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "12.0.1",
+  "version": "12.0.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "12.0.1",
+      "version": "12.0.2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -113,7 +113,7 @@
         "unixify": "^1.0.0",
         "update-notifier": "^5.0.0",
         "uuid": "^9.0.0",
-        "wait-port": "^0.3.0",
+        "wait-port": "^1.0.1",
         "winston": "^3.2.1",
         "write-file-atomic": "^4.0.0"
       },
@@ -22275,9 +22275,9 @@
       }
     },
     "node_modules/wait-port": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/wait-port/-/wait-port-0.3.1.tgz",
-      "integrity": "sha512-o8kW8xjslQDrbazXgXeDFt53l128J9xBAiG4aBmr9DcQA05jt0VBf2TE2vc9rxctgZjIuWpiXuO0gIYFo3pZSA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wait-port/-/wait-port-1.0.1.tgz",
+      "integrity": "sha512-JkEgxQRZqqBz449/bRVQAvl+e8LJ8fpW8J1W7WkKKo8PypoXX7EXGE47BmkNLTb5Ly/eI15IyTeAxDBwOEQ8DQ==",
       "dependencies": {
         "chalk": "^4.1.2",
         "commander": "^9.3.0",
@@ -39123,9 +39123,9 @@
       }
     },
     "wait-port": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/wait-port/-/wait-port-0.3.1.tgz",
-      "integrity": "sha512-o8kW8xjslQDrbazXgXeDFt53l128J9xBAiG4aBmr9DcQA05jt0VBf2TE2vc9rxctgZjIuWpiXuO0gIYFo3pZSA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wait-port/-/wait-port-1.0.1.tgz",
+      "integrity": "sha512-JkEgxQRZqqBz449/bRVQAvl+e8LJ8fpW8J1W7WkKKo8PypoXX7EXGE47BmkNLTb5Ly/eI15IyTeAxDBwOEQ8DQ==",
       "requires": {
         "chalk": "^4.1.2",
         "commander": "^9.3.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "12.0.1",
+  "version": "12.0.2",
   "author": "Netlify Inc.",
   "contributors": [
     "@whitep4nth3r (https://twitter.com/whitep4nth3r)",
@@ -326,7 +326,7 @@
     "unixify": "^1.0.0",
     "update-notifier": "^5.0.0",
     "uuid": "^9.0.0",
-    "wait-port": "^0.3.0",
+    "wait-port": "^1.0.1",
     "winston": "^3.2.1",
     "write-file-atomic": "^4.0.0"
   },

package/src/commands/dev/dev.js

@@ -178,18 +178,25 @@ const runCommand = (command, env = {}, spinner = null) => {
   return commandProcess
 }
 
+/**
+ * @typedef StartReturnObject
+ * @property {4 | 6 | undefined=} ipVersion The version the open port was found on
+ */
+
 /**
  * Start a static server if the `useStaticServer` is provided or a framework specific server
  * @param {object} config
  * @param {Partial<import('../../utils/types').ServerSettings>} config.settings
- * @returns {Promise<void>}
+ * @returns {Promise<StartReturnObject>}
  */
 const startFrameworkServer = async function ({ settings }) {
   if (settings.useStaticServer) {
     if (settings.command) {
       runCommand(settings.command, settings.env)
     }
-    return await startStaticServer({ settings })
+    await startStaticServer({ settings })
+
+    return {}
   }
 
   log(`${NETLIFYDEVLOG} Starting Netlify Dev with ${settings.framework || 'custom config'}`)
@@ -200,17 +207,17 @@ const startFrameworkServer = async function ({ settings }) {
 
   runCommand(settings.command, settings.env, spinner)
 
+  let port
   try {
-    const open = await waitPort({
+    port = await waitPort({
       port: settings.frameworkPort,
-      // Cannot use `localhost` as it may point to IPv4 or IPv6 depending on node version and OS
-      host: '127.0.0.1',
+      host: 'localhost',
       output: 'silent',
       timeout: FRAMEWORK_PORT_TIMEOUT,
       ...(settings.pollingStrategies.includes('HTTP') && { protocol: 'http' }),
     })
 
-    if (!open) {
+    if (!port.open) {
       throw new Error(`Timed out waiting for port '${settings.frameworkPort}' to be open`)
     }
 
@@ -221,6 +228,8 @@ const startFrameworkServer = async function ({ settings }) {
     log(NETLIFYDEVERR, `Please make sure your framework server is running on port ${settings.frameworkPort}`)
     exit(1)
   }
+
+  return { ipVersion: port?.ipVersion }
 }
 
 // 10 minutes
@@ -501,7 +510,11 @@ const dev = async (options, command) => {
 
   log(`${NETLIFYDEVWARN} Setting up local development server`)
 
-  const devCommand = () => startFrameworkServer({ settings })
+  const devCommand = async () => {
+    const { ipVersion } = await startFrameworkServer({ settings })
+    // eslint-disable-next-line no-magic-numbers
+    settings.frameworkHost = ipVersion === 6 ? '::1' : '127.0.0.1'
+  }
   const startDevOptions = getBuildOptions({
     cachedConfig,
     options,

package/src/lib/http-agent.js

@@ -43,9 +43,9 @@ const tryGetAgent = async ({ certificateFile, httpProxy }) => {
     return { error: `${httpProxy} must have a scheme of http or https` }
   }
 
-  let open
+  let port
   try {
-    open = await waitPort({
+    port = await waitPort({
       port: Number.parseInt(proxyUrl.port) || (scheme === 'http' ? DEFAULT_HTTP_PORT : DEFAULT_HTTPS_PORT),
       host: proxyUrl.hostname,
       timeout: AGENT_PORT_TIMEOUT,
@@ -56,7 +56,7 @@ const tryGetAgent = async ({ certificateFile, httpProxy }) => {
     return { error: `${httpProxy} is not available.`, message: error.message }
   }
 
-  if (!open) {
+  if (!port.open) {
     // timeout error
     return { error: `Could not connect to '${httpProxy}'` }
   }

package/src/utils/proxy.js

@@ -4,6 +4,7 @@ const { once } = require('events')
 const { readFile } = require('fs').promises
 const http = require('http')
 const https = require('https')
+const { isIPv6 } = require('net')
 const path = require('path')
 
 const contentType = require('content-type')
@@ -281,11 +282,11 @@ const reqToURL = function (req, pathname) {
 
 const MILLISEC_TO_SEC = 1e3
 
-const initializeProxy = async function ({ configPath, distDir, port, projectDir }) {
+const initializeProxy = async function ({ configPath, distDir, host, port, projectDir }) {
   const proxy = httpProxy.createProxyServer({
     selfHandleResponse: true,
     target: {
-      host: '127.0.0.1',
+      host,
       port,
     },
   })
@@ -434,7 +435,9 @@ const onRequest = async ({ addonsUrls, edgeFunctionsProxy, functionsServer, prox
   const options = {
     match,
     addonsUrls,
-    target: `http://127.0.0.1:${settings.frameworkPort}`,
+    target: `http://${isIPv6(settings.frameworkHost) ? `[${settings.frameworkHost}]` : settings.frameworkHost}:${
+      settings.frameworkPort
+    }`,
     publicFolder: settings.dist,
     functionsServer,
     functionsPort: settings.functionsPort,
@@ -498,6 +501,7 @@ const startProxy = async function ({
     state,
   })
   const proxy = await initializeProxy({
+    host: settings.frameworkHost,
     port: settings.frameworkPort,
     distDir: settings.dist,
     projectDir,