From 612328ef1251d479d36720fef1619f2ff7b06e0a Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 19 Sep 2016 14:33:43 +0100 Subject: [PATCH] Upgrade ng2-alfresco-upload --- .../ng2-alfresco-upload/demo/package.json | 14 +++++++------- .../ng2-alfresco-upload/demo/tsconfig.json | 4 +--- .../ng2-alfresco-upload/demo/typings.json | 7 ------- ng2-components/ng2-alfresco-upload/karma.conf.js | 2 +- ng2-components/ng2-alfresco-upload/package.json | 15 ++++++--------- ng2-components/ng2-alfresco-upload/tsconfig.json | 2 -- ng2-components/ng2-alfresco-upload/typings.json | 7 ------- 7 files changed, 15 insertions(+), 36 deletions(-) delete mode 100644 ng2-components/ng2-alfresco-upload/demo/typings.json delete mode 100644 ng2-components/ng2-alfresco-upload/typings.json diff --git a/ng2-components/ng2-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json index f7367f8b2a..9e209cfbe9 100644 --- a/ng2-components/ng2-alfresco-upload/demo/package.json +++ b/ng2-components/ng2-alfresco-upload/demo/package.json @@ -5,9 +5,8 @@ "author": "Alfresco Software, Ltd.", "main": "index.js", "scripts": { - "clean": "rimraf dist node_modules typings", - "typings": "typings install", - "postinstall": "npm run typings && npm run build", + "clean": "rimraf dist node_modules", + "postinstall": "npm run build", "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run server\" ", "server": "wsrv -o -l -s", "build": "npm run tslint && rimraf dist && npm run tsc", @@ -71,11 +70,12 @@ "ng2-alfresco-upload": "^0.3.0" }, "devDependencies": { - "concurrently": "2.0.0", + "@types/core-js": "^0.9.32", + "@types/jasmine": "^2.2.33", + "concurrently": "^2.2.0", "rimraf": "2.5.2", "tslint": "3.8.1", - "typescript": "1.8.10", - "typings": "1.0.4", - "wsrv": "0.1.3" + "typescript": "^2.0.2", + "wsrv": "^0.1.5" } } diff --git a/ng2-components/ng2-alfresco-upload/demo/tsconfig.json b/ng2-components/ng2-alfresco-upload/demo/tsconfig.json index 772c3a7e75..366b008904 100644 --- a/ng2-components/ng2-alfresco-upload/demo/tsconfig.json +++ b/ng2-components/ng2-alfresco-upload/demo/tsconfig.json @@ -12,8 +12,6 @@ }, "exclude": [ "dist", - "node_modules", - "typings/main", - "typings/main.d.ts" + "node_modules" ] } diff --git a/ng2-components/ng2-alfresco-upload/demo/typings.json b/ng2-components/ng2-alfresco-upload/demo/typings.json deleted file mode 100644 index d8954c2485..0000000000 --- a/ng2-components/ng2-alfresco-upload/demo/typings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "globalDependencies": { - "core-js": "registry:dt/core-js#0.0.0+20160317120654", - "jasmine": "registry:dt/jasmine#2.2.0+20160505161446", - "node": "registry:dt/node#4.0.0+20160509154515" - } -} diff --git a/ng2-components/ng2-alfresco-upload/karma.conf.js b/ng2-components/ng2-alfresco-upload/karma.conf.js index 3f1e30bd0d..b8f1867ae6 100644 --- a/ng2-components/ng2-alfresco-upload/karma.conf.js +++ b/ng2-components/ng2-alfresco-upload/karma.conf.js @@ -73,7 +73,7 @@ module.exports = function (config) { ], // Coverage reporter generates the coverage - reporters: ['mocha', 'coverage', 'coveralls', 'kjhtml'], + reporters: ['mocha', 'coverage', 'kjhtml'], // Source files that you wanna generate coverage for. // Do not include tests or libraries (these files will be instrumented by Istanbul) diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index 8473ae397e..3df13f9209 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -4,9 +4,7 @@ "version": "0.3.2", "author": "Alfresco Software, Ltd.", "scripts": { - "postinstall": "typings install", - "clean": "rimraf dist node_modules typings", - "typings": "typings install", + "clean": "rimraf dist node_modules", "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", "build:w": "npm run tslint && rimraf dist && npm run watch-task", "watch-task": "concurrently \"npm run tsc:w\" \"npm run copy-dist:w\" \"license-check\"", @@ -79,15 +77,15 @@ "material-design-lite": "^1.1.3" }, "devDependencies": { - "concurrently": "2.1.0", - "coveralls": "2.11.9", + "@types/core-js": "^0.9.32", + "@types/jasmine": "^2.2.33", + "concurrently": "^2.2.0", "cpx": "1.3.1", "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-coveralls": "1.1.2", "karma-jasmine": "1.0.2", "karma-jasmine-ajax": "0.1.13", "karma-jasmine-html-reporter": "0.2.0", @@ -97,9 +95,8 @@ "rimraf": "2.5.2", "traceur": "0.0.91", "tslint": "3.8.1", - "typescript": "1.8.10", - "typings": "1.0.4", - "wsrv": "0.1.3" + "typescript": "^2.0.2", + "wsrv": "^0.1.5" }, "license-check-config": { "src": [ diff --git a/ng2-components/ng2-alfresco-upload/tsconfig.json b/ng2-components/ng2-alfresco-upload/tsconfig.json index 39deca0930..a58fd44698 100644 --- a/ng2-components/ng2-alfresco-upload/tsconfig.json +++ b/ng2-components/ng2-alfresco-upload/tsconfig.json @@ -20,8 +20,6 @@ "exclude": [ "demo", "node_modules", - "typings/main", - "typings/main.d.ts", "dist" ] } diff --git a/ng2-components/ng2-alfresco-upload/typings.json b/ng2-components/ng2-alfresco-upload/typings.json deleted file mode 100644 index d8954c2485..0000000000 --- a/ng2-components/ng2-alfresco-upload/typings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "globalDependencies": { - "core-js": "registry:dt/core-js#0.0.0+20160317120654", - "jasmine": "registry:dt/jasmine#2.2.0+20160505161446", - "node": "registry:dt/node#4.0.0+20160509154515" - } -}