Merge branch 'develop'

edeustace · edeustace · commit 8b70a99b2711 · 2018-05-23T10:27:49.000-04:00
diff --git a/src/apps/catalog/index.ts b/src/apps/catalog/index.ts
@@ -1,10 +1,20 @@
 import * as _ from 'lodash';
 
 import { App, Archivable, BuildOpts, Buildable } from '../types';
-import Install, { Pkg, configureDeclarations, pieToConfigureMap, toDeclarations } from '../../install';
+import Install, {
+  Pkg,
+  configureDeclarations,
+  pieToConfigureMap,
+  toDeclarations
+} from '../../install';
 import { Names, getNames, webpackConfig } from '../common';
 import { archiveIgnores, createArchive } from '../create-archive';
-import { existsSync, writeFileSync, readFileSync, readJsonSync } from 'fs-extra';
+import {
+  existsSync,
+  writeFileSync,
+  readFileSync,
+  readJsonSync
+} from 'fs-extra';
 import { join, resolve } from 'path';
 import { JsonConfig } from '../../question/config';
 import { SupportConfig } from '../../framework-support';
@@ -23,29 +33,36 @@ const logger = buildLogger();
  */
 export default class CatalogApp
   implements App, Archivable<Pkg[]>, Buildable<Pkg[], BuildOpts> {
-
-  public static generatedFiles: string[] = ['pie-item.tar.gz', 'pie-catalog.bundle.js'];
-
-  public static build(args: any, loadSupport: (JsonConfig) => Promise<SupportConfig>): Promise<App> {
+  public static generatedFiles: string[] = [
+    'pie-item.tar.gz',
+    'pie-catalog.bundle.js'
+  ];
+
+  public static build(
+    args: any,
+    loadSupport: (JsonConfig) => Promise<SupportConfig>
+  ): Promise<App> {
     const dir = resolve(args.dir || process.cwd());
     if (!existsSync(join(dir, 'docs/demo'))) {
-      throw new Error(`Can't find a 'docs/demo' directory in path: ${dir}. Is this a pie directory?`);
+      throw new Error(
+        `Can't find a 'docs/demo' directory in path: ${dir}. Is this a pie directory?`
+      );
     }
 
     const config = JsonConfig.build(join(dir, 'docs/demo'), args);
 
-    return loadSupport(config)
-      .then((s) => {
-        return new CatalogApp(args, dir, config, s, getNames(args));
-      });
+    return loadSupport(config).then(s => {
+      return new CatalogApp(args, dir, config, s, getNames(args));
+    });
   }
 
   private static ENTRY = 'catalog.entry.js';
   private static BUNDLE = 'pie-catalog.bundle.js';
   private static WEBPACK_CONFIG = 'catalog.webpack.config.js';
 
   private static EXTERNALS = {
-    'lodash': '_',
+    // tslint:disable-next-line:object-literal-key-quotes
+    lodash: '_',
     'lodash.merge': '_.merge',
     'lodash/assign': '_.assign',
     'lodash/cloneDeep': '_.cloneDeep',
@@ -55,20 +72,24 @@ export default class CatalogApp
     'lodash/isEqual': '_.isEqual',
     'lodash/map': '_.map',
     'lodash/merge': '_.merge',
-    'react': 'React',
+    // tslint:disable-next-line:object-literal-key-quotes
+    react: 'React',
     'react-addons-transition-group': 'React.addons.TransitionGroup',
     'react-dom': 'ReactDOM',
+    'react-dom/server': 'ReactDOMServer',
     'react/lib/ReactCSSTransitionGroup': 'React.addons.CSSTransitionGroup',
     'react/lib/ReactTransitionGroup': 'React.addons.TransitionGroup'
   };
 
   private installer: Install;
 
-  constructor(readonly args: any,
+  constructor(
+    readonly args: any,
     private pieRoot: string,
     readonly config: JsonConfig,
     readonly support: SupportConfig,
-    readonly names: Names) {
+    readonly names: Names
+  ) {
     this.installer = new Install(config.dir, config.raw);
   }
 
@@ -77,30 +98,39 @@ export default class CatalogApp
   }
 
   public async build(opts: BuildOpts): Promise<Pkg[]> {
-
     const { dirs, pkgs } = await this.installer.install(opts.forceInstall);
 
     const js = `
       //controllers
       let controllers = window.controllers = {};
-      ${ pkgs.map(bi => controllerDependency(bi.element.tag, bi.controller.moduleId)).join('\n')}
+      ${pkgs
+        .map(bi => controllerDependency(bi.element.tag, bi.controller.moduleId))
+        .join('\n')}
       //custom elements
-      ${toDeclarations(pkgs).map((d) => d.js).join('\n')}
+      ${toDeclarations(pkgs)
+        .map(d => d.js)
+        .join('\n')}
 
       //configure elements
-      ${configureDeclarations(pkgs).map(e => e.js).join('\n')}
+      ${configureDeclarations(pkgs)
+        .map(e => e.js)
+        .join('\n')}
     `;
 
     writeFileSync(join(dirs.root, CatalogApp.ENTRY), js, 'utf8');
 
-    const config = _.merge(webpackConfig(
-      dirs,
-      this.support,
-      CatalogApp.ENTRY,
-      CatalogApp.BUNDLE,
-      this.config.dir), {
+    const config = _.merge(
+      webpackConfig(
+        dirs,
+        this.support,
+        CatalogApp.ENTRY,
+        CatalogApp.BUNDLE,
+        this.config.dir
+      ),
+      {
         externals: CatalogApp.EXTERNALS
-      });
+      }
+    );
 
     logger.silly('config: ', config);
 
@@ -118,13 +148,16 @@ export default class CatalogApp
       }
     ].concat(config.module.rules);
 
-    await report.promise('building webpack', buildWebpack(config, CatalogApp.WEBPACK_CONFIG));
+    await report.promise(
+      'building webpack',
+      buildWebpack(config, CatalogApp.WEBPACK_CONFIG)
+    );
 
     return pkgs;
   }
 
   public async createArchive(buildInfo: Pkg[]): Promise<string> {
-    const root = (name) => resolve(join(this.pieRoot, name));
+    const root = name => resolve(join(this.pieRoot, name));
     const archivePath = resolve(join(this.config.dir, this.names.out.archive));
     const pkg = readJsonSync(root('package.json'));
 
@@ -138,14 +171,24 @@ export default class CatalogApp
     logger.silly('tag', tag, 'hash', hash, 'shorthash', shortHash);
 
     if (!repository || !npm) {
-      return Promise.reject(new Error('The package.json is missing `repository` and `name` fields'));
+      return Promise.reject(
+        new Error('The package.json is missing `repository` and `name` fields')
+      );
     }
 
     /* TODO: ignore config/markup? */
     const ignores = archiveIgnores(this.config.dir);
 
-    logger.silly('call createArchive', archivePath, this.config.dir, ignores, addExtras);
-    const readme = existsSync(root('README.md')) ? readFileSync(root('README.md'), 'utf8') : '';
+    logger.silly(
+      'call createArchive',
+      archivePath,
+      this.config.dir,
+      ignores,
+      addExtras
+    );
+    const readme = existsSync(root('README.md'))
+      ? readFileSync(root('README.md'), 'utf8')
+      : '';
 
     const git = {
       hash,
@@ -154,15 +197,24 @@ export default class CatalogApp
     };
     const schemas = buildSchemas(root('docs/schemas'));
     logger.silly('callAddExtras...');
-    const ae = addExtras(this.config.raw, this.config.markup, this.support,
-      buildInfo, pkg, npm, readme, repository, git, schemas);
-    return createArchive(archivePath, this.config.dir, ignores, ae)
-      .catch((e) => {
-        const msg = `Error creating the archive: ${e.message}`;
-        logger.error(msg);
-        logger.info(e.stack);
-        throw new Error(msg);
-      });
+    const ae = addExtras(
+      this.config.raw,
+      this.config.markup,
+      this.support,
+      buildInfo,
+      pkg,
+      npm,
+      readme,
+      repository,
+      git,
+      schemas
+    );
+    return createArchive(archivePath, this.config.dir, ignores, ae).catch(e => {
+      const msg = `Error creating the archive: ${e.message}`;
+      logger.error(msg);
+      logger.info(e.stack);
+      throw new Error(msg);
+    });
   }
 }
 
