netlify-cli 8.14.0-scheduled-functions → 8.15.1

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "8.14.0-scheduled-functions",
+  "version": "8.15.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "8.14.0-scheduled-functions",
+      "version": "8.15.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -81,7 +81,7 @@
         "multiparty": "^4.2.1",
         "netlify": "^10.1.2",
         "netlify-headers-parser": "^6.0.1",
-        "netlify-onegraph-internal": "0.0.15",
+        "netlify-onegraph-internal": "0.0.16",
         "netlify-redirect-parser": "^13.0.1",
         "netlify-redirector": "^0.2.1",
         "node-fetch": "^2.6.0",
@@ -124,7 +124,7 @@
       },
       "devDependencies": {
         "@babel/preset-react": "^7.12.13",
-        "@netlify/eslint-config-node": "^4.1.6",
+        "@netlify/eslint-config-node": "^4.1.7",
         "ava": "^4.0.0",
         "c8": "^7.11.0",
         "eslint-plugin-sort-destructure-keys": "^1.3.5",
@@ -148,7 +148,7 @@
         "tomlify-j0.4": "^3.0.0",
         "tree-kill": "^1.2.2",
         "typescript": "^4.4.4",
-        "verdaccio": "^5.4.0"
+        "verdaccio": "^5.5.2"
       },
       "engines": {
         "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
@@ -2567,9 +2567,9 @@
       }
     },
     "node_modules/@netlify/eslint-config-node": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/@netlify/eslint-config-node/-/eslint-config-node-4.1.6.tgz",
-      "integrity": "sha512-G/6bqpeR8jQj1cbEjFg8sdc23Wq4TUz/fD+XFup0EYEJbUnjriClsljgMUSnmnBNllyMy36T9YEXkam4HUKtJA==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/@netlify/eslint-config-node/-/eslint-config-node-4.1.7.tgz",
+      "integrity": "sha512-3XYVE0Wnr8YmSTls7447fT4Lyr5goFJ1kK/xevdLVdlzinxd1Wc6SK4um5hZAvl6nrURmgRfLBSIqdpDeRFIlg==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.13.8",
@@ -4053,18 +4053,6 @@
         "url": "https://opencollective.com/verdaccio"
       }
     },
-    "node_modules/@verdaccio/readme/node_modules/marked": {
-      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz",
-      "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==",
-      "dev": true,
-      "bin": {
-        "marked": "bin/marked.js"
-      },
-      "engines": {
-        "node": ">= 12"
-      }
-    },
     "node_modules/@verdaccio/streams": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/@verdaccio/streams/-/streams-10.1.0.tgz",
@@ -4080,14 +4068,10 @@
       }
     },
     "node_modules/@verdaccio/ui-theme": {
-      "version": "6.0.0-6-next.15",
-      "resolved": "https://registry.npmjs.org/@verdaccio/ui-theme/-/ui-theme-6.0.0-6-next.15.tgz",
-      "integrity": "sha512-qKqsk3OUIG1VJh2cgkA8H1nSyB1ybMw9VAiWkBarv8uriRkwG+cIcEMUXZuG1pnr6ieNLsYtLRGKbnlBhIpSaA==",
-      "dev": true,
-      "engines": {
-        "node": ">=14",
-        "npm": ">=6"
-      }
+      "version": "6.0.0-6-next.16",
+      "resolved": "https://registry.npmjs.org/@verdaccio/ui-theme/-/ui-theme-6.0.0-6-next.16.tgz",
+      "integrity": "sha512-FbYl3273qaA0/fRwrvE876/HuvU81zjsnR70rCEojBelDuddl3xbY1LVdvthCjUGuIj2SUNpTzGhyROdqHJUCg==",
+      "dev": true
     },
     "node_modules/abab": {
       "version": "2.0.5",
@@ -14276,15 +14260,15 @@
       }
     },
     "node_modules/marked": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz",
