Skip to content

Commit b74ab83

Browse files
committed
refactor: update paths from modules/@angular to packages
1 parent da8ea35 commit b74ab83

File tree

53 files changed

+232
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+232
-104
lines changed

.pullapprove.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ groups:
8787
core:
8888
conditions:
8989
files:
90-
- "modules/@angular/core/*"
90+
- "packages/core/*"
9191
users:
9292
- tbosch #primary
9393
- mhevery
@@ -97,7 +97,7 @@ groups:
9797
compiler/animations:
9898
conditions:
9999
files:
100-
- "modules/@angular/compiler/src/animation/*"
100+
- "packages/compiler/src/animation/*"
101101
users:
102102
- matsko #primary
103103
- tbosch
@@ -107,7 +107,7 @@ groups:
107107
compiler/i18n:
108108
conditions:
109109
files:
110-
- "modules/@angular/compiler/src/i18n/*"
110+
- "packages/compiler/src/i18n/*"
111111
users:
112112
- vicb #primary
113113
- tbosch
@@ -117,7 +117,7 @@ groups:
117117
compiler:
118118
conditions:
119119
files:
120-
- "modules/@angular/compiler/*"
120+
- "packages/compiler/*"
121121
users:
122122
- tbosch #primary
123123
- vicb
@@ -129,7 +129,7 @@ groups:
129129
conditions:
130130
files:
131131
- "tools/@angular/tsc-wrapped/*"
132-
- "modules/@angular/compiler-cli/*"
132+
- "packages/compiler-cli/*"
133133
users:
134134
- alexeagle
135135
- chuckjaz
@@ -140,7 +140,7 @@ groups:
140140
common:
141141
conditions:
142142
files:
143-
- "modules/@angular/common/*"
143+
- "packages/common/*"
144144
users:
145145
- pkozlowski-opensource #primary
146146
- vicb
@@ -150,7 +150,7 @@ groups:
150150
forms:
151151
conditions:
152152
files:
153-
- "modules/@angular/forms/*"
153+
- "packages/forms/*"
154154
users:
155155
- kara #primary
156156
# needs secondary
@@ -160,7 +160,7 @@ groups:
160160
http:
161161
conditions:
162162
files:
163-
- "modules/@angular/http/*"
163+
- "packages/http/*"
164164
users:
165165
- vikerman #primary
166166
- alxhub
@@ -170,7 +170,7 @@ groups:
170170
language-service:
171171
conditions:
172172
files:
173-
- "modules/@angular/language-service/*"
173+
- "packages/language-service/*"
174174
users:
175175
- chuckjaz #primary
176176
# needs secondary
@@ -180,7 +180,7 @@ groups:
180180
router:
181181
conditions:
182182
files:
183-
- "modules/@angular/router/*"
183+
- "packages/router/*"
184184
users:
185185
- vicb #primary
186186
# needs secondary
@@ -190,7 +190,7 @@ groups:
190190
upgrade:
191191
conditions:
192192
files:
193-
- "modules/@angular/upgrade/*"
193+
- "packages/upgrade/*"
194194
users:
195195
- petebacondarwin #primary
196196
- gkalpak
@@ -200,7 +200,7 @@ groups:
200200
platform-browser:
201201
conditions:
202202
files:
203-
- "modules/@angular/platform-browser/*"
203+
- "packages/platform-browser/*"
204204
users:
205205
- tbosch #primary
206206
- vicb #secondary
@@ -210,7 +210,7 @@ groups:
210210
platform-server:
211211
conditions:
212212
files:
213-
- "modules/@angular/platform-server/*"
213+
- "packages/platform-server/*"
214214
users:
215215
- vikerman #primary
216216
- alxhub
@@ -222,7 +222,7 @@ groups:
222222
platform-webworker:
223223
conditions:
224224
files:
225-
- "modules/@angular/platform-webworker/*"
225+
- "packages/platform-webworker/*"
226226
users:
227227
- vicb #primary
228228
- tbosch #secondary
@@ -234,7 +234,7 @@ groups:
234234
benchpress:
235235
conditions:
236236
files:
237-
- "modules/@angular/benchpress/*"
237+
- "packages/benchpress/*"
238238
users:
239239
- tbosch #primary
240240
# needs secondary

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2020,7 +2020,7 @@ prefix using `animate-` must now be preixed using `bind-animate-`.
20202020

20212021
### ROUTER CHANGE LOG
20222022

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

20252025
<a name="2.0.0-rc.4"></a>
20262026
# [2.0.0-rc.4](https://github.com/angular/angular/compare/2.0.0-rc.3...2.0.0-rc.4) (2016-06-30)

