netlify-cli 16.7.0 → 16.8.1

package/src/lib/functions/registry.mjs

@@ -1,5 +1,5 @@
 // @ts-check
-import { mkdir } from 'fs/promises'
+import { mkdir, stat } from 'fs/promises'
 import { createRequire } from 'module'
 import { basename, extname, isAbsolute, join, resolve } from 'path'
 import { env } from 'process'
@@ -39,6 +39,7 @@ export class FunctionsRegistry {
     debug = false,
     isConnected = false,
     logLambdaCompat,
+    manifest,
     projectRoot,
     settings,
     timeouts,
@@ -96,6 +97,14 @@ export class FunctionsRegistry {
      * @type {boolean}
      */
     this.logLambdaCompat = Boolean(logLambdaCompat)
+
+    /**
+     * Contents of a `manifest.json` file that can be looked up when dealing
+     * with built functions.
+     *
+     * @type {object}
+     */
+    this.manifest = manifest
   }
 
   checkTypesPackage() {
@@ -390,12 +399,30 @@ export class FunctionsRegistry {
         FunctionsRegistry.logEvent('extracted', { func })
       }
 
-      func.mainFile = join(unzippedDirectory, `${func.name}.js`)
+      // If there's a manifest file, look up the function in order to extract
+      // the build data.
+      const manifestEntry = (this.manifest?.functions || []).find((manifestFunc) => manifestFunc.name === func.name)
+
+      func.buildData = manifestEntry?.buildData || {}
+
+      // When we look at an unzipped function, we don't know whether it uses
+      // the legacy entry file format (i.e. `[function name].js`) or the new
+      // one (i.e. `___netlify-entry-point.mjs`). Let's look for the new one
+      // and use it if it exists, otherwise use the old one.
+      try {
+        const v2EntryPointPath = join(unzippedDirectory, '___netlify-entry-point.mjs')
+
+        await stat(v2EntryPointPath)
+
+        func.mainFile = v2EntryPointPath
+      } catch {
+        func.mainFile = join(unzippedDirectory, `${func.name}.js`)
+      }
+    } else {
+      this.buildFunctionAndWatchFiles(func, !isReload)
     }
 
     this.functions.set(name, func)
-
-    this.buildFunctionAndWatchFiles(func, !isReload)
   }
 
   /**

package/src/lib/functions/server.mjs

@@ -1,6 +1,7 @@
 // @ts-check
 import { Buffer } from 'buffer'
 import { promises as fs } from 'fs'
+import path from 'path'
 
 import express from 'express'
 import expressLogging from 'express-logging'
@@ -261,6 +262,7 @@ export const startFunctionsServer = async (options) => {
     options
   const internalFunctionsDir = await getInternalFunctionsDir({ base: site.root })
   const functionsDirectories = []
+  let manifest
 
   // If the `loadDistFunctions` parameter is sent, the functions server will
   // use the built functions created by zip-it-and-ship-it rather than building
@@ -270,6 +272,18 @@ export const startFunctionsServer = async (options) => {
 
     if (distPath) {
       functionsDirectories.push(distPath)
+
+      // When using built functions, read the manifest file so that we can
+      // extract metadata such as routes and API version.
+      try {
+        const manifestPath = path.join(distPath, 'manifest.json')
+        // eslint-disable-next-line unicorn/prefer-json-parse-buffer
+        const data = await fs.readFile(manifestPath, 'utf8')
+
+        manifest = JSON.parse(data)
+      } catch {
+        // no-op
+      }
     }
   } else {
     // The order of the function directories matters. Rightmost directories take
@@ -297,6 +311,7 @@ export const startFunctionsServer = async (options) => {
     debug,
     isConnected: Boolean(siteUrl),
     logLambdaCompat: isFeatureFlagEnabled('cli_log_lambda_compat', siteInfo),
+    manifest,
     // functions always need to be inside the packagePath if set inside a monorepo
     projectRoot: command.workingDir,
     settings,

package/src/functions-templates/javascript/apollo-graphql/.netlify-function-template.mjs

@@ -1,5 +0,0 @@
-export default {
-  name: 'apollo-graphql',
-  description: 'GraphQL function using Apollo-Server-Lambda!',
-  functionType: 'serverless',
-}

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

@@ -1,21 +0,0 @@
-{
-  "name": "apollo-graphql",
-  "version": "1.0.0",
-  "description": "netlify functions:create - set up for apollo graphql",
-  "main": "apollo-graphql.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [
-    "netlify",
-    "serverless",
-    "js",
-    "apollo"
-  ],
-  "author": "Netlify",
-  "license": "MIT",
-  "dependencies": {
-    "apollo-server-lambda": "^2.18.2",
-    "graphql": "^14.1.1"
-  }
-}

package/src/functions-templates/javascript/apollo-graphql/{{name}}.js

@@ -1,42 +0,0 @@
-const { ApolloServer, gql } = require('apollo-server-lambda')
-
-const typeDefs = gql`
-  type Query {
-    hello: String
-    allAuthors: [Author!]
-    author(id: Int!): Author
-    authorByName(name: String!): Author
-  }
-  type Author {
-    id: ID!
-    name: String!
-    married: Boolean!
-  }
-`
-
-const authors = [
-  { id: 1, name: 'Terry Pratchett', married: false },
-  { id: 2, name: 'Stephen King', married: true },
-  { id: 3, name: 'JK Rowling', married: false },
-]
-
-const resolvers = {
-  Query: {
-    hello: () => 'Hello, world!',
-    allAuthors: () => authors,
-    author: () => {},
-    authorByName: (root, args) => {
-      console.log('hihhihi', args.name)
-      return authors.find((author) => author.name === args.name) || 'NOTFOUND'
-    },
-  },
-}
-
-const server = new ApolloServer({
-  typeDefs,
-  resolvers,
-})
-
-const handler = server.createHandler()
-
-module.exports = { handler }

package/src/functions-templates/javascript/apollo-graphql-rest/.netlify-function-template.mjs

@@ -1,5 +0,0 @@
-export default {
-  name: 'apollo-graphql-rest',
-  description: 'GraphQL function to wrap REST API using apollo-server-lambda and apollo-datasource-rest!',
-  functionType: 'serverless',
-}

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

@@ -1,22 +0,0 @@
-{
-  "name": "apollo-graphql-rest",
-  "version": "1.0.0",
-  "description": "netlify functions:create - GraphQL function to wrap REST API using apollo-server-lambda and apollo-datasource-rest!",
-  "main": "apollo-graphql-rest.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [
-    "netlify",
-    "serverless",
-    "js",
-    "apollo"
-  ],
-  "author": "Netlify",
-  "license": "MIT",
-  "dependencies": {
-    "apollo-server-lambda": "^2.18.2",
-    "apollo-datasource-rest": "^0.15.0",
-    "graphql": "^14.1.1"
-  }
-}

package/src/functions-templates/javascript/apollo-graphql-rest/random-user.js

@@ -1,23 +0,0 @@
-const { RESTDataSource } = require('apollo-datasource-rest')
-
-class RandomUser extends RESTDataSource {
-  constructor() {
-    super()
-    this.baseURL = 'https://randomuser.me/api'
-  }
-
-  async getUser(gender = DEFAULT_GENDER) {
-    const user = await this.get(`/?gender=${gender}`)
-    return user.results[0]
-  }
-
-  async getUsers(people = DEFAULT_PEOPLE_COUNT, gender = DEFAULT_GENDER) {
-    const user = await this.get(`/?results=${people}&gender=${gender}`)
-    return user.results
-  }
-}
-
-const DEFAULT_PEOPLE_COUNT = 10
-const DEFAULT_GENDER = 'all'
-
-module.exports = RandomUser

package/src/functions-templates/javascript/apollo-graphql-rest/{{name}}.js

@@ -1,68 +0,0 @@
-const { ApolloServer, gql } = require('apollo-server-lambda')
-
-const RandomUser = require('./random-user.js')
-// example from: https://medium.com/yld-engineering-blog/easier-graphql-wrappers-for-your-rest-apis-1410b0b5446d
-
-const typeDefs = gql`
-  """
-  Example Description for Name Type
-
-  It's multiline and you can use **markdown**! [more docs](https://www.apollographql.com/docs/apollo-server/essentials/schema#documentation)!
-  """
-  type Name {
-    "Description for first"
-    title: String
-    "Description for title"
-    first: String
-    "Description for last"
-    last: String
-  }
-  type Location {
-    street: String
-    city: String
-    state: String
-    postcode: String
-  }
-  type Picture {
-    large: String
-    medium: String
-    thumbnail: String
-  }
-  type User {
-    gender: String
-    name: Name
-    location: Location
-    email: String
-    phone: String
-    cell: String
-    picture: Picture
-    nat: String
-  }
-  type Query {
-    """
-    Example Description for getUser
-
-    It's multiline and you can use **markdown**!
-    """
-    getUser(gender: String): User
-    getUsers(people: Int, gender: String): [User]
-  }
-`
-const resolvers = {
-  Query: {
-    getUser: async (_, { gender }, { dataSources }) => dataSources.RandomUser.getUser(gender),
-    getUsers: async (_, { gender, people }, { dataSources }) => dataSources.RandomUser.getUsers(people, gender),
-  },
-}
-
-const server = new ApolloServer({
-  typeDefs,
-  resolvers,
-  dataSources: () => ({
-    RandomUser: new RandomUser(),
-  }),
-})
-
-const handler = server.createHandler()
-
-module.exports = { handler }

package/src/functions-templates/javascript/auth-fetch/.netlify-function-template.mjs

@@ -1,11 +0,0 @@
-export default {
-  name: 'auth-fetch',
-  description: 'Use `node-fetch` library and Netlify Identity to access APIs',
-  functionType: 'serverless',
-  onComplete() {
-    console.log(`auth-fetch function created from template!`)
-    console.log(
-      'REMINDER: Make sure to call this function with the Netlify Identity JWT. See https://netlify-gotrue-in-react.netlify.com/ for demo',
-    )
-  },
-}

package/src/functions-templates/javascript/auth-fetch/package-lock.json

@@ -1,83 +0,0 @@
-{
-  "name": "auth-fetch",
-  "version": "1.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "auth-fetch",
-      "version": "1.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "node-fetch": "^2.3.0"
-      }
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    }
-  },
-  "dependencies": {
-    "node-fetch": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    }
-  }
-}

package/src/functions-templates/javascript/auth-fetch/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "auth-fetch",
-  "version": "1.0.0",
-  "description": "netlify functions:create - default template for auth fetch function",
-  "main": "auth-fetch.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [
-    "netlify",
-    "serverless",
-    "js",
-    "identity",
-    "authentication"
-  ],
-  "author": "Netlify",
-  "license": "MIT",
-  "dependencies": {
-    "node-fetch": "^2.3.0"
-  }
-}

package/src/functions-templates/javascript/auth-fetch/{{name}}.js

@@ -1,39 +0,0 @@
-// for a full working demo of Netlify Identity + Functions, see https://netlify-gotrue-in-react.netlify.com/
-
-const fetch = require('node-fetch')
-
-const handler = async function (event, context) {
-  if (!context.clientContext && !context.clientContext.identity) {
-    return {
-      statusCode: 500,
-      // Could be a custom message or object i.e. JSON.stringify(err)
-      body: JSON.stringify({
-        msg: 'No identity instance detected. Did you enable it?',
-      }),
-    }
-  }
-  const { identity, user } = context.clientContext
-  try {
-    const response = await fetch('https://api.chucknorris.io/jokes/random')
-    if (!response.ok) {
-      // NOT res.status >= 200 && res.status < 300
-      return { statusCode: response.status, body: response.statusText }
-    }
-    const data = await response.json()
-
-    return {
-      statusCode: 200,
-      body: JSON.stringify({ identity, user, msg: data.value }),
-    }
-  } catch (error) {
-    // output to netlify function log
-    console.log(error)
-    return {
-      statusCode: 500,
-      // Could be a custom message or object i.e. JSON.stringify(err)
-      body: JSON.stringify({ msg: error.message }),
-    }
-  }
-}
-
-module.exports = { handler }

package/src/functions-templates/javascript/create-user/.netlify-function-template.mjs

@@ -1,11 +0,0 @@
-export default {
-  name: 'create-user',
-  description: 'Programmatically create a Netlify Identity user by invoking a function',
-  functionType: 'serverless',
-  onComplete() {
-    console.log(`create-user function created from template!`)
-    console.log(
-      'REMINDER: Make sure to call this function with a Netlify Identity JWT. See https://netlify-gotrue-in-react.netlify.com/ for demo',
-    )
-  },
-}

package/src/functions-templates/javascript/create-user/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "create-user",
-  "version": "1.0.0",
-  "description": "netlify functions:create - Programmatically create a Netlify Identity user by invoking a function",
-  "main": "create-user.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [
-    "netlify",
-    "serverless",
-    "js",
-    "identity",
-    "authentication"
-  ],
-  "author": "Netlify",
-  "license": "MIT",
-  "dependencies": {
-    "node-fetch": "^2.6.1"
-  }
-}

package/src/functions-templates/javascript/create-user/{{name}}.js

@@ -1,36 +0,0 @@
-const fetch = require('node-fetch')
-
-const handler = async (event, context) => {
-  if (event.httpMethod !== 'POST') return { statusCode: 400, body: 'Must POST to this function' }
-
-  // send account information along with the POST
-  const { email, full_name: fullName, password } = JSON.parse(event.body)
-  if (!email) return { statusCode: 400, body: 'email missing' }
-  if (!password) return { statusCode: 400, body: 'password missing' }
-  if (!fullName) return { statusCode: 400, body: 'full_name missing' }
-
-  // identity.token is a short lived admin token which
-  // is provided to all Netlify Functions to interact
-  // with the Identity API
-  const { identity } = context.clientContext
-
-  await fetch(`${identity.url}/admin/users`, {
-    method: 'POST',
-    headers: { Authorization: `Bearer ${identity.token}` },
-    body: JSON.stringify({
-      email,
-      password,
-      confirm: true,
-      user_metadata: {
-        full_name: fullName,
-      },
-    }),
-  })
-
-  return {
-    statusCode: 200,
-    body: 'success!',
-  }
-}
-
-module.exports = { handler }

package/src/functions-templates/javascript/fauna-crud/.netlify-function-template.mjs

@@ -1,17 +0,0 @@
-import execa from 'execa'
-
-export default {
-  name: 'fauna-crud',
-  description: 'CRUD function using Fauna DB',
-  functionType: 'serverless',
-  addons: [
-    {
-      addonName: 'fauna',
-      addonDidInstall(fnPath) {
-        execa.sync(fnPath + '/create-schema.js', undefined, {
-          stdio: 'inherit',
-        })
-      },
-    },
-  ],
-}

package/src/functions-templates/javascript/fauna-crud/create-schema.js

@@ -1,36 +0,0 @@
-#!/usr/bin/env node
-const process = require('process')
-
-/* bootstrap database in your FaunaDB account - use with `netlify dev:exec <path-to-this-file>` */
-const { Client, query } = require('faunadb')
-
-const createFaunaDB = async function () {
-  if (!process.env.FAUNADB_SERVER_SECRET) {
-    console.log('No FAUNADB_SERVER_SECRET in environment, skipping DB setup')
-  }
-  console.log('Create the database!')
-  const client = new Client({
-    secret: process.env.FAUNADB_SERVER_SECRET,
-  })
-
-  /* Based on your requirements, change the schema here */
-  try {
-    await client.query(query.CreateCollection({ name: 'items' }))
-
-    console.log('Created items class')
-    return await client.query(
-      query.CreateIndex({
-        name: 'all_items',
-        source: query.Collection('items'),
-        active: true,
-      }),
-    )
-  } catch (error) {
-    if (error.requestResult.statusCode === 400 && error.message === 'instance not unique') {
-      console.log('DB already exists')
-    }
-    throw error
-  }
-}
-
-createFaunaDB()

