netlify-cli 11.1.0 → 11.4.0

package/npm-shrinkwrap.json

@@ -1,21 +1,21 @@
 {
   "name": "netlify-cli",
-  "version": "11.1.0",
+  "version": "11.4.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "11.1.0",
+      "version": "11.4.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@netlify/build": "^27.14.0",
-        "@netlify/config": "^18.2.0",
+        "@netlify/build": "^27.15.6",
+        "@netlify/config": "^18.2.1",
         "@netlify/edge-bundler": "^1.13.0",
         "@netlify/framework-info": "^9.2.0",
         "@netlify/local-functions-proxy": "^1.1.1",
-        "@netlify/plugins-list": "^6.39.0",
+        "@netlify/plugins-list": "^6.40.0",
         "@netlify/zip-it-and-ship-it": "^5.13.5",
         "@octokit/rest": "^18.0.0",
         "@sindresorhus/slugify": "^1.1.0",
@@ -81,7 +81,7 @@
         "multiparty": "^4.2.1",
         "netlify": "^12.0.1",
         "netlify-headers-parser": "^6.0.2",
-        "netlify-onegraph-internal": "0.8.7",
+        "netlify-onegraph-internal": "0.10.0",
         "netlify-redirect-parser": "^13.0.5",
         "netlify-redirector": "^0.2.1",
         "node-fetch": "^2.6.0",
@@ -1189,14 +1189,14 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "node_modules/@netlify/build": {
-      "version": "27.14.0",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.14.0.tgz",
-      "integrity": "sha512-/o1Q+Z2JNpU15S63AsyT4HBPbiweMhBO6jclxNN9kjBnlTefcBJ1c5zN7cOlrcHM+SC+tRPC0oJM/aL/OkXsWg==",
+      "version": "27.15.6",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.15.6.tgz",
+      "integrity": "sha512-ZSah6LDAG0KwWiTUfVfL/kBie7qsUj4cMSl0D7dbTBWSRpGx8MgYjlJHP3U2PgXAgmLcc4NOciGIZD/zL4yJCA==",
       "dependencies": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
-        "@netlify/config": "^18.2.0",
-        "@netlify/edge-bundler": "^1.12.1",
+        "@netlify/config": "^18.2.2",
+        "@netlify/edge-bundler": "^1.13.0",
         "@netlify/functions-utils": "^4.2.4",
         "@netlify/git-utils": "^4.0.0",
         "@netlify/plugins-list": "^6.36.0",
@@ -1806,9 +1806,9 @@
       }
     },
     "node_modules/@netlify/build/node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz",
-      "integrity": "sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw==",
+      "version": "2.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
+      "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ==",
       "engines": {
         "node": ">=12.20"
       },
@@ -1817,9 +1817,9 @@
       }
     },
     "node_modules/@netlify/build/node_modules/read-pkg/node_modules/type-fest": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz",
-      "integrity": "sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw==",
+      "version": "2.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
+      "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ==",
       "engines": {
         "node": ">=12.20"
       },
@@ -2011,9 +2011,9 @@
       }
     },
     "node_modules/@netlify/config": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.0.tgz",
-      "integrity": "sha512-UxJ2bg9KQVNzzPhuTRVybtXLuVo/XBw8CCVJkWHkVSJlomYvtnA0epTreRHjtGSvy++10Rhu37WwzRbFNG5rBQ==",
+      "version": "18.2.2",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.2.tgz",
+      "integrity": "sha512-VgtbLwjjkh6vRIejAuXY8DIvNvXia8ta1Bphkb33Dr3VbGITvZ0avRcnC0BANpKZCBb6jsaubyMwg7V6IzDkPw==",
       "dependencies": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",
@@ -2321,9 +2321,9 @@
       }
     },
     "node_modules/@netlify/config/node_modules/type-fest": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz",
-      "integrity": "sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw==",
+      "version": "2.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
+      "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ==",
       "engines": {
         "node": ">=12.20"
       },
