From 7d193108df4d1cd68101acc5426ba686024323de Mon Sep 17 00:00:00 2001 From: SteveSandersonMS Date: Mon, 2 May 2016 12:18:52 -0700 Subject: [PATCH] Build using local 'tsc' tool instead of hoping the globally-installed one exists and is the right version --- src/Microsoft.AspNet.AngularServices/npm/package.json | 4 ++-- .../npm/redux-typed/package.json | 7 +++++-- .../npm/aspnet-prerendering/package.json | 5 ++++- .../npm/aspnet-webpack-react/package.json | 5 ++++- .../npm/aspnet-webpack/package.json | 6 +++++- .../npm/domain-task/package.json | 5 ++++- templates/yeoman/package.json | 5 ++++- 7 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/Microsoft.AspNet.AngularServices/npm/package.json b/src/Microsoft.AspNet.AngularServices/npm/package.json index 36ae8c0..d24b5c1 100644 --- a/src/Microsoft.AspNet.AngularServices/npm/package.json +++ b/src/Microsoft.AspNet.AngularServices/npm/package.json @@ -5,7 +5,7 @@ "main": "./dist/Exports", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "prepublish": "tsd install && tsc && node build.js" + "prepublish": "tsd install && ./node_modules/.bin/tsc && node build.js" }, "repository": { "type": "git", @@ -22,7 +22,7 @@ "es6-shim": "^0.35.0", "reflect-metadata": "^0.1.2", "systemjs-builder": "^0.14.11", - "typescript": "^1.7.3", + "typescript": "^1.8.10", "zone.js": "^0.6.10" } } diff --git a/src/Microsoft.AspNet.ReactServices/npm/redux-typed/package.json b/src/Microsoft.AspNet.ReactServices/npm/redux-typed/package.json index 9348d82..48b78bd 100644 --- a/src/Microsoft.AspNet.ReactServices/npm/redux-typed/package.json +++ b/src/Microsoft.AspNet.ReactServices/npm/redux-typed/package.json @@ -5,9 +5,12 @@ "main": "main.js", "typings": "main.d.ts", "scripts": { - "prepublish": "tsd update && tsc && echo 'Finished building NPM package \"redux-typed\"'", + "prepublish": "tsd update && ./node_modules/.bin/tsc && echo 'Finished building NPM package \"redux-typed\"'", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "Microsoft", - "license": "Apache-2.0" + "license": "Apache-2.0", + "devDependencies": { + "typescript": "^1.8.10" + } } diff --git a/src/Microsoft.AspNet.SpaServices/npm/aspnet-prerendering/package.json b/src/Microsoft.AspNet.SpaServices/npm/aspnet-prerendering/package.json index 167761e..0ac53e7 100644 --- a/src/Microsoft.AspNet.SpaServices/npm/aspnet-prerendering/package.json +++ b/src/Microsoft.AspNet.SpaServices/npm/aspnet-prerendering/package.json @@ -4,7 +4,7 @@ "description": "Helpers for server-side rendering of JavaScript applications in ASP.NET projects. Works in conjunction with the Microsoft.AspNet.SpaServices NuGet package.", "main": "index.js", "scripts": { - "prepublish": "tsd update && tsc && echo 'Finished building NPM package \"aspnet-prerendering\"'", + "prepublish": "tsd update && ./node_modules/.bin/tsc && echo 'Finished building NPM package \"aspnet-prerendering\"'", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "Microsoft", @@ -12,5 +12,8 @@ "dependencies": { "domain-task": "^1.0.1", "es6-promise": "^3.1.2" + }, + "devDependencies": { + "typescript": "^1.8.10" } } diff --git a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack-react/package.json b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack-react/package.json index 68ba614..8f10687 100644 --- a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack-react/package.json +++ b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack-react/package.json @@ -4,7 +4,7 @@ "description": "Helpers for using Webpack with React in ASP.NET projects. Works in conjunction with the Microsoft.AspNet.SpaServices NuGet package.", "main": "index.js", "scripts": { - "prepublish": "tsd update && tsc && echo 'Finished building NPM package \"aspnet-webpack-react\"'", + "prepublish": "tsd update && ./node_modules/.bin/tsc && echo 'Finished building NPM package \"aspnet-webpack-react\"'", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "Microsoft", @@ -18,5 +18,8 @@ "react": "^0.14.7", "react-transform-hmr": "^1.0.4", "webpack": "^1.12.14" + }, + "devDependencies": { + "typescript": "^1.8.10" } } diff --git a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/package.json b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/package.json index 49fbc4e..44d1691 100644 --- a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/package.json +++ b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/package.json @@ -4,7 +4,7 @@ "description": "Helpers for using Webpack in ASP.NET projects. Works in conjunction with the Microsoft.AspNet.SpaServices NuGet package.", "main": "index.js", "scripts": { - "prepublish": "rm *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"aspnet-webpack\"'", + "prepublish": "./node_modules/.bin/rimraf *.d.ts && tsd update && ./node_modules/.bin/tsc && echo 'Finished building NPM package \"aspnet-webpack\"'", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "Microsoft", @@ -17,5 +17,9 @@ "webpack": "^1.12.14", "webpack-dev-middleware": "^1.5.1", "webpack-externals-plugin": "^1.0.0" + }, + "devDependencies": { + "typescript": "^1.8.10", + "rimraf": "^2.5.2" } } diff --git a/src/Microsoft.AspNet.SpaServices/npm/domain-task/package.json b/src/Microsoft.AspNet.SpaServices/npm/domain-task/package.json index a84ba7e..39673b7 100644 --- a/src/Microsoft.AspNet.SpaServices/npm/domain-task/package.json +++ b/src/Microsoft.AspNet.SpaServices/npm/domain-task/package.json @@ -4,7 +4,7 @@ "description": "Tracks outstanding operations for a logical thread of execution", "main": "main.js", "scripts": { - "prepublish": "tsd update && tsc && echo 'Finished building NPM package \"domain-task\"'", + "prepublish": "tsd update && ./node_modules/.bin/tsc && echo 'Finished building NPM package \"domain-task\"'", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "Microsoft", @@ -12,5 +12,8 @@ "dependencies": { "domain-context": "^0.5.1", "isomorphic-fetch": "^2.2.1" + }, + "devDependencies": { + "typescript": "^1.8.10" } } diff --git a/templates/yeoman/package.json b/templates/yeoman/package.json index 982cb80..ee90e16 100644 --- a/templates/yeoman/package.json +++ b/templates/yeoman/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build": "tsc && node ./tmp/build/build.js" + "build": "./node_modules/.bin/tsc && node ./tmp/build/build.js" }, "author": "Microsoft", "license": "Apache-2.0", @@ -16,5 +16,8 @@ "lodash": "^4.11.1", "mkdirp": "^0.5.1", "rimraf": "^2.5.2" + }, + "devDependencies": { + "typescript": "^1.8.10" } }