aio/content/examples/testing/ts/app-specs.plnkr.no-link.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -416,14 +416,14 @@
416416
<router-outlet></router-outlet>
417417
418418
419-
<!--
419+
<!--
420420
Copyright 2016 Google Inc. All Rights Reserved.
421421
Use of this source code is governed by an MIT-style license that
422422
can be found in the LICENSE file at http://angular.io/license
423423
-->"><input type="hidden" name="files[app/banner.component.html]" value="<h1>{{title}}</h1>
424424
425425
426-
<!--
426+
<!--
427427
Copyright 2016 Google Inc. All Rights Reserved.
428428
Use of this source code is governed by an MIT-style license that
429429
can be found in the LICENSE file at http://angular.io/license
@@ -432,7 +432,7 @@
432432
</div>
433433
434434
435-
<!--
435+
<!--
436436
Copyright 2016 Google Inc. All Rights Reserved.
437437
Use of this source code is governed by an MIT-style license that
438438
can be found in the LICENSE file at http://angular.io/license
@@ -445,7 +445,7 @@
445445
</div>
446446
447447
448-
<!--
448+
<!--
449449
Copyright 2016 Google Inc. All Rights Reserved.
450450
Use of this source code is governed by an MIT-style license that
451451
can be found in the LICENSE file at http://angular.io/license
@@ -462,7 +462,7 @@ <h2><span>{{hero.name | titlecase}}</span> Details</h2>
462462
</div>
463463
464464
465-
<!--
465+
<!--
466466
Copyright 2016 Google Inc. All Rights Reserved.
467467
Use of this source code is governed by an MIT-style license that
468468
can be found in the LICENSE file at http://angular.io/license
@@ -476,7 +476,7 @@ <h2><span>{{hero.name | titlecase}}</span> Details</h2>
476476
</ul>
477477
478478
479-
<!--
479+
<!--
480480
Copyright 2016 Google Inc. All Rights Reserved.
481481
Use of this source code is governed by an MIT-style license that
482482
can be found in the LICENSE file at http://angular.io/license
@@ -548,7 +548,7 @@ <h2 highlight=&quot;skyblue&quot;>About</h2>
548548
Use of this source code is governed by an MIT-style license that
549549
can be found in the LICENSE file at http://angular.io/license
550550
*/"><input type="hidden" name="files[app/app.component.router.spec.ts]" value="// For more examples:
551-
// https://github.com/angular/angular/blob/master/modules/@angular/router/test/integration.spec.ts
551+
// https://github.com/angular/angular/blob/master/packages/router/test/integration.spec.ts
552552
553553
import { async, ComponentFixture, fakeAsync, TestBed, tick,
554554
} from '@angular/core/testing';
@@ -3296,7 +3296,7 @@ <h2>No Highlight</h2>
32963296
</html>
32973297
32983298
3299-
<!--
3299+
<!--
33003300
Copyright 2016 Google Inc. All Rights Reserved.
33013301
Use of this source code is governed by an MIT-style license that
33023302
can be found in the LICENSE file at http://angular.io/license
@@ -3375,4 +3375,4 @@ <h2>No Highlight</h2>
33753375
Use of this source code is governed by an MIT-style license that
33763376
can be found in the LICENSE file at http://angular.io/license
33773377
*/
3378-
"></form><script>document.getElementById("mainForm").submit();</script></body></html>
3378+
"></form><script>document.getElementById("mainForm").submit();</script></body></html>

aio/content/examples/testing/ts/src/app/app.component.router.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// For more examples:
2-
// https://github.com/angular/angular/blob/master/modules/@angular/router/test/integration.spec.ts
2+
// https://github.com/angular/angular/blob/master/packages/router/test/integration.spec.ts
33

44
import { async, ComponentFixture, fakeAsync, TestBed, tick,
55
} from '@angular/core/testing';

integration/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ See the `package.json` of the test(s) you're debugging, to see which dist/ folde
4343
Then run the right `tsc --watch` command to keep those dist folders up-to-date, for example:
4444

4545
```
46-
$ ./node_modules/.bin/tsc -p modules/@angular/core/tsconfig-build.json --watch
46+
$ ./node_modules/.bin/tsc -p packages/core/tsconfig-build.json --watch
4747
```
4848

4949
Now you can run the integration test, it will re-install from the dist/ folder on each run.

