Use default options when netlify.toml isn't available (#15)

* Add default options to avoid failure when netlify.toml is not present
* Use /api as the default prefix path
* Redirects from /.netlify/* are not used.

Author: satyarohith

README.md

@@ -65,7 +65,7 @@ You may provide additional configuration in the `netlify.toml` file to configure
 functions = "functions" # Functions source directory. Use this if you would like to use Nimbella to deploy your functions.
 timeout = 6000 # Function timeout limit in milliseconds.
 memory = 256 # Function memory limit in MB.
-path = "/.netlify/functions/" # The prefix path to access your deployed packages. Change this if you're using both Netlify Functions and Nimbella for your backend.
+path = "/api/" # The prefix path to access your deployed packages.
 ```
 
 ## Usage
@@ -76,7 +76,7 @@ In this section, you will learn how to structure your repository and `netlify.to
 
 The Nimbella add-on for Netlify allows you to use [Nimbella projects](https://nimbella.io/downloads/nim/nim.html#overview-of-nimbella-projects-actions-and-deployment) to automate packaging and deployment. We suggest reading the documentation about [Nimbella projects](https://nimbella.io/downloads/nim/nim.html#overview-of-nimbella-projects-actions-and-deployment) at some point. We provide a quick introduction here.
 
-Nimbella projects inspect a directory named `packages` at the base of your repository. The contents of this directory dictate the serverless functions that are deployed. The plugin will automatically deploy the functions inside `packages` and will also create redirect rules so all requests to `/.netlify/functions/*` are redirected to functions (also called actions) deployed on Nimbella.
+Nimbella projects inspect a directory named `packages` at the base of your repository. The contents of this directory dictate the serverless functions that are deployed. The plugin will automatically deploy the functions inside `packages` and all of the functions (also called actions) can accessed using the following pattern: `https://your-site.com/<path(default="api")>/<packageName>/<actionName>`.
 
 For example, for the following project structure:
 
@@ -96,14 +96,7 @@ site
     └── index.html
 ```
 
-You will invoke the function `auth/login.js` via the API end point `https://your-site.com/.netlify/functions/auth/login`.
-
-If you're using Netlify Functions, you need to change the base prefix `/.netlify/functions/` to something different (e.g. `/api/`) in `netlify.toml` so Netlify Functions can be accessed using `/.netlify/functions/` and Nimbella Functions can be accessed using `/api/` route.
-
-```toml
-[nimbella]
-path = '/api/' # default /.netlify/functions/.
-```
+You will invoke the function `auth/login.js` via the API end point `https://your-site.com/api/auth/login`.
 
 #### Deploy Netlify Functions on Nimbella Cloud
 
@@ -122,7 +115,7 @@ This plugin builds your functions using a modified version of [netlify-lambda](h
 
 All enviroment variables present in the build runtime during Netlify build (except `CI` and `NETLIFY`) are made availabe to the deployed functions on Nimbella Cloud.
 
-**Note:** When you're using `packages` along with functions, make sure to apend "default" to `.netlify/functions` to invoke the functions as all functions are deployed under `default` package of your namespace.
+**Note:** When you're using `packages` along with functions, make sure to apend "default" to `/api/` to invoke the functions as all functions are deployed under `default` package of your namespace.
 
 ## Examples
 

index.js

@@ -5,11 +5,17 @@ const toml = require('@iarna/toml');
 const cpx = require('cpx');
 const build = require('netlify-lambda/lib/build');
 
-let config = {};
+const NIM_CLI = 'https://apigcp.nimbella.io/downloads/nim/nimbella-cli.tgz';
+const functionsBuildDir = `functions-build-${Date.now()}`;
+let netlifyToml = {};
 let isProject = false;
 let isActions = false;
-const functionsBuildDir = `functions-build-${Date.now()}`;
-const NIM_CLI = 'https://apigcp.nimbella.io/downloads/nim/nimbella-cli.tgz';
+let options = {
+  functions: '',
+  timeout: 6000,
+  memory: 256,
+  path: '/api/'
+};
 
 // Disable auto updates of nim.
 process.env.NIM_DISABLE_AUTOUPDATE = '1';
@@ -85,9 +91,16 @@ module.exports = {
         await utils.cache.save(nimConfig);
       }
 
-      config = toml.parse(await readFile(constants.CONFIG_PATH));
+      if (constants.CONFIG_PATH && existsSync(constants.CONFIG_PATH)) {
+        netlifyToml = toml.parse(await readFile(constants.CONFIG_PATH));
+
+        if (netlifyToml.nimbella) {
+          options = {...options, ...netlifyToml.nimbella};
+        }
+      }
+
+      isActions = options.functions ? existsSync(options.functions) : false;
       isProject = existsSync('packages');
-      isActions = existsSync(config.nimbella.functions);
     } catch (error) {
       utils.build.failBuild(error.message);
     }
@@ -96,11 +109,11 @@ module.exports = {
   onBuild: async ({utils}) => {
     try {
       if (isActions) {
-        // Here we're passing the build directory instead of source because source is extracted from config.nimbella.functions.
+        // Here we're passing the build directory instead of source because source is extracted from options.functions.
         const stats = await build.run(functionsBuildDir);
         console.log(stats.toString(stats.compilation.options.stats));
         // Copy any files that do not end with .js. T
-        cpx.copy(config.nimbella.functions + '/**/*.!(js)', functionsBuildDir);
+        cpx.copy(options.functions + '/**/*.!(js)', functionsBuildDir);
       }
     } catch (error) {
       utils.build.failBuild(error.message);
@@ -119,8 +132,9 @@ module.exports = {
         await deployActions({
           run: utils.run,
           functionsDir: functionsBuildDir,
-          timeout: config.nimbella.timeout || 6000, // Default is 10 seconds
-          memory: config.nimbella.memory || 256 // Default is 256MB (max for free tier)
+          secretsPath: join(process.cwd(), 'env.json'),
+          timeout: options.timeout, // Default is 6 seconds
+          memory: options.memory // Default is 256MB (max for free tier)
         });
       }
 
@@ -137,11 +151,11 @@ module.exports = {
         redirects.push(...success);
       }
 
-      if (config.redirects) {
+      if (netlifyToml.redirects) {
         console.log(
           "Found redirect rules in netlify.toml. We will rewrite rules that redirect (200 rewrites) to '/.netlify/functions/*'."
         );
-        redirects.push(...config.redirects);
+        redirects.push(...netlifyToml.redirects);
       }
 
       for (const redirect of redirects) {
@@ -155,7 +169,7 @@ module.exports = {
         }
       }
 
-      let {path: redirectPath = '.netlify/functions'} = config.nimbella;
+      let {path: redirectPath} = options;
       redirectPath = redirectPath.endsWith('/')
         ? redirectPath
         : redirectPath + '/';