Skip to content

Commit 0f06a5b

Browse files
mheverymhevery
committed
chore(ngUpgrade): Move into Angular2
This is moving ngUpgrade into the main repository per #4838. The ngUpgrade is published from the main import consistent with https://docs.google.com/document/d/1rbVTKTYLz6p2smQNYI8h4-QN-m2PS6F3iQIDmSzn0Ww/edit#heading=h.6cxvr9awtf5r
1 parent 28db864 commit 0f06a5b

18 files changed

Lines changed: 33 additions & 28 deletions

File tree

‎modules/angular2/angular2.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ export * from './core';
22
export * from './profile';
33
export * from './lifecycle_hooks';
44
export * from './bootstrap';
5+
export * from './upgrade';

modules/upgrade/src/angular.d.ts renamed to modules/angular2/src/upgrade/angular.d.ts

File renamed without changes.

modules/upgrade/src/constants.ts renamed to modules/angular2/src/upgrade/constants.ts

File renamed without changes.

modules/upgrade/src/downgrade_ng2_adapter.ts renamed to modules/angular2/src/upgrade/downgrade_ng2_adapter.ts

File renamed without changes.

modules/upgrade/src/metadata.ts renamed to modules/angular2/src/upgrade/metadata.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Type, ComponentMetadata, DirectiveResolver, DirectiveMetadata} from 'angular2/angular2';
2-
import {stringify} from 'upgrade/src/util';
2+
import {stringify} from './util';
33

44
var COMPONENT_SELECTOR = /^[\w|-]*$/;
55
var SKEWER_CASE = /-(\w)/g;

modules/upgrade/src/upgrade_adapter.ts renamed to modules/angular2/src/upgrade/upgrade_adapter.ts

File renamed without changes.

modules/upgrade/src/upgrade_ng1_adapter.ts renamed to modules/angular2/src/upgrade/upgrade_ng1_adapter.ts

File renamed without changes.

modules/upgrade/src/util.ts renamed to modules/angular2/src/upgrade/util.ts

File renamed without changes.

‎modules/angular2/test/public_api_spec.ts‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {SymbolsDiff} from './symbol_inspector/symbol_differ';
2525
// =================================================================================================
2626
// =================================================================================================
2727

28-
var NG_API = [
28+
var NG_ALL = [
2929
'APP_COMPONENT',
3030
'APP_ID',
3131
'AbstractProviderError',
@@ -1243,6 +1243,22 @@ var NG_API = [
12431243
'Stream.where():dart',
12441244
];
12451245

1246+
var NG_UPGRADE = [
1247+
'UpgradeAdapter:js',
1248+
'UpgradeAdapter.addProvider():js',
1249+
'UpgradeAdapter.bootstrap():js',
1250+
'UpgradeAdapter.compileNg2Components():js',
1251+
'UpgradeAdapter.downgradeNg2Component():js',
1252+
'UpgradeAdapter.downgradeNg2Provider():js',
1253+
'UpgradeAdapter.upgradeNg1Component():js',
1254+
'UpgradeAdapter.upgradeNg1Provider():js',
1255+
'UpgradeAdapterRef:js',
1256+
'UpgradeAdapterRef.dispose():js',
1257+
'UpgradeAdapterRef.ready():js'
1258+
];
1259+
1260+
var NG_API = [].concat(NG_ALL).concat(NG_UPGRADE);
1261+
12461262
export function main() {
12471263
/**
12481264
var x = getSymbolsFromLibrary('ng');

modules/upgrade/test/metadata_spec.ts renamed to modules/angular2/test/upgrade/metadata_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
} from 'angular2/testing_internal';
1313

1414
import {Component, View} from 'angular2/angular2';
15-
import {getComponentInfo, parseFields} from 'upgrade/src/metadata';
15+
import {getComponentInfo, parseFields} from 'angular2/src/upgrade/metadata';
1616

1717
export function main() {
1818
describe('upgrade metadata', () => {

0 commit comments

Comments
 (0)