feat(tree): move tree from cdk-experimental, material-experimental to cdk, lib (#9872)

Author: tinayuangao

.github/CODEOWNERS

@@ -33,6 +33,7 @@
 /src/lib/toolbar/**                                @devversion
 /src/lib/tooltip/**                                @andrewseguin
 /src/lib/badge/**                                  @amcdnl
+/src/lib/tree/**                                   @tinayuangao
 
 # Angular Material core
 /src/lib/core/*                                    @jelbourn
@@ -71,18 +72,17 @@
 /src/cdk/stepper/**                                @mmalerba
 /src/cdk/table/**                                  @andrewseguin
 /src/cdk/testing/**                                @devversion
+/src/cdk/tree/**                                   @tinayuangao
 
 # Moment adapter package
 /src/material-moment-adapter/**                    @mmalerba
 
 # Material experimental package
 /src/material-experimental/**                      @jelbourn
-/src/material-experimental/tree/**                 @tinayuangao
 
 # CDK experimental package
 /src/cdk-experimental/**                           @jelbourn
 /src/cdk-experimental/dialog/**                    @jelbourn @josephperrott @crisbeto
-/src/cdk-experimental/tree/**                      @tinayuangao
 
 # Docs examples & guides
 /guides/**                                         @amcdnl @jelbourn
@@ -131,6 +131,7 @@
 /src/demo-app/tabs/**                              @andrewseguin
 /src/demo-app/toolbar/**                           @devversion
 /src/demo-app/tooltip/**                           @andrewseguin
+/src/demo-app/tree/**                              @tinayuangao
 /src/demo-app/typography/**                        @crisbeto
 /src/demo-app/badge/**                             @amcdnl
 

src/cdk-experimental/tree/control/base-tree-control.ts renamed to src/cdk/tree/control/base-tree-control.ts

@@ -8,7 +8,7 @@
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
     "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk-experimental/tree",
+    "flatModuleId": "@angular/cdk/tree",
     "skipTemplateCodegen": true
   }
 }

src/cdk-experimental/tree/control/flat-tree-control.spec.ts renamed to src/cdk/tree/control/flat-tree-control.spec.ts

@@ -14,6 +14,7 @@ import {OverlayModule} from '@angular/cdk/overlay';
 import {PlatformModule} from '@angular/cdk/platform';
 import {PortalModule} from '@angular/cdk/portal';
 import {CdkTableModule} from '@angular/cdk/table';
+import {CdkTreeModule} from '@angular/cdk/tree';
 import {NgModule} from '@angular/core';
 import {
   MatAutocompleteModule,
@@ -51,10 +52,8 @@ import {
   MatTabsModule,
   MatToolbarModule,
   MatTooltipModule,
-  MatStepperModule,
+  MatTreeModule
 } from '@angular/material';
-import {CdkTreeModule} from '@angular/cdk-experimental/tree';
-import {MatTreeModule} from '@angular/material-experimental/tree';
 
 /**
  * NgModule that includes all Material modules that are required to serve the demo-app.

src/cdk-experimental/tree/control/flat-tree-control.ts renamed to src/cdk/tree/control/flat-tree-control.ts

@@ -57,8 +57,7 @@ System.config({
     '@angular/cdk/scrolling': 'dist/packages/cdk/scrolling/index.js',
     '@angular/cdk/stepper': 'dist/packages/cdk/stepper/index.js',
     '@angular/cdk/table': 'dist/packages/cdk/table/index.js',
-
-    '@angular/cdk-experimental/tree': 'dist/packages/cdk-experimental/tree/index.js',
+    '@angular/cdk/tree': 'dist/packages/cdk/tree/index.js',
 
     '@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
     '@angular/material/bottom-sheet': 'dist/packages/material/bottom-sheet/index.js',
@@ -93,13 +92,8 @@ System.config({
     '@angular/material/tabs': 'dist/packages/material/tabs/index.js',
     '@angular/material/toolbar': 'dist/packages/material/toolbar/index.js',
     '@angular/material/tooltip': 'dist/packages/material/tooltip/index.js',
-<<<<<<< HEAD
     '@angular/material/badge': 'dist/packages/material/badge/index.js',
     '@angular/material/tree': 'dist/packages/material/tree/index.js',
-=======
-
-    '@angular/material-experimental/tree': 'dist/packages/material-experimental/tree/index.js',
->>>>>>> feat(tree): move tree to experimental (#9324)
   },
   packages: {
     // Thirdparty barrels.

src/cdk-experimental/tree/control/nested-tree-control.spec.ts renamed to src/cdk/tree/control/nested-tree-control.spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {CollectionViewer, DataSource} from '@angular/cdk/collections';
-import {FlatTreeControl, TreeControl} from '@angular/cdk-experimental/tree';
+import {FlatTreeControl, TreeControl} from '@angular/cdk/tree';
 import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
 import {map} from 'rxjs/operators/map';

src/cdk-experimental/tree/control/nested-tree-control.ts renamed to src/cdk/tree/control/nested-tree-control.ts

@@ -7,8 +7,8 @@
  */
 
 import {Component} from '@angular/core';
-import {FlatTreeControl, NestedTreeControl} from '@angular/cdk-experimental/tree';
-import {MatTreeFlattener, MatTreeFlatDataSource, MatTreeNestedDataSource} from '@angular/material-experimental/tree';
+import {FlatTreeControl, NestedTreeControl} from '@angular/cdk/tree';
+import {MatTreeFlattener, MatTreeFlatDataSource, MatTreeNestedDataSource} from '@angular/material/tree';
 import {of as ofObservable} from 'rxjs/observable/of';
 
 import {JsonNode, JsonDatabase} from './json-database';

src/cdk-experimental/tree/control/tree-control.ts renamed to src/cdk/tree/control/tree-control.ts

@@ -41,3 +41,4 @@ export * from '@angular/material/table';
 export * from '@angular/material/tabs';
 export * from '@angular/material/toolbar';
 export * from '@angular/material/tooltip';
+export * from '@angular/material/tree';

src/cdk-experimental/tree/index.ts renamed to src/cdk/tree/index.ts

@@ -7,7 +7,7 @@
  */
 
 import {CollectionViewer, DataSource} from '@angular/cdk/collections';
-import {FlatTreeControl, TreeControl} from '@angular/cdk-experimental/tree';
+import {FlatTreeControl, TreeControl} from '@angular/cdk/tree';
 import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
 import {map} from 'rxjs/operators/map';

src/cdk-experimental/tree/nested-node.ts renamed to src/cdk/tree/nested-node.ts

@@ -19,7 +19,7 @@ import {
   CdkTree,
   CdkTreeNodeDef,
   CdkTreeNode,
-} from '@angular/cdk-experimental/tree';
+} from '@angular/cdk/tree';
 import {MatTreeNodeOutlet} from './outlet';
 import {mixinTabIndex, mixinDisabled, CanDisable, HasTabIndex} from '@angular/material/core';
 