karma-js.conf.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,9 @@ module.exports = function(config) {
4242
'tools/build/file2modulename.js',
4343
'test-main.js',
4444
{pattern: 'dist/all/empty.*', included: false, watched: false},
45+
{pattern: 'packages/platform-browser/test/static_assets/**', included: false, watched: false},
4546
{
46-
pattern: 'modules/@angular/platform-browser/test/static_assets/**',
47-
included: false,
48-
watched: false
49-
},
50-
{
51-
pattern: 'modules/@angular/platform-browser/test/browser/static_assets/**',
47+
pattern: 'packages/platform-browser/test/browser/static_assets/**',
5248
included: false,
5349
watched: false,
5450
}

modules/empty.ts

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/**
2+
* @license
3+
* Copyright Google Inc. All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
// This file intentionally left blank. It is used to load nothing in some cases.
10+
// Such as parse5/index is redirected here instead of loading into browser.
11+
12+
export let __empty__: any;

modules/es6-subset.d.ts

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
2+
/**
3+
* Subset of lib.es2015.core.d.ts typings.
4+
* Angular should not require use of ES6 runtime but some API usages are already present.
5+
* See https://github.com/angular/angular/issues/5242
6+
* TODO(alexeagle): remove methods below which may not be present in targeted browser
7+
*/
8+
9+
interface String {
10+
/**
11+
* Returns true if the sequence of elements of searchString converted to a String is the
12+
* same as the corresponding elements of this object (converted to a String) starting at
13+
* position. Otherwise returns false.
14+
*/
15+
startsWith(searchString: string, position?: number): boolean;
16+
17+
/**
18+
* Returns true if the sequence of elements of searchString converted to a String is the
19+
* same as the corresponding elements of this object (converted to a String) starting at
20+
* endPosition – length(this). Otherwise returns false.
21+
*/
22+
endsWith(searchString: string, endPosition?: number): boolean;
23+
}
24+
25+
interface Array<T> {
26+
/**
27+
* Returns the value of the first element in the array where predicate is true, and undefined
28+
* otherwise.
29+
* @param predicate find calls predicate once for each element of the array, in ascending
30+
* order, until it finds one where predicate returns true. If such an element is found, find
31+
* immediately returns that element value. Otherwise, find returns undefined.
32+
* @param thisArg If provided, it will be used as the this value for each invocation of
33+
* predicate. If it is not provided, undefined is used instead.
34+
*/
35+
find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
36+
/**
37+
* Returns the this object after filling the section identified by start and end with value
38+
* @param value value to fill array section with
39+
* @param start index to start filling the array at. If start is negative, it is treated as
40+
* length+start where length is the length of the array.
41+
* @param end index to stop filling the array at. If end is negative, it is treated as
42+
* length+end.
43+
*/
44+
fill(value: T, start?: number, end?: number): T[];
45+
}
46+
47+
interface NumberConstructor {
48+
/**
49+
* Returns true if the value passed is an integer, false otherwise.
50+
* @param number A numeric value.
51+
*/
52+
isInteger(number: number): boolean;
53+
}
54+
55+
// Workaround https://github.com/Microsoft/TypeScript/issues/9193
56+
interface PromiseConstructor {
57+
all<T>(values: (T|PromiseLike<T>)[]): Promise<T[]>;
58+
}
59+
60+
interface Function {
61+
/**
62+
* Returns the name of the function. Function names are read-only and can not be changed.
63+
*/
64+
readonly name: string;
65+
}

modules/system.d.ts

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/**
2+
* Dummy typings for systemjs.
3+
*/
4+
declare var System: any;

modules/tsconfig.json

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"compilerOptions": {
3+
"baseUrl": ".",
4+
"declaration": true,
5+
"experimentalDecorators": true,
6+
"emitDecoratorMetadata": true,
7+
"module": "commonjs",
8+
"moduleResolution": "node",
9+
"outDir": "../dist/all/",
10+
"noImplicitAny": true,
11+
"noFallthroughCasesInSwitch": true,
12+
"paths": {
13+
"selenium-webdriver": ["../node_modules/@types/selenium-webdriver/index.d.ts"],
14+
"rxjs/*": ["../node_modules/rxjs/*"],
15+
"@angular/*": ["../dist/all/@angular/*"],
16+
"@angular/tsc-wrapped": ["../dist/tools/@angular/tsc-wrapped"],
17+
"@angular/tsc-wrapped/*": ["../dist/tools/@angular/tsc-wrapped/*"]
18+
},
19+
"rootDir": ".",
20+
"inlineSourceMap": true,
21+
"lib": ["es5", "dom", "es2015.promise", "es2015.collection", "es2015.iterable"],
22+
"skipDefaultLibCheck": true,
23+
"skipLibCheck": true,
24+
"target": "es5",
25+
"types": ["angularjs"]
26+
},
27+
"exclude": [
28+
"angular1_router",
29+
"benchmarks/e2e_test/old",
30+
"benchmarks/src/old",
31+
"benchmarks/src/**/index_aot.ts",
32+
"benchmarks_external",
33+
"payload_tests",
34+
"rollup-test"
35+
]
36+
}

modules/types.d.ts

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/**
2+
* @license
3+
* Copyright Google Inc. All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
// This file contains all ambient imports needed to compile the modules/ source code
10+
11+
/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />
12+
/// <reference path="../node_modules/@types/hammerjs/index.d.ts" />
13+
/// <reference path="../node_modules/@types/jasmine/index.d.ts" />
14+
/// <reference path="../node_modules/@types/node/index.d.ts" />
15+
/// <reference path="../node_modules/@types/selenium-webdriver/index.d.ts" />
16+
/// <reference path="./es6-subset.d.ts" />
17+
/// <reference path="./system.d.ts" />

packages/benchpress/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
"bugs": {
2828
"url": "https://github.com/angular/angular/issues"
2929
},
30-
"homepage": "https://github.com/angular/angular/tree/master/modules/@angular/compiler-cli"
30+
"homepage": "https://github.com/angular/angular/tree/master/packages/compiler-cli"
3131
}

0 commit comments

Comments
 (0)