honeymoose/Angular-Cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: remove dependency on tsd and use @types/* instead

Browse Source
This commit is contained in:
Igor Minar
2016-05-25 16:42:28 -07:00
parent 4dbd8ed6b8
commit b9347eb01c
19 changed files with 94 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-4
View File
@@ -26,10 +26,6 @@ tmp
**/*.css.ts
**/*.css.shim.ts
# Or type definitions we mirror from github
# (NB: these lines are removed in publish-build-artifacts.sh)
/typings/
# Include when developing application packages.
pubspec.lock
.c9
modules/@angular/compiler_cli/integrationtest/typings.d.ts
Vendored
+2 -2
View File
@@ -1,2 +1,2 @@
/// <reference path="../../../../typings/node/node.d.ts" />
/// <reference path="../../../../typings/jasmine/jasmine.d.ts" />
/// <reference path="../../../../node_modules/@types/node/index.d.ts" />
/// <reference path="../../../../node_modules/@types/jasmine/index.d.ts" />
modules/@angular/compiler_cli/tsconfig-es5.json
+2 -2
View File
@@ -27,8 +27,8 @@
"files": [
"index.ts",
"src/main.ts",
"../../../typings/node/node.d.ts",
"../../../typings/jasmine/jasmine.d.ts",
"../../../node_modules/@types/node/index.d.ts",
"../../../node_modules/@types/jasmine/index.d.ts",
"../../../node_modules/zone.js/dist/zone.js.d.ts"
]
}
modules/@angular/core/tsconfig-es5.json
-1
View File
@@ -23,7 +23,6 @@
"files": [
"index.ts",
"testing.ts",
"../../../typings/jasmine/jasmine.d.ts",
"../../../node_modules/zone.js/dist/zone.js.d.ts"
]
}
modules/@angular/platform-browser/tsconfig-es2015.json
+3 -4
View File
@@ -12,7 +12,6 @@
"moduleResolution": "node",
"outDir": "../../../dist/packages-dist/platform-browser/esm",
"paths": {
"selenium-webdriver": ["./typings/selenium-webdriver/selenium-webdriver.d.ts"],
"@angular/core": ["../../../dist/packages-dist/core"],
"@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
"@angular/common": ["../../../dist/packages-dist/common"],
@@ -28,9 +27,9 @@
"files": [
"index.ts",
"testing.ts",
"../../../typings/jasmine/jasmine.d.ts",
"../../../typings/hammerjs/hammerjs.d.ts",
"../../../typings/angular-protractor/angular-protractor.d.ts",
"../../../node_modules/@types/hammerjs/index.d.ts",
"../../../node_modules/@types/protractor/index.d.ts",
"../../../node_modules/@types/jasmine/index.d.ts",
"../../../node_modules/zone.js/dist/zone.js.d.ts"
]
}
modules/@angular/platform-browser/tsconfig-es5.json
+3 -4
View File
@@ -12,7 +12,6 @@
"moduleResolution": "node",
"outDir": "../../../dist/packages-dist/platform-browser/",
"paths": {
"selenium-webdriver": ["./typings/selenium-webdriver/selenium-webdriver.d.ts"],
"@angular/core": ["../../../dist/packages-dist/core"],
"@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
"@angular/common": ["../../../dist/packages-dist/common"],
@@ -29,9 +28,9 @@
"files": [
"index.ts",
"testing.ts",
"../../../typings/hammerjs/hammerjs.d.ts",
"../../../typings/angular-protractor/angular-protractor.d.ts",
"../../../typings/jasmine/jasmine.d.ts",
"../../../node_modules/@types/hammerjs/index.d.ts",
"../../../node_modules/@types/protractor/index.d.ts",
"../../../node_modules/@types/jasmine/index.d.ts",
"../../../node_modules/zone.js/dist/zone.js.d.ts"
]
}
modules/@angular/platform-server/tsconfig-es2015.json
+1 -1
View File
@@ -24,7 +24,7 @@
},
"files": [
"index.ts",
"../../../typings/node/node.d.ts",
"../../../node_modules/@types/node/index.d.ts",
"../../../node_modules/zone.js/dist/zone.js.d.ts"
]
}
modules/@angular/platform-server/tsconfig-es5.json
+1 -1
View File
@@ -25,7 +25,7 @@
},
"files": [
"index.ts",
"../../../typings/node/node.d.ts",
"../../../node_modules/@types/node/index.d.ts",
"../../../node_modules/zone.js/dist/zone.js.d.ts"
]
}
modules/rollup-test/tsconfig.json
-2
View File
@@ -14,7 +14,5 @@
},
"files": [
"hello_world.ts"
//"../typings/es6-collections/es6-collections.d.ts",
//"../typings/es6-promise/es6-promise.d.ts"
]
}
modules/tsconfig.json
+1 -1
View File
@@ -11,7 +11,7 @@
"moduleResolution": "node",
"outDir": "../dist/all/",
"paths": {
"selenium-webdriver": ["./@angular/typings/selenium-webdriver/selenium-webdriver.d.ts"],
"selenium-webdriver": ["../node_modules/@types/selenium-webdriver/index.d.ts"],
"rxjs/*": ["../node_modules/rxjs/*"],
"@angular/*": ["./@angular/*"],
"tsc-wrapped": ["../dist/tools/tsc-wrapped"]
modules/types.d.ts
Vendored
+5 -5
View File
@@ -1,8 +1,8 @@
// This file contains all ambient imports needed to compile the modules/ source code
/// <reference path="../typings/hammerjs/hammerjs.d.ts" />
/// <reference path="../typings/jasmine/jasmine.d.ts" />
/// <reference path="../typings/node/node.d.ts" />
/// <reference path="../typings/selenium-webdriver/selenium-webdriver.d.ts" />
/// <reference path="../typings/angular-protractor/angular-protractor.d.ts" />
/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />
/// <reference path="../node_modules/@types/hammerjs/index.d.ts" />
/// <reference path="../node_modules/@types/jasmine/index.d.ts" />
/// <reference path="../node_modules/@types/node/index.d.ts" />
/// <reference path="../node_modules/@types/protractor/index.d.ts" />
/// <reference path="../node_modules/@types/selenium-webdriver/index.d.ts" />
npm-shrinkwrap.clean.json
+24 -264
View File
File diff suppressed because it is too large Load Diff
npm-shrinkwrap.json
Generated
+40 -428
View File
File diff suppressed because it is too large Load Diff
package.json
+8 -2
View File
@@ -15,7 +15,7 @@
"url": "https://github.com/angular/angular.git"
},
"scripts": {
"postinstall": "node tools/npm/copy-npm-shrinkwrap; tsd reinstall --overwrite --clean --config ./tsd.json"
"postinstall": "node tools/npm/copy-npm-shrinkwrap"
},
"dependencies": {
"es6-shim": "^0.35.0",
@@ -24,6 +24,13 @@
"zone.js": "^0.6.12"
},
"devDependencies": {
"@types/angularjs": "^1.5.13-alpha",
"@types/fs-extra": "0.0.22-alpha",
"@types/hammerjs": "^2.0.22-alpha",
"@types/jasmine": "^2.2.22-alpha",
"@types/node": "^4.0.22-alpha",
"@types/protractor": "^1.5.11-alpha",
"@types/selenium-webdriver": "^2.44.20-alpha",
"angular": "^1.5.0",
"angular-animate": "^1.5.0",
"angular-mocks": "^1.5.0",
@@ -100,7 +107,6 @@
"through2": "^0.6.5",
"ts-api-guardian": "0.0.2",
"ts2dart": "^0.9.10",
"tsd": "^0.6.5-beta",
"tsickle": "^0.1.2",
"tslint": "^3.7.0-dev.2",
"typescript": "^1.9.0-dev.20160409",
scripts/ci-lite/install.sh
-10
View File
@@ -55,16 +55,6 @@ fi
echo 'travis_fold:end:install.browserstack'
# Install external typings via tsd
echo 'travis_fold:start:install.typings'
if [[ ${TRAVIS} ]]; then
echo ${TSDRC} > ~/.tsdrc
fi
$(npm bin)/tsd reinstall --overwrite --clean --config ./tsd.json
echo 'travis_fold:end:install.typings'
# node tools/chromedriverpatch.js
$(npm bin)/webdriver-manager update
scripts/publish/publish-build-artifacts.sh
+1 -2
View File
@@ -26,8 +26,7 @@ function publishRepo {
# copy over build artifacts into the repo directory
rm -rf $REPO_DIR/*
cp -R $ARTIFACTS_DIR/* $REPO_DIR/
grep -v /typings/ .gitignore > $REPO_DIR/.gitignore
# Replace $$ANGULAR_VESION$$ with the build version.
BUILD_VER="2.0.0-${SHORT_SHA}"
if [[ ${TRAVIS} ]]; then
tools/cjs-jasmine/tsconfig-output_emitter_codegen.json
+1 -1
View File
@@ -19,7 +19,7 @@
"target": "es5"
},
"files": [
"../../typings/node/node.d.ts",
"../../node_modules/@types/node/index.d.ts",
"../../dist/all/@angular/compiler/test/output/output_emitter_codegen_typed.ts",
"../../dist/all/@angular/compiler/test/output/output_emitter_codegen_untyped.ts",
"../../dist/all/@angular/compiler/test/offline_compiler_codegen_untyped.ts",
tools/types.d.ts
Vendored
+2 -3
View File
@@ -1,5 +1,4 @@
// This file contains all ambient imports needed to compile the tools source code
/// <reference path="../typings/jasmine/jasmine.d.ts" />
/// <reference path="../typings/node/node.d.ts" />
/// <reference path="../typings/fs-extra/fs-extra.d.ts" />
/// <reference path="../node_modules/@types/jasmine/index.d.ts" />
/// <reference path="../node_modules/@types/node/index.d.ts" />
tsd.json
-30
View File
@@ -1,30 +0,0 @@
{
"version": "v4",
"repo": "DefinitelyTyped/DefinitelyTyped",
"ref": "master",
"path": "typings",
"bundle": "typings/tsd.d.ts",
"installed": {
"fs-extra/fs-extra.d.ts": {
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"node/node.d.ts": {
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"jasmine/jasmine.d.ts": {
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"hammerjs/hammerjs.d.ts": {
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"selenium-webdriver/selenium-webdriver.d.ts": {
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"angular-protractor/angular-protractor.d.ts": {
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
},
"angularjs/angular.d.ts": {
"commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3"
}
}
}