From c14341d1f807f9a8dcbdea1417b202c53390d76a Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 19 Sep 2016 11:59:10 +0100 Subject: [PATCH] Upgrade ng2-activiti-processlist --- .../ng2-activiti-processlist/angular-cli.json | 27 ------------------- .../demo/package.json | 12 ++++----- .../demo/tsconfig.json | 4 +-- .../demo/typings.json | 7 ----- .../ng2-activiti-processlist/karma.conf.js | 2 +- .../ng2-activiti-processlist/package.json | 19 +++++-------- .../ng2-activiti-processlist/tsconfig.json | 2 -- .../ng2-activiti-processlist/typings.json | 7 ----- .../ng2-alfresco-core/tsconfig.json | 2 -- 9 files changed, 15 insertions(+), 67 deletions(-) delete mode 100644 ng2-components/ng2-activiti-processlist/angular-cli.json delete mode 100644 ng2-components/ng2-activiti-processlist/demo/typings.json delete mode 100644 ng2-components/ng2-activiti-processlist/typings.json diff --git a/ng2-components/ng2-activiti-processlist/angular-cli.json b/ng2-components/ng2-activiti-processlist/angular-cli.json deleted file mode 100644 index c6a5e72386..0000000000 --- a/ng2-components/ng2-activiti-processlist/angular-cli.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "project": { - "version": "ng2-activiti-processlist", - "name": "0.1.0" - }, - "apps": [ - { - "main": "src/ng2-activiti-processlist.component.ts", - "tsconfig": "tsconfig.json", - "mobile": false - } - ], - "addons": [], - "packages": [], - "test": { - "karma": { - "config": "karma.conf.js" - } - }, - "defaults": { - "prefix": "", - "sourceDir": "src", - "styleExt": "css", - "prefixInterfaces": false, - "lazyRoutePrefix": "+" - } -} diff --git a/ng2-components/ng2-activiti-processlist/demo/package.json b/ng2-components/ng2-activiti-processlist/demo/package.json index 7ae9e5c90d..46003cda6c 100644 --- a/ng2-components/ng2-activiti-processlist/demo/package.json +++ b/ng2-components/ng2-activiti-processlist/demo/package.json @@ -5,8 +5,7 @@ "author": "Will Abson", "main": "index.js", "scripts": { - "clean": "rimraf dist node_modules typings", - "typings": "typings install", + "clean": "rimraf dist node_modules", "postinstall": "npm run typings && npm run build", "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run server\" ", "server": "wsrv -o -s -l", @@ -44,12 +43,13 @@ "material-design-lite": "^1.1.3" }, "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" }, "publishConfig": { "registry": "http://devproducts.alfresco.me:4873/" diff --git a/ng2-components/ng2-activiti-processlist/demo/tsconfig.json b/ng2-components/ng2-activiti-processlist/demo/tsconfig.json index 772c3a7e75..366b008904 100644 --- a/ng2-components/ng2-activiti-processlist/demo/tsconfig.json +++ b/ng2-components/ng2-activiti-processlist/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-activiti-processlist/demo/typings.json b/ng2-components/ng2-activiti-processlist/demo/typings.json deleted file mode 100644 index 7e0e18568d..0000000000 --- a/ng2-components/ng2-activiti-processlist/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-activiti-processlist/karma.conf.js b/ng2-components/ng2-activiti-processlist/karma.conf.js index 1a3d76b9db..459fe5f79c 100644 --- a/ng2-components/ng2-activiti-processlist/karma.conf.js +++ b/ng2-components/ng2-activiti-processlist/karma.conf.js @@ -71,7 +71,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-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json index fa543bfe47..ee7ab0ea48 100644 --- a/ng2-components/ng2-activiti-processlist/package.json +++ b/ng2-components/ng2-activiti-processlist/package.json @@ -4,10 +4,7 @@ "version": "0.3.2", "author": "Alfresco Software, Ltd.", "scripts": { - "postinstall": "typings install", - "clean": "rimraf dist node_modules typings", - "typings": "typings install", - "server": "wsrv -o -p 9875", + "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\"", @@ -20,7 +17,7 @@ "test": "karma start karma.conf.js --reporters mocha,coverage --single-run", "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "node_modules/.bin/remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html", - "coverage": "npm run test && http-server -c-1 -o -p 9875 ./coverage/report", + "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", "prepublish": "npm run build", "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable" }, @@ -68,17 +65,15 @@ "ng2-activiti-tasklist": "0.3.3" }, "devDependencies": { - "angular-cli": "1.0.0-beta.9", - "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", - "http-server": "0.8.5", "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", @@ -88,8 +83,8 @@ "rimraf": "2.5.2", "traceur": "^0.0.91", "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^1.0.4" + "typescript": "^2.0.2", + "wsrv": "^0.1.5" }, "license-check-config": { "src": [ diff --git a/ng2-components/ng2-activiti-processlist/tsconfig.json b/ng2-components/ng2-activiti-processlist/tsconfig.json index e4d2ae201a..2c2f13837f 100644 --- a/ng2-components/ng2-activiti-processlist/tsconfig.json +++ b/ng2-components/ng2-activiti-processlist/tsconfig.json @@ -20,8 +20,6 @@ "exclude": [ "demo", "node_modules", - "typings/main", - "typings/main.d.ts", "dist" ] } diff --git a/ng2-components/ng2-activiti-processlist/typings.json b/ng2-components/ng2-activiti-processlist/typings.json deleted file mode 100644 index 7e0e18568d..0000000000 --- a/ng2-components/ng2-activiti-processlist/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-core/tsconfig.json b/ng2-components/ng2-alfresco-core/tsconfig.json index 39deca0930..a58fd44698 100644 --- a/ng2-components/ng2-alfresco-core/tsconfig.json +++ b/ng2-components/ng2-alfresco-core/tsconfig.json @@ -20,8 +20,6 @@ "exclude": [ "demo", "node_modules", - "typings/main", - "typings/main.d.ts", "dist" ] }