Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

refactor: run v8 material import schematic #590

Merged
merged 1 commit into from
May 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/app-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {NgModule} from '@angular/core';
import {LocationStrategy, PathLocationStrategy} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {RouterModule} from '@angular/router';
import {MatNativeDateModule} from '@angular/material';
import {MatNativeDateModule} from '@angular/material/core';
import {ExampleModule} from '@angular/material-examples';

import {MaterialDocsApp} from './material-docs-app';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, NgModule, OnDestroy, OnInit} from '@angular/core';
import {MatCardModule} from '@angular/material';
import {MatCardModule} from '@angular/material/card';
import {CommonModule} from '@angular/common';
import {ActivatedRoute, Params, RouterModule} from '@angular/router';
import {DocumentationItems, SECTIONS} from '../../shared/documentation-items/documentation-items';
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/component-list/component-list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {ActivatedRoute, Router, RouterModule} from '@angular/router';
import {ComponentPageTitle} from '../page-title/page-title';
import {SvgViewerModule} from '../../shared/svg-viewer/svg-viewer';
import {CommonModule} from '@angular/common';
import {MatCardModule} from '@angular/material';
import {MatCardModule } from '@angular/material/card';
import {combineLatest} from 'rxjs';

@Component({
Expand Down
3 changes: 2 additions & 1 deletion src/app/pages/component-page-header/component-page-header.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {Component, EventEmitter, NgModule, Output} from '@angular/core';
import {ComponentPageTitle} from '../page-title/page-title';
import {NavigationFocusModule} from '../../shared/navigation-focus/navigation-focus';
import {MatButtonModule, MatIconModule} from '@angular/material';
import {MatButtonModule} from '@angular/material/button';
import {MatIconModule} from '@angular/material/icon';

@Component({
selector: 'component-page-header',
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/component-sidenav/component-sidenav.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {MatSidenav} from '@angular/material';
import {MatSidenav} from '@angular/material/sidenav';
import {take} from 'rxjs/operators';
import {ComponentSidenav, ComponentSidenavModule} from './component-sidenav';
import {DocsAppTestingModule} from '../../testing/testing-module';
Expand Down
3 changes: 2 additions & 1 deletion src/app/pages/component-sidenav/component-sidenav.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import {
Component, Input, NgZone, ViewEncapsulation, ViewChild, OnInit, NgModule, OnDestroy
} from '@angular/core';
import {DocumentationItems} from '../../shared/documentation-items/documentation-items';
import {MatSidenav, MatSidenavModule, MatIconModule} from '@angular/material';
import {MatIconModule} from '@angular/material/icon';
import {MatSidenav, MatSidenavModule} from '@angular/material/sidenav';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {ActivatedRoute, Params, Router, RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common';
Expand Down
3 changes: 2 additions & 1 deletion src/app/pages/component-viewer/component-viewer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import {ComponentViewer, ComponentViewerModule} from './component-viewer';
import {DocsAppTestingModule} from '../../testing/testing-module';

import {EXAMPLE_COMPONENTS} from '@angular/material-examples';
import {MatButtonModule, MatIconModule} from '@angular/material';
import {MatButtonModule} from '@angular/material/button';
import {MatIconModule} from '@angular/material/icon';
import {NgModule} from '@angular/core';
import {NoopAnimationsModule} from '@angular/platform-browser/animations';

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/component-viewer/component-viewer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
ViewChild,
ViewEncapsulation,
} from '@angular/core';
import {MatTabsModule} from '@angular/material';
import {MatTabsModule} from '@angular/material/tabs';
import {ActivatedRoute, Params, Router, RouterModule} from '@angular/router';
import {combineLatest, Observable, Subject} from 'rxjs';
import {map, takeUntil} from 'rxjs/operators';
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/guide-list/guide-list.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Component, NgModule, OnInit} from '@angular/core';
import {GuideItems} from '../../shared/guide-items/guide-items';
import {MatListModule} from '@angular/material';
import {MatListModule} from '@angular/material/list';
import {RouterModule} from '@angular/router';
import {FooterModule} from '../../shared/footer/footer';
import {CommonModule} from '@angular/common';
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/homepage/homepage.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Component, NgModule, OnInit} from '@angular/core';
import {SvgViewerModule} from '../../shared/svg-viewer/svg-viewer';
import {MatButtonModule} from '@angular/material';
import {MatButtonModule} from '@angular/material/button';
import {FooterModule} from '../../shared/footer/footer';
import {RouterModule} from '@angular/router';
import {ComponentPageTitle} from '../page-title/page-title';
Expand Down
12 changes: 5 additions & 7 deletions src/app/shared/doc-viewer/doc-viewer-module.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import {DocViewer} from './doc-viewer';
import {ExampleViewer} from '../example-viewer/example-viewer';
import {StackblitzButtonModule} from '../stackblitz/stackblitz-button';
import {
MatButtonModule,
MatIconModule,
MatTabsModule,
MatTooltipModule,
MatSnackBarModule,
} from '@angular/material';
import {MatButtonModule} from '@angular/material/button';
import {MatIconModule} from '@angular/material/icon';
import {MatSnackBarModule} from '@angular/material/snack-bar';
import {MatTabsModule} from '@angular/material/tabs';
import {MatTooltipModule} from '@angular/material/tooltip';
import {PortalModule} from '@angular/cdk/portal';
import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
Expand Down
10 changes: 4 additions & 6 deletions src/app/shared/example-viewer/example-viewer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ import {HttpTestingController} from '@angular/common/http/testing';
import {NgModule} from '@angular/core';
import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {
MatAutocompleteModule,
MatInputModule,
MatSlideToggleModule,
MatSnackBar,
} from '@angular/material';
import {MatAutocompleteModule} from '@angular/material/autocomplete';
import {MatInputModule} from '@angular/material/input';
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
import {MatSnackBar} from '@angular/material/snack-bar';

import {EXAMPLE_COMPONENTS} from '@angular/material-examples';
import {By} from '@angular/platform-browser';
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/example-viewer/example-viewer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, Input} from '@angular/core';
import {MatSnackBar} from '@angular/material';
import {MatSnackBar} from '@angular/material/snack-bar';
import {ComponentPortal} from '@angular/cdk/portal';

import {EXAMPLE_COMPONENTS, LiveExample} from '@angular/material-examples';
Expand Down
3 changes: 2 additions & 1 deletion src/app/shared/navbar/navbar.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {Component, NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {MatButtonModule, MatMenuModule} from '@angular/material';
import {MatButtonModule} from '@angular/material/button';
import {MatMenuModule} from '@angular/material/menu';
import {RouterModule} from '@angular/router';
import {ThemePickerModule} from '../theme-picker/theme-picker';
import {VersionPickerModule} from '../version-picker';
Expand Down
4 changes: 3 additions & 1 deletion src/app/shared/stackblitz/stackblitz-button.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import {Component, Input, NgModule} from '@angular/core';
import {StackblitzWriter} from './stackblitz-writer';
import {ExampleData} from '@angular/material-examples';
import {MatButtonModule, MatIconModule, MatTooltipModule} from '@angular/material';
import {MatButtonModule} from '@angular/material/button';
import {MatIconModule} from '@angular/material/icon';
import {MatTooltipModule} from '@angular/material/tooltip';

@Component({
selector: 'stackblitz-button',
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/stackblitz/stackblitz-writer.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {HttpClient} from '@angular/common/http';
import {Injectable} from '@angular/core';
import {VERSION} from '@angular/material';
import {VERSION} from '@angular/material/core';
import {ExampleData} from '@angular/material-examples';

import {materialVersion} from '../version/version';
Expand Down
12 changes: 5 additions & 7 deletions src/app/shared/theme-picker/theme-picker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@ import {
} from '@angular/core';
import {StyleManager} from '../style-manager/style-manager';
import {ThemeStorage, DocsSiteTheme} from './theme-storage/theme-storage';
import {
MatButtonModule,
MatGridListModule,
MatIconModule,
MatMenuModule,
MatTooltipModule,
} from '@angular/material';
import {MatButtonModule} from '@angular/material/button';
import {MatGridListModule} from '@angular/material/grid-list';
import {MatIconModule} from '@angular/material/icon';
import {MatMenuModule} from '@angular/material/menu';
import {MatTooltipModule} from '@angular/material/tooltip';
import {CommonModule} from '@angular/common';
import {ActivatedRoute} from '@angular/router';
import {Subscription} from 'rxjs';
Expand Down
4 changes: 3 additions & 1 deletion src/app/shared/version-picker/version-picker.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import {Component, NgModule} from '@angular/core';
import {HttpClient} from '@angular/common/http';
import {CommonModule} from '@angular/common';
import {MatButtonModule, MatIconModule, MatMenuModule} from '@angular/material';
import {MatButtonModule} from '@angular/material/button';
import {MatIconModule} from '@angular/material/icon';
import {MatMenuModule} from '@angular/material/menu';
import {materialVersion, VersionInfo} from '../version/version';

const versionUrl = 'https://material.angular.io/assets/versions.json';
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/version/version.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {VERSION} from '@angular/material';
import {VERSION} from '@angular/material/core';

/** This material version will be used in footer and stackblitz. */
export const materialVersion = VERSION.full;
Expand Down
2 changes: 1 addition & 1 deletion src/app/testing/testing-module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {NgModule} from '@angular/core';
import {MATERIAL_SANITY_CHECKS} from '@angular/material';
import {MATERIAL_SANITY_CHECKS} from '@angular/material/core';
import {RouterTestingModule} from '@angular/router/testing';


Expand Down