Skip to content

Commit

Permalink
refactor: update paths from modules/@angular to packages
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonaden committed Mar 9, 2017
1 parent da8ea35 commit b74ab83
Show file tree
Hide file tree
Showing 53 changed files with 232 additions and 104 deletions.
30 changes: 15 additions & 15 deletions .pullapprove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ groups:
core:
conditions:
files:
- "modules/@angular/core/*"
- "packages/core/*"
users:
- tbosch #primary
- mhevery
Expand All @@ -97,7 +97,7 @@ groups:
compiler/animations:
conditions:
files:
- "modules/@angular/compiler/src/animation/*"
- "packages/compiler/src/animation/*"
users:
- matsko #primary
- tbosch
Expand All @@ -107,7 +107,7 @@ groups:
compiler/i18n:
conditions:
files:
- "modules/@angular/compiler/src/i18n/*"
- "packages/compiler/src/i18n/*"
users:
- vicb #primary
- tbosch
Expand All @@ -117,7 +117,7 @@ groups:
compiler:
conditions:
files:
- "modules/@angular/compiler/*"
- "packages/compiler/*"
users:
- tbosch #primary
- vicb
Expand All @@ -129,7 +129,7 @@ groups:
conditions:
files:
- "tools/@angular/tsc-wrapped/*"
- "modules/@angular/compiler-cli/*"
- "packages/compiler-cli/*"
users:
- alexeagle
- chuckjaz
Expand All @@ -140,7 +140,7 @@ groups:
common:
conditions:
files:
- "modules/@angular/common/*"
- "packages/common/*"
users:
- pkozlowski-opensource #primary
- vicb
Expand All @@ -150,7 +150,7 @@ groups:
forms:
conditions:
files:
- "modules/@angular/forms/*"
- "packages/forms/*"
users:
- kara #primary
# needs secondary
Expand All @@ -160,7 +160,7 @@ groups:
http:
conditions:
files:
- "modules/@angular/http/*"
- "packages/http/*"
users:
- vikerman #primary
- alxhub
Expand All @@ -170,7 +170,7 @@ groups:
language-service:
conditions:
files:
- "modules/@angular/language-service/*"
- "packages/language-service/*"
users:
- chuckjaz #primary
# needs secondary
Expand All @@ -180,7 +180,7 @@ groups:
router:
conditions:
files:
- "modules/@angular/router/*"
- "packages/router/*"
users:
- vicb #primary
# needs secondary
Expand All @@ -190,7 +190,7 @@ groups:
upgrade:
conditions:
files:
- "modules/@angular/upgrade/*"
- "packages/upgrade/*"
users:
- petebacondarwin #primary
- gkalpak
Expand All @@ -200,7 +200,7 @@ groups:
platform-browser:
conditions:
files:
- "modules/@angular/platform-browser/*"
- "packages/platform-browser/*"
users:
- tbosch #primary
- vicb #secondary
Expand All @@ -210,7 +210,7 @@ groups:
platform-server:
conditions:
files:
- "modules/@angular/platform-server/*"
- "packages/platform-server/*"
users:
- vikerman #primary
- alxhub
Expand All @@ -222,7 +222,7 @@ groups:
platform-webworker:
conditions:
files:
- "modules/@angular/platform-webworker/*"
- "packages/platform-webworker/*"
users:
- vicb #primary
- tbosch #secondary
Expand All @@ -234,7 +234,7 @@ groups:
benchpress:
conditions:
files:
- "modules/@angular/benchpress/*"
- "packages/benchpress/*"
users:
- tbosch #primary
# needs secondary
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2020,7 +2020,7 @@ prefix using `animate-` must now be preixed using `bind-animate-`.

### ROUTER CHANGE LOG