@@ -3593,9 +3593,9 @@
       "integrity": "sha512-1n9VvO/9qM7cRB5f7NgSNqeUrovM7j9WVAY7ZQ4LtQuXSquFmO9Fku7WrV3zAUC6v2Y62fxGyJ0fRllYz5uXLw=="
     },
     "node_modules/@netlify/plugins-list": {
-      "version": "6.39.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.39.0.tgz",
-      "integrity": "sha512-f8sMN7XFlQQ63km5vhg5y5+E3DXoWEoAe94YOMGlmzifZCCzPS/bEUVaQ07n+iDspy3dOIN97FHAAu0B2Jpe2Q==",
+      "version": "6.40.0",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.40.0.tgz",
+      "integrity": "sha512-VDYHEVS/r3eEylUNVwwF0scyV8ISMfxbz6MMl7TEpgArXOS+lYhObNAukrWcUR7aa0zf9C3jwy67zROh0M+ZdQ==",
       "engines": {
         "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
       }
@@ -15963,9 +15963,9 @@
       }
     },
     "node_modules/netlify-onegraph-internal": {
-      "version": "0.8.7",
-      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.8.7.tgz",
-      "integrity": "sha512-FDHQes/GP7UjlzAwJ+qwKfhESBo9NQDN9Ed6U+9a5CW5o2j8Lr23P9Ac1MKp7jDP5h0uAq73r9P86J9Kl1yzLQ==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.10.0.tgz",
+      "integrity": "sha512-Gf6cE1W+q35niIz54xpSLneShpRxlleYL3ZD3D1tjGazuv19q8XBVAAynaAQFzbOk/RPTnu3+Vi/5L7DGACOIg==",
       "dependencies": {
         "graphql": "16.5.0",
         "node-fetch": "^2.6.0",
@@ -22410,15 +22410,15 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/write-file-atomic": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16"
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/ws": {
@@ -23374,14 +23374,14 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "@netlify/build": {
-      "version": "27.14.0",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.14.0.tgz",
-      "integrity": "sha512-/o1Q+Z2JNpU15S63AsyT4HBPbiweMhBO6jclxNN9kjBnlTefcBJ1c5zN7cOlrcHM+SC+tRPC0oJM/aL/OkXsWg==",
+      "version": "27.15.6",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.15.6.tgz",
+      "integrity": "sha512-ZSah6LDAG0KwWiTUfVfL/kBie7qsUj4cMSl0D7dbTBWSRpGx8MgYjlJHP3U2PgXAgmLcc4NOciGIZD/zL4yJCA==",
       "requires": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
-        "@netlify/config": "^18.2.0",
-        "@netlify/edge-bundler": "^1.12.1",
+        "@netlify/config": "^18.2.2",
+        "@netlify/edge-bundler": "^1.13.0",
         "@netlify/functions-utils": "^4.2.4",
         "@netlify/git-utils": "^4.0.0",
         "@netlify/plugins-list": "^6.36.0",
@@ -23752,9 +23752,9 @@
           },
           "dependencies": {
             "type-fest": {
-              "version": "2.18.0",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz",
-              "integrity": "sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw=="
+              "version": "2.18.1",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
+              "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ=="
             }
           }
         },
@@ -23769,9 +23769,9 @@
           },
           "dependencies": {
             "type-fest": {
-              "version": "2.18.0",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz",
-              "integrity": "sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw=="
+              "version": "2.18.1",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
+              "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ=="
             }
           }
         },
@@ -23885,9 +23885,9 @@
       }
     },
     "@netlify/config": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.0.tgz",
-      "integrity": "sha512-UxJ2bg9KQVNzzPhuTRVybtXLuVo/XBw8CCVJkWHkVSJlomYvtnA0epTreRHjtGSvy++10Rhu37WwzRbFNG5rBQ==",
+      "version": "18.2.2",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-18.2.2.tgz",
+      "integrity": "sha512-VgtbLwjjkh6vRIejAuXY8DIvNvXia8ta1Bphkb33Dr3VbGITvZ0avRcnC0BANpKZCBb6jsaubyMwg7V6IzDkPw==",
       "requires": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",
