Skip to content

Commit 8ec736f

Browse files
Splaktarjelbourn
authored andcommittedOct 30, 2018
fix(ci): hammerjs not loaded causes warnings and flaky failures (#548)
import hammerjs for the tests shorten a few imports
1 parent 3d8f963 commit 8ec736f

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed
 

‎material.angular.io/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"@angular/platform-browser-dynamic": "^7.0.0",
3434
"@angular/router": "^7.0.0",
3535
"core-js": "^2.5.6",
36+
"hammerjs": "^2.0.8",
3637
"moment": "^2.22.1",
3738
"rxjs": "^6.1.0",
3839
"zone.js": "^0.8.26"
@@ -44,7 +45,6 @@
4445
"@types/jasmine": "^2.8.9",
4546
"@types/node": "^10.0.9",
4647
"firebase-tools": "^6.0.0",
47-
"hammerjs": "^2.0.8",
4848
"highlight.js": "^9.9.0",
4949
"jasmine-core": "~2.99.1",
5050
"jasmine-spec-reporter": "~4.2.1",

‎material.angular.io/src/app/app-module.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ import {MatNativeDateModule} from '@angular/material';
88
import {ExampleModule} from '@angular/material-examples';
99

1010
import {MaterialDocsApp} from './material-docs-app';
11-
import {HomepageModule} from './pages/homepage/homepage';
11+
import {HomepageModule} from './pages/homepage';
1212
import {MATERIAL_DOCS_ROUTES} from './routes';
13-
import {ComponentListModule} from './pages/component-list/component-list';
13+
import {ComponentListModule} from './pages/component-list';
1414
import {ComponentViewerModule} from './pages/component-viewer/component-viewer';
1515
import {ComponentCategoryListModule} from './pages/component-category-list/component-category-list';
1616
import {ComponentSidenavModule} from './pages/component-sidenav/component-sidenav';
1717
import {FooterModule} from './shared/footer/footer';
1818
import {ComponentPageTitle} from './pages/page-title/page-title';
1919
import {ComponentHeaderModule} from './pages/component-page-header/component-page-header';
20-
import {StyleManager} from './shared/style-manager/style-manager';
20+
import {StyleManager} from './shared/style-manager';
2121
import {SvgViewerModule} from './shared/svg-viewer/svg-viewer';
22-
import {ThemePickerModule} from './shared/theme-picker/theme-picker';
23-
import {StackblitzButtonModule} from './shared/stackblitz/stackblitz-button';
24-
import {NavBarModule} from './shared/navbar/navbar';
22+
import {ThemePickerModule} from './shared/theme-picker';
23+
import {StackblitzButtonModule} from './shared/stackblitz';
24+
import {NavBarModule} from './shared/navbar';
2525
import {ThemeStorage} from './shared/theme-picker/theme-storage/theme-storage';
2626
import {GuideItems} from './shared/guide-items/guide-items';
2727
import {DocumentationItems} from './shared/documentation-items/documentation-items';
28-
import {GuideListModule} from './pages/guide-list/guide-list';
29-
import {GuideViewerModule} from './pages/guide-viewer/guide-viewer';
28+
import {GuideListModule} from './pages/guide-list';
29+
import {GuideViewerModule} from './pages/guide-viewer';
3030
import {DocViewerModule} from './shared/doc-viewer/doc-viewer-module';
3131
import {
3232
CanActivateComponentSidenav

‎material.angular.io/src/main.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import './polyfills.ts';
2+
import 'hammerjs';
23

34
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
45
import {enableProdMode} from '@angular/core';

‎material.angular.io/src/test.ts

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
BrowserDynamicTestingModule,
77
platformBrowserDynamicTesting,
88
} from '@angular/platform-browser-dynamic/testing';
9+
import 'hammerjs';
910

1011
declare const require: any;
1112

0 commit comments

Comments
 (0)