express-generator-typescript 1.9.9 → 1.10.2

package/bin/cli.js

@@ -11,38 +11,38 @@ const expressGenTs = require('../lib/express-generator-typescript');
 
 
 (() => {
-    console.log('Setting up new Express/TypeScript project...');
-    // const opts = processOptions(process.argv.slice(2));
-    // Process options
-    let destination = 'express-gen-ts';
-    let withAuth = false;
-    let useYarn = false;
-    let useSocketIo = false;
-    const args = process.argv.slice(2);
-    let idx = -1;
-    idx = args.indexOf('--with-auth');
-    if (idx > -1) {
-        withAuth = true;
-        args.splice(idx, 1);
-    }
-    idx = args.indexOf('--use-yarn');
-    if (idx > -1) {
-        useYarn = true;
-        args.splice(idx, 1);
-    }
-    idx = args.indexOf('--socket-io');
-    if (idx > -1) {
-        useSocketIo = true;
-        withAuth = true;
-        args.splice(idx, 1);
-    }
-    if (args.length > 0) {
-        destination = args[0];
-    }
-    destination = path.join(process.cwd(), destination);
-    // Creating new project finished
-    expressGenTs(destination, withAuth, useYarn, useSocketIo).then(() => {
-        console.log('Project setup complete!');
-    });
+  console.log('Setting up new Express/TypeScript project...');
+  // const opts = processOptions(process.argv.slice(2));
+  // Process options
+  let destination = 'express-gen-ts';
+  let withAuth = false;
+  let useYarn = false;
+  let useSocketIo = false;
+  const args = process.argv.slice(2);
+  let idx = -1;
+  idx = args.indexOf('--with-auth');
+  if (idx > -1) {
+    withAuth = true;
+    args.splice(idx, 1);
+  }
+  idx = args.indexOf('--use-yarn');
+  if (idx > -1) {
+    useYarn = true;
+    args.splice(idx, 1);
+  }
+  idx = args.indexOf('--socket-io');
+  if (idx > -1) {
+    useSocketIo = true;
+    withAuth = true;
+    args.splice(idx, 1);
+  }
+  if (args.length > 0) {
+    destination = args[0];
+  }
+  destination = path.join(process.cwd(), destination);
+  // Creating new project finished
+  expressGenTs(destination, withAuth, useYarn, useSocketIo).then(() => {
+    console.log('Project setup complete!');
+  });
  })();
  

package/lib/express-generator-typescript.js

@@ -14,7 +14,9 @@ const fs = require('fs');
 // **** Variables **** //
 
 const ncpOpts = {
-  filter: new RegExp('^(?!.*(node_modules|package-lock.json)).*$'),
+  filter: (fileName) => {
+    return !(fileName === 'package-lock.json' || fileName === 'node_modules');
+  },
 };
 
 
@@ -27,7 +29,7 @@ async function expressGenTs(destination, withAuth, useYarn, useSocketIo) {
   try {
     await copyProjectFiles(destination, withAuth, useSocketIo);
     updatePackageJson(destination);
-    await renameGitingoreFile(destination);
+    await renameGitigoreFile(destination);
     const depStrings = getDepStrings(withAuth, useSocketIo);
     downloadNodeModules(destination, depStrings, useYarn);
   } catch (err) {
@@ -49,7 +51,7 @@ function copyProjectFiles(destination, withAuth, useSocketIo) {
   // Return
   return new Promise((res, rej) => {
     ncp.limit = 16;
-    ncp(source, destination, ncpOpts, (err) => {
+    return ncp(source, destination, ncpOpts, (err) => {
       return (!!err ? rej(err) : res());
     });
   });
@@ -70,7 +72,7 @@ function updatePackageJson(destination) {
 /**
  * Because npm does not allow .gitignore to be published.
  */
-function renameGitingoreFile(destination) {
+function renameGitigoreFile(destination) {
   return new Promise((res, rej) => {
     fs.rename(destination + '/gitignore', destination + '/.gitignore', (err) => {
       return (!!err ? rej(err) : res());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-generator-typescript",
-  "version": "1.9.9",
+  "version": "1.10.2",
   "description": "Generate new Express applications similar to express-generate which but sets it up to use TypeScript instead",
   "scripts": {
     "express-generator-typescript": "node bin/cli.js",