@@ -24063,9 +24063,9 @@
           "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw=="
         },
         "type-fest": {
-          "version": "2.18.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz",
-          "integrity": "sha512-pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw=="
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.18.1.tgz",
+          "integrity": "sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ=="
         },
         "yocto-queue": {
           "version": "1.0.0",
@@ -24766,9 +24766,9 @@
       "integrity": "sha512-1n9VvO/9qM7cRB5f7NgSNqeUrovM7j9WVAY7ZQ4LtQuXSquFmO9Fku7WrV3zAUC6v2Y62fxGyJ0fRllYz5uXLw=="
     },
     "@netlify/plugins-list": {
-      "version": "6.39.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.39.0.tgz",
-      "integrity": "sha512-f8sMN7XFlQQ63km5vhg5y5+E3DXoWEoAe94YOMGlmzifZCCzPS/bEUVaQ07n+iDspy3dOIN97FHAAu0B2Jpe2Q=="
+      "version": "6.40.0",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.40.0.tgz",
+      "integrity": "sha512-VDYHEVS/r3eEylUNVwwF0scyV8ISMfxbz6MMl7TEpgArXOS+lYhObNAukrWcUR7aa0zf9C3jwy67zROh0M+ZdQ=="
     },
     "@netlify/run-utils": {
       "version": "4.0.1",
@@ -34193,9 +34193,9 @@
       }
     },
     "netlify-onegraph-internal": {
-      "version": "0.8.7",
-      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.8.7.tgz",
-      "integrity": "sha512-FDHQes/GP7UjlzAwJ+qwKfhESBo9NQDN9Ed6U+9a5CW5o2j8Lr23P9Ac1MKp7jDP5h0uAq73r9P86J9Kl1yzLQ==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.10.0.tgz",
+      "integrity": "sha512-Gf6cE1W+q35niIz54xpSLneShpRxlleYL3ZD3D1tjGazuv19q8XBVAAynaAQFzbOk/RPTnu3+Vi/5L7DGACOIg==",
       "requires": {
         "graphql": "16.5.0",
         "node-fetch": "^2.6.0",
@@ -39129,9 +39129,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write-file-atomic": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "requires": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "11.1.0",
+  "version": "11.4.0",
   "author": "Netlify Inc.",
   "contributors": [
     "@whitep4nth3r (https://twitter.com/whitep4nth3r)",
@@ -222,12 +222,12 @@
     "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,yml,json,html}\" \"*.{mjs,cjs,js,yml,json,html}\" \".*.{mjs,cjs,js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!**/*/package-lock.json\" \"!.github/**/*.md\""
   },
   "dependencies": {
-    "@netlify/build": "^27.14.0",
-    "@netlify/config": "^18.2.0",
+    "@netlify/build": "^27.15.6",
+    "@netlify/config": "^18.2.1",
     "@netlify/edge-bundler": "^1.13.0",
     "@netlify/framework-info": "^9.2.0",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/plugins-list": "^6.39.0",
+    "@netlify/plugins-list": "^6.40.0",
     "@netlify/zip-it-and-ship-it": "^5.13.5",
     "@octokit/rest": "^18.0.0",
     "@sindresorhus/slugify": "^1.1.0",
@@ -293,7 +293,7 @@
     "multiparty": "^4.2.1",
     "netlify": "^12.0.1",
     "netlify-headers-parser": "^6.0.2",
-    "netlify-onegraph-internal": "0.8.7",
+    "netlify-onegraph-internal": "0.10.0",
     "netlify-redirect-parser": "^13.0.5",
     "netlify-redirector": "^0.2.1",
     "node-fetch": "^2.6.0",

package/src/commands/deploy/deploy.js

@@ -410,7 +410,13 @@ const bundleEdgeFunctions = async (options) => {
     phase: 'start',
   })
 
-  const { severityCode, success } = await runCoreSteps(['edge_functions_bundling'], { ...options, buffer: true })
+  const { severityCode, success } = await runCoreSteps(['edge_functions_bundling'], {
+    ...options,
+    buffer: true,
+    featureFlags: {
+      edge_functions_produce_eszip: true,
+    },
+  })
 
   if (!success) {
     statusCb({

package/src/commands/dev/dev.js

@@ -434,6 +434,7 @@ const dev = async (options, command) => {
   }
 
   let { env } = cachedConfig
+
   if (!options.offline && siteInfo.use_envelope) {
     env = await getEnvelopeEnv({ api, context: options.context, env, siteInfo })
   }

package/src/commands/graph/graph-handler.js

@@ -33,17 +33,18 @@ const graphHandler = async (args, options, command) => {
     error(`Error parsing schema: ${buildSchemaError}`)
   }
 
-  const userOperationName = args.operationName
+  const userOperationNames = args.operationNames
   const userCodegenId = options.codegen
 
   const handlerOptions = options.data ? JSON.parse(options.data) : {}
 
-  let operationName = userOperationName
-  if (!operationName) {
-    operationName = await autocompleteOperationNames({ netlifyGraphConfig })
+  let operationNames = userOperationNames
+  if (!operationNames || operationNames.length === 0) {
+    const operationName = await autocompleteOperationNames({ netlifyGraphConfig })
+    operationNames = [operationName]
   }
 
-  if (!operationName) {
+  if (!operationNames || operationNames.length === 0) {
     error(`No operation name provided`)
   }
 
@@ -66,14 +67,17 @@ const graphHandler = async (args, options, command) => {
   }
 
   if (schema) {
-    generateHandlerByOperationName({
-      generate: codeGenerator.generateHandler,
-      logger: log,
-      netlifyGraphConfig,
-      schema,
-      operationName,
-      handlerOptions,
-    })
+    /* eslint-disable fp/no-loops */
+    for (const operationName of operationNames) {
+      await generateHandlerByOperationName({
+        generate: codeGenerator.generateHandler,
+        logger: log,
+        netlifyGraphConfig,
+        schema,
+        operationName,
+        handlerOptions,
+      })
+    }
   } else {
     error(`Failed to parse Netlify GraphQL schema`)
   }
@@ -87,14 +91,14 @@ const graphHandler = async (args, options, command) => {
 const createGraphHandlerCommand = (program) =>
   program
     .command('graph:handler')
-    .argument('[name]', 'Operation name')
+    .argument('[name...]', 'Operation name(s)')
     .option('-c, --codegen <id>', 'The id of the specific code generator to use')
     .option("-d, --data '<json>'", 'Optional data to pass along to the code generator')
     .description(
       'Generate a handler for a Graph operation given its name. See `graph:operations` for a list of operations.',
     )
-    .action(async (operationName, options, command) => {
-      await graphHandler({ operationName }, options, command)
+    .action(async (operationNames, options, command) => {
+      await graphHandler({ operationNames }, options, command)
     })
 
 module.exports = { createGraphHandlerCommand }

package/src/commands/init/init.js

@@ -198,6 +198,8 @@ const init = async (options, command) => {
     siteInfo = await createOrLinkSiteToRepo(command)
   }
 
+  log()
+
   // Check for existing CI setup
   const remoteBuildRepo = getRepoUrl({ siteInfo })
   if (remoteBuildRepo && !options.force) {

package/src/commands/link/link.js

@@ -1,8 +1,4 @@
 // @ts-check
-const { join, relative } = require('path')
-const path = require('path')
-const { cwd } = require('process')
-
 const inquirer = require('inquirer')
 const isEmpty = require('lodash/isEmpty')
 
@@ -234,10 +230,6 @@ or run ${chalk.cyanBright('netlify sites:create')} to create a site.`)
   log(`Admin url: ${chalk.magentaBright(site.admin_url)}`)
   log(`Site url:  ${chalk.cyanBright(site.ssl_url || site.url)}`)
   log()
-
-  log(`Site id saved to ${path.join(netlify.site.root, '/.netlify/state.json')}`)
-  // log(`Local Config: .netlify/config.json`)
-  log()
   log(`You can now run other \`netlify\` cli commands in this directory`)
 
   return site
@@ -296,7 +288,7 @@ const link = async (options, command) => {
 
     // Save site ID
     state.set('siteId', siteData.id)
-    log(`Linked to ${siteData.name} in ${state.path}`)
+    log(`Linked to ${siteData.name}`)
 
     await track('sites_linked', {
       siteId: siteData.id,
@@ -327,7 +319,7 @@ const link = async (options, command) => {
     const [firstSiteData] = results
     state.set('siteId', firstSiteData.id)
 
-    log(`Linked to ${firstSiteData.name} in ${relative(join(cwd(), '..'), state.path)}`)
+    log(`Linked to ${firstSiteData.name}`)
 
     await track('sites_linked', {
       siteId: (firstSiteData && firstSiteData.id) || siteId,

package/src/commands/sites/sites-create.js

@@ -39,16 +39,14 @@ const getSiteNameInput = async (name, user, api) => {
     ]
     siteSuggestion = sample(suggestions)
 
-    console.log(
-      `Choose a unique site name (e.g. ${siteSuggestion}.netlify.app) or leave it blank for a random name. You can update the site name later.`,
-    )
     const { name: nameInput } = await inquirer.prompt([
       {
         type: 'input',
         name: 'name',
-        message: 'Site name (optional):',
-        filter: (val) => (val === '' ? undefined : val),
-        validate: (input) => /^[a-zA-Z\d-]+$/.test(input) || 'Only alphanumeric characters and hyphens are allowed',
+        message: 'Site name (you can change it later):',
+        default: siteSuggestion,
+        validate: (input) =>
+          /^[a-zA-Z\d-]+$/.test(input || undefined) || 'Only alphanumeric characters and hyphens are allowed',
       },
     ])
     name = nameInput || siteSuggestion

package/src/functions-templates/javascript/apollo-graphql-rest/package.json

@@ -16,7 +16,7 @@
   "license": "MIT",
   "dependencies": {
     "apollo-server-lambda": "^2.18.2",
-    "apollo-datasource-rest": "^0.14.0",
+    "apollo-datasource-rest": "^0.15.0",
     "graphql": "^14.1.1"
   }
 }

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

@@ -26,9 +26,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.18.23",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.23.tgz",
-      "integrity": "sha512-MhbCWN18R4GhO8ewQWAFK4TGQdBpXWByukz7cWyJmXhvRuCIaM/oWytGPqVmDzgEnnaIc9ss6HbU5mUi+vyZPA=="
+      "version": "14.18.25",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.25.tgz",
+      "integrity": "sha512-9pLfceRSrKIsv/MISN6RoFWTIzka36Uk2Uuf5a8cHyDYhEgl5Hm5dXoe621KULeBjt+cFsY18mILsWWtJeG80w=="
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
@@ -58,9 +58,9 @@
       }
     },
     "@types/node": {
-      "version": "14.18.23",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.23.tgz",
-      "integrity": "sha512-MhbCWN18R4GhO8ewQWAFK4TGQdBpXWByukz7cWyJmXhvRuCIaM/oWytGPqVmDzgEnnaIc9ss6HbU5mUi+vyZPA=="
+      "version": "14.18.25",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.25.tgz",
+      "integrity": "sha512-9pLfceRSrKIsv/MISN6RoFWTIzka36Uk2Uuf5a8cHyDYhEgl5Hm5dXoe621KULeBjt+cFsY18mILsWWtJeG80w=="
     },
     "is-promise": {
       "version": "4.0.0",

package/src/lib/build.js

@@ -35,6 +35,7 @@ const getBuildOptions = ({ cachedConfig, options: { context, cwd, debug, dry, js
   cwd,
   featureFlags: {
     functionsBundlingManifest: true,
+    edge_functions_produce_eszip: true,
   },
 })
 

package/src/lib/one-graph/cli-client.js

@@ -318,7 +318,7 @@ const refetchAndGenerateFromOneGraph = async (input) => {
     return
   }
 
-  generateFunctionsFile({
+  await generateFunctionsFile({
     config,
     logger,
     netlifyGraphConfig,
@@ -619,7 +619,7 @@ ${JSON.stringify(payload, null, 2)}`)
         return
       }
 
-      const files = generateHandlerByOperationId({
+      const files = await generateHandlerByOperationId({
         netlifyGraphConfig,
         schema,
         operationId: payload.operationId,

package/src/lib/one-graph/cli-netlify-graph.js

@@ -550,9 +550,9 @@ const readGraphQLSchemaFile = (netlifyGraphConfig) => {
  * @param {string} input.operationsDoc The document containing the operation with operationId and any fragment dependency to use when generating the handler
  * @param {object} input.handlerOptions The options to use when generating the handler
  * @param {(message: string) => void=} input.logger A function that if provided will be used to log messages
- * @returns {{exportedFiles: CodegenHelpers.ExportedFile[]; operation: GraphQL.OperationDefinitionNode;} | undefined} The generated files
+ * @returns {Promise<{exportedFiles: CodegenHelpers.ExportedFile[]; operation: GraphQL.OperationDefinitionNode;} | undefined>} The generated files
  */
-const generateHandlerSourceByOperationId = ({
+const generateHandlerSourceByOperationId = async ({
   generate,
   handlerOptions,
   netlifyGraphConfig,
@@ -571,7 +571,7 @@ const generateHandlerSourceByOperationId = ({
     operationsDoc,
   }
 
-  const result = NetlifyGraph.generateCustomHandlerSource(generateHandlerPayload)
+  const result = await NetlifyGraph.generateCustomHandlerSource(generateHandlerPayload)
 
   return result
 }
@@ -585,15 +585,15 @@ const generateHandlerSourceByOperationId = ({
  * @param {string} input.operationId The operationId to use when generating the handler
  * @param {object} input.handlerOptions The options to use when generating the handler
  * @param {(message: string) => void=} input.logger A function that if provided will be used to log messages
- * @returns {Array<{filePath: string, name:string, prettierSuccess: boolean}> | undefined} An array of the generated handler filepaths
+ * @returns {Promise<Array<{filePath: string, name:string, prettierSuccess: boolean}> | undefined>} An array of the generated handler filepaths
  */
-const generateHandlerByOperationId = ({ generate, handlerOptions, netlifyGraphConfig, operationId, schema }) => {
+const generateHandlerByOperationId = async ({ generate, handlerOptions, netlifyGraphConfig, operationId, schema }) => {
   let currentOperationsDoc = readGraphQLOperationsSourceFile(netlifyGraphConfig)
   if (currentOperationsDoc.trim().length === 0) {
     currentOperationsDoc = NetlifyGraph.defaultExampleOperationsDoc
   }
 
-  const result = generateHandlerSourceByOperationId({
+  const result = await generateHandlerSourceByOperationId({
     generate,
     handlerOptions,
     netlifyGraphConfig,
@@ -669,9 +669,9 @@ const generateHandlerByOperationId = ({ generate, handlerOptions, netlifyGraphCo
  * @param {string} input.operationName The name of the operation to use when generating the handler
  * @param {object} input.handlerOptions The options to use when generating the handler
  * @param {(message: string) => void} input.logger A function that if provided will be used to log messages
- * @returns
+ * @returns {Promise<void>}
  */
-const generateHandlerByOperationName = ({
+const generateHandlerByOperationName = async ({
   generate,
   handlerOptions,
   logger,
@@ -702,7 +702,7 @@ const generateHandlerByOperationName = ({
     return
   }
 
-  generateHandlerByOperationId({
+  await generateHandlerByOperationId({
     logger,
     generate,
     netlifyGraphConfig,

package/src/utils/init/config-github.js

@@ -224,6 +224,8 @@ const configGithub = async ({ command, repoName, repoOwner, siteId }) => {
   })
   await saveNetlifyToml({ repositoryRoot, config, configPath, baseDir, buildCmd, buildDir, functionsDir })
 
+  log()
+
   const octokit = getGitHubClient(token)
   const [deployKey, githubRepo] = await Promise.all([
     addDeployKey({ api, octokit, repoOwner, repoName }),

package/src/utils/init/plugins.js

@@ -1,38 +1,10 @@
-const fetch = require('node-fetch')
-
-// TODO: use static `import` after migrating this repository to pure ES modules
-const netlifyPluginsList = import('@netlify/plugins-list')
-
-// 1 minute
-const PLUGINS_LIST_TIMEOUT = 6e4
-
-const getPluginsList = async () => {
-  const { pluginsList, pluginsUrl } = await netlifyPluginsList
-  try {
-    const response = await fetch(pluginsUrl, { timeout: PLUGINS_LIST_TIMEOUT })
-    return await response.json()
-  } catch {
-    return pluginsList
-  }
-}
-
-const getPluginInfo = (list, packageName) => list.find(({ package }) => package === packageName)
-
 const isPluginInstalled = (configPlugins, plugin) =>
   configPlugins.some(({ package: configPlugin }) => configPlugin === plugin)
 
 const getRecommendPlugins = (frameworkPlugins, config) =>
   frameworkPlugins.filter((plugin) => !isPluginInstalled(config.plugins, plugin))
 
-const getPluginsToInstall = ({ installSinglePlugin, plugins, recommendedPlugins }) => {
-  if (Array.isArray(plugins)) {
-    return plugins.map((plugin) => ({ package: plugin }))
-  }
-
-  return installSinglePlugin === true ? [{ package: recommendedPlugins[0] }] : []
-}
-
 const getUIPlugins = (configPlugins) =>
   configPlugins.filter(({ origin }) => origin === 'ui').map(({ package }) => ({ package }))
 
-module.exports = { getPluginsList, getPluginInfo, getRecommendPlugins, getPluginsToInstall, getUIPlugins }
+module.exports = { getRecommendPlugins, getUIPlugins }

package/src/utils/init/utils.js

@@ -1,7 +1,6 @@
 // @ts-check
 const { existsSync } = require('fs')
 const { writeFile } = require('fs').promises
-const { EOL } = require('os')
 const path = require('path')
 const process = require('process')
 
@@ -10,11 +9,12 @@ const inquirer = require('inquirer')
 const isEmpty = require('lodash/isEmpty')
 
 const { normalizeBackslash } = require('../../lib/path')
+const { log } = require('../command-helpers')
 const { chalk, error: failAndExit, warn } = require('../command-helpers')
 
 const { getFrameworkInfo } = require('./frameworks')
 const { detectNodeVersion } = require('./node-version')
-const { getPluginInfo, getPluginsList, getPluginsToInstall, getRecommendPlugins, getUIPlugins } = require('./plugins')
+const { getRecommendPlugins, getUIPlugins } = require('./plugins')
 
 const normalizeDir = ({ baseDirectory, defaultValue, dir }) => {
   if (dir === undefined) {
@@ -55,14 +55,7 @@ const getDefaultSettings = ({
   }
 }
 
-const getPromptInputs = async ({
-  defaultBaseDir,
-  defaultBuildCmd,
-  defaultBuildDir,
-  defaultFunctionsDir,
-  frameworkName,
-  recommendedPlugins,
-}) => {
+const getPromptInputs = ({ defaultBaseDir, defaultBuildCmd, defaultBuildDir }) => {
   const inputs = [
     defaultBaseDir !== undefined && {
       type: 'input',
@@ -83,50 +76,9 @@ const getPromptInputs = async ({
       message: 'Directory to deploy (blank for current dir):',
       default: defaultBuildDir,
     },
-    {
-      type: 'input',
-      name: 'functionsDir',
-      message: 'Netlify functions folder:',
-      default: defaultFunctionsDir,
-    },
   ].filter(Boolean)
 
-  if (recommendedPlugins.length === 0) {
-    return inputs
-  }
-
-  const pluginsList = await getPluginsList()
-
-  const prefix = `Seems like this is a ${formatTitle(frameworkName)} site.${EOL}❇️  `
-  if (recommendedPlugins.length === 1) {
-    const { name } = getPluginInfo(pluginsList, recommendedPlugins[0])
-    return [
-      ...inputs,
-      {
-        type: 'confirm',
-        name: 'installSinglePlugin',
-        message: `${prefix}We're going to install this Build Plugin: ${formatTitle(
-          `${name} plugin`,
-        )}${EOL}➡️  OK to install?`,
-        default: true,
-      },
-    ]
-  }
-
-  const infos = recommendedPlugins.map((packageName) => getPluginInfo(pluginsList, packageName))
-  return [
-    ...inputs,
-    {
-      type: 'checkbox',
-      name: 'plugins',
-      message: `${prefix}We're going to install these plugins: ${infos
-        .map(({ name }) => `${name} plugin`)
-        .map(formatTitle)
-        .join(', ')}${EOL}➡️  OK to install??`,
-      choices: infos.map((info) => ({ name: `${info.name} plugin`, value: info.package })),
-      default: infos.map((info) => info.package),
-    },
-  ]
+  return inputs.filter(Boolean)
 }
 
 // `repositoryRoot === siteRoot` means the base directory wasn't detected by @netlify/config, so we use cwd()
@@ -154,25 +106,24 @@ const getBuildSettings = async ({ config, env, repositoryRoot, siteRoot }) => {
       frameworkBuildDir,
       frameworkPlugins,
     })
-  const { baseDir, buildCmd, buildDir, functionsDir, installSinglePlugin, plugins } = await inquirer.prompt(
-    await getPromptInputs({
+
+  if (recommendedPlugins.length !== 0) {
+    log(`Configuring ${formatTitle(frameworkName)} runtime...`)
+    log()
+  }
+
+  const { baseDir, buildCmd, buildDir } = await inquirer.prompt(
+    getPromptInputs({
+      defaultBaseDir,
       defaultBuildCmd,
       defaultBuildDir,
-      defaultFunctionsDir,
-      defaultBaseDir,
-      recommendedPlugins,
-      frameworkName,
     }),
   )
-  const pluginsToInstall = getPluginsToInstall({
-    plugins,
-    installSinglePlugin,
-    recommendedPlugins,
-  })
 
+  const pluginsToInstall = recommendedPlugins.map((plugin) => ({ package: plugin }))
   const normalizedBaseDir = baseDir ? normalizeBackslash(baseDir) : undefined
 
-  return { baseDir: normalizedBaseDir, buildCmd, buildDir, functionsDir, pluginsToInstall }
+  return { baseDir: normalizedBaseDir, buildCmd, buildDir, functionsDir: defaultFunctionsDir, pluginsToInstall }
 }
 
 const getNetlifyToml = ({