-      "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==",
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz",
+      "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==",
       "dev": true,
       "bin": {
-        "marked": "bin/marked"
+        "marked": "bin/marked.js"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 12"
       }
     },
     "node_modules/matcher": {
@@ -15033,9 +15017,9 @@
       }
     },
     "node_modules/netlify-onegraph-internal": {
-      "version": "0.0.15",
-      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.0.15.tgz",
-      "integrity": "sha512-PlUro29zk/D+9/8NLQOx8Qw58KWvZo/42uR+7YMqSx9pMtgvtqKWqpAGGf0iCy4eAwe/XLT/eCQR6k/dIBbZHw==",
+      "version": "0.0.16",
+      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.0.16.tgz",
+      "integrity": "sha512-reQ/C7ztbYCDMXqFLSw0rBwOi866sqdBjagUs6Ug6LXDkCIGHBTjMX0iwNhEn7+/WzV4f1lJj66NhdjF5Q4/aQ==",
       "dependencies": {
         "graphql": "16.0.0",
         "node-fetch": "^2.6.0",
@@ -21037,16 +21021,16 @@
       }
     },
     "node_modules/verdaccio": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/verdaccio/-/verdaccio-5.5.0.tgz",
-      "integrity": "sha512-isHIHRpjoT0cUXQyH1wAAHnO0E5Ky+pMVaaYThrzsjlkQHS2rp04xj7VPQrVHTJFIbv2VTIHRjWriw0J2Ilt8g==",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/verdaccio/-/verdaccio-5.5.2.tgz",
+      "integrity": "sha512-SU107gfxE8FLrwp5GezhmWE0otWTAb7xIcz/m931vqOPjeH2MwbMf0+WuCDQ5O80XxdwurlK/JFNRYzDzqUrMA==",
       "dev": true,
       "dependencies": {
         "@verdaccio/commons-api": "10.1.0",
         "@verdaccio/local-storage": "10.1.1",
         "@verdaccio/readme": "10.2.1",
         "@verdaccio/streams": "10.1.0",
-        "@verdaccio/ui-theme": "6.0.0-6-next.15",
+        "@verdaccio/ui-theme": "6.0.0-6-next.16",
         "async": "3.2.3",
         "body-parser": "1.19.1",
         "clipanion": "3.1.0",
@@ -21069,9 +21053,9 @@
         "lodash": "4.17.21",
         "lru-cache": "6.0.0",
         "lunr-mutable-indexes": "2.3.2",
-        "marked": "2.1.3",
+        "marked": "4.0.10",
         "memoizee": "0.4.15",
-        "mime": "2.6.0",
+        "mime": "3.0.0",
         "minimatch": "3.0.4",
         "mkdirp": "1.0.4",
         "mv": "2.1.1",
@@ -21162,15 +21146,15 @@
       }
     },
     "node_modules/verdaccio/node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
+      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
       "dev": true,
       "bin": {
         "mime": "cli.js"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=10.0.0"
       }
     },
     "node_modules/verdaccio/node_modules/mkdirp": {
@@ -21450,9 +21434,9 @@
       }
     },
     "node_modules/winston": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-3.4.0.tgz",
-      "integrity": "sha512-FqilVj+5HKwCfIHQzMxrrd5tBIH10JTS3koFGbLVWBODjiIYq7zir08rFyBT4rrTYG/eaTqDcfSIbcjSM78YSw==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.5.0.tgz",
+      "integrity": "sha512-OQMbmLsIdVHvm2hSurrYZs+iZNIImXneYJ6pX7LseSMEq20HdTETXiNnNX3FDwN4LB/xDRZLF6JYOY+AI112Kw==",
       "dependencies": {
         "@dabh/diagnostics": "^2.0.2",
         "async": "^3.2.3",
@@ -21460,6 +21444,7 @@
         "logform": "^2.3.2",
         "one-time": "^1.0.0",
         "readable-stream": "^3.4.0",
+        "safe-stable-stringify": "^2.3.1",
         "stack-trace": "0.0.x",
         "triple-beam": "^1.3.0",
         "winston-transport": "^4.4.2"
@@ -21481,6 +21466,14 @@
         "node": ">= 6.4.0"
       }
     },
+    "node_modules/winston/node_modules/safe-stable-stringify": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz",
+      "integrity": "sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -23426,9 +23419,9 @@
       "integrity": "sha512-tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="
     },
     "@netlify/eslint-config-node": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/@netlify/eslint-config-node/-/eslint-config-node-4.1.6.tgz",