src/cdk-experimental/tree/node.ts renamed to src/cdk/tree/node.ts

@@ -5,7 +5,7 @@
  * 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
  */
-import {CdkTreeNodeOutlet} from '@angular/cdk-experimental/tree';
+import {CdkTreeNodeOutlet} from '@angular/cdk/tree';
 import {
   Directive,
   ViewContainerRef,

src/cdk-experimental/tree/outlet.ts renamed to src/cdk/tree/outlet.ts

@@ -5,7 +5,7 @@
  * 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
  */
-import {CdkTreeNodePadding} from '@angular/cdk-experimental/tree';
+import {CdkTreeNodePadding} from '@angular/cdk/tree';
 import {Directive, Input} from '@angular/core';
 
 

src/cdk-experimental/tree/padding.ts renamed to src/cdk/tree/padding.ts

@@ -7,7 +7,7 @@
  */
 
 import {Directive, Input} from '@angular/core';
-import {CdkTreeNodeToggle} from '@angular/cdk-experimental/tree';
+import {CdkTreeNodeToggle} from '@angular/cdk/tree';
 
 /**
  * Wrapper for the CdkTree's toggle with Material design styles.

src/cdk-experimental/tree/public-api.ts renamed to src/cdk/tree/public-api.ts

@@ -8,7 +8,7 @@
 
 import {NgModule} from '@angular/core';
 
-import {CdkTreeModule} from '@angular/cdk-experimental/tree';
+import {CdkTreeModule} from '@angular/cdk/tree';
 import {CommonModule} from '@angular/common';
 import {MatCommonModule} from '@angular/material/core';
 import {MatNestedTreeNode, MatTreeNodeDef, MatTreeNode} from './node';

src/cdk-experimental/tree/toggle.ts renamed to src/cdk/tree/toggle.ts

@@ -5,7 +5,7 @@
  * 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
  */
-import {TreeControl, FlatTreeControl, NestedTreeControl} from '@angular/cdk-experimental/tree';
+import {TreeControl, FlatTreeControl, NestedTreeControl} from '@angular/cdk/tree';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {Component, ViewChild} from '@angular/core';
 import {

src/cdk-experimental/tree/tree-errors.ts renamed to src/cdk/tree/tree-errors.ts

@@ -7,7 +7,7 @@
  */
 
 import {ChangeDetectionStrategy, Component, ViewChild, ViewEncapsulation} from '@angular/core';
-import {CdkTree} from '@angular/cdk-experimental/tree';
+import {CdkTree} from '@angular/cdk/tree';
 import {MatTreeNodeOutlet} from './outlet';
 
 /**

src/cdk-experimental/tree/tree-module.ts renamed to src/cdk/tree/tree-module.ts

@@ -8,7 +8,7 @@
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
     "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material-experimental/tree",
+    "flatModuleId": "@angular/material/tree",
     "skipTemplateCodegen": true,
     "fullTemplateTypeCheck": true
   }

src/cdk-experimental/tree/tree.md renamed to src/cdk/tree/tree.md

@@ -69,8 +69,7 @@ System.config({
     '@angular/cdk/stepper': 'dist/packages/cdk/stepper/index.js',
     '@angular/cdk/table': 'dist/packages/cdk/table/index.js',
     '@angular/cdk/testing': 'dist/packages/cdk/testing/index.js',
-
-    '@angular/cdk-experimental/tree': 'dist/packages/cdk-experimental/tree/index.js',
+    '@angular/cdk/tree': 'dist/packages/cdk/tree/index.js',
 
     '@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
     '@angular/material/badge': 'dist/packages/material/badge/index.js',
@@ -106,8 +105,7 @@ System.config({
     '@angular/material/tabs': 'dist/packages/material/tabs/index.js',
     '@angular/material/toolbar': 'dist/packages/material/toolbar/index.js',
     '@angular/material/tooltip': 'dist/packages/material/tooltip/index.js',
-
-    '@angular/material-experimental/tree': 'dist/packages/material-experimental/tree/index.js',
+    '@angular/material/tree': 'dist/packages/material/tree/index.js',
   },
   packages: {
     // Thirdparty barrels.