Merge branch 'release/1.7.0'

Author: 8eecf0d2

.github/main.workflow

@@ -1,2 +1,2 @@
 node_modules
-.dist
+dist

.gitignore

@@ -35,6 +35,12 @@ The [**build** command](https://github.com/8eecf0d2/netlify-local/wiki/Command-B
 netlify-local build <options>
 ```
 
+#### `bundle` command
+The [**bundle** command](https://github.com/8eecf0d2/netlify-local/wiki/Command-Bundle) will attempt to parse your `netlify.toml` and update your Webpack Configuration with the correct `entry` and `output` properties.
+```bash
+netlify-local bundle <options>
+```
+
 #### Options
 You can view a detailed [list of options in the wiki](https://github.com/8eecf0d2/netlify-local/wiki/Options).
 

README.md

@@ -1,11 +1,11 @@
 {
   "name": "netlify-local",
-  "version": "1.6.7",
+  "version": "1.7.0",
   "description": "Local Netlify service emulation",
-  "main": ".dist/index.js",
-  "types": ".dist/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "bin": {
-    "netlify-local": ".dist/cli.js"
+    "netlify-local": "dist/cli.js"
   },
   "repository": "https://github.com/8eecf0d2/netlify-local.git",
   "author": "8eecf0d2 <[email protected]>",
@@ -15,7 +15,7 @@
     "build": "tsc --project ./tsconfig.json",
     "pretest": "yarn run build",
     "test": "ts-mocha --project ./test/tsconfig.json test/**/*.ts",
-    "test:now": "ts-mocha --project ./test/tsconfig.json test/**/*.ts"
+    "lint": "tslint -c tslint.json src/**/*.ts"
   },
   "devDependencies": {
     "@types/assert": "^1.4.0",
@@ -32,6 +32,7 @@
     "assert": "^1.4.1",
     "mocha": "^5.2.0",
     "ts-mocha": "^2.0.0",
+    "tslint": "^5.12.0",
     "typescript": "^3.1.3"
   },
   "dependencies": {
@@ -43,9 +44,9 @@
     "get-port": "^4.0.0",
     "git-branch": "^2.0.1",
     "jsonwebtoken": "^8.3.0",
+    "serve-static": "^1.13.2",
     "toml": "^2.3.3",
     "url-pattern": "^1.0.3",
-    "serve-static": "^1.13.2",
     "webpack": "^4.20.2"
   },
   "files": [

package.json

@@ -6,10 +6,8 @@ import * as program from "commander";
 
 import { Logger } from "./helper";
 import { Netlify } from "./netlify";
-import { Server } from "./server";
-import { Build } from "./build";
-import { Webpack } from "./webpack";
-import { parseNetlifyConfig, parseNetlifyPluginLocalConfig, parseSslCertificates, parseWebpackConfig } from "./config";
+import { parseNetlifyConfig, parseNetlifyPluginLocalConfig, parseSslCertificates, parseWebpackConfig, Server, Webpack } from "./utility";
+import { Build, Bundle } from "./command";
 
 const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "package.json"), "utf8"));
 
@@ -29,7 +27,7 @@ program
   .description("Locally emulate Netlify services")
   .action(() => {
     (async () => {
-      if(program.context) {
+      if (program.context) {
         process.env.NETLIFY_LOCAL_CONTEXT = program.context;
       }
 
@@ -41,8 +39,8 @@ program
           static: program.static === undefined ? undefined : program.static === "false" ? false : true,
           lambda: program.lambda === undefined ? undefined : program.lambda === "false" ? false : true,
           certificates: program.certificates,
-          port: program.hasOwnProperty("port") ? parseInt(program.port) : undefined,
-        }
+          port: program.hasOwnProperty("port") ? parseInt(program.port, 10) : undefined,
+        },
       });
 
       const server = new Server({
@@ -52,49 +50,73 @@ program
 
       await server.listen();
 
-      if(netlifyConfig.plugins.local.webpack.config) {
+      if (netlifyConfig.plugins.local.webpack.config) {
         const webpackConfig = parseWebpackConfig(netlifyConfig.plugins.local.webpack.config);
         const webpack = new Webpack(webpackConfig);
         webpack.watch();
       }
 
     })()
-      .catch(error => {
-        Logger.error(error)
+      .catch((error) => {
+        Logger.error(error);
         process.exit(1);
-      })
+      });
   });
 
 program
   .command("build")
   .description("Execute Netlify build")
   .action(() => {
     (async () => {
-      if(program.context) {
+      if (program.context) {
         process.env.NETLIFY_LOCAL_CONTEXT = program.context;
       }
 
       const netlifyConfig = parseNetlifyConfig(program.netlify || "netlify.toml", {
         webpack: {
           config: program.webpack,
         },
-        server: {
-          static: false,
-          lambda: false,
-          certificates: undefined,
-          port: 9000,
-        }
       });
 
       try {
-        await Build.from(netlifyConfig);
-      } catch(error) {}
+        await Build.start(netlifyConfig);
+      } catch (error) {
+        Logger.error(error);
+      }
 
     })()
-      .catch(error => {
-        Logger.error(error)
+      .catch((error) => {
+        Logger.error(error);
         process.exit(1);
-      })
+      });
+  });
+
+program
+  .command("bundle")
+  .description("Bundle Netlify functions")
+  .action(() => {
+    (async () => {
+      if (program.context) {
+        process.env.NETLIFY_LOCAL_CONTEXT = program.context;
+      }
+
+      const netlifyConfig = parseNetlifyConfig(program.netlify || "netlify.toml", {
+        webpack: {
+          config: program.webpack,
+        },
+      });
+
+      try {
+        await Bundle.start(netlifyConfig);
+      } catch (error) {
+        Logger.error(error);
+      }
+
+    })()
+      .catch((error) => {
+        Logger.error(error);
+        process.exit(1);
+      });
   });
 
 program.parse(process.argv);

src/ts/cli.ts

@@ -1,26 +1,25 @@
 import { exec } from "child_process";
 
-import { Logger } from "./helper";
-import { Netlify} from "./netlify";
+import { Logger } from "../helper";
+import { Netlify} from "../netlify";
 
 export class Build {
-
-  public static async from (netlifyConfig: Netlify.Config): Promise<void> {
+  public static async start(netlifyConfig: Netlify.Config): Promise<void> {
     return new Promise<void>((resolve, reject) => {
       Logger.info("build started");
-      const buildCommand = Build.objectToEnvironmentVariables(netlifyConfig.build.environment) + netlifyConfig.build.command;
+      const buildCommand = Build.objectToEnvironmentVariables(netlifyConfig.build.environment || {}) + netlifyConfig.build.command;
       const result = exec(buildCommand, (error, stdout, stderr) => {
-        if(error) {
+        if (error) {
           Logger.error("build failed");
-          console.log(stderr);
+          Logger.raw(stdout);
           return reject();
         } else {
           Logger.good("build complete");
-          console.log(stdout);
+          Logger.raw(stdout);
           return resolve();
         }
       });
-    })
+    });
   }
 
   private static objectToEnvironmentVariables = (obj: { [key: string]: any }): string => {

src/ts/build.ts renamed to src/ts/command/build.ts

@@ -0,0 +1,25 @@
+import { Logger } from "../helper";
+import { Netlify } from "../netlify";
+import { composeWebpackEntry, composeWebpackOutput, parseWebpackConfig, Webpack } from "../utility";
+
+export class Bundle {
+
+  public static async start(netlifyConfig: Netlify.Config): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+      Logger.info("bundle started");
+      const baseWebpackConfig = parseWebpackConfig(netlifyConfig.plugins.local.webpack.config).find((config) => config.name === "functions");
+      const updatedWebpackConfig = Bundle.generateFunctionsConfig(netlifyConfig, baseWebpackConfig);
+      const webpack = new Webpack(updatedWebpackConfig);
+      webpack.build();
+    })
+  }
+
+  public static generateFunctionsConfig(netlifyConfig: Netlify.Config, webpackConfig: Webpack.Config): Webpack.Config {
+    return {
+      ...webpackConfig,
+      entry: composeWebpackEntry(netlifyConfig),
+      output: composeWebpackOutput(netlifyConfig),
+    };
+  }
+
+}

src/ts/command/bundle.ts

@@ -0,0 +1,2 @@
+export * from "./build";
+export * from "./bundle";

src/ts/command/index.ts

@@ -1,22 +1,31 @@
 import chalk from "chalk";
 
 export class Logger {
-  static active = () => !(process.env.SILENT === "true");
+  public static active = () => !(process.env.SILENT === "true");
 
-  public static info (...args: any[]): void {
-    if(Logger.active()) {
+  public static raw(...args: Array<any>): void {
+    if (Logger.active()) {
+      // tslint:disable-next-line
+      console.log(...args);
+    }
+  }
+  public static info(...args: Array<any>): void {
+    if (Logger.active()) {
+      // tslint:disable-next-line
       console.log(chalk.white("[netlify-local]"), ...args);
     }
   }
 
-  public static good (...args: any[]): void {
-    if(Logger.active()) {
+  public static good(...args: Array<any>): void {
+    if (Logger.active()) {
+      // tslint:disable-next-line
       console.log(chalk.green("[netlify-local]"), ...args);
     }
   }
 
-  public static error (...args: any[]): void {
-    if(Logger.active()) {
+  public static error(...args: Array<any>): void {
+    if (Logger.active()) {
+      // tslint:disable-next-line
       console.error(chalk.red("[netlify-local]"), ...args);
     }
   }

src/ts/helper/logger.ts

@@ -1,4 +1,2 @@
-export { parseNetlifyConfig, parseWebpackConfig } from "./config";
 export { Netlify } from "./netlify";
-export { Server } from "./server";
-export { Webpack } from "./webpack";
+export { composeWebpackEntry, composeWebpackOutput, parseNetlifyConfig, parseWebpackConfig, Server, Webpack } from "./utility";