-      "integrity": "sha512-G/6bqpeR8jQj1cbEjFg8sdc23Wq4TUz/fD+XFup0EYEJbUnjriClsljgMUSnmnBNllyMy36T9YEXkam4HUKtJA==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/@netlify/eslint-config-node/-/eslint-config-node-4.1.7.tgz",
+      "integrity": "sha512-3XYVE0Wnr8YmSTls7447fT4Lyr5goFJ1kK/xevdLVdlzinxd1Wc6SK4um5hZAvl6nrURmgRfLBSIqdpDeRFIlg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.13.8",
@@ -24521,14 +24514,6 @@
         "dompurify": "^2.2.6",
         "jsdom": "15.2.1",
         "marked": "4.0.10"
-      },
-      "dependencies": {
-        "marked": {
-          "version": "4.0.10",
-          "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz",
-          "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==",
-          "dev": true
-        }
       }
     },
     "@verdaccio/streams": {
@@ -24538,9 +24523,9 @@
       "dev": true
     },
     "@verdaccio/ui-theme": {
-      "version": "6.0.0-6-next.15",
-      "resolved": "https://registry.npmjs.org/@verdaccio/ui-theme/-/ui-theme-6.0.0-6-next.15.tgz",
-      "integrity": "sha512-qKqsk3OUIG1VJh2cgkA8H1nSyB1ybMw9VAiWkBarv8uriRkwG+cIcEMUXZuG1pnr6ieNLsYtLRGKbnlBhIpSaA==",
+      "version": "6.0.0-6-next.16",
+      "resolved": "https://registry.npmjs.org/@verdaccio/ui-theme/-/ui-theme-6.0.0-6-next.16.tgz",
+      "integrity": "sha512-FbYl3273qaA0/fRwrvE876/HuvU81zjsnR70rCEojBelDuddl3xbY1LVdvthCjUGuIj2SUNpTzGhyROdqHJUCg==",
       "dev": true
     },
     "abab": {
@@ -32219,9 +32204,9 @@
       }
     },
     "marked": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz",
-      "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==",
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz",
+      "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==",
       "dev": true
     },
     "matcher": {
@@ -32799,9 +32784,9 @@
       }
     },
     "netlify-onegraph-internal": {
-      "version": "0.0.15",
-      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.0.15.tgz",
-      "integrity": "sha512-PlUro29zk/D+9/8NLQOx8Qw58KWvZo/42uR+7YMqSx9pMtgvtqKWqpAGGf0iCy4eAwe/XLT/eCQR6k/dIBbZHw==",
+      "version": "0.0.16",
+      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.0.16.tgz",
+      "integrity": "sha512-reQ/C7ztbYCDMXqFLSw0rBwOi866sqdBjagUs6Ug6LXDkCIGHBTjMX0iwNhEn7+/WzV4f1lJj66NhdjF5Q4/aQ==",
       "requires": {
         "graphql": "16.0.0",
         "node-fetch": "^2.6.0",
@@ -37412,16 +37397,16 @@
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
     },
     "verdaccio": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/verdaccio/-/verdaccio-5.5.0.tgz",
-      "integrity": "sha512-isHIHRpjoT0cUXQyH1wAAHnO0E5Ky+pMVaaYThrzsjlkQHS2rp04xj7VPQrVHTJFIbv2VTIHRjWriw0J2Ilt8g==",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/verdaccio/-/verdaccio-5.5.2.tgz",
+      "integrity": "sha512-SU107gfxE8FLrwp5GezhmWE0otWTAb7xIcz/m931vqOPjeH2MwbMf0+WuCDQ5O80XxdwurlK/JFNRYzDzqUrMA==",
       "dev": true,
       "requires": {
         "@verdaccio/commons-api": "10.1.0",
         "@verdaccio/local-storage": "10.1.1",
         "@verdaccio/readme": "10.2.1",
         "@verdaccio/streams": "10.1.0",
-        "@verdaccio/ui-theme": "6.0.0-6-next.15",
+        "@verdaccio/ui-theme": "6.0.0-6-next.16",
         "async": "3.2.3",
         "body-parser": "1.19.1",
         "clipanion": "3.1.0",
@@ -37444,9 +37429,9 @@
         "lodash": "4.17.21",
         "lru-cache": "6.0.0",
         "lunr-mutable-indexes": "2.3.2",
-        "marked": "2.1.3",
+        "marked": "4.0.10",
         "memoizee": "0.4.15",
-        "mime": "2.6.0",
+        "mime": "3.0.0",
         "minimatch": "3.0.4",
         "mkdirp": "1.0.4",
         "mv": "2.1.1",
@@ -37481,9 +37466,9 @@
           }
         },
         "mime": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-          "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
