Merge branch 'milestone-0.3'

Changelog.md

@@ -1,3 +1,20 @@
+<a name="0.4-0"></a>
+# [0.4.0](https://github.com/martinroob/ngx-i18nsupport/compare/v0.3.1...v0.4.0) (2017-05-03)
+
+### Bug Fixes
+
+* **xliffmerge:** xliffmerge creates empty json files ([#18](https://github.com/martinroob/ngx-i18nsupport/issues/18))
+
+### Features
+
+* **xliffmerge:** create an API to access parsing functionality. ([#11](https://github.com/martinroob/ngx-i18nsupport/issues/11)). 
+The API is in a separate npm package [ngx-i18nsupport-lib](https://github.com/martinroob/ngx-i18nsupport-lib).
+
+* **xliffmerge:** use explicitly set IDs for ngx-translate data generation. ([#15](https://github.com/martinroob/ngx-i18nsupport/issues/15))
+For detail have a look at the Wiki page [ngx translate usage](https://github.com/martinroob/ngx-i18nsupport/wiki/ngx-translate-usage).
+
+* **xliffmerge:** Handle new source element introduced with Angular 4. ([#21](https://github.com/martinroob/ngx-i18nsupport/issues/21))
+
 <a name="0.3.1"></a>
 # [0.3.1](https://github.com/martinroob/ngx-i18nsupport/compare/v0.3.0...v0.3.1) (2017-04-25)
 

package.json

@@ -1,11 +1,10 @@
 {
   "name": "ngx-i18nsupport",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Some tooling to be used with the Angular 2 i18n workflow",
   "main": "index.js",
   "module": "./src",
   "es2015": "./src",
-  "typings": "./ngx-i18nsupport.d.ts",
   "bin": {
     "xliffmerge": "./dist/xliffmerge/xliffmerge"
   },
@@ -18,7 +17,8 @@
     "pretest": "npm run build",
     "test": "./node_modules/.bin/jasmine-node dist",
     "precover": "npm run build",
-    "cover": "./node_modules/.bin/istanbul cover --root dist --include-all-sources ./node_modules/jasmine-node/bin/jasmine-node -- dist"
+    "cover": "./node_modules/.bin/istanbul cover --root dist --include-all-sources ./node_modules/jasmine-node/bin/jasmine-node -- dist",
+    "prepublish": "npm run build"
   },
   "repository": {
     "type": "git",
@@ -28,7 +28,8 @@
     "i18n",
     "tooling",
     "angular",
-    "xliff"
+    "xliff",
+    "xmb"
   ],
   "author": "Martin Roob <martinroob65@gmail.com> (www.roobsoft.de)",
   "license": "MIT",
@@ -37,7 +38,6 @@
   },
   "homepage": "https://github.com/martinroob/ngx-i18nsupport#readme",
   "devDependencies": {
-    "@types/cheerio": "^0.17.31",
     "@types/jasmine": "^2.5.43",
     "@types/node": "^7.0.5",
     "coveralls": "^2.11.16",
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "chalk": "^1.1.3",
-    "cheerio": "^0.22.0",
-    "commander": "^2.9.0"
+    "commander": "^2.9.0",
+    "ngx-i18nsupport-lib": "^0.0.8"
   }
 }

spec/support/jasmine.json

@@ -1,5 +1,5 @@
 {
-  "spec_dir": "dist/out-tsc",
+  "spec_dir": "dist",
   "spec_files": [
     "**/*[sS]pec.js"
   ],

src/common/command-output.ts

@@ -11,7 +11,7 @@
 
 import * as chalk from "chalk";
 import WritableStream = NodeJS.WritableStream;
-import util = require('util');
+import * as util from "util";
 
 enum LogLevel {
     "ERROR",

src/common/file-util.ts

@@ -1,4 +1,5 @@
-import fs = require("fs");
+import * as fs from "fs";
+
 /**
  * Created by martin on 17.02.2017.
  * Some (a few) simple utils for file operations.
@@ -92,4 +93,11 @@ export class FileUtil {
         }
     };
 
+    /**
+     * Delete a file.
+     * @param path
+     */
+    public static deleteFile(path: string) {
+        fs.unlinkSync(path);
+    }
 }