@@ -176,32 +228,32 @@ export const addExtras = (
   readme: string,
   repository: any,
   git: any,
-  schemas: any[]) => (archive: any): void => {
-
-    const catalog = {
-      demo: {
-        config,
-        configureMap: pieToConfigureMap(pkgs),
-        externals: support.externals,
-        markup,
-      },
-      npm,
-      package: pkg,
-      readme,
-      repository,
-      schemas,
-      version: {
-        git,
-        pkg: pkg.version,
-      }
-    };
-
-    const catalogString = JSON.stringify(catalog, null, '  ');
-    logger.silly('catalog json: ', catalogString);
-    logger.silly('archive: ', archive);
-    /**
-     * It is important that the catalog json is the first entry in the tar,
-     * so that the upload stream will consume this entry first.
-     */
-    archive.append(catalogString, { name: 'pie-catalog-data.json' });
+  schemas: any[]
+) => (archive: any): void => {
+  const catalog = {
+    demo: {
+      config,
+      configureMap: pieToConfigureMap(pkgs),
+      externals: support.externals,
+      markup
+    },
+    npm,
+    package: pkg,
+    readme,
+    repository,
+    schemas,
+    version: {
+      git,
+      pkg: pkg.version
+    }
   };
+
+  const catalogString = JSON.stringify(catalog, null, '  ');
+  logger.silly('catalog json: ', catalogString);
+  logger.silly('archive: ', archive);
+  /**
+   * It is important that the catalog json is the first entry in the tar,
+   * so that the upload stream will consume this entry first.
+   */
+  archive.append(catalogString, { name: 'pie-catalog-data.json' });
+};
diff --git a/src/install/index.ts b/src/install/index.ts
@@ -1,36 +1,40 @@
 import * as _ from 'lodash';
 
