Skip to content

Commit

Permalink
Merge pull request #158 from wwelling/master
Browse files Browse the repository at this point in the history
Removed unused modules
  • Loading branch information
tdonohue committed Oct 2, 2017
2 parents ef13e0a + e812bd6 commit 62bfeb4
Show file tree
Hide file tree
Showing 22 changed files with 82 additions and 376 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"compression": "1.7.1",
"cookie-parser": "1.4.3",
"core-js": "2.5.1",
"express": "4.16.0",
"express": "4.16.1",
"express-session": "1.15.6",
"font-awesome": "4.7.0",
"http-server": "0.10.0",
Expand Down Expand Up @@ -133,7 +133,7 @@
"awesome-typescript-loader": "3.2.3",
"caniuse-lite": "1.0.30000697",
"codelyzer": "3.2.0",
"compression-webpack-plugin": "1.0.0",
"compression-webpack-plugin": "1.0.1",
"copy-webpack-plugin": "4.1.0",
"coveralls": "3.0.0",
"css-loader": "0.28.7",
Expand Down Expand Up @@ -182,7 +182,7 @@
"rollup-plugin-uglify": "2.0.1",
"sass-loader": "6.0.6",
"script-ext-html-webpack-plugin": "1.8.5",
"source-map-loader": "0.2.1",
"source-map-loader": "0.2.2",
"string-replace-loader": "1.3.0",
"to-string-loader": "1.1.5",
"ts-helpers": "1.1.2",
Expand Down
Empty file removed resources/data/.gitkeep
Empty file.
Empty file removed resources/data/en/.gitkeep
Empty file.
5 changes: 0 additions & 5 deletions resources/data/en/test.json

This file was deleted.

4 changes: 0 additions & 4 deletions src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import { HostWindowState } from './shared/host-window.reducer';
import { HostWindowResizeAction } from './shared/host-window.actions';
import { MockTranslateLoader } from './shared/testing/mock-translate-loader';

import { BrowserCookiesModule } from '../modules/cookies/browser-cookies.module';
import { BrowserDataLoaderModule } from '../modules/data-loader/browser-data-loader.module';
import { BrowserTransferStateModule } from '../modules/transfer-state/browser-transfer-state.module';
import { BrowserTransferStoreModule } from '../modules/transfer-store/browser-transfer-store.module';

Expand All @@ -52,8 +50,6 @@ describe('App component', () => {
useClass: MockTranslateLoader
}
}),
BrowserCookiesModule,
BrowserDataLoaderModule,
BrowserTransferStateModule,
BrowserTransferStoreModule
],
Expand Down
2 changes: 0 additions & 2 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { appMetaReducers, debugMetaReducers } from './app.metareducers';

import { CoreModule } from './core/core.module';
import { AppRoutingModule } from './app-routing.module';
import { TransferHttpModule } from '../modules/transfer-http/transfer-http.module';

import { AppComponent } from './app.component';
import { HeaderComponent } from './header/header.component';
Expand Down Expand Up @@ -66,7 +65,6 @@ if (!ENV_CONFIG.production) {
EffectsModule.forRoot(appEffects),
StoreModule.forRoot(appReducers),
StoreRouterConnectingModule,
TransferHttpModule,
...DEV_MODULES
],
providers: [
Expand Down
13 changes: 7 additions & 6 deletions src/app/browser-app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import { TranslateHttpLoader } from '@ngx-translate/http-loader';
import { EffectsModule } from '@ngrx/effects';

import { TransferState } from '../modules/transfer-state/transfer-state';
import { BrowserCookiesModule } from '../modules/cookies/browser-cookies.module';
import { BrowserDataLoaderModule } from '../modules/data-loader/browser-data-loader.module';
import { BrowserTransferStateModule } from '../modules/transfer-state/browser-transfer-state.module';
import { BrowserTransferStoreEffects } from '../modules/transfer-store/browser-transfer-store.effects';
import { BrowserTransferStoreModule } from '../modules/transfer-store/browser-transfer-store.module';
Expand All @@ -39,10 +37,13 @@ export function createTranslateLoader(http: HttpClient) {
appId: 'ds-app-id'
}),
HttpClientModule,
IdlePreloadModule.forRoot(), // forRoot ensures the providers are only created once
RouterModule.forRoot([], { useHash: false, preloadingStrategy: IdlePreload }),
BrowserCookiesModule,
BrowserDataLoaderModule,
// forRoot ensures the providers are only created once
IdlePreloadModule.forRoot(),
RouterModule.forRoot([], {
useHash: false,
preloadingStrategy:
IdlePreload
}),
BrowserTransferStateModule,
BrowserTransferStoreModule,
TranslateModule.forRoot({
Expand Down
10 changes: 3 additions & 7 deletions src/app/server-app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ import { TransferState } from '../modules/transfer-state/transfer-state';
import { ServerTransferStoreEffects } from '../modules/transfer-store/server-transfer-store.effects';
import { ServerTransferStoreModule } from '../modules/transfer-store/server-transfer-store.module';

import { ServerCookiesModule } from '../modules/cookies/server-cookies.module';

import { ServerDataLoaderModule } from '../modules/data-loader/server-data-loader.module';

import { AppState } from './app.reducer';

import { AppModule } from './app.module';
Expand Down Expand Up @@ -54,9 +50,9 @@ export function createTranslateLoader() {
BrowserModule.withServerTransition({
appId: 'ds-app-id'
}),
RouterModule.forRoot([], { useHash: false }),
ServerCookiesModule,
ServerDataLoaderModule,
RouterModule.forRoot([], {
useHash: false
}),
ServerTransferStateModule,
ServerTransferStoreModule,
TranslateModule.forRoot({
Expand Down
13 changes: 0 additions & 13 deletions src/modules/cookies/browser-cookies.module.ts

This file was deleted.

34 changes: 0 additions & 34 deletions src/modules/cookies/browser-cookies.ts

This file was deleted.

9 changes: 0 additions & 9 deletions src/modules/cookies/cookies.ts

This file was deleted.

13 changes: 0 additions & 13 deletions src/modules/cookies/server-cookies.module.ts

This file was deleted.

24 changes: 0 additions & 24 deletions src/modules/cookies/server-cookies.ts

This file was deleted.

13 changes: 0 additions & 13 deletions src/modules/data-loader/browser-data-loader.module.ts

This file was deleted.

27 changes: 0 additions & 27 deletions src/modules/data-loader/browser-data-loader.ts

This file was deleted.

21 changes: 0 additions & 21 deletions src/modules/data-loader/data-loader.ts

This file was deleted.

13 changes: 0 additions & 13 deletions src/modules/data-loader/server-data-loader.module.ts

This file was deleted.

28 changes: 0 additions & 28 deletions src/modules/data-loader/server-data-loader.ts

This file was deleted.

12 changes: 0 additions & 12 deletions src/modules/transfer-http/transfer-http.module.ts

This file was deleted.

0 comments on commit 62bfeb4

Please sign in to comment.