+          "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
           "dev": true
         },
         "mkdirp": {
@@ -37730,9 +37715,9 @@
       }
     },
     "winston": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-3.4.0.tgz",
-      "integrity": "sha512-FqilVj+5HKwCfIHQzMxrrd5tBIH10JTS3koFGbLVWBODjiIYq7zir08rFyBT4rrTYG/eaTqDcfSIbcjSM78YSw==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.5.0.tgz",
+      "integrity": "sha512-OQMbmLsIdVHvm2hSurrYZs+iZNIImXneYJ6pX7LseSMEq20HdTETXiNnNX3FDwN4LB/xDRZLF6JYOY+AI112Kw==",
       "requires": {
         "@dabh/diagnostics": "^2.0.2",
         "async": "^3.2.3",
@@ -37740,9 +37725,17 @@
         "logform": "^2.3.2",
         "one-time": "^1.0.0",
         "readable-stream": "^3.4.0",
+        "safe-stable-stringify": "^2.3.1",
         "stack-trace": "0.0.x",
         "triple-beam": "^1.3.0",
         "winston-transport": "^4.4.2"
+      },
+      "dependencies": {
+        "safe-stable-stringify": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz",
+          "integrity": "sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg=="
+        }
       }
     },
     "winston-transport": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "8.14.0-scheduled-functions",
