netlify-cli 8.15.0 → 8.15.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "8.15.0",
+  "version": "8.15.4",
   "author": "Netlify Inc.",
   "contributors": [
     "Mathias Biilmann <matt@netlify.com> (https://twitter.com/biilmann)",
@@ -55,17 +55,17 @@
     "format:check:prettier": "cross-env-shell prettier --check $npm_package_config_prettier",
     "format:fix:prettier": "cross-env-shell prettier --write $npm_package_config_prettier",
     "test:dev": "run-s test:init:* test:dev:*",
-    "test:ci": "run-s test:ci:*",
     "test:init": "run-s test:init:*",
     "test:init:cli-version": "npm run start -- --version",
     "test:init:cli-help": "npm run start -- --help",
-    "test:init:eleventy-deps": "npm ci --prefix tests/eleventy-site --no-audit",
-    "test:init:hugo-deps": "npm ci --prefix tests/hugo-site --no-audit",
+    "test:init:eleventy-deps": "npm ci --prefix tests/integration/eleventy-site --no-audit",
+    "test:init:hugo-deps": "npm ci --prefix tests/integration/hugo-site --no-audit",
     "test:dev:ava": "ava --verbose",
-    "test:ci:ava": "c8 -r json ava",
+    "test:ci:ava:unit": "c8 -r json ava --no-worker-threads tests/unit/**/*.test.js tools/**/*.test.js",
+    "test:ci:ava:integration": "c8 -r json ava --concurrency 1 --no-worker-threads tests/integration/**/*.test.js",
     "test:affected": "node ./tools/affected-test.js",
     "e2e": "node ./tools/e2e/run.mjs",
-    "docs": "node ./site/scripts/docs.js",
+    "docs": "node ./site/scripts/docs.mjs",
     "watch": "c8 --reporter=lcov ava --watch",
     "site:build": "run-s site:build:*",
     "site:build:install": "cd site && npm ci --no-audit",
@@ -77,14 +77,14 @@
     "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",
+    "@netlify/build": "^26.2.3",
     "@netlify/config": "^17.0.6",
     "@netlify/framework-info": "^9.0.0",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/plugin-edge-handlers": "^3.0.4",
-    "@netlify/plugins-list": "^6.3.1",
+    "@netlify/plugins-list": "^6.6.0",
     "@netlify/routing-local-proxy": "^0.34.1",
-    "@netlify/zip-it-and-ship-it": "^5.5.0",
+    "@netlify/zip-it-and-ship-it": "^5.5.2",
     "@octokit/rest": "^18.0.0",
     "@sindresorhus/slugify": "^1.1.0",
     "ansi-escapes": "^5.0.0",
@@ -137,7 +137,7 @@
     "is-wsl": "^2.2.0",
     "isexe": "^2.0.0",
     "jwt-decode": "^3.0.0",
-    "lambda-local": "2.0.0",
+    "lambda-local": "2.0.1",
     "listr": "^0.14.3",
     "locate-path": "^6.0.0",
     "lodash": "^4.17.20",
@@ -148,7 +148,7 @@
     "multiparty": "^4.2.1",
     "netlify": "^10.1.2",
     "netlify-headers-parser": "^6.0.1",
-    "netlify-onegraph-internal": "0.0.16",
+    "netlify-onegraph-internal": "0.0.18",
     "netlify-redirect-parser": "^13.0.1",
     "netlify-redirector": "^0.2.1",
     "node-fetch": "^2.6.0",
@@ -203,7 +203,7 @@
     "proxyquire": "^2.1.3",
     "seedrandom": "^3.0.5",
     "serialize-javascript": "^6.0.0",
-    "sinon": "^12.0.0",
+    "sinon": "^13.0.0",
     "sort-on": "^4.1.0",
     "strip-ansi": "^6.0.0",
     "supertest": "^6.1.6",
@@ -215,10 +215,8 @@
   },
   "ava": {
     "files": [
-      "site/**/*.test.js",
-      "src/**/*.test.js",
       "tools/**/*.test.js",
-      "tests/*.test.js"
+      "tests/**/*.test.js"
     ],
     "cache": true,
     "concurrency": 5,

package/src/commands/functions/functions-invoke.js

@@ -3,7 +3,6 @@ const fs = require('fs')
 const path = require('path')
 const process = require('process')
 
-const CronParser = require('cron-parser')
 const inquirer = require('inquirer')
 const fetch = require('node-fetch')
 
@@ -131,13 +130,6 @@ const getFunctionToTrigger = function (options, argumentName) {
   return argumentName
 }
 
-const getNextRun = function (schedule) {
-  const cron = CronParser.parseExpression(schedule, {
-    tz: 'Etc/UTC',
-  })
-  return cron.next().toDate()
-}
-
 /**
  * The functions:invoke command
  * @param {string} nameArgument
@@ -156,7 +148,7 @@ const functionsInvoke = async (nameArgument, options, command) => {
     console.warn(`${NETLIFYDEVWARN} "port" flag was not specified. Attempting to connect to localhost:8888 by default`)
   const port = options.port || DEFAULT_PORT
 
-  const functions = await getFunctions(functionsDir)
+  const functions = await getFunctions(functionsDir, config)
   const functionToTrigger = await getNameFromArgs(functions, options, nameArgument)
   const functionObj = functions.find((func) => func.name === functionToTrigger)
 
@@ -164,10 +156,8 @@ const functionsInvoke = async (nameArgument, options, command) => {
   let body = {}
 
   if (functionObj.schedule) {
-    body.next_run = getNextRun(functionObj.schedule)
     headers = {
       'user-agent': CLOCKWORK_USERAGENT,
-      'X-NF-Event': 'schedule',
     }
   } else if (eventTriggeredFunctions.has(functionToTrigger)) {
     /** handle event triggered fns  */

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/functions-templates/rust/hello-world/Cargo.toml

@@ -11,4 +11,4 @@ http = "0.2.6"
 lambda_runtime = "0.4.1"
 log = "0.4.14"
 simple_logger = "1.16.0"
-tokio = "1.15.0"
+tokio = "1.16.1"

package/src/lib/functions/netlify-function.js

@@ -1,4 +1,6 @@
 // @ts-check
+const CronParser = require('cron-parser')
+
 const { error: errorExit } = require('../../utils/command-helpers')
 
 const BACKGROUND_SUFFIX = '-background'
@@ -6,6 +8,13 @@ const BACKGROUND_SUFFIX = '-background'
 // Returns a new set with all elements of `setA` that don't exist in `setB`.
 const difference = (setA, setB) => new Set([...setA].filter((item) => !setB.has(item)))
 
+const getNextRun = function (schedule) {
+  const cron = CronParser.parseExpression(schedule, {
+    tz: 'Etc/UTC',
+  })
+  return cron.next().toDate()
+}
+
 class NetlifyFunction {
   constructor({
     config,
@@ -51,6 +60,14 @@ class NetlifyFunction {
     return Boolean(this.schedule)
   }
 
+  async getNextRun() {
+    if (!(await this.isScheduled())) {
+      return null
+    }
+
+    return getNextRun(this.schedule)
+  }
+
   // The `build` method transforms source files into invocable functions. Its
   // return value is an object with:
   //

package/src/lib/functions/server.js

@@ -1,7 +1,14 @@
 // @ts-check
 const jwtDecode = require('jwt-decode')
 
-const { NETLIFYDEVERR, NETLIFYDEVLOG, error: errorExit, getInternalFunctionsDir, log } = require('../../utils')
+const {
+  CLOCKWORK_USERAGENT,
+  NETLIFYDEVERR,
+  NETLIFYDEVLOG,
+  error: errorExit,
+  getInternalFunctionsDir,
+  log,
+} = require('../../utils')
 
 const { handleBackgroundFunction, handleBackgroundFunctionResult } = require('./background')
 const { createFormSubmissionHandler } = require('./form-submissions-handler')
@@ -107,7 +114,21 @@ const createHandler = function ({ functionsRegistry }) {
 
       handleBackgroundFunctionResult(functionName, error)
     } else if (await func.isScheduled()) {
-      const { error, result } = await func.invoke(event, clientContext)
+      const { error, result } = await func.invoke(
+        {
+          ...event,
+          body: JSON.stringify({
+            next_run: await func.getNextRun(),
+          }),
+          isBase64Encoded: false,
+          headers: {
+            ...event.headers,
+            'user-agent': CLOCKWORK_USERAGENT,
+            'X-NF-Event': 'schedule',
+          },
+        },
+        clientContext,
+      )
 
       handleScheduledFunction({
         error,

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

@@ -138,9 +138,9 @@ const refetchAndGenerateFromOneGraph = async (input) => {
   }
 
   const parsedDoc = parse(currentOperationsDoc)
-  const operations = extractFunctionsFromOperationDoc(parsedDoc)
+  const { fragments, functions } = extractFunctionsFromOperationDoc(parsedDoc)
 
-  generateFunctionsFile(netlifyGraphConfig, schema, currentOperationsDoc, operations)
+  generateFunctionsFile({ netlifyGraphConfig, schema, operationsDoc: currentOperationsDoc, functions, fragments })
   writeGraphQLSchemaFile(netlifyGraphConfig, schema)
   state.set('oneGraphEnabledServices', enabledServices)
 }
@@ -170,8 +170,8 @@ const updateGraphQLOperationsFile = async (input) => {
   const parsedDoc = parse(appOperationsDoc, {
     noLocation: true,
   })
-  const operations = extractFunctionsFromOperationDoc(parsedDoc)
-  generateFunctionsFile(netlifyGraphConfig, schema, appOperationsDoc, operations)
+  const { fragments, functions } = extractFunctionsFromOperationDoc(parsedDoc)
+  generateFunctionsFile({ netlifyGraphConfig, schema, operationsDoc: appOperationsDoc, functions, fragments })
 }
 
 const handleCliSessionEvent = async ({ event, netlifyGraphConfig, netlifyToken, schema, siteId }) => {

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

@@ -24,6 +24,105 @@ InternalConsole.registerConsole(internalConsole)
  */
 const filterRelativePathItems = (items) => items.filter((part) => part !== '')
 
+/**
+ * Return the default Netlify Graph configuration for a generic site
+ * @param {object} context
+ * @param {string[]} context.detectedFunctionsPath
+ * @param {string[]} context.siteRoot
+ */
+const makeDefaultNetlifGraphConfig = ({ baseConfig, detectedFunctionsPath }) => {
+  const functionsPath = filterRelativePathItems([...detectedFunctionsPath])
+  const webhookBasePath = '/.netlify/functions'
+  const netlifyGraphPath = [...functionsPath, 'netlifyGraph']
+  const netlifyGraphImplementationFilename = [...netlifyGraphPath, `index.${baseConfig.extension}`]
+  const netlifyGraphTypeDefinitionsFilename = [...netlifyGraphPath, `index.d.ts`]
+  const graphQLOperationsSourceFilename = [...netlifyGraphPath, NetlifyGraph.defaultSourceOperationsFilename]
+  const graphQLSchemaFilename = [...netlifyGraphPath, NetlifyGraph.defaultGraphQLSchemaFilename]
+  const netlifyGraphRequirePath = [`./netlifyGraph`]
+  const moduleType = baseConfig.moduleType || 'esm'
+
+  return {
+    functionsPath,
+    webhookBasePath,
+    netlifyGraphPath,
+    netlifyGraphImplementationFilename,
+    netlifyGraphTypeDefinitionsFilename,
+    graphQLOperationsSourceFilename,
+    graphQLSchemaFilename,
+    netlifyGraphRequirePath,
+    moduleType,
+  }
+}
+
+/**
+ * Return the default Netlify Graph configuration for a Nextjs site
+ * @param {object} context
+ * @param {string[]} context.detectedFunctionsPath
+ * @param {string[]} context.siteRoot
+ */
+const makeDefaultNextJsNetlifGraphConfig = ({ baseConfig, siteRoot }) => {
+  const functionsPath = filterRelativePathItems([...siteRoot, 'pages', 'api'])
+  const webhookBasePath = '/api'
+  const netlifyGraphPath = filterRelativePathItems([...siteRoot, 'lib', 'netlifyGraph'])
+  const netlifyGraphImplementationFilename = [...netlifyGraphPath, `index.${baseConfig.extension}`]
+  const netlifyGraphTypeDefinitionsFilename = [...netlifyGraphPath, `index.d.ts`]
+  const graphQLOperationsSourceFilename = [...netlifyGraphPath, NetlifyGraph.defaultSourceOperationsFilename]
+  const graphQLSchemaFilename = [...netlifyGraphPath, NetlifyGraph.defaultGraphQLSchemaFilename]
+  const netlifyGraphRequirePath = ['..', '..', 'lib', 'netlifyGraph']
+  const moduleType = baseConfig.moduleType || 'esm'
+
+  return {
+    functionsPath,
+    webhookBasePath,
+    netlifyGraphPath,
+    netlifyGraphImplementationFilename,
+    netlifyGraphTypeDefinitionsFilename,
+    graphQLOperationsSourceFilename,
+    graphQLSchemaFilename,
+    netlifyGraphRequirePath,
+    moduleType,
+  }
+}
+
+/**
+ * Return the default Netlify Graph configuration for a Remix site
+ * @param {object} context
+ * @param {string[]} context.detectedFunctionsPath
+ * @param {string[]} context.siteRoot
+ */
+const makeDefaultRemixNetlifGraphConfig = ({ baseConfig, detectedFunctionsPath, siteRoot }) => {
+  const functionsPath = filterRelativePathItems([...detectedFunctionsPath])
+  const webhookBasePath = '/webhooks'
+  const netlifyGraphPath = filterRelativePathItems([
+    ...siteRoot,
+    ...NetlifyGraph.defaultNetlifyGraphConfig.netlifyGraphPath,
+  ])
+  const netlifyGraphImplementationFilename = [...netlifyGraphPath, `index.${baseConfig.extension}`]
+  const netlifyGraphTypeDefinitionsFilename = [...netlifyGraphPath, `index.d.ts`]
+  const graphQLOperationsSourceFilename = [...netlifyGraphPath, NetlifyGraph.defaultSourceOperationsFilename]
+  const graphQLSchemaFilename = [...netlifyGraphPath, NetlifyGraph.defaultGraphQLSchemaFilename]
+  const netlifyGraphRequirePath = [`../../netlify/functions/netlifyGraph`]
+  const moduleType = 'esm'
+
+  return {
+    functionsPath,
+    webhookBasePath,
+    netlifyGraphPath,
+    netlifyGraphImplementationFilename,
+    netlifyGraphTypeDefinitionsFilename,
+    graphQLOperationsSourceFilename,
+    graphQLSchemaFilename,
+    netlifyGraphRequirePath,
+    moduleType,
+  }
+}
+
+const defaultFrameworkLookup = {
+  'Next.js': makeDefaultNextJsNetlifGraphConfig,
+  Remix: makeDefaultRemixNetlifGraphConfig,
+  default: makeDefaultNetlifGraphConfig,
+}
+
 /**
  * Return a full NetlifyGraph config with any defaults overridden by netlify.toml
  * @param {import('../base-command').BaseCommand} command
@@ -48,7 +147,8 @@ const getNetlifyGraphConfig = async ({ command, options, settings }) => {
     try {
       settings = await detectServerSettings(devConfig, options, site.root)
     } catch (detectServerSettingsError) {
-      error(detectServerSettingsError)
+      settings = {}
+      warn('Error while auto-detecting project settings, Netlify Graph encounter problems', detectServerSettingsError)
     }
   }
 
@@ -58,26 +158,55 @@ const getNetlifyGraphConfig = async ({ command, options, settings }) => {
   const autodetectedLanguage = fs.existsSync(tsConfig) ? 'typescript' : 'javascript'
 
   const framework = settings.framework || userSpecifiedConfig.framework
-  const isNextjs = framework === 'Next.js'
+  const makeDefaultFrameworkConfig = defaultFrameworkLookup[framework] || defaultFrameworkLookup.default
+
   const detectedFunctionsPathString = getFunctionsDir({ config, options })
-  const detectedFunctionsPath = detectedFunctionsPathString ? detectedFunctionsPathString.split(path.sep) : null
-  const functionsPath = filterRelativePathItems(isNextjs ? [...siteRoot, 'pages', 'api'] : [...detectedFunctionsPath])
-  const netlifyGraphPath = filterRelativePathItems(
-    isNextjs
-      ? [...siteRoot, 'lib', 'netlifyGraph']
-      : [...siteRoot, ...NetlifyGraph.defaultNetlifyGraphConfig.netlifyGraphPath],
-  )
+  const detectedFunctionsPath = detectedFunctionsPathString
+    ? [path.sep, ...detectedFunctionsPathString.split(path.sep)]
+    : null
   const baseConfig = { ...NetlifyGraph.defaultNetlifyGraphConfig, ...userSpecifiedConfig }
-  const netlifyGraphImplementationFilename = [...netlifyGraphPath, `index.${baseConfig.extension}`]
-  const netlifyGraphTypeDefinitionsFilename = [...netlifyGraphPath, `index.d.ts`]
-  const graphQLOperationsSourceFilename = [...netlifyGraphPath, NetlifyGraph.defaultSourceOperationsFilename]
-  const graphQLSchemaFilename = [...netlifyGraphPath, NetlifyGraph.defaultGraphQLSchemaFilename]
-  const netlifyGraphRequirePath = isNextjs ? ['..', '..', 'lib', 'netlifyGraph'] : [`./netlifyGraph`]
-  const language = userSpecifiedConfig.language || autodetectedLanguage
-  const moduleType = baseConfig.moduleType || isNextjs ? 'esm' : 'commonjs'
+  const defaultFrameworkConfig = makeDefaultFrameworkConfig({ baseConfig, detectedFunctionsPath, siteRoot })
+
+  const functionsPath =
+    (userSpecifiedConfig.functionsPath && userSpecifiedConfig.functionsPath.split(path.sep)) ||
+    defaultFrameworkConfig.functionsPath
+  const netlifyGraphPath =
+    (userSpecifiedConfig.netlifyGraphPath && userSpecifiedConfig.netlifyGraphPath.split(path.sep)) ||
+    defaultFrameworkConfig.netlifyGraphPath
+  const netlifyGraphImplementationFilename =
+    (userSpecifiedConfig.netlifyGraphImplementationFilename &&
+      userSpecifiedConfig.netlifyGraphImplementationFilename.split(path.sep)) ||
+    defaultFrameworkConfig.netlifyGraphImplementationFilename
+  const netlifyGraphTypeDefinitionsFilename =
+    (userSpecifiedConfig.netlifyGraphTypeDefinitionsFilename &&
+      userSpecifiedConfig.netlifyGraphTypeDefinitionsFilename.split(path.sep)) ||
+    defaultFrameworkConfig.netlifyGraphTypeDefinitionsFilename
+  const graphQLOperationsSourceFilename =
+    (userSpecifiedConfig.graphQLOperationsSourceFilename &&
+      userSpecifiedConfig.graphQLOperationsSourceFilename.split(path.sep)) ||
+    defaultFrameworkConfig.graphQLOperationsSourceFilename
+  const graphQLSchemaFilename =
+    (userSpecifiedConfig.graphQLSchemaFilename && userSpecifiedConfig.graphQLSchemaFilename.split(path.sep)) ||
+    defaultFrameworkConfig.graphQLSchemaFilename
+  const netlifyGraphRequirePath =
+    (userSpecifiedConfig.netlifyGraphRequirePath && userSpecifiedConfig.netlifyGraphRequirePath.split(path.sep)) ||
+    defaultFrameworkConfig.netlifyGraphRequirePath
+  const moduleType =
+    (userSpecifiedConfig.moduleType && userSpecifiedConfig.moduleType.split(path.sep)) ||
+    defaultFrameworkConfig.moduleType
+  const language =
+    (userSpecifiedConfig.language && userSpecifiedConfig.language.split(path.sep)) || autodetectedLanguage
+  const webhookBasePath =
+    (userSpecifiedConfig.webhookBasePath && userSpecifiedConfig.webhookBasePath.split(path.sep)) ||
+    defaultFrameworkConfig.webhookBasePath
+  const customGeneratorFile =
+    userSpecifiedConfig.customGeneratorFile && userSpecifiedConfig.customGeneratorFile.split(path.sep)
+  const runtimeTargetEnv = userSpecifiedConfig.runtimeTargetEnv || defaultFrameworkConfig.runtimeTargetEnv || 'node'
+
   const fullConfig = {
     ...baseConfig,
     functionsPath,
+    webhookBasePath,
     netlifyGraphPath,
     netlifyGraphImplementationFilename,
     netlifyGraphTypeDefinitionsFilename,
@@ -87,6 +216,8 @@ const getNetlifyGraphConfig = async ({ command, options, settings }) => {
     framework,
     language,
     moduleType,
+    customGeneratorFile,
+    runtimeTargetEnv,
   }
 
   return fullConfig
@@ -97,7 +228,8 @@ const getNetlifyGraphConfig = async ({ command, options, settings }) => {
  * @param {NetlifyGraphConfig} netlifyGraphConfig
  */
 const ensureNetlifyGraphPath = (netlifyGraphConfig) => {
-  fs.mkdirSync(path.resolve(...netlifyGraphConfig.netlifyGraphPath), { recursive: true })
+  const fullPath = path.resolve(...netlifyGraphConfig.netlifyGraphPath)
+  fs.mkdirSync(fullPath, { recursive: true })
 }
 
 /**
@@ -105,22 +237,27 @@ const ensureNetlifyGraphPath = (netlifyGraphConfig) => {
  * @param {NetlifyGraphConfig} netlifyGraphConfig
  */
 const ensureFunctionsPath = (netlifyGraphConfig) => {
-  fs.mkdirSync(path.resolve(...netlifyGraphConfig.functionsPath), { recursive: true })
+  const fullPath = path.resolve(...netlifyGraphConfig.functionsPath)
+  fs.mkdirSync(fullPath, { recursive: true })
 }
 
 /**
  * Generate a library file with type definitions for a given NetlifyGraphConfig, operationsDoc, and schema, writing them to the filesystem
- * @param {NetlifyGraphConfig} netlifyGraphConfig
- * @param {GraphQLSchema} schema The schema to use when generating the functions and their types
- * @param {string} operationsDoc The GraphQL operations doc to use when generating the functions
- * @param {NetlifyGraph.ParsedFunction} queries The parsed queries with metadata to use when generating library functions
+ * @param {object} context
+ * @param {NetlifyGraphConfig} context.netlifyGraphConfig
+ * @param {GraphQLSchema} context.schema The schema to use when generating the functions and their types
+ * @param {string} context.operationsDoc The GraphQL operations doc to use when generating the functions
+ * @param {NetlifyGraph.ParsedFunction} context.functions The parsed queries with metadata to use when generating library functions
+ * @param {NetlifyGraph.ParsedFragment} context.fragments The parsed queries with metadata to use when generating library functions
+ * @returns {void} Void, effectfully writes the generated library to the filesystem
  */
-const generateFunctionsFile = (netlifyGraphConfig, schema, operationsDoc, queries) => {
+const generateFunctionsFile = ({ fragments, functions, netlifyGraphConfig, operationsDoc, schema }) => {
   const { clientSource, typeDefinitionsSource } = NetlifyGraph.generateFunctionsSource(
     netlifyGraphConfig,
     schema,
     operationsDoc,
-    queries,
+    functions,
+    fragments,
   )
 
   ensureNetlifyGraphPath(netlifyGraphConfig)
@@ -199,13 +336,15 @@ const generateHandler = (netlifyGraphConfig, schema, operationId, handlerOptions
     currentOperationsDoc = NetlifyGraph.defaultExampleOperationsDoc
   }
 
-  const result = NetlifyGraph.generateHandlerSource({
+  const payload = {
     handlerOptions,
     schema,
     netlifyGraphConfig,
     operationId,
     operationsDoc: currentOperationsDoc,
-  })
+  }
+
+  const result = NetlifyGraph.generateHandlerSource(payload)
 
   if (!result) {
     warn(`No handler was generated for operationId ${operationId}`)
@@ -237,6 +376,11 @@ const generateHandler = (netlifyGraphConfig, schema, operationId, handlerOptions
       filenameArr = [path.sep, ...netlifyGraphConfig.functionsPath, baseFilename]
     }
 
+    const parentDir = path.resolve(...filterRelativePathItems(filenameArr.slice(0, -1)))
+
+    // Make sure the parent directory exists
+    fs.mkdirSync(parentDir, { recursive: true })
+
     const absoluteFilename = path.resolve(...filenameArr)
 
     fs.writeFileSync(absoluteFilename, content)
@@ -254,7 +398,7 @@ const { buildSchema, parse } = GraphQL
  * @returns {string} The url to the Netlify Graph UI for the current session
  */
 const getGraphEditUrlBySiteName = ({ oneGraphSessionId, siteName }) => {
-  const host = 'app.netlify.com' || process.env.NETLIFY_APP_HOST
+  const host = process.env.NETLIFY_APP_HOST || 'app.netlify.com'
   // http because app.netlify.com will redirect to https, and localhost will still work for development
   const url = `http://${host}/sites/${siteName}/graph/explorer?cliSessionId=${oneGraphSessionId}`
 

package/src/utils/functions/get-functions.js

@@ -13,7 +13,14 @@ const addFunctionProps = ({ mainFile, name, runtime, schedule }) => {
 
 const JS = 'js'
 
-const getFunctions = async (functionsSrcDir) => {
+/**
+ * @param {Record<string, { schedule?: string }>} functionConfigRecord
+ * @returns {Record<string, { schedule?: string }>}
+ */
+const extractSchedule = (functionConfigRecord) =>
+  Object.fromEntries(Object.entries(functionConfigRecord).map(([name, { schedule }]) => [name, { schedule }]))
+
+const getFunctions = async (functionsSrcDir, config = {}) => {
   if (!(await fileExistsAsync(functionsSrcDir))) {
     return []
   }
@@ -22,6 +29,7 @@ const getFunctions = async (functionsSrcDir) => {
   // eslint-disable-next-line node/global-require
   const { listFunctions } = require('@netlify/zip-it-and-ship-it')
   const functions = await listFunctions(functionsSrcDir, {
+    config: config.functions ? extractSchedule(config.functions) : undefined,
     parseISC: true,
   })
   const functionsWithProps = functions.filter(({ runtime }) => runtime === JS).map((func) => addFunctionProps(func))

package/src/utils/init/utils.js

@@ -123,8 +123,8 @@ const getPromptInputs = async ({
         .map(({ name }) => `${name} plugin`)
         .map(formatTitle)
         .join(', ')}${EOL}➡️  OK to install??`,
-      choices: infos.map(({ name, package }) => ({ name: `${name} plugin`, value: package })),
-      default: infos.map(({ package }) => package),
+      choices: infos.map((info) => ({ name: `${info.name} plugin`, value: info.package })),
+      default: infos.map((info) => info.package),
     },
   ]
 }

package/src/utils/rules-proxy.js

@@ -11,14 +11,21 @@ const { fileExistsAsync } = require('../lib/fs')
 const { NETLIFYDEVLOG } = require('./command-helpers')
 const { parseRedirects } = require('./redirects')
 
+const watchers = []
+
 const onChanges = function (files, listener) {
   files.forEach((file) => {
     const watcher = chokidar.watch(file)
     watcher.on('change', listener)
     watcher.on('unlink', listener)
+    watchers.push(watcher)
   })
 }
 
+const getWatchers = function () {
+  return watchers
+}
+
 const getLanguage = function (headers) {
   if (headers['accept-language']) {
     return headers['accept-language'].split(',')[0].slice(0, 2)
@@ -97,4 +104,5 @@ module.exports = {
   onChanges,
   getLanguage,
   createRewriter,
+  getWatchers,
 }