-import { install, Dirs, Pkg, PieConfigure, PieController, PackageType, Element } from '@pie-cli-libs/installer';
-import { ElementDeclaration } from '../code-gen';
-import { PieTarget } from './common';
-import { RawConfig } from '../question/config';
-import report from '../cli/report';
-
-export {
+import {
+  install,
   Dirs,
-  PackageType,
   Pkg,
   PieConfigure,
   PieController,
+  PackageType,
   Element
-};
+} from '@pie-cli-libs/installer';
+import { ElementDeclaration } from '../code-gen';
+import { PieTarget } from './common';
+import { RawConfig } from '../question/config';
+import report from '../cli/report';
+
+export { Dirs, PackageType, Pkg, PieConfigure, PieController, Element };
 
 export { PieTarget };
 
 export type Mappings = {
-  controllers: PieTarget[],
-  configure: PieTarget[]
+  controllers: PieTarget[];
+  configure: PieTarget[];
 };
 
-export const controllerTargets = (pkgs: Pkg[]): PieTarget[] => toTargets('controller', pkgs);
+export const controllerTargets = (pkgs: Pkg[]): PieTarget[] =>
+  toTargets('controller', pkgs);
 
 export const configureDeclarations = (pkgs: Pkg[]): ElementDeclaration[] => {
   return pkgs.filter(bi => bi.configure).map(bi => {
     return new ElementDeclaration(`${bi.configure.tag}`, bi.configure.moduleId);
   });
 };
 
-export const pieToConfigureMap = (pkgs: Pkg[] = []): { [key: string]: string } => {
+export const pieToConfigureMap = (
+  pkgs: Pkg[] = []
+): { [key: string]: string } => {
   return pkgs.reduce((acc, p) => {
     if (p.configure) {
       return { ...acc, [p.element.tag]: p.configure.tag };
@@ -41,26 +45,35 @@ export const pieToConfigureMap = (pkgs: Pkg[] = []): { [key: string]: string } =
 };
 
 export const toDeclarations = (pkgs: Pkg[]): ElementDeclaration[] => {
-  return pkgs.map(bi => new ElementDeclaration(bi.element.tag, bi.element.moduleId));
+  return pkgs.map(
+    bi => new ElementDeclaration(bi.element.tag, bi.element.moduleId)
+  );
 };
 
-const toTargets = (key: 'controller' | 'configure', pkgs: Pkg[]): PieTarget[] => {
+const toTargets = (
+  key: 'controller' | 'configure',
+  pkgs: Pkg[]
+): PieTarget[] => {
   return _(pkgs)
     .filter(bi => bi[key])
     .map(bi => ({ pie: (bi as any).element.tag, target: bi[key].moduleId }))
     .value();
 };
 
 export type InstallResult = {
-  dirs: Dirs,
-  pkgs: Pkg[]
+  dirs: Dirs;
+  pkgs: Pkg[];
 };
 
 export default class Install {
-
-  constructor(private rootDir: string, private config: RawConfig) { }
+  constructor(private rootDir: string, private config: RawConfig) {}
 
   public install(force: boolean = false): Promise<InstallResult> {
-    return install(this.rootDir, this.config.elements, this.config.models, report);
+    return install(
+      this.rootDir,
+      this.config.elements,
+      this.config.models,
+      report
+    );
   }
 }