package/src/functions-templates/javascript/fauna-crud/create.js

@@ -1,37 +0,0 @@
-const process = require('process')
-
-const { Client, query } = require('faunadb')
-
-/* configure faunaDB Client with our secret */
-const client = new Client({
-  secret: process.env.FAUNADB_SERVER_SECRET,
-})
-
-/* export our lambda function as named "handler" export */
-const handler = async (event) => {
-  /* parse the string body into a useable JS object */
-  const data = JSON.parse(event.body)
-  console.log('Function `create` invoked', data)
-  const item = {
-    data,
-  }
-  /* construct the fauna query */
-  try {
-    const response = await client.query(query.Create(query.Collection('items'), item))
-    console.log('success', response)
-    /* Success! return the response with statusCode 200 */
-    return {
-      statusCode: 200,
-      body: JSON.stringify(response),
-    }
-  } catch (error) {
-    console.log('error', error)
-    /* Error! return the error with statusCode 400 */
-    return {
-      statusCode: 400,
-      body: JSON.stringify(error),
-    }
-  }
-}
-
-module.exports = { handler }

package/src/functions-templates/javascript/fauna-crud/delete.js

@@ -1,29 +0,0 @@
-/* Import faunaDB sdk */
-const process = require('process')
-
-const { Client, query } = require('faunadb')
-
-const client = new Client({
-  secret: process.env.FAUNADB_SERVER_SECRET,
-})
-
-const handler = async (event) => {
-  const { id } = event
-  console.log(`Function 'delete' invoked. delete id: ${id}`)
-  try {
-    const response = await client.query(query.Delete(query.Ref(query.Collection('items'), id)))
-    console.log('success', response)
-    return {
-      statusCode: 200,
-      body: JSON.stringify(response),
-    }
-  } catch (error) {
-    console.log('error', error)
-    return {
-      statusCode: 400,
-      body: JSON.stringify(error),
-    }
-  }
-}
-
-module.exports = { handler }

package/src/functions-templates/javascript/fauna-crud/package.json

@@ -1,20 +0,0 @@
-{
-  "name": "fauna-crud",
-  "version": "1.0.0",
-  "description": "netlify functions:create - CRUD functionality with Fauna DB",
-  "main": "fauna-crud.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [
-    "netlify",
-    "serverless",
-    "js",
-    "faunadb"
-  ],
-  "author": "Netlify",
-  "license": "MIT",
-  "dependencies": {
-    "faunadb": "^4.0.3"
-  }
-}