Tune logic and fix paths

Author: nomcopter

README.md

@@ -1,4 +1,4 @@
-# @nomcopter/generator-typescript-react
+# generator-typescript-react
 [![CircleCI](SHIELDS IO LINK)](CIRCLE LINK)
 [![npm](SHIELDS IO LINK)](NPM PACKAGE LINK)
 

generators/app/templates/demo/_index.tsx

@@ -1,7 +1,10 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { AppContainer } from 'react-hot-loader';
-import { Demo } from './_Demo';
+import '../styles/index.less';
+
+import { Demo } from './Demo';
+import './demo.less';
 
 const APP_ELEMENT = document.getElementById('app')!;
 const render = (Component: React.ComponentClass<any>) => {

generators/app/templates/test/_spec.ts

@@ -1,5 +1,7 @@
 import { expect } from 'chai';
 
 describe('<%= humanReadableName %>', () => {
-
+  it('should be sane', () => {
+    expect(true).to.equal(true);
+  })
 });

generators/app/templates/webpack/_base.ts

@@ -1,6 +1,6 @@
 import * as HtmlWebpackPlugin from 'html-webpack-plugin';
 import * as webpack from 'webpack';
-import { CONSTANTS } from './_constants';
+import { CONSTANTS } from './constants';
 
 // tslint:disable-next-line no-var-requires
 const VENDOR_LIBS = Object.keys(require('../package.json').dependencies);

generators/app/templates/webpack/_bundle.ts

@@ -1,5 +1,5 @@
 import * as webpack from 'webpack';
-import config from './_base';
+import config from './base';
 
 const bundleConfig = {
   ...config,

generators/app/templates/webpack/_hot.ts

@@ -1,6 +1,6 @@
 import * as webpack from 'webpack';
-import config from './_base';
-import { CONSTANTS } from './_constants';
+import config from './base';
+import { CONSTANTS } from './constants';
 
 const baseEntry = config.entry as webpack.Entry;
 const entry = {

src/app/index.ts

@@ -2,50 +2,22 @@ import * as _ from 'lodash';
 import * as path from 'path';
 import * as Base from 'yeoman-generator';
 
-export default class GeneratorTypescriptReact extends Base {
-  private readonly destinationName: string;
-  private readonly copyWithoutTemplating: (templateNames: string[], directory?: string) => void;
-  private readonly copyWithTemplating: (templateData: object, templateNames: string[], directory?: string) => void;
-
+class GeneratorTypescriptReact extends Base {
   private humanReadableName: string;
   private kebabCaseName: string;
 
-  constructor() {
-    super(...arguments);
-
-    this.destinationName = path.basename(this.destinationRoot());
-
-    this.copyWithTemplating = (templateData, templateNames, directory = '.') => {
-      templateNames.forEach(filename => {
-        this.fs.copyTpl(
-          this.templatePath(path.join(directory, '_' + filename)),
-          this.destinationPath(path.join(directory, filename)),
-          templateData,
-        );
-      });
-    };
-
-    this.copyWithoutTemplating = (templateNames, directory = '.') => {
-      templateNames.forEach(filename => {
-        this.fs.copy(
-          this.templatePath(path.join(directory, '_' + filename)),
-          this.destinationPath(path.join(directory, filename)),
-        );
-      });
-    };
-  }
-
   prompting() {
+    const destinationName = path.basename(this.destinationRoot());
     return this.prompt([{
       type: 'input',
       name: 'kebab',
       message: 'What is the Package Name for this app?',
-      default: _.kebabCase(this.destinationName),
+      default: _.kebabCase(destinationName),
     }, {
       type: 'input',
       name: 'human',
       message: 'What is the Human-Readable Name for this app?',
-      default: _.startCase(this.destinationName),
+      default: _.startCase(destinationName),
     }])
       .then(answers => {
         this.kebabCaseName = answers.kebab;
@@ -59,27 +31,54 @@ export default class GeneratorTypescriptReact extends Base {
       humanReadableName: this.humanReadableName,
     };
 
-    this.copyWithoutTemplating([
+    this._copyWithoutTemplating([
       '.editorconfig', '.npmignore', 'circle.yml', 'LICENSE',
       'tsconfig.json', 'tsconfig-build.json', 'tslint.json',
     ]);
-    this.copyWithTemplating(allTemplateData, ['.gitignore', 'package.json', 'README.md']);
+    this._copyWithTemplating(allTemplateData, ['.gitignore', 'package.json', 'README.md']);
 
-    this.copyWithoutTemplating(['demo.less', 'index.tsx'], 'demo');
-    this.copyWithTemplating(allTemplateData, ['Demo.tsx'], 'demo');
+    this._copyWithoutTemplating(['demo.less', 'index.tsx'], 'demo');
+    this._copyWithTemplating(allTemplateData, ['Demo.tsx'], 'demo');
 
-    this.copyWithTemplating(allTemplateData, ['index.ts'], 'src');
+    this._copyWithTemplating(allTemplateData, ['index.ts'], 'src');
 
-    this.copyWithoutTemplating(['index.less'], 'styles');
+    this._copyWithoutTemplating(['index.less'], 'styles');
 
-    this.copyWithoutTemplating(['mocha.opts', 'registerTsNode.js'], 'test');
-    this.copyWithTemplating(allTemplateData, ['spec.ts'], 'test');
+    this._copyWithoutTemplating(['mocha.opts', 'registerTsNode.js'], 'test');
+    this._copyWithTemplating(allTemplateData, ['spec.ts'], 'test');
 
-    this.copyWithoutTemplating(['base.ts', 'bundle.ts', 'constants.ts', 'hot.ts'], 'webpack');
-    this.copyWithTemplating(allTemplateData, ['index-template.html'], 'webpack');
+    this._copyWithoutTemplating(['base.ts', 'bundle.ts', 'constants.ts', 'hot.ts'], 'webpack');
+    this._copyWithTemplating(allTemplateData, ['index-template.html'], 'webpack');
   }
 
   install() {
     this.spawnCommandSync('yarn', ['install'], { cwd: this.destinationRoot() });
   }
+
+  end() {
+    this.log();
+    this.log('To start devving, use webpack-dev-server:');
+    this.log('  yarn start');
+  }
+
+  private _copyWithTemplating(templateData: object, templateNames: string[], directory: string = '.') {
+    templateNames.forEach(filename => {
+      this.fs.copyTpl(
+        this.templatePath(path.join(directory, '_' + filename)),
+        this.destinationPath(path.join(directory, filename)),
+        templateData,
+      );
+    });
+  }
+
+  private _copyWithoutTemplating(templateNames: string[], directory: string = '.') {
+    templateNames.forEach(filename => {
+      this.fs.copy(
+        this.templatePath(path.join(directory, '_' + filename)),
+        this.destinationPath(path.join(directory, filename)),
+      );
+    });
+  }
 }
+
+export = GeneratorTypescriptReact;