From 7f09b6ee263a55fb91d68d2c15066cda1cac730d Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 27 Jun 2016 13:05:24 +0100 Subject: [PATCH 1/4] #286 Upgrade and freeze dependency versions - upgrade to angular 2 rc.3 - freeze all dependency versions --- demo-shell-ng2/package.json | 63 ++++++++-------- ng2-components/ng2-alfresco-core/package.json | 65 +++++++++-------- .../ng2-alfresco-datatable/demo/package.json | 44 ++++++------ .../ng2-alfresco-datatable/package.json | 58 +++++++-------- .../demo/package.json | 50 +++++++------ .../ng2-alfresco-documentlist/package.json | 66 +++++++++-------- .../ng2-alfresco-login/demo/package.json | 38 +++++----- .../ng2-alfresco-login/package.json | 67 ++++++++--------- .../ng2-alfresco-search/demo/package.json | 50 ++++++------- .../ng2-alfresco-search/package.json | 70 ++++++++++-------- .../ng2-alfresco-upload/demo/package.json | 50 ++++++------- .../ng2-alfresco-upload/package.json | 71 ++++++++++--------- .../ng2-alfresco-viewer/demo/package.json | 49 +++++++------ .../ng2-alfresco-viewer/package.json | 67 +++++++++-------- 14 files changed, 434 insertions(+), 374 deletions(-) diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index 5e3d1cef7d..fef7db3c00 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -52,46 +52,47 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "core-js": "^2.4.0", - "reflect-metadata": "^0.1.3", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.12", + "zone.js": "0.6.12", "angular2-in-memory-web-api": "0.0.12", - "material-design-icons": "^2.2.3", - "material-design-lite": "^1.1.3", + "rimraf": "2.5.2", + "material-design-icons": "2.2.3", + "material-design-lite": "1.1.3", "ng2-translate": "2.2.0", - "pdfjs-dist": "^1.5.258", + "pdfjs-dist": "1.5.258", + "flag-icon-css": "2.3.0", - "alfresco-js-api": "^0.1.0", - "ng2-alfresco-core": "^0.1.0", - "ng2-alfresco-datatable": "^0.1.0", - "ng2-alfresco-documentlist": "^0.1.0", - "ng2-alfresco-login": "^0.1.0", - "ng2-alfresco-search": "^0.1.9", - "ng2-alfresco-upload": "^0.1.0", - "ng2-alfresco-viewer": "^0.1.13", - "rimraf": "^2.5.2" + "alfresco-js-api": "0.1.2", + "ng2-alfresco-core": "0.1.35", + "ng2-alfresco-datatable": "0.1.11", + "ng2-alfresco-documentlist": "0.1.33", + "ng2-alfresco-login": "0.1.24", + "ng2-alfresco-search": "0.1.20", + "ng2-alfresco-upload": "0.1.46", + "ng2-alfresco-viewer": "0.1.28" }, "devDependencies": { - "browser-sync": "^2.10.0", - "concurrently": "^2.0.0", - "connect-history-api-fallback": "^1.2.0", - "flag-icon-css": "^2.3.0", - "license-check": "^1.0.4", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4" + "browser-sync": "2.10.0", + "concurrently": "2.0.0", + "connect-history-api-fallback": "1.2.0", + "license-check": "1.0.4", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4" }, "license-check-config": { "src": [ diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index 4dd719ed99..8512796411 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -55,42 +55,49 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", - "angular2-in-memory-web-api": "0.0.12", - "core-js": "^2.4.0", - "ng2-translate": "2.2.0", - "reflect-metadata": "^0.1.3", - "rimraf": "^2.5.2", - "rxjs": "5.0.0-beta.6", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "zone.js": "^0.6.12" + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", + "rxjs": "5.0.0-beta.6", + "zone.js": "0.6.12", + "angular2-in-memory-web-api": "0.0.12", + + "ng2-translate": "2.2.2", + + "rimraf": "2.5.2" + }, + "peerDependencies": { + "material-design-icons": "^2.2.3", + "material-design-lite": "^1.1.3" }, "devDependencies": { - "cpx": "^1.3.1", + "cpx": "1.3.1", "coveralls": "^2.11.9", "http-server": "0.8.5", - "jasmine-ajax": "^3.2.0", + "jasmine-ajax": "3.2.0", "jasmine-core": "2.4.1", - "karma": "~0.13.22", - "karma-chrome-launcher": "~1.0.1", - "karma-coverage": "^1.0.0", - "karma-jasmine": "~1.0.2", - "karma-mocha-reporter": "^2.0.3", - "karma-jasmine-html-reporter": "^0.2.0", - "license-check": "^1.0.4", - "remap-istanbul": "^0.6.3", - "traceur": "^0.0.91", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4" + "karma": "0.13.22", + "karma-chrome-launcher": "1.0.1", + "karma-coverage": "1.0.0", + "karma-jasmine": "1.0.2", + "karma-mocha-reporter": "2.0.3", + "karma-jasmine-html-reporter": "0.2.0", + "license-check": "1.0.4", + "remap-istanbul": "0.6.3", + "traceur": "0.0.91", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4" }, "license-check-config": { "src": [ diff --git a/ng2-components/ng2-alfresco-datatable/demo/package.json b/ng2-components/ng2-alfresco-datatable/demo/package.json index 141af69f4c..0e70ad49ee 100644 --- a/ng2-components/ng2-alfresco-datatable/demo/package.json +++ b/ng2-components/ng2-alfresco-datatable/demo/package.json @@ -23,34 +23,36 @@ }, "license": "Apache-2.0", "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "core-js": "^2.4.0", - "reflect-metadata": "^0.1.3", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.12", + "zone.js": "0.6.12", "angular2-in-memory-web-api": "0.0.12", - "rimraf": "^2.5.2", - "material-design-icons": "^2.2.3", - "material-design-lite": "^1.1.3", - "ng2-alfresco-datatable": "^0.1.0" + "rimraf": "2.5.2", + "material-design-icons": "2.2.3", + "material-design-lite": "1.1.3", + + "ng2-alfresco-datatable": "0.1.11" }, "devDependencies": { - "browser-sync": "^2.10.0", - "concurrently": "^2.0.0", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4", - "wsrv": "^0.1.0" + "browser-sync": "2.10.0", + "concurrently": "2.0.0", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4", + "wsrv": "0.1.3" }, "keywords": [ "angular2", diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index e94fbe425d..7a02dda48b 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -51,45 +51,47 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "core-js": "^2.4.0", - "reflect-metadata": "^0.1.3", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.12", + "zone.js": "0.6.12", "angular2-in-memory-web-api": "0.0.12", - "rimraf": "^2.5.2" + + "rimraf": "2.5.2" }, "peerDependencies": { "material-design-icons": "^2.2.3", "material-design-lite": "^1.1.3" }, "devDependencies": { - "concurrently": "^2.1.0", - "coveralls": "^2.11.9", - "cpx": "^1.3.1", + "concurrently": "2.1.0", + "coveralls": "2.11.9", + "cpx": "1.3.1", "jasmine-core": "2.4.1", - "karma": "~0.13.22", - "karma-chrome-launcher": "~1.0.1", - "karma-coverage": "^1.0.0", - "karma-jasmine": "~1.0.2", - "karma-jasmine-html-reporter": "^0.2.0", - "karma-mocha-reporter": "^2.0.3", - "license-check": "^1.0.4", - "remap-istanbul": "^0.6.3", - "traceur": "^0.0.91", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4", - "wsrv": "^0.1.0" + "karma": "0.13.22", + "karma-chrome-launcher": "1.0.1", + "karma-coverage": "1.0.0", + "karma-jasmine": "1.0.2", + "karma-jasmine-html-reporter": "0.2.0", + "karma-mocha-reporter": "2.0.3", + "license-check": "1.0.4", + "remap-istanbul": "0.6.3", + "traceur": "0.0.91", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4", + "wsrv": "0.1.3" }, "license-check-config": { "src": [ diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json index b3b7ccbdbf..12b62719a1 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/package.json +++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json @@ -18,35 +18,39 @@ }, "license": "Apache-2.0", "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "core-js": "^2.4.0", - "reflect-metadata": "^0.1.3", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.12", + "zone.js": "0.6.12", "angular2-in-memory-web-api": "0.0.12", - "material-design-icons": "^2.2.3", - "material-design-lite": "^1.1.3", - "ng2-alfresco-documentlist": "^0.1.16", - "alfresco-js-api": "^0.1.0", - "ng2-translate": "2.2.0", - "rimraf": "^2.5.2" + + "rimraf": "2.5.2", + "material-design-icons": "2.2.3", + "material-design-lite": "1.1.3", + "ng2-translate": "2.2.2", + + "ng2-alfresco-core": "0.1.35", + "alfresco-js-api": "0.1.2", + "ng2-alfresco-documentlist": "0.1.33" }, "devDependencies": { - "browser-sync": "^2.10.0", - "connect-history-api-fallback": "^1.2.0", - "concurrently": "^2.0.0", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4" + "browser-sync": "2.10.0", + "connect-history-api-fallback": "1.2.0", + "concurrently": "2.0.0", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4" }, "keywords": [ "angular2", diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 89ce0ed739..b53d91557a 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -57,44 +57,50 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "core-js": "^2.4.0", - "reflect-metadata": "^0.1.3", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.12", + "zone.js": "0.6.12", "angular2-in-memory-web-api": "0.0.12", - "ng2-alfresco-core": "^0.1.0", - "alfresco-js-api": "^0.1.0", - "ng2-translate": "2.2.0", - "rimraf": "^2.5.2" + "rimraf": "2.5.2", + "ng2-translate": "2.2.2", + + "ng2-alfresco-core": "0.1.35", + "alfresco-js-api": "0.1.2" + }, + "peerDependencies": { + "material-design-icons": "^2.2.3", + "material-design-lite": "^1.1.3" }, "devDependencies": { - "concurrently": "^2.1.0", - "coveralls": "^2.11.9", - "cpx": "^1.3.1", + "concurrently": "2.1.0", + "coveralls": "2.11.9", + "cpx": "1.3.1", "http-server": "0.8.5", "jasmine-core": "2.4.1", - "karma": "~0.13.22", - "karma-chrome-launcher": "~1.0.1", - "karma-coverage": "^1.0.0", - "karma-jasmine": "~1.0.2", - "karma-mocha-reporter": "^2.0.3", - "karma-jasmine-html-reporter": "^0.2.0", - "license-check": "^1.0.4", - "remap-istanbul": "^0.6.3", - "traceur": "^0.0.91", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4" + "karma": "0.13.22", + "karma-chrome-launcher": "1.0.1", + "karma-coverage": "1.0.0", + "karma-jasmine": "1.0.2", + "karma-mocha-reporter": "2.0.3", + "karma-jasmine-html-reporter": "0.2.0", + "license-check": "1.0.4", + "remap-istanbul": "0.6.3", + "traceur": "0.0.91", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4" }, "license-check-config": { "src": [ diff --git a/ng2-components/ng2-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json index 6f6dc69618..8aee6eab82 100644 --- a/ng2-components/ng2-alfresco-login/demo/package.json +++ b/ng2-components/ng2-alfresco-login/demo/package.json @@ -46,29 +46,31 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "core-js": "^2.4.0", - "reflect-metadata": "^0.1.3", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.12", + "zone.js": "0.6.12", "angular2-in-memory-web-api": "0.0.12", - "material-design-icons": "^2.2.3", - "material-design-lite": "^1.1.3", - "alfresco-js-api": "^0.1.0", - "ng2-alfresco-core": "^0.1.0", - "ng2-alfresco-login": "^0.1.0", - "ng2-translate": "2.2.0", - "rimraf": "^2.5.2" + "rimraf": "2.5.2", + "material-design-icons": "2.2.3", + "material-design-lite": "1.1.3", + "ng2-translate": "2.2.2", + + "alfresco-js-api": "0.1.2", + "ng2-alfresco-core": "0.1.35", + "ng2-alfresco-login": "0.1.24" }, "devDependencies": { "browser-sync": "^2.10.0", diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 121ac7e8d4..c6de14cbac 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -65,46 +65,49 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "core-js": "^2.4.0", - "reflect-metadata": "^0.1.3", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.12", + "zone.js": "0.6.12", "angular2-in-memory-web-api": "0.0.12", - "ng2-alfresco-core": "^0.1.0", - "alfresco-js-api": "^0.1.0", - "ng2-translate": "2.2.0", - "rimraf": "^2.5.2" + "rimraf": "2.5.2", + + "ng2-translate": "2.2.2", + + "ng2-alfresco-core": "0.1.35", + "alfresco-js-api": "0.1.2" }, "devDependencies": { - "concurrently": "^2.1.0", - "coveralls": "^2.11.9", - "cpx": "^1.3.1", + "concurrently": "2.1.0", + "coveralls": "2.11.9", + "cpx": "1.3.1", "http-server": "0.8.5", "jasmine-core": "2.4.1", - "karma": "~0.13.22", - "karma-chrome-launcher": "~1.0.1", - "karma-coverage": "^1.0.0", - "karma-jasmine": "~1.0.2", - "karma-mocha-reporter": "^2.0.3", - "karma-jasmine-html-reporter": "^0.2.0", - "license-check": "^1.0.4", - "remap-istanbul": "^0.6.3", - "traceur": "^0.0.91", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4", - "xo": "^0.14.0", - "yargs": "^4.7.0" + "karma": "0.13.22", + "karma-chrome-launcher": "1.0.1", + "karma-coverage": "1.0.0", + "karma-jasmine": "1.0.2", + "karma-mocha-reporter": "2.0.3", + "karma-jasmine-html-reporter": "0.2.0", + "license-check": "1.0.4", + "remap-istanbul": "0.6.3", + "traceur": "0.0.91", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4", + "xo": "0.14.0", + "yargs": "4.7.0" }, "license-check-config": { "src": [ diff --git a/ng2-components/ng2-alfresco-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json index e311e08c7d..c8f33f9064 100644 --- a/ng2-components/ng2-alfresco-search/demo/package.json +++ b/ng2-components/ng2-alfresco-search/demo/package.json @@ -46,37 +46,39 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "core-js": "^2.4.0", - "reflect-metadata": "^0.1.3", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.12", + "zone.js": "0.6.12", "angular2-in-memory-web-api": "0.0.12", - "material-design-icons": "^2.2.3", - "material-design-lite": "^1.1.3", - "ng2-translate": "2.2.0", - "alfresco-js-api": "^0.1.0", - "ng2-alfresco-core": "^0.1.0", - "ng2-alfresco-search": "^0.1.12", - "rimraf": "^2.5.2" + "rimraf": "2.5.2", + "ng2-translate": "2.2.2", + "material-design-icons": "2.2.3", + "material-design-lite": "1.1.3", + + "alfresco-js-api": "0.1.2", + "ng2-alfresco-core": "0.1.35", + "ng2-alfresco-search": "0.1.20" }, "devDependencies": { - "browser-sync": "^2.10.0", - "connect-history-api-fallback": "^1.2.0", - "concurrently": "^2.0.0", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4" + "browser-sync": "2.10.0", + "connect-history-api-fallback": "1.2.0", + "concurrently": "2.0.0", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4" }, "publishConfig": { "registry": "http://devproducts.alfresco.me:4873/" diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index 35f6aefb82..fa8dee1f86 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -44,6 +44,10 @@ { "name": "Will Abson", "email": "will.abson@alfresco.com" + }, + { + "name": "Denys Vuika", + "email": "denys.vuika@alfresco.com" } ], "keywords": [ @@ -53,45 +57,51 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "core-js": "^2.4.0", - "reflect-metadata": "^0.1.3", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.12", + "zone.js": "0.6.12", "angular2-in-memory-web-api": "0.0.12", - "alfresco-js-api": "^0.1.0", - "ng2-alfresco-core": "^0.1.25", - "ng2-translate": "2.2.0", - "rimraf": "^2.5.2", + + "rimraf": "2.5.2", + "ng2-translate": "2.2.2", + + "alfresco-js-api": "0.1.2", + "ng2-alfresco-core": "0.1.35" + }, + "peerDependencies": { + "material-design-icons": "^2.2.3", "material-design-lite": "^1.1.3" }, "devDependencies": { - "concurrently": "^2.1.0", - "coveralls": "^2.11.9", - "cpx": "^1.3.1", + "concurrently": "2.1.0", + "coveralls": "2.11.9", + "cpx": "1.3.1", "http-server": "0.8.5", "jasmine-core": "2.4.1", - "karma": "~0.13.22", - "karma-chrome-launcher": "~1.0.1", - "karma-coverage": "^1.0.0", - "karma-jasmine": "~1.0.2", - "karma-mocha-reporter": "^2.0.3", - "karma-jasmine-html-reporter": "^0.2.0", - "license-check": "^1.0.4", - "remap-istanbul": "^0.6.3", - "traceur": "^0.0.91", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4" + "karma": "0.13.22", + "karma-chrome-launcher": "1.0.1", + "karma-coverage": "1.0.0", + "karma-jasmine": "1.0.2", + "karma-mocha-reporter": "2.0.3", + "karma-jasmine-html-reporter": "0.2.0", + "license-check": "1.0.4", + "remap-istanbul": "0.6.3", + "traceur": "0.0.91", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4" }, "license-check-config": { "src": [ diff --git a/ng2-components/ng2-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json index 8ab9c5dee1..d05aa74df7 100644 --- a/ng2-components/ng2-alfresco-upload/demo/package.json +++ b/ng2-components/ng2-alfresco-upload/demo/package.json @@ -46,37 +46,39 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "core-js": "^2.4.0", - "reflect-metadata": "^0.1.3", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.12", + "zone.js": "0.6.12", "angular2-in-memory-web-api": "0.0.12", - "material-design-icons": "^2.2.3", - "material-design-lite": "^1.1.3", - "alfresco-js-api": "^0.1.0", - "ng2-alfresco-core": "^0.1.0", - "ng2-translate": "2.2.0", - "ng2-alfresco-upload": "^0.1.0", - "rimraf": "^2.5.2" + "rimraf": "2.5.2", + "ng2-translate": "2.2.2", + "material-design-icons": "2.2.3", + "material-design-lite": "1.1.3", + + "alfresco-js-api": "0.1.2", + "ng2-alfresco-core": "0.1.35", + "ng2-alfresco-upload": "0.1.46" }, "devDependencies": { - "browser-sync": "^2.10.0", - "connect-history-api-fallback": "^1.2.0", - "concurrently": "^2.0.0", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4" + "browser-sync": "2.10.0", + "connect-history-api-fallback": "1.2.0", + "concurrently": "2.0.0", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4" }, "publishConfig": { "registry": "http://devproducts.alfresco.me:4873/" diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index 353d4c5ddd..c4c4fa3275 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -60,46 +60,53 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "core-js": "^2.4.0", - "reflect-metadata": "^0.1.3", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.12", + "zone.js": "0.6.12", "angular2-in-memory-web-api": "0.0.12", - "alfresco-js-api": "^0.1.0", - "ng2-alfresco-core": "^0.1.0", - "ng2-translate": "2.2.0", - "rimraf": "^2.5.2" + + "rimraf": "2.5.2", + "ng2-translate": "2.2.2", + + "alfresco-js-api": "0.1.2", + "ng2-alfresco-core": "0.1.35" + }, + "peerDependencies": { + "material-design-icons": "^2.2.3", + "material-design-lite": "^1.1.3" }, "devDependencies": { - "concurrently": "^2.1.0", - "coveralls": "^2.11.9", - "cpx": "^1.3.1", + "concurrently": "2.1.0", + "coveralls": "2.11.9", + "cpx": "1.3.1", "http-server": "0.8.5", - "jasmine-ajax": "^3.2.0", + "jasmine-ajax": "3.2.0", "jasmine-core": "2.4.1", - "karma": "~0.13.22", - "karma-chrome-launcher": "~1.0.1", - "karma-coverage": "^1.0.0", - "karma-jasmine": "~1.0.2", - "karma-jasmine-ajax": "^0.1.13", - "karma-jasmine-html-reporter": "^0.2.0", - "karma-mocha-reporter": "^2.0.3", - "license-check": "^1.0.4", - "remap-istanbul": "^0.6.3", - "traceur": "^0.0.91", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4" + "karma": "0.13.22", + "karma-chrome-launcher": "1.0.1", + "karma-coverage": "1.0.0", + "karma-jasmine": "1.0.2", + "karma-jasmine-ajax": "0.1.13", + "karma-jasmine-html-reporter": "0.2.0", + "karma-mocha-reporter": "2.0.3", + "license-check": "1.0.4", + "remap-istanbul": "0.6.3", + "traceur": "0.0.91", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4" }, "license-check-config": { "src": [ diff --git a/ng2-components/ng2-alfresco-viewer/demo/package.json b/ng2-components/ng2-alfresco-viewer/demo/package.json index 804af452c7..483787d09e 100644 --- a/ng2-components/ng2-alfresco-viewer/demo/package.json +++ b/ng2-components/ng2-alfresco-viewer/demo/package.json @@ -18,33 +18,37 @@ }, "license": "Apache-2.0", "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "core-js": "^2.4.0", - "reflect-metadata": "^0.1.3", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.12", + "zone.js": "0.6.12", "angular2-in-memory-web-api": "0.0.12", - "ng2-alfresco-viewer": "file:../", - "material-design-icons": "^2.2.3", - "material-design-lite": "^1.1.3", - "rimraf": "^2.5.2" + + "rimraf": "2.5.2", + "material-design-icons": "2.2.3", + "material-design-lite": "1.1.3", + "pdfjs-dist": "1.5.258", + + "ng2-alfresco-viewer": "0.1.28" }, "devDependencies": { - "browser-sync": "^2.10.0", - "connect-history-api-fallback": "^1.2.0", - "concurrently": "^2.0.0", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4" + "browser-sync": "2.10.0", + "connect-history-api-fallback": "1.2.0", + "concurrently": "2.0.0", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4" }, "contributors": [ { @@ -58,6 +62,7 @@ ], "keywords": [ "angular2", - "typescript" + "typescript", + "alfresco" ] } diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index eb114afe1e..50639f0a85 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -54,44 +54,51 @@ "alfresco" ], "dependencies": { - "@angular/common": "2.0.0-rc.2", - "@angular/compiler": "2.0.0-rc.2", - "@angular/core": "2.0.0-rc.2", - "@angular/http": "2.0.0-rc.2", - "@angular/platform-browser": "2.0.0-rc.2", - "@angular/platform-browser-dynamic": "2.0.0-rc.2", - "@angular/router": "2.0.0-rc.2", + "@angular/common": "2.0.0-rc.3", + "@angular/compiler": "2.0.0-rc.3", + "@angular/core": "2.0.0-rc.3", + "@angular/forms": "0.1.1", + "@angular/http": "2.0.0-rc.3", + "@angular/platform-browser": "2.0.0-rc.3", + "@angular/platform-browser-dynamic": "2.0.0-rc.3", + "@angular/router": "3.0.0-alpha.7", "@angular/router-deprecated": "2.0.0-rc.2", - "@angular/upgrade": "2.0.0-rc.2", + "@angular/upgrade": "2.0.0-rc.3", "systemjs": "0.19.27", - "core-js": "^2.4.0", - "reflect-metadata": "^0.1.3", + "core-js": "2.4.0", + "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.12", + "zone.js": "0.6.12", "angular2-in-memory-web-api": "0.0.12", - "pdfjs-dist": "^1.5.258", - "rimraf": "^2.5.2" + + "rimraf": "2.5.2", + + "pdfjs-dist": "1.5.258" + }, + "peerDependencies": { + "material-design-icons": "^2.2.3", + "material-design-lite": "^1.1.3" }, "devDependencies": { - "concurrently": "^2.1.0", - "coveralls": "^2.11.9", - "cpx": "^1.3.1", + "concurrently": "2.1.0", + "coveralls": "2.11.9", + "cpx": "1.3.1", "http-server": "0.8.5", - "jasmine-ajax": "^3.2.0", + "jasmine-ajax": "3.2.0", "jasmine-core": "2.4.1", - "karma": "~0.13.22", - "karma-chrome-launcher": "~1.0.1", - "karma-coverage": "^1.0.0", - "karma-jasmine": "~1.0.2", - "karma-jasmine-ajax": "^0.1.13", - "karma-jasmine-html-reporter": "^0.2.0", - "karma-mocha-reporter": "^2.0.3", - "license-check": "^1.0.4", - "remap-istanbul": "^0.6.3", - "traceur": "^0.0.91", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4" + "karma": "0.13.22", + "karma-chrome-launcher": "1.0.1", + "karma-coverage": "1.0.0", + "karma-jasmine": "1.0.2", + "karma-jasmine-ajax": "0.1.13", + "karma-jasmine-html-reporter": "0.2.0", + "karma-mocha-reporter": "2.0.3", + "license-check": "1.0.4", + "remap-istanbul": "0.6.3", + "traceur": "0.0.91", + "tslint": "3.8.1", + "typescript": "1.8.10", + "typings": "1.0.4" }, "license-check-config": { "src": [ From 5efb9b9cfdbd5cb75d545ed64a8df014deeead57 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 27 Jun 2016 13:45:57 +0100 Subject: [PATCH 2/4] Fix 'core' library issues with ng2-translate --- ng2-components/ng2-alfresco-core/package.json | 3 +-- .../src/services/AlfrescoTranslationService.service.ts | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index 8512796411..0d13fabc96 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -70,7 +70,6 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", "ng2-translate": "2.2.2", @@ -92,7 +91,7 @@ "karma-jasmine": "1.0.2", "karma-mocha-reporter": "2.0.3", "karma-jasmine-html-reporter": "0.2.0", - "license-check": "1.0.4", + "license-check": "1.1.5", "remap-istanbul": "0.6.3", "traceur": "0.0.91", "tslint": "3.8.1", diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts index e410c97421..08532606b4 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts @@ -16,7 +16,6 @@ */ import { Injectable, Optional } from '@angular/core'; -import { Http } from '@angular/http'; import { MissingTranslationHandler, TranslateService } from 'ng2-translate/ng2-translate'; import { AlfrescoTranslationLoader } from './AlfrescoTranslationLoader.service'; @@ -25,8 +24,8 @@ export class AlfrescoTranslationService extends TranslateService { userLang: string = 'en' ; currentLoader: AlfrescoTranslationLoader; - constructor(http: Http, currentLoader: AlfrescoTranslationLoader, @Optional() missingTranslationHandler: MissingTranslationHandler) { - super(http, currentLoader, missingTranslationHandler); + constructor(currentLoader: AlfrescoTranslationLoader, @Optional() missingTranslationHandler: MissingTranslationHandler) { + super(currentLoader, missingTranslationHandler); this.userLang = navigator.language.split('-')[0]; // use navigator lang if available this.userLang = /(fr|en)/gi.test(this.userLang) ? this.userLang : 'en'; this.setDefaultLang(this.userLang); From c317a10b08a45a1917bd8a63caca57b255d05a15 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 27 Jun 2016 14:54:49 +0100 Subject: [PATCH 3/4] Dependency version fixes --- demo-shell-ng2/package.json | 3 +-- ng2-components/ng2-alfresco-datatable/demo/package.json | 1 - ng2-components/ng2-alfresco-datatable/package.json | 4 +--- ng2-components/ng2-alfresco-documentlist/demo/package.json | 3 +-- ng2-components/ng2-alfresco-documentlist/package.json | 6 +++--- ng2-components/ng2-alfresco-login/demo/package.json | 3 +-- ng2-components/ng2-alfresco-login/package.json | 7 +++---- ng2-components/ng2-alfresco-search/demo/package.json | 3 +-- ng2-components/ng2-alfresco-search/package.json | 6 +++--- ng2-components/ng2-alfresco-upload/demo/package.json | 3 +-- ng2-components/ng2-alfresco-upload/package.json | 5 ++--- ng2-components/ng2-alfresco-viewer/demo/package.json | 1 - ng2-components/ng2-alfresco-viewer/package.json | 4 +--- 13 files changed, 18 insertions(+), 31 deletions(-) diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index fef7db3c00..61aa87255a 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -67,7 +67,6 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", "rimraf": "2.5.2", "material-design-icons": "2.2.3", @@ -89,7 +88,7 @@ "browser-sync": "2.10.0", "concurrently": "2.0.0", "connect-history-api-fallback": "1.2.0", - "license-check": "1.0.4", + "license-check": "1.1.5", "tslint": "3.8.1", "typescript": "1.8.10", "typings": "1.0.4" diff --git a/ng2-components/ng2-alfresco-datatable/demo/package.json b/ng2-components/ng2-alfresco-datatable/demo/package.json index 0e70ad49ee..2f876afacb 100644 --- a/ng2-components/ng2-alfresco-datatable/demo/package.json +++ b/ng2-components/ng2-alfresco-datatable/demo/package.json @@ -38,7 +38,6 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", "rimraf": "2.5.2", "material-design-icons": "2.2.3", diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index 7a02dda48b..6b4dbb77d6 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -66,8 +66,6 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", - "rimraf": "2.5.2" }, "peerDependencies": { @@ -85,7 +83,7 @@ "karma-jasmine": "1.0.2", "karma-jasmine-html-reporter": "0.2.0", "karma-mocha-reporter": "2.0.3", - "license-check": "1.0.4", + "license-check": "1.1.5", "remap-istanbul": "0.6.3", "traceur": "0.0.91", "tslint": "3.8.1", diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json index 12b62719a1..ff0a987b23 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/package.json +++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json @@ -33,7 +33,6 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", "rimraf": "2.5.2", "material-design-icons": "2.2.3", @@ -41,7 +40,7 @@ "ng2-translate": "2.2.2", "ng2-alfresco-core": "0.1.35", - "alfresco-js-api": "0.1.2", + "alfresco-js-api": "0.1.0", "ng2-alfresco-documentlist": "0.1.33" }, "devDependencies": { diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index b53d91557a..02908b259b 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -72,12 +72,12 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", + "rimraf": "2.5.2", "ng2-translate": "2.2.2", "ng2-alfresco-core": "0.1.35", - "alfresco-js-api": "0.1.2" + "alfresco-js-api": "0.1.0" }, "peerDependencies": { "material-design-icons": "^2.2.3", @@ -95,7 +95,7 @@ "karma-jasmine": "1.0.2", "karma-mocha-reporter": "2.0.3", "karma-jasmine-html-reporter": "0.2.0", - "license-check": "1.0.4", + "license-check": "1.1.5", "remap-istanbul": "0.6.3", "traceur": "0.0.91", "tslint": "3.8.1", diff --git a/ng2-components/ng2-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json index 8aee6eab82..006a9317ae 100644 --- a/ng2-components/ng2-alfresco-login/demo/package.json +++ b/ng2-components/ng2-alfresco-login/demo/package.json @@ -61,14 +61,13 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", "rimraf": "2.5.2", "material-design-icons": "2.2.3", "material-design-lite": "1.1.3", "ng2-translate": "2.2.2", - "alfresco-js-api": "0.1.2", + "alfresco-js-api": "0.1.0", "ng2-alfresco-core": "0.1.35", "ng2-alfresco-login": "0.1.24" }, diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index c6de14cbac..e2d047ce3d 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -80,13 +80,12 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", - "rimraf": "2.5.2", + "rimraf": "2.5.2", "ng2-translate": "2.2.2", "ng2-alfresco-core": "0.1.35", - "alfresco-js-api": "0.1.2" + "alfresco-js-api": "0.1.0" }, "devDependencies": { "concurrently": "2.1.0", @@ -100,7 +99,7 @@ "karma-jasmine": "1.0.2", "karma-mocha-reporter": "2.0.3", "karma-jasmine-html-reporter": "0.2.0", - "license-check": "1.0.4", + "license-check": "1.1.5", "remap-istanbul": "0.6.3", "traceur": "0.0.91", "tslint": "3.8.1", diff --git a/ng2-components/ng2-alfresco-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json index c8f33f9064..0e37189de6 100644 --- a/ng2-components/ng2-alfresco-search/demo/package.json +++ b/ng2-components/ng2-alfresco-search/demo/package.json @@ -61,14 +61,13 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", "rimraf": "2.5.2", "ng2-translate": "2.2.2", "material-design-icons": "2.2.3", "material-design-lite": "1.1.3", - "alfresco-js-api": "0.1.2", + "alfresco-js-api": "0.1.0", "ng2-alfresco-core": "0.1.35", "ng2-alfresco-search": "0.1.20" }, diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index fa8dee1f86..85d9d9e10f 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -72,12 +72,12 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", "rimraf": "2.5.2", "ng2-translate": "2.2.2", + "material-design-lite": "1.1.3", - "alfresco-js-api": "0.1.2", + "alfresco-js-api": "0.1.0", "ng2-alfresco-core": "0.1.35" }, "peerDependencies": { @@ -96,7 +96,7 @@ "karma-jasmine": "1.0.2", "karma-mocha-reporter": "2.0.3", "karma-jasmine-html-reporter": "0.2.0", - "license-check": "1.0.4", + "license-check": "1.1.5", "remap-istanbul": "0.6.3", "traceur": "0.0.91", "tslint": "3.8.1", diff --git a/ng2-components/ng2-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json index d05aa74df7..1540fece0a 100644 --- a/ng2-components/ng2-alfresco-upload/demo/package.json +++ b/ng2-components/ng2-alfresco-upload/demo/package.json @@ -61,14 +61,13 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", "rimraf": "2.5.2", "ng2-translate": "2.2.2", "material-design-icons": "2.2.3", "material-design-lite": "1.1.3", - "alfresco-js-api": "0.1.2", + "alfresco-js-api": "0.1.0", "ng2-alfresco-core": "0.1.35", "ng2-alfresco-upload": "0.1.46" }, diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index c4c4fa3275..71217ce2fd 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -75,12 +75,11 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", "rimraf": "2.5.2", "ng2-translate": "2.2.2", - "alfresco-js-api": "0.1.2", + "alfresco-js-api": "0.1.0", "ng2-alfresco-core": "0.1.35" }, "peerDependencies": { @@ -101,7 +100,7 @@ "karma-jasmine-ajax": "0.1.13", "karma-jasmine-html-reporter": "0.2.0", "karma-mocha-reporter": "2.0.3", - "license-check": "1.0.4", + "license-check": "1.1.5", "remap-istanbul": "0.6.3", "traceur": "0.0.91", "tslint": "3.8.1", diff --git a/ng2-components/ng2-alfresco-viewer/demo/package.json b/ng2-components/ng2-alfresco-viewer/demo/package.json index 483787d09e..efb895145e 100644 --- a/ng2-components/ng2-alfresco-viewer/demo/package.json +++ b/ng2-components/ng2-alfresco-viewer/demo/package.json @@ -33,7 +33,6 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", "rimraf": "2.5.2", "material-design-icons": "2.2.3", diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index 50639f0a85..94a141429a 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -69,10 +69,8 @@ "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", - "angular2-in-memory-web-api": "0.0.12", "rimraf": "2.5.2", - "pdfjs-dist": "1.5.258" }, "peerDependencies": { @@ -93,7 +91,7 @@ "karma-jasmine-ajax": "0.1.13", "karma-jasmine-html-reporter": "0.2.0", "karma-mocha-reporter": "2.0.3", - "license-check": "1.0.4", + "license-check": "1.1.5", "remap-istanbul": "0.6.3", "traceur": "0.0.91", "tslint": "3.8.1", From ca8e5de989b50a95c1265a10e1fd74e994d61aa4 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 27 Jun 2016 15:06:35 +0100 Subject: [PATCH 4/4] Fix translation service --- demo-shell-ng2/package.json | 2 +- .../src/services/AlfrescoTranslationService.service.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index 61aa87255a..e2e11d472a 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -75,7 +75,7 @@ "pdfjs-dist": "1.5.258", "flag-icon-css": "2.3.0", - "alfresco-js-api": "0.1.2", + "alfresco-js-api": "0.1.0", "ng2-alfresco-core": "0.1.35", "ng2-alfresco-datatable": "0.1.11", "ng2-alfresco-documentlist": "0.1.33", diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts index 08532606b4..a63322914e 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts @@ -22,9 +22,8 @@ import { AlfrescoTranslationLoader } from './AlfrescoTranslationLoader.service'; @Injectable() export class AlfrescoTranslationService extends TranslateService { userLang: string = 'en' ; - currentLoader: AlfrescoTranslationLoader; - constructor(currentLoader: AlfrescoTranslationLoader, @Optional() missingTranslationHandler: MissingTranslationHandler) { + constructor(public currentLoader: AlfrescoTranslationLoader, @Optional() missingTranslationHandler: MissingTranslationHandler) { super(currentLoader, missingTranslationHandler); this.userLang = navigator.language.split('-')[0]; // use navigator lang if available this.userLang = /(fr|en)/gi.test(this.userLang) ? this.userLang : 'en';