netlify-cli 8.10.2 → 8.13.0

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "8.10.2",
+  "version": "8.13.0",
   "author": "Netlify Inc.",
   "contributors": [
     "Mathias Biilmann <matt@netlify.com> (https://twitter.com/biilmann)",
     "David Calavera <david@netlify.com> (https://twitter.com/calavera)",
     "David Wells <david.wells@netlify.com> (https://davidwells.io/)",
     "Raees Iqbal <raees@netlify.com> (https://raeesbhatti.com/)",
-    "Bret Comnes <bcomnes@gmail.com> (https://bret.io)"
+    "Bret Comnes <bcomnes@gmail.com> (https://bret.io)",
+    "Sean Grove <sean.s.grove@netlify.com> (https://twitter.com/sgrove)"
   ],
   "engines": {
     "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
@@ -76,14 +77,14 @@
     "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\""
   },
   "dependencies": {
-    "@netlify/build": "^26.1.7",
+    "@netlify/build": "^26.2.0",
     "@netlify/config": "^17.0.3",
     "@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.0",
+    "@netlify/plugins-list": "^6.3.1",
     "@netlify/routing-local-proxy": "^0.34.1",
-    "@netlify/zip-it-and-ship-it": "^5.4.1",
+    "@netlify/zip-it-and-ship-it": "^5.5.0",
     "@octokit/rest": "^18.0.0",
     "@sindresorhus/slugify": "^1.1.0",
     "ansi-escapes": "^5.0.0",
@@ -121,6 +122,7 @@
     "gh-release-fetch": "^3.0.0",
     "git-repo-info": "^2.1.0",
     "gitconfiglocal": "^2.1.0",
+    "graphql": "^16.1.0",
     "hasbin": "^1.2.3",
     "hasha": "^5.2.2",
     "http-proxy": "^1.18.0",
@@ -144,6 +146,7 @@
     "multiparty": "^4.2.1",
     "netlify": "^10.1.2",
     "netlify-headers-parser": "^6.0.1",
+    "netlify-onegraph-internal": "0.0.15",
     "netlify-redirect-parser": "^13.0.1",
     "netlify-redirector": "^0.2.1",
     "node-fetch": "^2.6.0",
@@ -182,7 +185,7 @@
   },
   "devDependencies": {
     "@babel/preset-react": "^7.12.13",
-    "@netlify/eslint-config-node": "^4.1.5",
+    "@netlify/eslint-config-node": "^4.1.6",
     "ava": "^3.15.0",
     "c8": "^7.11.0",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",

package/src/commands/dev/dev.js

@@ -11,6 +11,8 @@ const stripAnsiCc = require('strip-ansi-control-characters')
 const waitPort = require('wait-port')
 
 const { startFunctionsServer } = require('../../lib/functions/server')
+const { OneGraphCliClient, startOneGraphCLISession } = require('../../lib/one-graph/cli-client')
+const { getNetlifyGraphConfig } = require('../../lib/one-graph/cli-netlify-graph')
 const {
   NETLIFYDEV,
   NETLIFYDEVERR,
@@ -18,6 +20,7 @@ const {
   NETLIFYDEVWARN,
   chalk,
   detectServerSettings,
+  error,
   exit,
   getSiteInformation,
   injectEnvVariables,
@@ -46,10 +49,10 @@ const startStaticServer = async ({ settings }) => {
   log(`\n${NETLIFYDEVLOG} Static server listening to`, settings.frameworkPort)
 }
 
-const isNonExistingCommandError = ({ command, error }) => {
+const isNonExistingCommandError = ({ command, error: commandError }) => {
   // `ENOENT` is only returned for non Windows systems
   // See https://github.com/sindresorhus/execa/pull/447
-  if (error.code === 'ENOENT') {
+  if (commandError.code === 'ENOENT') {
     return true
   }
 
@@ -60,7 +63,8 @@ const isNonExistingCommandError = ({ command, error }) => {
 
   // this only works on English versions of Windows
   return (
-    typeof error.message === 'string' && error.message.includes('is not recognized as an internal or external command')
+    typeof commandError.message === 'string' &&
+    commandError.message.includes('is not recognized as an internal or external command')
   )
 }
 
@@ -231,7 +235,7 @@ const printBanner = ({ url }) => {
  */
 const dev = async (options, command) => {
   log(`${NETLIFYDEV}`)
-  const { api, config, site, siteInfo } = command.netlify
+  const { api, config, site, siteInfo, state } = command.netlify
   config.dev = { ...config.dev }
   config.build = { ...config.build }
   /** @type {import('./types').DevConfig} */
@@ -262,8 +266,8 @@ const dev = async (options, command) => {
   let settings = {}
   try {
     settings = await detectServerSettings(devConfig, options, site.root)
-  } catch (error) {
-    log(NETLIFYDEVERR, error.message)
+  } catch (error_) {
+    log(NETLIFYDEVERR, error_.message)
     exit(1)
   }
 
@@ -291,6 +295,26 @@ const dev = async (options, command) => {
   process.env.URL = url
   process.env.DEPLOY_URL = url
 
+  const startNetlifyGraphWatcher = Boolean(options.graph)
+
+  if (startNetlifyGraphWatcher && options.offline) {
+    warn(`Unable to start Netlify Graph in offline mode`)
+  } else if (startNetlifyGraphWatcher && !site.id) {
+    error(
+      `No siteId defined, unable to start Netlify Graph. To enable, run ${chalk.yellow(
+        'netlify init',
+      )} or ${chalk.yellow('netlify link')}.`,
+    )
+  } else if (startNetlifyGraphWatcher) {
+    const netlifyToken = await command.authenticate()
+    await OneGraphCliClient.ensureAppForSite(netlifyToken, site.id)
+    const netlifyGraphConfig = await getNetlifyGraphConfig({ command, options })
+
+    log(`Starting Netlify Graph session, to edit your library run \`netlify graph:edit\` in another tab`)
+
+    startOneGraphCLISession({ netlifyGraphConfig, netlifyToken, site, state })
+  }
+
   printBanner({ url })
 }
 
@@ -335,7 +359,13 @@ const createDevCommand = (program) => {
         'specify the path to a local GeoIP location database in MMDB format',
       ).hideHelp(),
     )
-    .addExamples(['netlify dev', 'netlify dev -d public', 'netlify dev -c "hugo server -w" --targetPort 1313'])
+    .addOption(new Option('--graph', 'enable Netlify Graph support').hideHelp())
+    .addExamples([
+      'netlify dev',
+      'netlify dev -d public',
+      'netlify dev -c "hugo server -w" --targetPort 1313',
+      'BROWSER=none netlify dev # disable browser auto opening',
+    ])
     .action(dev)
 }
 module.exports = { createDevCommand }

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

@@ -0,0 +1,91 @@
+const gitRepoInfo = require('git-repo-info')
+
+const { OneGraphCliClient, generateSessionName, loadCLISession } = require('../../lib/one-graph/cli-client')
+const {
+  defaultExampleOperationsDoc,
+  getGraphEditUrlBySiteName,
+  getNetlifyGraphConfig,
+  readGraphQLOperationsSourceFile,
+} = require('../../lib/one-graph/cli-netlify-graph')
+const { NETLIFYDEVERR, chalk, error } = require('../../utils')
+const { openBrowser } = require('../../utils/open-browser')
+
+const { createCLISession, createPersistedQuery, ensureAppForSite, updateCLISessionMetadata } = OneGraphCliClient
+
+/**
+ * Creates the `netlify graph:edit` command
+ * @param {import('commander').OptionValues} options
+ * @param {import('../base-command').BaseCommand} program
+ * @returns
+ */
+const graphEdit = async (options, command) => {
+  const { api, site, siteInfo, state } = command.netlify
+  const siteId = site.id
+
+  if (!site.id) {
+    error(
+      `${NETLIFYDEVERR} Warning: no siteId defined, unable to start Netlify Graph. To enable, run ${chalk.yellow(
+        'netlify init',
+      )} or ${chalk.yellow('netlify link')}`,
+    )
+  }
+  const netlifyGraphConfig = await getNetlifyGraphConfig({ command, options })
+
+  const { branch } = gitRepoInfo()
+
+  let graphqlDocument = readGraphQLOperationsSourceFile(netlifyGraphConfig)
+
+  if (graphqlDocument.trim().length === 0) {
+    graphqlDocument = defaultExampleOperationsDoc
+  }
+
+  const netlifyToken = await command.authenticate()
+
+  await ensureAppForSite(netlifyToken, siteId)
+
+  let oneGraphSessionId = loadCLISession(state)
+  if (!oneGraphSessionId) {
+    const sessionName = generateSessionName()
+    const oneGraphSession = await createCLISession(netlifyToken, site.id, sessionName)
+    state.set('oneGraphSessionId', oneGraphSession.id)
+    oneGraphSessionId = state.get('oneGraphSessionId')
+  }
+
+  const persistedDoc = await createPersistedQuery(netlifyToken, {
+    appId: siteId,
+    description: 'Temporary snapshot of local queries',
+    document: graphqlDocument,
+    tags: ['netlify-cli', `session:${oneGraphSessionId}`, `git-branch:${branch}`],
+  })
+
+  await updateCLISessionMetadata(netlifyToken, siteId, oneGraphSessionId, { docId: persistedDoc.id })
+
+  let siteName = siteInfo.name
+
+  if (!siteName) {
+    const siteData = await api.getSite({ siteId })
+    siteName = siteData.name
+    if (!siteName) {
+      error(`No site name found for siteId ${siteId}`)
+    }
+  }
+
+  const graphEditUrl = getGraphEditUrlBySiteName({ siteName, oneGraphSessionId })
+
+  await openBrowser({ url: graphEditUrl })
+}
+
+/**
+ * Creates the `netlify graph:edit` command
+ * @param {import('../base-command').BaseCommand} program
+ * @returns
+ */
+const createGraphEditCommand = (program) =>
+  program
+    .command('graph:edit')
+    .description('Launch the browser to edit your local graph functions from Netlify')
+    .action(async (options, command) => {
+      await graphEdit(options, command)
+    })
+
+module.exports = { createGraphEditCommand }

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

@@ -0,0 +1,95 @@
+/* eslint-disable eslint-comments/disable-enable-pair */
+/* eslint-disable fp/no-loops */
+const {
+  OneGraphCliClient,
+  handleCliSessionEvent,
+  loadCLISession,
+  refetchAndGenerateFromOneGraph,
+} = require('../../lib/one-graph/cli-client')
+const { buildSchema, getNetlifyGraphConfig, readGraphQLSchemaFile } = require('../../lib/one-graph/cli-netlify-graph')
+const { chalk, error, warn } = require('../../utils')
+
+/**
+ * Creates the `netlify graph:pull` command
+ * @param {import('commander').OptionValues} options
+ * @param {import('../base-command').BaseCommand} program
+ * @returns
+ */
+const graphPull = async (options, command) => {
+  const { site, state } = command.netlify
+
+  if (!site.id) {
+    error(
+      `No siteId defined, unable to start Netlify Graph. To enable, run ${chalk.yellow(
+        'netlify init',
+      )} or ${chalk.yellow('netlify link')}`,
+    )
+  }
+
+  const netlifyGraphConfig = await getNetlifyGraphConfig({ command, options })
+  const netlifyToken = await command.authenticate()
+  const siteId = site.id
+
+  await refetchAndGenerateFromOneGraph({ netlifyGraphConfig, netlifyToken, state, siteId })
+
+  const oneGraphSessionId = loadCLISession(state)
+
+  if (!oneGraphSessionId) {
+    warn('No local Netlify Graph session found, skipping command queue drain')
+    return
+  }
+
+  const schemaString = readGraphQLSchemaFile(netlifyGraphConfig)
+
+  let schema
+
+  try {
+    schema = buildSchema(schemaString)
+  } catch (buildSchemaError) {
+    error(`Error parsing schema: ${buildSchemaError}`)
+  }
+
+  if (!schema) {
+    error(`Failed to fetch and update Netlify GraphQL schema`)
+  }
+
+  const next = await OneGraphCliClient.fetchCliSessionEvents({
+    appId: siteId,
+    authToken: netlifyToken,
+    sessionId: oneGraphSessionId,
+  })
+
+  if (next.errors) {
+    error(`Failed to fetch Netlify Graph cli session events`, next.errors)
+  }
+
+  if (next.events) {
+    const ackIds = []
+    for (const event of next.events) {
+      await handleCliSessionEvent({ netlifyToken, event, netlifyGraphConfig, schema, siteId: site.id })
+      ackIds.push(event.id)
+    }
+
+    await OneGraphCliClient.ackCLISessionEvents({
+      appId: siteId,
+      authToken: netlifyToken,
+      sessionId: oneGraphSessionId,
+      eventIds: ackIds,
+    })
+  }
+}
+
+/**
+ * Creates the `netlify graph:pull` command
+ * @param {import('../base-command').BaseCommand} program
+ * @returns
+ */
+const createGraphPullCommand = (program) =>
+  program
+    .command('graph:pull')
+    .description('Pull down your local Netlify Graph schema, and process pending Graph edit events')
+    .action(async (options, command) => {
+      await graphPull(options, command)
+    })
+
+module.exports = { createGraphPullCommand }

package/src/commands/graph/graph.js

@@ -0,0 +1,30 @@
+// @ts-check
+const { createGraphEditCommand } = require('./graph-edit')
+const { createGraphPullCommand } = require('./graph-pull')
+
+/**
+ * The graph command
+ * @param {import('commander').OptionValues} options
+ * @param {import('../base-command').BaseCommand} command
+ */
+const graph = (options, command) => {
+  command.help()
+}
+
+/**
+ * Creates the `netlify graph` command
+ * @param {import('../base-command').BaseCommand} program
+ * @returns
+ */
+const createGraphCommand = (program) => {
+  createGraphEditCommand(program)
+  createGraphPullCommand(program)
+
+  return program
+    .command('graph')
+    .description('(Beta) Control the Netlify Graph functions for the current site')
+    .addExamples(['netlify graph:pull', 'netlify graph:edit'])
+    .action(graph)
+}
+
+module.exports = { createGraphCommand }

package/src/commands/graph/index.js

@@ -0,0 +1,5 @@
+const { createGraphCommand } = require('./graph')
+
+module.exports = {
+  createGraphCommand,
+}

package/src/commands/main.js

@@ -29,6 +29,7 @@ const { createDeployCommand } = require('./deploy')
 const { createDevCommand } = require('./dev')
 const { createEnvCommand } = require('./env')
 const { createFunctionsCommand } = require('./functions')
+const { createGraphCommand } = require('./graph')
 const { createInitCommand } = require('./init')
 const { createLinkCommand } = require('./link')
 const { createLmCommand } = require('./lm')
@@ -170,6 +171,7 @@ const createMainCommand = () => {
   createDevCommand(program)
   createEnvCommand(program)
   createFunctionsCommand(program)
+  createGraphCommand(program)
   createInitCommand(program)
   createLinkCommand(program)
   createLmCommand(program)

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

@@ -9,15 +9,15 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@netlify/functions": "^0.10.0",
-        "@types/node": "^14.18.5",
+        "@netlify/functions": "^0.11.0",
+        "@types/node": "^14.0.0",
         "typescript": "^4.0.0"
       }
     },
     "node_modules/@netlify/functions": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-0.10.0.tgz",
-      "integrity": "sha512-NNFADTPnokuoMY1OUhaXlE/Jrzk5lHOl1uB4L/8pw1UJ/CaectZJACMExijbJnqaKIhOQG0WmbBQUh1lgnK/Qg==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-0.11.0.tgz",
+      "integrity": "sha512-+WWX081UCkLZYkfh1Ru+PH5HTujNXugeskATGhZLTyS1U3Cqh2gYLArdG1a/vU8WWopu/wjpxEOdWq8/T5Nw5Q==",
       "dependencies": {
         "is-promise": "^4.0.0"
       },
@@ -50,9 +50,9 @@
   },
   "dependencies": {
     "@netlify/functions": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-0.10.0.tgz",
-      "integrity": "sha512-NNFADTPnokuoMY1OUhaXlE/Jrzk5lHOl1uB4L/8pw1UJ/CaectZJACMExijbJnqaKIhOQG0WmbBQUh1lgnK/Qg==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-0.11.0.tgz",
+      "integrity": "sha512-+WWX081UCkLZYkfh1Ru+PH5HTujNXugeskATGhZLTyS1U3Cqh2gYLArdG1a/vU8WWopu/wjpxEOdWq8/T5Nw5Q==",
       "requires": {
         "is-promise": "^4.0.0"
       }

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

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

package/src/lib/functions/config.js

@@ -13,6 +13,7 @@ const normalizeFunctionsConfig = ({ functionsConfig = {}, projectRoot }) =>
         nodeBundler: config.node_bundler === 'esbuild' ? 'esbuild_zisi' : config.node_bundler,
         processDynamicNodeImports: true,
         schedule: config.schedule,
+        zipGo: true,
       },
     }),
     {},