diff --git a/modules/@angular/router/.clang-format b/modules/@angular/router/.clang-format deleted file mode 100644 index 20d8c48f22..0000000000 --- a/modules/@angular/router/.clang-format +++ /dev/null @@ -1,3 +0,0 @@ -Language: JavaScript -BasedOnStyle: Google -ColumnLimit: 100 \ No newline at end of file diff --git a/modules/@angular/router/package.json b/modules/@angular/router/package.json index fd67e0f3c8..a5e20261a2 100644 --- a/modules/@angular/router/package.json +++ b/modules/@angular/router/package.json @@ -14,8 +14,6 @@ "devsetup": "typings install", "rewrite_npm_package": "node --harmony_destructuring tools/rewrite-published-package.js", "build_bundle": "cp -r src router && tsc typings/index.d.ts src/router.ts --rootDir . --module system -t es5 --outFile dist/bundles/router.js --moduleResolution node --emitDecoratorMetadata --experimentalDecorators", - "lint": "tslint \"src/**/*.ts\"", - "format": "clang-format -style=file -i --glob=src/**/*.ts" }, "keywords": [ "angular2", @@ -24,14 +22,14 @@ ], "repository": { "type": "git", - "url": "git+https://github.com/angular/vladivostok.git" + "url": "git+https://github.com/angular/angular.git" }, "author": "vsavkin", "license": "MIT", "bugs": { - "url": "https://github.com/angular/vladivostok/issues" + "url": "https://github.com/angular/angular/issues" }, - "homepage": "https://github.com/angular/vladivostok#readme", + "homepage": "https://github.com/angular/angular#readme", "dependencies": { "@angular/common": "^2.0.0-rc.2", "@angular/compiler": "^2.0.0-rc.2", diff --git a/modules/@angular/router/src/router_state.ts b/modules/@angular/router/src/router_state.ts index 1425eea546..b27a32f593 100644 --- a/modules/@angular/router/src/router_state.ts +++ b/modules/@angular/router/src/router_state.ts @@ -120,6 +120,7 @@ export class ActivatedRouteSnapshot { /** @internal **/ _urlSegment: UrlSegment; + /** @internal */ _lastPathIndex: number; /** diff --git a/modules/@angular/router/tslint.json b/modules/@angular/router/tslint.json deleted file mode 100644 index 192a338dcd..0000000000 --- a/modules/@angular/router/tslint.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "rulesDirectory": ["node_modules/codelyzer"], - "rules": { - "no-inferrable-types": true, - "class-name": true, - "comment-format": [ - true, - "check-space" - ], - "indent": [ - true, - "spaces" - ], - "no-duplicate-variable": true, - "no-eval": true, - "no-arg": true, - "no-internal-module": true, - "no-trailing-whitespace": true, - "no-bitwise": true, - "no-shadowed-variable": false, - "no-unused-expression": true, - "no-unused-variable": true, - "one-line": [ - true, - "check-catch", - "check-else", - "check-open-brace", - "check-whitespace" - ], - "semicolon": [true, "always"], - "typedef-whitespace": [ - true, - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - } - ], - "curly": false, - "variable-name": [ - true, - "ban-keywords", - "check-format", - "allow-leading-underscore" - ], - "whitespace": [ - true, - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type" - ], - "component-selector-name": [true, "kebab-case"], - "component-selector-type": [true, "element"], - "input-property-directive": true, - "output-property-directive": true - } -} \ No newline at end of file