diff --git a/ng2-components/ng2-alfresco-webscript/demo/package.json b/ng2-components/ng2-alfresco-webscript/demo/package.json index b02191c2b8..1c7bdec232 100644 --- a/ng2-components/ng2-alfresco-webscript/demo/package.json +++ b/ng2-components/ng2-alfresco-webscript/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 -s -l", "build": "npm run tslint && rimraf dist && npm run tsc", @@ -45,12 +44,13 @@ "ng2-alfresco-webscript": "^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" }, "contributors": [ { diff --git a/ng2-components/ng2-alfresco-webscript/demo/typings.json b/ng2-components/ng2-alfresco-webscript/demo/typings.json deleted file mode 100644 index 7e0e18568d..0000000000 --- a/ng2-components/ng2-alfresco-webscript/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-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json index 5e2ef55461..3388c0cb04 100644 --- a/ng2-components/ng2-alfresco-webscript/package.json +++ b/ng2-components/ng2-alfresco-webscript/package.json @@ -6,9 +6,7 @@ "main": "./dist/index.js", "typings": "./dist/index.d.ts", "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\"", @@ -54,8 +52,9 @@ "zone.js": "^0.6.12" }, "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", @@ -72,9 +71,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" }, "keywords": [ "webscript", diff --git a/ng2-components/ng2-alfresco-webscript/tsconfig.json b/ng2-components/ng2-alfresco-webscript/tsconfig.json index e4d2ae201a..2c2f13837f 100644 --- a/ng2-components/ng2-alfresco-webscript/tsconfig.json +++ b/ng2-components/ng2-alfresco-webscript/tsconfig.json @@ -20,8 +20,6 @@ "exclude": [ "demo", "node_modules", - "typings/main", - "typings/main.d.ts", "dist" ] } diff --git a/ng2-components/ng2-alfresco-webscript/typings.json b/ng2-components/ng2-alfresco-webscript/typings.json deleted file mode 100644 index 7e0e18568d..0000000000 --- a/ng2-components/ng2-alfresco-webscript/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/scripts/npm-link-demo-shell.sh b/scripts/npm-link-demo-shell.sh index 1254b822b8..290197f433 100755 --- a/scripts/npm-link-demo-shell.sh +++ b/scripts/npm-link-demo-shell.sh @@ -8,7 +8,6 @@ npm install -g typings echo "====== linking component: ng2-alfresco-core =====" cd "$DIR/../ng2-components/ng2-alfresco-core" npm link -npm run typings npm run build #LINK FORM @@ -16,7 +15,6 @@ echo "====== linking component: ng2-activiti-form =====" cd "$DIR/../ng2-components/ng2-activiti-form" npm link ng2-alfresco-core npm link -npm run typings npm run build #LINK DATATABLE @@ -24,7 +22,6 @@ echo "====== linking component: ng2-alfresco-datatable =====" cd "$DIR/../ng2-components/ng2-alfresco-datatable" npm link ng2-alfresco-core npm link -npm run typings npm run build #LINK DOCUMENTLIST @@ -33,7 +30,6 @@ cd "$DIR/../ng2-components/ng2-alfresco-documentlist" npm link ng2-alfresco-core npm link ng2-alfresco-datatable npm link -npm run typings npm run build #LINK WEBSCRIPT @@ -42,7 +38,6 @@ cd "$DIR/../ng2-components/ng2-alfresco-webscript" npm link ng2-alfresco-core npm link ng2-alfresco-datatable npm link -npm run typings npm run build #LINK TASKLIST @@ -52,7 +47,6 @@ npm link ng2-alfresco-core npm link ng2-alfresco-datatable npm link ng2-activiti-form npm link -npm run typings npm run build #LINK PROCESSLIST @@ -62,7 +56,6 @@ npm link ng2-alfresco-core npm link ng2-alfresco-datatable npm link ng2-activiti-tasklist npm link -npm run typings npm run build #LINK VIEWER @@ -70,7 +63,6 @@ echo "====== linking component: ng2-alfresco-viewer =====" cd "$DIR/../ng2-components/ng2-alfresco-viewer" npm link ng2-alfresco-core npm link -npm run typings npm run build #LINK TAG @@ -92,7 +84,6 @@ do cd "$DESTDIR" npm link ng2-alfresco-core npm link - npm run typings npm run build done @@ -116,4 +107,4 @@ do DESTDIR="$DIR/../ng2-components/${PACKAGE}" echo "====== demo shell linking: ${PACKAGE} =====" npm link ${PACKAGE} -done \ No newline at end of file +done