chore(): remove CovalentCoreModule since its been deprecated in beta.3 (

#539) * chore(docs): remove CovalentCoreModule mention in docs since its deprecated * feat(docs): remove CovalentCoreModule and only import needed modules on every feature module in docs * fix(dynamic-forms): remove CovalentCoreModule from unit tests * chore(): add material prebuilt theme in karma.conf.js this is needed to remove the warning for the material theme (need to add the covalent theme later on)
Teradata · May 5, 2017 · feb7cf7 · feb7cf7
1 parent cdf6cad
commit feb7cf7
Show file tree

Hide file tree

Showing 32 changed files with 179 additions and 95 deletions.
diff --git a/docs/GETTING_STARTED.md b/docs/GETTING_STARTED.md
@@ -36,7 +36,7 @@ npm install --save https://github.com/Teradata/covalent-nightly.git
 
 **src/app/app.module.ts**
 ```ts
-import { CovalentCoreModule } from '@covalent/core';
+import { CovalentLayoutModule, CovalentStepsModule /*, any other modules */ } from '@covalent/core';
 // (optional) Additional Covalent Modules imports
 import { CovalentHttpModule } from '@covalent/http';
 import { CovalentHighlightModule } from '@covalent/highlight';
@@ -45,7 +45,8 @@ import { CovalentDynamicFormsModule } from '@covalent/dynamic-forms';
 // other imports 
 @NgModule({
   imports: [
-    CovalentCoreModule,
+    CovalentLayoutModule,
+    CovalentStepsModule,
     // (optional) Additional Covalent Modules imports
     CovalentHttpModule.forRoot(),
     CovalentHighlightModule,

diff --git a/karma.conf.js b/karma.conf.js
@@ -24,7 +24,9 @@ module.exports = function (config) {
       }
     },
     files: [
-      { pattern: './src/test.ts', watched: false }
+      {pattern: './src/test.ts', watched: false},
+      // Include a Material theme in the test suite.
+      {pattern: 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css', included: true, watched: true},
     ],
     preprocessors: {
       './src/test.ts': ['@angular/cli']

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -14,7 +14,9 @@ import { LayoutsModule } from './components/layouts/';
 import { StyleGuideModule } from './components/style-guide/';
 import { appRoutes, appRoutingProviders } from './app.routes';
 
-import { CovalentCoreModule } from '../platform/core';
+import { MdButtonModule, MdListModule, MdIconModule, MdCardModule, MdCoreModule, MdMenuModule } from '@angular/material';
+
+import { CovalentLayoutModule, CovalentExpansionPanelModule, CovalentNotificationsModule, CovalentMenuModule } from '../platform/core';
 import { CovalentHighlightModule } from '../platform/highlight';
 import { CovalentHttpModule } from '../platform/http';
 import { CovalentMarkdownModule } from '../platform/markdown';
@@ -35,7 +37,18 @@ import { getSelectedLanguage, createTranslateLoader } from './utilities/translat
     BrowserModule,
     HttpModule,
     JsonpModule,
-    CovalentCoreModule,
+    /** Material Modules */
+    MdCoreModule,
+    MdButtonModule,
+    MdListModule,
+    MdIconModule,
+    MdCardModule,
+    MdMenuModule,
+    /** Covalent Modules */
+    CovalentLayoutModule,
+    CovalentExpansionPanelModule,
+    CovalentNotificationsModule,
+    CovalentMenuModule,
     CovalentHttpModule.forRoot(),
     CovalentHighlightModule,
     CovalentMarkdownModule,

diff --git a/src/app/components/components/chips/chips.component.html b/src/app/components/components/chips/chips.component.html
@@ -195,7 +195,7 @@ <h3>Setup:</h3>
         import { CovalentChipsModule } from '@covalent/core';
         @NgModule({
           imports: [
-            CovalentChipsModule, // or CovalentCoreModule (included inside of it)
+            CovalentChipsModule,
             ...
           ],
           ...

diff --git a/src/app/components/components/components.module.ts b/src/app/components/components/components.module.ts
@@ -1,4 +1,8 @@
 import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
 
 import { componentsRoutes } from './components.routes';
 
@@ -31,7 +35,15 @@ import { NgxTranslateDemoComponent } from './ngx-translate/ngx-translate.compone
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { CovalentCoreModule } from '../../../platform/core';
+import { MdButtonModule, MdListModule, MdIconModule, MdCardModule, MdMenuModule, MdInputModule, MdButtonToggleModule,
+         MdProgressSpinnerModule, MdSelectModule, MdSlideToggleModule, MdDialogModule, MdSnackBarModule, MdToolbarModule,
+         MdTabsModule, MdSidenavModule, MdTooltipModule, MdCheckboxModule, MdRadioModule, MdCoreModule, MdAutocompleteModule,
+         MdProgressBarModule, MdSliderModule, MdChipsModule, MdGridListModule, MdRippleModule } from '@angular/material';
+
+import { CovalentCommonModule, CovalentLayoutModule, CovalentMediaModule, CovalentExpansionPanelModule, CovalentFileModule,
+         CovalentStepsModule, CovalentLoadingModule, CovalentDialogsModule, CovalentSearchModule, CovalentPagingModule,
+         CovalentNotificationsModule, CovalentMenuModule, CovalentChipsModule, CovalentDataTableModule, CovalentJsonFormatterModule,
+         } from '../../../platform/core';
 import { CovalentHighlightModule } from '../../../platform/highlight';
 import { CovalentMarkdownModule } from '../../../platform/markdown';
 import { CovalentDynamicFormsModule } from '../../../platform/dynamic-forms';
@@ -68,7 +80,53 @@ import { DocumentationToolsModule } from '../../documentation-tools';
     NgxTranslateDemoComponent,
   ],
   imports: [
-    CovalentCoreModule,
+    /** Angular Modules */
+    BrowserModule,
+    BrowserAnimationsModule,
+    CommonModule,
+    FormsModule,
+    /** Material Modules */
+    MdCoreModule,
+    MdButtonModule,
+    MdListModule,
+    MdIconModule,
+    MdCardModule,
+    MdMenuModule,
+    MdInputModule,
+    MdSelectModule,
+    MdButtonToggleModule,
+    MdSlideToggleModule,
+    MdProgressSpinnerModule,
+    MdDialogModule,
+    MdSnackBarModule,
+    MdToolbarModule,
+    MdTabsModule,
+    MdSidenavModule,
+    MdTooltipModule,
+    MdCheckboxModule,
+    MdRadioModule,
+    MdAutocompleteModule,
+    MdSliderModule,
+    MdProgressBarModule,
+    MdChipsModule,
+    MdGridListModule,
+    MdRippleModule,
+    /** Covalent Modules */
+    CovalentCommonModule,
+    CovalentLayoutModule,
+    CovalentMediaModule,
+    CovalentExpansionPanelModule,
+    CovalentStepsModule,
+    CovalentDialogsModule,
+    CovalentLoadingModule,
+    CovalentSearchModule,
+    CovalentPagingModule,
+    CovalentFileModule,
+    CovalentNotificationsModule,
+    CovalentMenuModule,
+    CovalentChipsModule,
+    CovalentJsonFormatterModule,
+    CovalentDataTableModule,
     CovalentHighlightModule,
     CovalentMarkdownModule,
     CovalentDynamicFormsModule,

diff --git a/src/app/components/components/data-table/data-table.component.html b/src/app/components/components/data-table/data-table.component.html
@@ -434,7 +434,7 @@ <h3>Setup:</h3>
         import { CovalentDataTableModule } from '@covalent/core';
         @NgModule({
           imports: [
-            CovalentDataTableModule, // or CovalentCoreModule (included inside of it)
+            CovalentDataTableModule,
             ...
           ],
           ...

diff --git a/src/app/components/components/dialogs/dialogs.component.html b/src/app/components/components/dialogs/dialogs.component.html
@@ -96,7 +96,7 @@ <h3>Setup:</h3>
 
         @NgModule({
           imports: [
-            CovalentDialogsModule, // or CovalentCoreModule (included inside of it)
+            CovalentDialogsModule,
             ...
           ],
           ...

diff --git a/src/app/components/components/expansion-panel/expansion-panel.component.html b/src/app/components/components/expansion-panel/expansion-panel.component.html
@@ -225,7 +225,7 @@ <h3>Setup:</h3>
         import { CovalentExpansionPanelModule } from '@covalent/core';
         @NgModule({
           imports: [
-            CovalentExpansionPanelModule, // or CovalentCoreModule (included inside of it)
+            CovalentExpansionPanelModule,
             ...
           ],
           ...

diff --git a/src/app/components/components/http/http.component.html b/src/app/components/components/http/http.component.html
@@ -85,7 +85,7 @@ <h3>Setup:</h3>
 
         @NgModule({
           imports: [
-            HttpModule, /* or CovalentCoreModule */
+            HttpModule,
             CovalentHttpModule.forRoot({
               interceptors: [{
                 interceptor: CustomInterceptor, paths: ['**'],

diff --git a/src/app/components/components/json-formatter/json-formatter.component.html b/src/app/components/components/json-formatter/json-formatter.component.html
@@ -61,7 +61,7 @@ <h3>Setup:</h3>
         import { CovalentJsonFormatterModule } from '@covalent/core';
         @NgModule({
           imports: [
-            CovalentJsonFormatterModule, // or CovalentCoreModule (included inside of it)
+            CovalentJsonFormatterModule,
             ...
           ],
           ...

diff --git a/src/app/components/components/loading/loading.component.html b/src/app/components/components/loading/loading.component.html
@@ -314,7 +314,7 @@ <h3>Setup:</h3>
 
         @NgModule({
           imports: [
-            CovalentLoadingModule, // or CovalentCoreModule (included inside of it)
+            CovalentLoadingModule,
             ...
           ],
           ...

diff --git a/src/app/components/components/media/media.component.html b/src/app/components/components/media/media.component.html
@@ -94,7 +94,7 @@ <h3>Setup:</h3>
         import { CovalentMediaModule } from '@covalent/core';
         @NgModule({
           imports: [
-            CovalentMediaModule, // or CovalentCoreModule (included inside of it)
+            CovalentMediaModule,
             ...
           ],
           ...

diff --git a/src/app/components/components/notifications/notifications.component.html b/src/app/components/components/notifications/notifications.component.html
@@ -324,7 +324,7 @@ <h3>Setup:</h3>
         import { CovalentNotificationsModule } from '@covalent/core';
         @NgModule({
           imports: [
-            CovalentNotificationsModule, // or CovalentCoreModule (included inside of it)
+            CovalentNotificationsModule,
             ...
           ],
           ...

diff --git a/src/app/components/components/paging/paging.component.html b/src/app/components/components/paging/paging.component.html
@@ -129,7 +129,7 @@ <h3>Setup:</h3>
         import { CovalentPagingModule } from '@covalent/core';
         @NgModule({
           imports: [
-            CovalentPagingModule, // or CovalentCoreModule (included inside of it)
+            CovalentPagingModule,
             ...
           ],
           ...

diff --git a/src/app/components/components/search/search.component.html b/src/app/components/components/search/search.component.html
@@ -73,7 +73,7 @@ <h3>Setup:</h3>
         import { CovalentSearchModule } from '@covalent/core';
         @NgModule({
           imports: [
-            CovalentSearchModule, // or CovalentCoreModule (included inside of it)
+            CovalentSearchModule,
             ...
           ],
           ...

diff --git a/src/app/components/components/steps/steps.component.html b/src/app/components/components/steps/steps.component.html
@@ -159,7 +159,7 @@ <h3>Setup:</h3>
         import { CovalentStepsModule } from '@covalent/core';
         @NgModule({
           imports: [
-            CovalentStepsModule, // or CovalentCoreModule (included inside of it)
+            CovalentStepsModule,
             ...
           ],
           ...

diff --git a/src/app/components/docs/docs.module.ts b/src/app/components/docs/docs.module.ts
@@ -1,4 +1,7 @@
 import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { CommonModule } from '@angular/common';
 
 import { docsRoutes } from './docs.routes';
 
@@ -16,7 +19,9 @@ import { MockDataComponent } from './mock-data/mock-data.component';
 
 import { DocumentationToolsModule } from '../../documentation-tools';
 
-import { CovalentCoreModule } from '../../../platform/core';
+import { MdButtonModule, MdListModule, MdIconModule, MdCardModule, MdToolbarModule, MdCoreModule } from '@angular/material';
+
+import { CovalentLayoutModule, CovalentMediaModule } from '../../../platform/core';
 import { CovalentHighlightModule } from '../../../platform/highlight';
 
 @NgModule({
@@ -34,7 +39,20 @@ import { CovalentHighlightModule } from '../../../platform/highlight';
     MockDataComponent,
   ],
   imports: [
-    CovalentCoreModule,
+    /** Angular Modules */
+    BrowserModule,
+    BrowserAnimationsModule,
+    CommonModule,
+    /** Material Modules */
+    MdCoreModule,
+    MdButtonModule,
+    MdListModule,
+    MdIconModule,
+    MdCardModule,
+    MdToolbarModule,
+    /** Covalent Modules */
+    CovalentLayoutModule,
+    CovalentMediaModule,
     CovalentHighlightModule,
     DocumentationToolsModule,
     docsRoutes,

diff --git a/src/app/components/layouts/layouts.module.ts b/src/app/components/layouts/layouts.module.ts
@@ -1,4 +1,7 @@
 import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { CommonModule } from '@angular/common';
 
 import { layoutsRoutes } from './layouts.routes';
 
@@ -9,7 +12,9 @@ import { NavListComponent } from './nav-list/nav-list.component';
 import { CardOverComponent } from './card-over/card-over.component';
 import { ManageListComponent } from './manage-list/manage-list.component';
 
-import { CovalentCoreModule } from '../../../platform/core';
+import { MdButtonModule, MdListModule, MdIconModule, MdCardModule, MdToolbarModule, MdCoreModule } from '@angular/material';
+
+import { CovalentLayoutModule, CovalentExpansionPanelModule, CovalentStepsModule, CovalentMediaModule } from '../../../platform/core';
 import { CovalentHighlightModule } from '../../../platform/highlight';
 
 import { DocumentationToolsModule } from '../../documentation-tools';
@@ -24,7 +29,22 @@ import { DocumentationToolsModule } from '../../documentation-tools';
     ManageListComponent,
   ],
   imports: [
-    CovalentCoreModule,
+    /** Angular Modules */
+    BrowserModule,
+    BrowserAnimationsModule,
+    CommonModule,
+    /** Material Modules */
+    MdCoreModule,
+    MdButtonModule,
+    MdListModule,
+    MdIconModule,
+    MdCardModule,
+    MdToolbarModule,
+    /** Covalent Modules */
+    CovalentLayoutModule,
+    CovalentExpansionPanelModule,
+    CovalentStepsModule,
+    CovalentMediaModule,
     CovalentHighlightModule,
     DocumentationToolsModule,
     layoutsRoutes,

diff --git a/src/app/components/style-guide/style-guide.module.ts b/src/app/components/style-guide/style-guide.module.ts
@@ -1,4 +1,8 @@
 import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
 
 import { styleGuideRoutes } from './style-guide.routes';
 
@@ -15,7 +19,11 @@ import { UtilityStylesComponent } from './utility-styles/utility-styles.componen
 import { ResourcesComponent } from './resources/resources.component';
 import { NavigationDrawerComponent } from './navigation-drawer/navigation-drawer.component';
 
-import { CovalentCoreModule } from '../../../platform/core';
+import { MdButtonModule, MdListModule, MdIconModule, MdCardModule, MdToolbarModule, MdCoreModule,
+         MdInputModule, MdMenuModule, MdSelectModule } from '@angular/material';
+
+import { CovalentLayoutModule, CovalentMediaModule, CovalentSearchModule, CovalentPagingModule,
+         CovalentExpansionPanelModule } from '../../../platform/core';
 import { CovalentHighlightModule } from '../../../platform/highlight';
 
 @NgModule({
@@ -34,7 +42,27 @@ import { CovalentHighlightModule } from '../../../platform/highlight';
     NavigationDrawerComponent,
   ],
   imports: [
-    CovalentCoreModule,
+    /** Angular Modules */
+    BrowserModule,
+    BrowserAnimationsModule,
+    CommonModule,
+    FormsModule,
+    /** Material Modules */
+    MdCoreModule,
+    MdButtonModule,
+    MdListModule,
+    MdIconModule,
+    MdCardModule,
+    MdToolbarModule,
+    MdInputModule,
+    MdMenuModule,
+    MdSelectModule,
+    /** Covalent Modules */
+    CovalentLayoutModule,
+    CovalentMediaModule,
+    CovalentSearchModule,
+    CovalentPagingModule,
+    CovalentExpansionPanelModule,
     CovalentHighlightModule,
     styleGuideRoutes,
   ],