fix(deps): Update dependencies and refactor for it

Author: EndyKaufman

package-lock.json

@@ -46,9 +46,9 @@
 		"srcgen"
 	],
 	"devDependencies": {
-		"@types/chai": "^4.0.6",
+		"@types/chai": "^4.0.7",
 		"@types/mocha": "^2.2.44",
-		"@types/node": "^8.0.53",
+		"@types/node": "^8.0.54",
 		"@types/sinon": "^4.0.0",
 		"chai": "^4.1.2",
 		"mocha": "^4.0.1",
@@ -57,16 +57,16 @@
 		"typescript": "2.4.2"
 	},
 	"dependencies": {
-		"@angular/common": "5.0.2",
-		"@angular/compiler": "5.0.2",
-		"@angular/core": "5.0.2",
+		"@angular/common": "5.0.5",
+		"@angular/compiler": "5.0.5",
+		"@angular/core": "5.0.5",
 		"@biesbjerg/ngx-translate-extract": "^2.3.4",
 		"@types/cheerio": "^0.22.6",
-		"@types/commander": "^2.11.0",
+		"@types/commander": "^2.12.2",
 		"@types/del": "^3.0.0",
 		"@types/dotenv": "^4.0.2",
 		"@types/fs-extra": "^4.0.5",
-		"@types/lodash": "^4.14.86",
+		"@types/lodash": "^4.14.87",
 		"@types/loglevel": "^1.5.3",
 		"cheerio": "^1.0.0-rc.2",
 		"commander": "^2.12.2",
@@ -85,7 +85,8 @@
 		"npm-run": "^4.1.2",
 		"po2json": "^0.4.5",
 		"recursive-readdir": "^2.2.1",
-		"srcgen": "^0.3.0",
+		"sort-paths": "^1.1.0",
+		"srcgen": "^0.3.1",
 		"tmp": "0.0.33"
 	}
 }

package.json

@@ -267,7 +267,7 @@ export class Base {
             }
         );
         this.log('po2ts').debug(options);
-        const srcgenTemplate = 'convert.po.to.ts';
+        const srcgenTemplate = path.resolve(__dirname + '/../../srcgen/convert.po.to.ts');
         const optionsFile = path.resolve(__dirname + '/../../srcgen/temp_' + process.hrtime() + '-convert.po.to.ts.json');
         fsExtra.writeJSONSync(optionsFile, options);
         if (!fsExtra.existsSync(optionsFile)) {
@@ -280,7 +280,7 @@ export class Base {
             this.log('po2ts').debug('end');
             return await false;
         }
-        let result = await this.commandRunner(commandString, path.resolve(__dirname + '/../../'));
+        let result = await this.commandRunner(commandString);
         if (fsExtra.existsSync(optionsFile)) {
             del.sync([optionsFile], { force: true });
         }
@@ -332,7 +332,7 @@ export class Base {
             }
         );
         this.log('makeTsList').debug(options);
-        const srcgenTemplate = 'make.list.ts.files';
+        const srcgenTemplate = path.resolve(__dirname + '/../../srcgen/make.list.ts.files');
         const optionsFile = path.resolve(__dirname + '/../../srcgen/temp_' + process.hrtime() + '-make.list.ts.files.json');
         fsExtra.writeJSONSync(optionsFile, options);
         if (!fsExtra.existsSync(optionsFile)) {
@@ -345,7 +345,7 @@ export class Base {
             this.log('makeTsList').debug('end');
             return await false;
         }
-        let result = await this.commandRunner(commandString, path.resolve(__dirname + '/../../'));
+        let result = await this.commandRunner(commandString);
         if (fsExtra.existsSync(optionsFile)) {
             del.sync([optionsFile], { force: true });
         }

src/lib/base.ts

@@ -2,7 +2,8 @@ var po2json = require('po2json'),
   fs = require('fs'),
   path = require('path'),
   _ = require('lodash'),
-  recursive = require('recursive-readdir');
+  recursive = require('recursive-readdir'),
+  sortPaths = require('sort-paths');
 var folder = path.resolve(__srcdir, '../../', po.input.dir);
 var packageName = package.name;
 if (!packageName && fs.existsSync(path.resolve(__srcdir, '../../', po.input.dir, '../', 'package.json'))) {
@@ -11,6 +12,7 @@ if (!packageName && fs.existsSync(path.resolve(__srcdir, '../../', po.input.dir,
 console.log('Scan folder: ' + folder);
 console.log('Module name: ' + packageName);
 recursive(folder, ['!*.po'], function (err, files) {
+  files = sortPaths(files, path.sep);
   for (var i = 0; i < files.length; i++) {
     var file = files[i];
     var fileName = _.kebabCase(path.basename(file, '.po'));

srcgen/convert.po.to.ts/loader#.js

@@ -3,7 +3,8 @@ var fs = require('fs'),
   _ = require('lodash'),
   srcgen = require('srcgen'),
   recursive = require('recursive-readdir'),
-  replaceExt = require('replace-ext');
+  replaceExt = require('replace-ext'),
+  sortPaths = require('sort-paths');
 var scanPath = path.resolve(__srcdir, '..', '..', scan.path);
 var packageName = package.name;
 if (!packageName && fs.existsSync(path.resolve(__srcdir, '..', '..', scan.path, 'package.json'))) {
@@ -12,6 +13,7 @@ if (!packageName && fs.existsSync(path.resolve(__srcdir, '..', '..', scan.path,
 console.log('Scan dir:' + scanPath);
 console.log('Module name: ' + packageName);
 recursive(scanPath, ['!*.ts', '*node_modules*'], function (err, files) {
+  files = sortPaths(files, path.sep);
   var exportArray = [];
   var exportEntities = {};
   var list = [];