[You can find the router changelog here.](https://github.com/angular/angular/blob/master/modules/@angular/router/CHANGELOG.md)
[You can find the router changelog here.](https://github.com/angular/angular/blob/master/packages/router/CHANGELOG.md)

<a name="2.0.0-rc.4"></a>
# [2.0.0-rc.4](https://github.com/angular/angular/compare/2.0.0-rc.3...2.0.0-rc.4) (2016-06-30)
Expand Down
18 changes: 9 additions & 9 deletions aio/content/examples/testing/ts/app-specs.plnkr.no-link.html
Original file line number Diff line number Diff line change
Expand Up @@ -416,14 +416,14 @@
<router-outlet></router-outlet>
<!--
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Use of this source code is governed by an MIT-style license that
can be found in the LICENSE file at http://angular.io/license
-->"><input type="hidden" name="files[app/banner.component.html]" value="<h1>{{title}}</h1>
<!--
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Use of this source code is governed by an MIT-style license that
can be found in the LICENSE file at http://angular.io/license
Expand All @@ -432,7 +432,7 @@
</div>
<!--
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Use of this source code is governed by an MIT-style license that
can be found in the LICENSE file at http://angular.io/license
Expand All @@ -445,7 +445,7 @@
</div>
<!--
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Use of this source code is governed by an MIT-style license that
can be found in the LICENSE file at http://angular.io/license
Expand All @@ -462,7 +462,7 @@ <h2><span>{{hero.name | titlecase}}</span> Details</h2>
</div>
<!--
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Use of this source code is governed by an MIT-style license that
can be found in the LICENSE file at http://angular.io/license
Expand All @@ -476,7 +476,7 @@ <h2><span>{{hero.name | titlecase}}</span> Details</h2>
</ul>
<!--
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Use of this source code is governed by an MIT-style license that
can be found in the LICENSE file at http://angular.io/license
Expand Down Expand Up @@ -548,7 +548,7 @@ <h2 highlight=&quot;skyblue&quot;>About</h2>
Use of this source code is governed by an MIT-style license that
can be found in the LICENSE file at http://angular.io/license
*/"><input type="hidden" name="files[app/app.component.router.spec.ts]" value="// For more examples:
// https://github.com/angular/angular/blob/master/modules/@angular/router/test/integration.spec.ts
// https://github.com/angular/angular/blob/master/packages/router/test/integration.spec.ts
import { async, ComponentFixture, fakeAsync, TestBed, tick,
} from '@angular/core/testing';
Expand Down Expand Up @@ -3296,7 +3296,7 @@ <h2>No Highlight</h2>
</html>
<!--
<!--
Copyright 2016 Google Inc. All Rights Reserved.
Use of this source code is governed by an MIT-style license that
can be found in the LICENSE file at http://angular.io/license
Expand Down Expand Up @@ -3375,4 +3375,4 @@ <h2>No Highlight</h2>
Use of this source code is governed by an MIT-style license that
can be found in the LICENSE file at http://angular.io/license
*/
"></form><script>document.getElementById("mainForm").submit();</script></body></html>
"></form><script>document.getElementById("mainForm").submit();</script></body></html>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// For more examples:
// https://github.com/angular/angular/blob/master/modules/@angular/router/test/integration.spec.ts
// https://github.com/angular/angular/blob/master/packages/router/test/integration.spec.ts

import { async, ComponentFixture, fakeAsync, TestBed, tick,
} from '@angular/core/testing';
Expand Down
2 changes: 1 addition & 1 deletion integration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ See the `package.json` of the test(s) you're debugging, to see which dist/ folde
Then run the right `tsc --watch` command to keep those dist folders up-to-date, for example:

```
$ ./node_modules/.bin/tsc -p modules/@angular/core/tsconfig-build.json --watch
$ ./node_modules/.bin/tsc -p packages/core/tsconfig-build.json --watch
```

Now you can run the integration test, it will re-install from the dist/ folder on each run.
Expand Down
8 changes: 2 additions & 6 deletions karma-js.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,9 @@ module.exports = function(config) {
'tools/build/file2modulename.js',
'test-main.js',
{pattern: 'dist/all/empty.*', included: false, watched: false},
{pattern: 'packages/platform-browser/test/static_assets/**', included: false, watched: false},
{
pattern: 'modules/@angular/platform-browser/test/static_assets/**',
included: false,
watched: false
},
{
pattern: 'modules/@angular/platform-browser/test/browser/static_assets/**',
pattern: 'packages/platform-browser/test/browser/static_assets/**',
included: false,
watched: false,
}
Expand Down
12 changes: 12 additions & 0 deletions modules/empty.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

// This file intentionally left blank. It is used to load nothing in some cases.
// Such as parse5/index is redirected here instead of loading into browser.

export let __empty__: any;
65 changes: 65 additions & 0 deletions modules/es6-subset.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@

/**
* Subset of lib.es2015.core.d.ts typings.
* Angular should not require use of ES6 runtime but some API usages are already present.
* See https://github.com/angular/angular/issues/5242
* TODO(alexeagle): remove methods below which may not be present in targeted browser
*/

interface String {
/**
* Returns true if the sequence of elements of searchString converted to a String is the
* same as the corresponding elements of this object (converted to a String) starting at
* position. Otherwise returns false.
*/
startsWith(searchString: string, position?: number): boolean;

/**
* Returns true if the sequence of elements of searchString converted to a String is the
* same as the corresponding elements of this object (converted to a String) starting at
* endPosition – length(this). Otherwise returns false.
*/
endsWith(searchString: string, endPosition?: number): boolean;
}

interface Array<T> {
/**
* Returns the value of the first element in the array where predicate is true, and undefined
* otherwise.
* @param predicate find calls predicate once for each element of the array, in ascending
* order, until it finds one where predicate returns true. If such an element is found, find
* immediately returns that element value. Otherwise, find returns undefined.
* @param thisArg If provided, it will be used as the this value for each invocation of
* predicate. If it is not provided, undefined is used instead.
*/
find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
/**
* Returns the this object after filling the section identified by start and end with value
* @param value value to fill array section with
* @param start index to start filling the array at. If start is negative, it is treated as
* length+start where length is the length of the array.
* @param end index to stop filling the array at. If end is negative, it is treated as
* length+end.
*/
fill(value: T, start?: number, end?: number): T[];
}

interface NumberConstructor {
/**
* Returns true if the value passed is an integer, false otherwise.
* @param number A numeric value.
*/
isInteger(number: number): boolean;
}

// Workaround https://github.com/Microsoft/TypeScript/issues/9193
interface PromiseConstructor {
all<T>(values: (T|PromiseLike<T>)[]): Promise<T[]>;
}

interface Function {
/**
* Returns the name of the function. Function names are read-only and can not be changed.
*/
readonly name: string;
}
4 changes: 4 additions & 0 deletions modules/system.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/**
* Dummy typings for systemjs.
*/
declare var System: any;
36 changes: 36 additions & 0 deletions modules/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"compilerOptions": {
"baseUrl": ".",
"declaration": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"module": "commonjs",
"moduleResolution": "node",
"outDir": "../dist/all/",
"noImplicitAny": true,
"noFallthroughCasesInSwitch": true,
"paths": {
"selenium-webdriver": ["../node_modules/@types/selenium-webdriver/index.d.ts"],
"rxjs/*": ["../node_modules/rxjs/*"],
"@angular/*": ["../dist/all/@angular/*"],
"@angular/tsc-wrapped": ["../dist/tools/@angular/tsc-wrapped"],
"@angular/tsc-wrapped/*": ["../dist/tools/@angular/tsc-wrapped/*"]
},
"rootDir": ".",
"inlineSourceMap": true,
"lib": ["es5", "dom", "es2015.promise", "es2015.collection", "es2015.iterable"],
"skipDefaultLibCheck": true,
"skipLibCheck": true,
"target": "es5",
"types": ["angularjs"]
},
"exclude": [
"angular1_router",
"benchmarks/e2e_test/old",
"benchmarks/src/old",
"benchmarks/src/**/index_aot.ts",
"benchmarks_external",
"payload_tests",
"rollup-test"
]
}
17 changes: 17 additions & 0 deletions modules/types.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

// This file contains all ambient imports needed to compile the modules/ source code

/// <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/selenium-webdriver/index.d.ts" />
/// <reference path="./es6-subset.d.ts" />
/// <reference path="./system.d.ts" />
2 changes: 1 addition & 1 deletion packages/benchpress/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
"bugs": {
"url": "https://github.com/angular/angular/issues"
},
"homepage": "https://github.com/angular/angular/tree/master/modules/@angular/compiler-cli"
"homepage": "https://github.com/angular/angular/tree/master/packages/compiler-cli"
}
Loading

0 comments on commit b74ab83

Please sign in to comment.