+  "version": "8.15.1",
   "author": "Netlify Inc.",
   "contributors": [
     "Mathias Biilmann <matt@netlify.com> (https://twitter.com/biilmann)",
@@ -64,7 +64,7 @@
     "test:dev:ava": "ava --verbose",
     "test:ci:ava": "c8 -r json ava",
     "test:affected": "node ./tools/affected-test.js",
-    "e2e": "node ./tools/e2e/run.js",
+    "e2e": "node ./tools/e2e/run.mjs",
     "docs": "node ./site/scripts/docs.js",
     "watch": "c8 --reporter=lcov ava --watch",
     "site:build": "run-s site:build:*",
@@ -73,8 +73,8 @@
     "postinstall": "node ./scripts/postinstall.js"
   },
   "config": {
-    "eslint": "--ignore-path .gitignore --cache --format=codeframe --max-warnings=0 \"{src,tools,scripts,site,tests,.github}/**/*.{js,md,html}\" \"*.{js,md,html}\" \".*.{js,md,html}\"",
-    "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{js,md,yml,json,html}\" \"*.{js,yml,json,html}\" \".*.{js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!.github/**/*.md\""
+    "eslint": "--ignore-path .gitignore --cache --format=codeframe --max-warnings=0 \"{src,tools,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,html}\" \"*.{mjs,cjs,js,md,html}\" \".*.{mjs,cjs,js,md,html}\"",
+    "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\" \"!.github/**/*.md\""
   },
   "dependencies": {
     "@netlify/build": "^26.2.0",
@@ -148,7 +148,7 @@
     "multiparty": "^4.2.1",
     "netlify": "^10.1.2",
     "netlify-headers-parser": "^6.0.1",
-    "netlify-onegraph-internal": "0.0.15",
+    "netlify-onegraph-internal": "0.0.16",
     "netlify-redirect-parser": "^13.0.1",
     "netlify-redirector": "^0.2.1",
     "node-fetch": "^2.6.0",
@@ -187,7 +187,7 @@
   },
   "devDependencies": {
     "@babel/preset-react": "^7.12.13",
-    "@netlify/eslint-config-node": "^4.1.6",
+    "@netlify/eslint-config-node": "^4.1.7",
     "ava": "^4.0.0",
     "c8": "^7.11.0",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",

package/src/commands/dev/dev.js

@@ -308,7 +308,7 @@ const dev = async (options, command) => {
   } else if (startNetlifyGraphWatcher) {
     const netlifyToken = await command.authenticate()
     await OneGraphCliClient.ensureAppForSite(netlifyToken, site.id)
-    const netlifyGraphConfig = await getNetlifyGraphConfig({ command, options })
+    const netlifyGraphConfig = await getNetlifyGraphConfig({ command, options, settings })
 
     log(`Starting Netlify Graph session, to edit your library run \`netlify graph:edit\` in another tab`)
 

package/src/commands/link/link.js

@@ -276,16 +276,13 @@ const link = async (options, command) => {
     return exit()
   }
 
-  // If already linked to site. exit and prompt for unlink
   if (siteData) {
+    // If already linked to site. exit and prompt for unlink
     log(`Site already linked to "${siteData.name}"`)
     log(`Admin url: ${siteData.admin_url}`)
     log()
     log(`To unlink this site, run: ${chalk.cyanBright('netlify unlink')}`)
-    return exit()
-  }
-
-  if (options.id) {
+  } else if (options.id) {
     try {
       // @ts-ignore types from API are wrong they cannot recognize `getSite` of API
       siteData = await api.getSite({ site_id: options.id })
@@ -306,11 +303,7 @@ const link = async (options, command) => {
       linkType: 'manual',
       kind: 'byId',
     })
-
-    return exit()
-  }
-
-  if (options.name) {
+  } else if (options.name) {
     let results
     try {
       results = await listSites({
@@ -341,11 +334,9 @@ const link = async (options, command) => {
       linkType: 'manual',
       kind: 'byName',
     })
-
-    return exit()
+  } else {
+    siteData = await linkPrompt(command.netlify, options)
   }
-
-  siteData = await linkPrompt(command.netlify, options)
   return siteData
 }
 

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

@@ -9,6 +9,7 @@ const { v4: uuidv4 } = require('uuid')
 
 const { chalk, error, getRepoData, log, logJson, track, warn } = require('../../utils')
 const { configureRepo } = require('../../utils/init/config')
+const { link } = require('../link')
 
 const SITE_NAME_SUGGESTION_SUFFIX_LENGTH = 5
 
@@ -159,6 +160,11 @@ const sitesCreate = async (options, command) => {
     )
   }
 
+  if (!options.disableLinking) {
+    log()
+    await link({ id: site.id }, command)
+  }
+
   return site
 }
 
@@ -172,15 +178,16 @@ const createSitesCreateCommand = (program) =>
     .command('sites:create')
     .description(
       `Create an empty site (advanced)
-Create a blank site that isn't associated with any git remote. Does not link to the current working directory.`,
+Create a blank site that isn't associated with any git remote. Will link the site to the current working directory.`,
     )
     .option('-n, --name [name]', 'name of site')
     .option('-a, --account-slug [slug]', 'account slug to create the site under')
     .option('-c, --with-ci', 'initialize CI hooks during site creation')
     .option('-m, --manual', 'force manual CI setup.  Used --with-ci flag')
+    .option('--disable-linking', 'create the site without linking it to current directory')
     .addHelpText(
       'after',
-      `Create a blank site that isn't associated with any git remote. Does not link to the current working directory.`,
+      `Create a blank site that isn't associated with any git remote. Will link the site to the current working directory.`,
     )
     .action(sitesCreate)
 

package/src/functions-templates/javascript/stripe-charge/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "stripe": "^8.199.0"
+        "stripe": "^8.201.0"
       }
     },
     "node_modules/@types/node": {
@@ -105,9 +105,9 @@
       }
     },
     "node_modules/stripe": {
-      "version": "8.199.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.199.0.tgz",
-      "integrity": "sha512-Bc5Zfp6eOOCdde9x5NPrAczeGSKuNwemzjsfGJXWtpbUfQXgJujzTGgkhx2YuzamqakDYJkTgf9w7Ry2uY8QNA==",
+      "version": "8.201.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.201.0.tgz",
+      "integrity": "sha512-pF0F1DdE9zt0U6Cb0XN+REpdFkUmaqp6C7OEVOCeUpTAafjjJqrdV/WmZd7Y5MwT8XvDAxB5/v3CAXwxAp0XNg==",
       "dependencies": {
         "@types/node": ">=8.1.0",
         "qs": "^6.6.0"
@@ -184,9 +184,9 @@
       }
     },
     "stripe": {
-      "version": "8.199.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.199.0.tgz",
-      "integrity": "sha512-Bc5Zfp6eOOCdde9x5NPrAczeGSKuNwemzjsfGJXWtpbUfQXgJujzTGgkhx2YuzamqakDYJkTgf9w7Ry2uY8QNA==",
+      "version": "8.201.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.201.0.tgz",
+      "integrity": "sha512-pF0F1DdE9zt0U6Cb0XN+REpdFkUmaqp6C7OEVOCeUpTAafjjJqrdV/WmZd7Y5MwT8XvDAxB5/v3CAXwxAp0XNg==",
       "requires": {
         "@types/node": ">=8.1.0",
         "qs": "^6.6.0"

package/src/functions-templates/javascript/stripe-subscription/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "stripe": "^8.199.0"
+        "stripe": "^8.201.0"
       }
     },
     "node_modules/@types/node": {
@@ -105,9 +105,9 @@
       }
     },
     "node_modules/stripe": {
-      "version": "8.199.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.199.0.tgz",
-      "integrity": "sha512-Bc5Zfp6eOOCdde9x5NPrAczeGSKuNwemzjsfGJXWtpbUfQXgJujzTGgkhx2YuzamqakDYJkTgf9w7Ry2uY8QNA==",
+      "version": "8.201.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.201.0.tgz",
+      "integrity": "sha512-pF0F1DdE9zt0U6Cb0XN+REpdFkUmaqp6C7OEVOCeUpTAafjjJqrdV/WmZd7Y5MwT8XvDAxB5/v3CAXwxAp0XNg==",
       "dependencies": {
         "@types/node": ">=8.1.0",
         "qs": "^6.6.0"
@@ -184,9 +184,9 @@
       }
     },
     "stripe": {
-      "version": "8.199.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.199.0.tgz",
-      "integrity": "sha512-Bc5Zfp6eOOCdde9x5NPrAczeGSKuNwemzjsfGJXWtpbUfQXgJujzTGgkhx2YuzamqakDYJkTgf9w7Ry2uY8QNA==",
+      "version": "8.201.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.201.0.tgz",
+      "integrity": "sha512-pF0F1DdE9zt0U6Cb0XN+REpdFkUmaqp6C7OEVOCeUpTAafjjJqrdV/WmZd7Y5MwT8XvDAxB5/v3CAXwxAp0XNg==",
       "requires": {
         "@types/node": ">=8.1.0",
         "qs": "^6.6.0"

package/src/lib/functions/runtimes/js/builders/zisi.js

@@ -64,7 +64,10 @@ const buildFunction = async ({ cache, config, directory, func, hasTypeModule, pr
 }
 
 /**
- * @param {string} mainFile
+ * @param {object} params
+ * @param {unknown} params.config
+ * @param {string} params.mainFile
+ * @param {string} params.projectRoot
  */
 const parseForSchedule = async ({ config, mainFile, projectRoot }) => {
   const listedFunction = await listFunction(mainFile, {

package/src/lib/functions/scheduled.js

@@ -4,8 +4,9 @@ const { CLOCKWORK_USERAGENT } = require('../../utils')
 
 const { formatLambdaError } = require('./utils')
 
-const handleScheduledFunction = ({ error, request, response, result }) => {
-  const acceptsHtml = request.headers.accept && request.headers.accept.includes('text/html')
+const buildHelpResponse = ({ error, headers, path, result }) => {
+  const acceptsHtml = headers.accept && headers.accept.includes('text/html')
+
   const paragraph = (text) => {
     text = text.trim()
 
@@ -14,21 +15,21 @@ const handleScheduledFunction = ({ error, request, response, result }) => {
     }
 
     text = text
-      .replaceAll('<pre><code>', '```\n')
-      .replaceAll('</code></pre>', '\n```')
-      .replaceAll(`<code>`, '`')
-      .replaceAll(`</code>`, '`')
+      .replace(/<pre><code>/gm, '```\n')
+      .replace(/<\/code><\/pre>/gm, '\n```')
+      .replace(/<code>/gm, '`')
+      .replace(/<\/code>/gm, '`')
 
     return `${text}\n\n`
   }
 
-  const isSimulatedRequest = request.headers['user-agent'] === CLOCKWORK_USERAGENT
+  const isSimulatedRequest = headers['user-agent'] === CLOCKWORK_USERAGENT
 
   let message = ''
 
   if (!isSimulatedRequest) {
     message += paragraph(`
-You performed an HTTP request to <code>${request.path}</code>, which is a scheduled function.
+You performed an HTTP request to <code>${path}</code>, which is a scheduled function.
 You can do this to test your functions locally, but it won't work in production.
     `)
   }
@@ -41,7 +42,11 @@ There was an error during execution of your scheduled function:
   }
 
   if (result) {
-    const { statusCode } = result
+    // lambda emulator adds level field, which isn't user-provided
+    const returnValue = { ...result }
+    delete returnValue.level
+
+    const { statusCode } = returnValue
     if (statusCode >= 500) {
       message += paragraph(`
 Your function returned a status code of <code>${statusCode}</code>.
@@ -50,7 +55,7 @@ At the moment, Netlify does nothing about that. In the future, there might be a
     }
 
     const allowedKeys = new Set(['statusCode'])
-    const returnedKeys = Object.keys(result)
+    const returnedKeys = Object.keys(returnValue)
     const ignoredKeys = returnedKeys.filter((key) => !allowedKeys.has(key))
 
     if (ignoredKeys.length !== 0) {
@@ -62,17 +67,32 @@ At the moment, Netlify does nothing about that. In the future, there might be a
     }
   }
 
-  response.status(error ? 500 : 200)
-  if (acceptsHtml) {
-    response.set('Content-Type', 'text/html')
-    response.send(
-      `<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/water.css@2/out/water.css">\n
-      ${message}`,
-    )
-  } else {
-    response.set('Content-Type', 'text/plain')
-    response.send(message)
-  }
+  const statusCode = error ? 500 : 200
+  return acceptsHtml
+    ? {
+        statusCode,
+        contentType: 'text/html',
+        message: `<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/water.css@2/out/water.css">\n
+                ${message}`,
+      }
+    : {
+        statusCode,
+        contentType: 'text/plain',
+        message,
+      }
+}
+
+const handleScheduledFunction = ({ error, request, response, result }) => {
+  const { contentType, message, statusCode } = buildHelpResponse({
+    error,
+    headers: request.headers,
+    path: request.path,
+    result,
+  })
+
+  response.status(statusCode)
+  response.set('Content-Type', contentType)
+  response.send(message)
 }
 
-module.exports = { handleScheduledFunction }
+module.exports = { handleScheduledFunction, buildHelpResponse }

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

@@ -29,7 +29,7 @@ const filterRelativePathItems = (items) => items.filter((part) => part !== '')
  * @param {import('../base-command').BaseCommand} command
  * @return {NetlifyGraphConfig} NetlifyGraphConfig
  */
-const getNetlifyGraphConfig = async ({ command, options }) => {
+const getNetlifyGraphConfig = async ({ command, options, settings }) => {
   const { config, site } = command.netlify
   config.dev = { ...config.dev }
   config.build = { ...config.build }
@@ -44,11 +44,12 @@ const getNetlifyGraphConfig = async ({ command, options }) => {
   }
 
   /** @type {Partial<import('../../utils/types').ServerSettings>} */
-  let settings = {}
-  try {
-    settings = await detectServerSettings(devConfig, options, site.root)
-  } catch (detectServerSettingsError) {
-    error(detectServerSettingsError)
+  if (!settings) {
+    try {
+      settings = await detectServerSettings(devConfig, options, site.root)
+    } catch (detectServerSettingsError) {
+      error(detectServerSettingsError)
+    }
   }
 
   const siteRoot = [path.sep, ...filterRelativePathItems(site.root.split(path.sep))]