feat(config): add config support (#17)

* feat(config): add config support

* refactor(config): apply review notes, replace entryPoints with modules

* feat(build): add es2015 bundles support

* feat(config): add support for skipBundles and buildEs2015 options, fix bundle filenames with multiple entryPoints

Author: IlyaSurmay

package.json

@@ -65,6 +65,9 @@
     "node-sass-tilde-importer": "1.0.0",
     "read-pkg": "2.0.0",
     "reflect-metadata": "0.1.10",
+    "rollup": "0.52.1",
+    "rollup-plugin-commonjs": "8.2.6",
+    "rollup-plugin-node-resolve": "3.0.0",
     "rxjs": "5.4.2",
     "semver": "5.3.0",
     "split": "1.0.0",

src/bin/ngm-cli.ts

@@ -85,6 +85,7 @@ const cli = meow(`
   alias: {
     m: 'message',
     p: 'project',
+    c: 'config',
     w: 'watch',
     v: 'version',
     local: 'use-local-dependencies alias'
@@ -104,10 +105,10 @@ if (cli.input.length === 0) {
 }
 
 // project flag is mandatory for now
-if (!cli.flags.project) {
-  console.error('Please provide path to your projects source folder, `-p DIR` ');
-  process.exit(1);
-}
+// if (!cli.flags.project) {
+//   console.error('Please provide path to your projects source folder, `-p DIR` ');
+//   process.exit(1);
+// }
 
 import { main } from '../lib/ngm';
 

src/commands/build.command.ts

@@ -5,12 +5,14 @@ import path = require('path');
 const Listr = require('listr');
 const cpy = require('cpy');
 const del = require('del');
+const fs = require('fs');
 
 import { findSubmodules, tasksWatch } from '../utils';
-import { build, bundleUmd, buildPkgs } from '../tasks';
+import { build, bundleUmd, buildPkgs, bundleEs2015 } from '../tasks';
 import { inlineResources } from '../helpers/inline-resources';
 
-export function buildCommand({project, verbose, clean, local, main, watch, skipBundles}) {
+
+export function buildCommand({project, verbose, clean, local, main, watch, skipBundles, buildEs2015}) {
   // 1. clean dist folders
   // 2.1 merge pkg json
   // todo: 2.2 validate pkg (main, module, types fields)
@@ -119,14 +121,28 @@ export function buildCommand({project, verbose, clean, local, main, watch, skipB
         task: () => new Listr(
           opts.map(opt => ({
             title: `Bundling ${opt.pkg.name}`,
-            task: () => bundleUmd({
-              main,
-              src: opt.tmp,
-              dist: opt.dist,
-              name: opt.pkg.name,
-              tsconfig: opt.tsconfig.path,
-              minify: false
-            })
+            task: () => {
+              if (Array.isArray(main) && main.length) {
+                return Promise.all(main.map((entryPoint, i) => bundleUmd({
+                  main: entryPoint,
+                  src: opt.tmp,
+                  dist: opt.dist,
+                  name: i === 0 ? opt.pkg.name : entryPoint.replace('.ts', ''),
+                  tsconfig: opt.tsconfig.path,
+                  minify: false
+                })))
+              }
+
+              return bundleUmd({
+                main,
+                src: opt.tmp,
+                dist: opt.dist,
+                name: opt.pkg.name,
+                tsconfig: opt.tsconfig.path,
+                minify: false
+              })
+            },
+            skip: () => watch || skipBundles
           }))
         ),
         skip: () => watch || skipBundles
@@ -136,18 +152,65 @@ export function buildCommand({project, verbose, clean, local, main, watch, skipB
         task: () => new Listr(
           opts.map(opt => ({
             title: `Bundling ${opt.pkg.name}`,
-            task: () => bundleUmd({
-              main,
-              src: opt.tmp,
-              dist: opt.dist,
-              name: opt.pkg.name,
-              tsconfig: opt.tsconfig.path,
-              minify: true
-            })
+            task: () => {
+              if (Array.isArray(main) && main.length) {
+                return Promise.all(main.map((entryPoint, i) => bundleUmd({
+                  main: entryPoint,
+                  src: opt.tmp,
+                  dist: opt.dist,
+                  name: i === 0 ? opt.pkg.name : entryPoint.replace('.ts', ''),
+                  tsconfig: opt.tsconfig.path,
+                  minify: true
+                })))
+              }
+
+              return bundleUmd({
+                main,
+                src: opt.tmp,
+                dist: opt.dist,
+                name: opt.pkg.name,
+                tsconfig: opt.tsconfig.path,
+                minify: true
+              })
+            },
+            skip: () => watch || skipBundles
           }))
         ),
         skip: () => watch || skipBundles
       },
+      {
+        title: 'Bundling es2015 version',
+        task: () => new Listr(
+          opts.map(opt => ({
+            title: `Bundling ${opt.pkg.name}`,
+            task: () => {
+              const tsconfig = JSON.parse(fs.readFileSync(path.resolve(opt.tmp, 'tsconfig.json'), 'utf8'));
+              tsconfig.compilerOptions.target = 'es2015';
+              tsconfig.compilerOptions.module = 'es2015';
+              tsconfig.compilerOptions.outDir = 'dist-es2015';
+              fs.writeFileSync(path.resolve(opt.tmp, 'tsconfig.json'), JSON.stringify(tsconfig), 'utf8');
+
+              if (Array.isArray(main) && main.length) {
+                return Promise.all(main.map((entryPoint, i) => bundleEs2015({
+                  input: entryPoint,
+                  dist: opt.dist,
+                  name: i === 0 ? opt.pkg.name : entryPoint.replace('.ts', ''),
+                  tmp: opt.tmp
+                })))
+              }
+
+              return bundleEs2015({
+                input: main,
+                dist: opt.dist,
+                name: opt.pkg.name,
+                tmp: opt.tmp
+              });
+            },
+            skip: () => !buildEs2015 || watch || skipBundles
+          }))
+        ),
+        skip: () => !buildEs2015 || watch || skipBundles
+      },
       {
         title: 'Clean .tmp folders',
         task: () => new Listr(
@@ -161,8 +224,34 @@ export function buildCommand({project, verbose, clean, local, main, watch, skipB
 }
 
 export function buildTsRun(cli) {
-  const {project, watch, verbose, clean, local, skipBundles} = cli.flags;
-  let main = cli.flags.main || 'index.ts';
-  return buildCommand({project, verbose, clean, local, main, watch, skipBundles})
-    .then(tasks => tasksWatch({project, tasks, watch}));
+  const config = cli.flags.config ? JSON.parse(fs.readFileSync(path.resolve(cli.flags.config), 'utf8')) : {};
+  let {src, main, modules, watch, verbose, clean, local, skipBundles, buildEs2015} = config;
+  const project = cli.flags.project || src;
+  main = cli.flags.main || main || 'index.ts';
+  verbose = cli.flags.verbose || verbose;
+  watch = cli.flags.watch || watch;
+  clean = cli.flags.clean || clean;
+  skipBundles = cli.flags.skipBundles || skipBundles;
+  buildEs2015 = cli.flags.buildEs2015 || buildEs2015;
+  const modulePaths = modules ? modules.map(module => module.src) : [];
+
+  if (!project && !modulePaths) {
+    console.error('Please provide path to your projects source folder, `-p DIR` or specify `src` or `modules` in config');
+    process.exit(1);
+  }
+
+  if (modulePaths.length) {
+    const commands = modules.map((module: any) => {
+      return {
+        title: `Build ${module.src}`,
+        task: () => buildCommand({project: module.src, verbose, clean, local, main: module.entryPoints, watch, skipBundles, buildEs2015})
+      }
+    });
+
+    const taskQueue = new Listr(commands, {renderer: verbose ? 'verbose' : 'default'});
+    return tasksWatch({project: modulePaths, taskQueue, watch, paths: modulePaths});
+  }
+
+  return buildCommand({project, verbose, clean, local, main, watch, skipBundles, buildEs2015})
+    .then(taskQueue => tasksWatch({project, taskQueue, watch, paths: null}));
 }