netlify-cli 10.4.0 → 10.6.0

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

@@ -298,10 +298,10 @@ const runPrettier = async (filePath) => {
  * @param {Record<string, NetlifyGraph.ExtractedFunction>} context.functions The parsed queries with metadata to use when generating library functions
  * @param {Record<string, NetlifyGraph.ExtractedFragment>} context.fragments The parsed queries with metadata to use when generating library functions
  * @param {(message: string) => void=} context.logger A function that if provided will be used to log messages
- * @returns {void} Void, effectfully writes the generated library to the filesystem
+ * @returns {Promise<void>} Void, effectfully writes the generated library to the filesystem
  */
-const generateFunctionsFile = ({ fragments, functions, logger, netlifyGraphConfig, operationsDoc, schema }) => {
-  const { clientSource, typeDefinitionsSource } = NetlifyGraph.generateFunctionsSource(
+const generateFunctionsFile = async ({ fragments, functions, logger, netlifyGraphConfig, operationsDoc, schema }) => {
+  const { clientSource, typeDefinitionsSource } = await NetlifyGraph.generateFunctionsSource(
     netlifyGraphConfig,
     schema,
     operationsDoc,
@@ -394,7 +394,7 @@ const readGraphQLSchemaFile = (netlifyGraphConfig) => {
  * @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
+ * @returns {Array<{filePath: string, prettierSuccess: boolean}>} An array of the generated handler filepaths
  */
 const generateHandlerByOperationId = ({ handlerOptions, logger, netlifyGraphConfig, operationId, schema }) => {
   let currentOperationsDoc = readGraphQLOperationsSourceFile(netlifyGraphConfig)
@@ -425,6 +425,8 @@ const generateHandlerByOperationId = ({ handlerOptions, logger, netlifyGraphConf
     return
   }
 
+  const results = []
+
   exportedFiles.forEach((exportedFile) => {
     const { content } = exportedFile
     const isNamed = exportedFile.kind === 'NamedExportedFile'
@@ -453,7 +455,14 @@ const generateHandlerByOperationId = ({ handlerOptions, logger, netlifyGraphConf
     const relativePath = path.relative(process.cwd(), absoluteFilename)
     logger && logger(`Wrote ${chalk.cyan(relativePath)}`)
     runPrettier(absoluteFilename)
+
+    results.push({
+      filePath: absoluteFilename,
+      prettierSuccess: true,
+    })
   })
+
+  return results
 }
 
 /**
@@ -520,6 +529,22 @@ const getGraphEditUrlBySiteId = ({ oneGraphSessionId, siteId }) => {
   return url
 }
 
+/**
+ * Load `netlifyGraph.json` from the appropriate location
+ * @param {string} siteRoot The root directory of the site
+ * @returns {import('netlify-onegraph-internal').NetlifyGraphJsonConfig.JsonConfig}
+ */
+const loadNetlifyGraphConfig = (siteRoot) => {
+  const configPath = path.join(siteRoot, 'netlifyGraph.json')
+  if (fs.existsSync(configPath)) {
+    // eslint-disable-next-line unicorn/prefer-json-parse-buffer
+    const file = fs.readFileSync(configPath, 'utf-8')
+    return JSON.parse(file)
+  }
+
+  return {}
+}
+
 module.exports = {
   buildSchema,
   defaultExampleOperationsDoc: NetlifyGraph.defaultExampleOperationsDoc,
@@ -532,6 +557,7 @@ module.exports = {
   getGraphEditUrlBySiteId,
   getGraphEditUrlBySiteName,
   getNetlifyGraphConfig,
+  loadNetlifyGraphConfig,
   normalizeOperationsDoc: GraphQLHelpers.normalizeOperationsDoc,
   parse,
   readGraphQLOperationsSourceFile,

package/src/recipes/vscode/index.js

@@ -1,5 +1,6 @@
 const { join } = require('path')
 
+const execa = require('execa')
 const inquirer = require('inquirer')
 
 const { NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, log } = require('../../utils/command-helpers')
@@ -27,6 +28,26 @@ const getEdgeFunctionsPath = ({ config, repositoryRoot }) =>
 
 const getSettingsPath = (repositoryRoot) => join(repositoryRoot, '.vscode', 'settings.json')
 
+const hasDenoVSCodeExt = async () => {
+  const { stdout: extensions } = await execa('code', ['--list-extensions'], { stderr: 'inherit' })
+  return extensions.split('\n').includes('denoland.vscode-deno')
+}
+
+const getDenoVSCodeExt = async () => {
+  await execa('code', ['--install-extension', 'denoland.vscode-deno'], { stdio: 'inherit' })
+}
+
+const getDenoExtPrompt = () => {
+  const message = 'The Deno VS Code extension is recommended. Would you like to install it now?'
+
+  return inquirer.prompt({
+    type: 'confirm',
+    name: 'confirm',
+    message,
+    default: true,
+  })
+}
+
 const run = async ({ config, repositoryRoot }) => {
   const { DenoBridge } = await import('@netlify/edge-bundler')
   const deno = new DenoBridge({
@@ -45,14 +66,22 @@ const run = async ({ config, repositoryRoot }) => {
   }
 
   try {
-    await writeSettings({ settings, settingsPath })
-
-    log(`${NETLIFYDEVLOG} VS Code settings file ${fileExists ? 'updated' : 'created'}.`)
+    if (!(await hasDenoVSCodeExt())) {
+      const { confirm: denoExtConfirm } = await getDenoExtPrompt()
+      if (denoExtConfirm) getDenoVSCodeExt()
+    }
+  } catch {
     log(
-      `${NETLIFYDEVWARN} If you don't have the Deno VS Code extension, install it by visiting ${chalk.blue(
+      `${NETLIFYDEVWARN} Unable to install Deno VS Code extension. To install it manually, visit ${chalk.blue(
         'https://ntl.fyi/deno-vscode',
       )}.`,
     )
+  }
+
+  try {
+    await writeSettings({ settings, settingsPath })
+
+    log(`${NETLIFYDEVLOG} VS Code settings file ${fileExists ? 'updated' : 'created'}.`)
   } catch {
     error('Could not write VS Code settings file.')
   }

package/src/utils/deploy/hash-fns.js

@@ -61,11 +61,7 @@ const getFunctionZips = async ({
     })
   }
 
-  const featureFlags = {
-    zisi_detect_esm: true,
-  }
-
-  return await zipIt.zipFunctions(directories, tmpDir, { basePath: rootDir, config: functionsConfig, featureFlags })
+  return await zipIt.zipFunctions(directories, tmpDir, { basePath: rootDir, config: functionsConfig })
 }
 
 const hashFns = async (

package/src/functions-templates/go/scheduled-function/.netlify-function-template.js

@@ -1,5 +0,0 @@
-module.exports = {
-  name: 'scheduled-function',
-  priority: 1,
-  description: 'Basic implementation of a scheduled function in Go.',
-}

package/src/functions-templates/go/scheduled-function/go.mod

@@ -1,5 +0,0 @@
-module github.com/your-github-handle/{{name}}
-
-go 1.17
-
-require github.com/aws/aws-lambda-go v1.31.1

package/src/functions-templates/go/scheduled-function/go.sum

@@ -1,21 +0,0 @@
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/aws/aws-lambda-go v1.28.0 h1:fZiik1PZqW2IyAN4rj+Y0UBaO1IDFlsNo9Zz/XnArK4=
-github.com/aws/aws-lambda-go v1.28.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

package/src/functions-templates/go/scheduled-function/netlify.toml

@@ -1,11 +0,0 @@
-[build]
-functions = "functions"
-
-[build.environment]
-GO_VERSION = "1.17"
-
-[functions]
-directory = "src/"
-
-[functions.hourly-schedule]
-schedule = "@hourly"

package/src/functions-templates/go/scheduled-function/src/hourly-schedule/main.go

@@ -1,36 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"log"
-	"net/http"
-	"time"
-
-	"github.com/aws/aws-lambda-go/events"
-	"github.com/aws/aws-lambda-go/lambda"
-)
-
-type requestBody struct {
-	NextRun time.Time `json:"next_run"`
-}
-
-// The schedule for this function is defined inside the netlify.toml file. To learn about scheduled functions 
-// and supported cron extensions, visit https://ntl.fyi/sched-func.
-func handler(ctx context.Context, request events.APIGatewayProxyRequest) (*events.APIGatewayProxyResponse, error) {
-	requestBody := requestBody{}
-
-	if err := json.Unmarshal([]byte(request.Body), &requestBody); err != nil {
-		log.Fatalf("cannot parse request body: %s", err.Error())
-	}
-
-	log.Printf("Next run at %s\n", requestBody.NextRun.Local())
-
-	return &events.APIGatewayProxyResponse{
-		StatusCode: http.StatusNoContent,
-	}, nil
-}
-
-func main() {
-	lambda.Start(handler)
-}