fix: import paths for systemjs

shlomiassaf · Aug 21, 2016 · 987e21b · 987e21b
1 parent e8ab6aa
commit 987e21b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 19 deletions.
diff --git a/src/components/angular2-modal/angular2-modal.module.ts b/src/components/angular2-modal/angular2-modal.module.ts
@@ -1,17 +1,10 @@
 import { NgModule, ModuleWithProviders } from '@angular/core';
-
 import { EVENT_MANAGER_PLUGINS } from '@angular/platform-browser';
-import { DOMOutsideEventPlugin } from './providers';
-import {
-  OverlayRenderer,
-  DOMOverlayRenderer,
-  CSSBackdrop,
-  CSSDialogContainer,
-  OverlayDialogBoundary,
-  OverlayTarget
-} from '../angular2-modal';
-import { Overlay, ModalOverlay } from './overlay';
 
+import { DOMOutsideEventPlugin, DOMOverlayRenderer } from './providers';
+import { OverlayRenderer } from './models/tokens';
+import { CSSBackdrop, CSSDialogContainer } from './components';
+import { Overlay, ModalOverlay, OverlayDialogBoundary, OverlayTarget } from './overlay';
 
 @NgModule({
   declarations: [

diff --git a/src/components/angular2-modal/components/css-dialog-container.ts b/src/components/angular2-modal/components/css-dialog-container.ts
@@ -10,7 +10,7 @@ import {
 import { DomSanitizationService } from '@angular/platform-browser';
 
 import { BaseDynamicComponent } from './base-dynamic-component';
-import { DialogRef } from '../../angular2-modal';
+import { DialogRef } from '../models/dialog-ref';
 import { Class } from '../framework/utils';
 
 /**

diff --git a/src/components/angular2-modal/overlay/overlay.service.ts b/src/components/angular2-modal/overlay/overlay.service.ts
@@ -3,7 +3,7 @@ import { ViewContainerRef, Injectable } from '@angular/core';
 import { OverlayRenderer, OverlayConfig } from '../models/tokens';
 import { DialogRefStack } from '../models/dialog-ref-stack';
 import { vcRefStore } from '../models/vc-ref-store';
-import { DialogRef } from '../angular2-modal';
+import { DialogRef } from '../models/dialog-ref';
 import { OverlayContext } from '../models/overlay-context';
 
 const _stack = new DialogRefStack<any>();

diff --git a/src/components/angular2-modal/providers/modal.ts b/src/components/angular2-modal/providers/modal.ts
@@ -7,7 +7,7 @@ import {
 import { Overlay } from '../overlay';
 import { Class, Maybe } from '../framework/utils';
 import { OverlayConfig } from '../models/tokens';
-import { DialogRef } from '../angular2-modal';
+import { DialogRef } from '../models/dialog-ref';
 import { ModalControllingContextBuilder } from '../models/overlay-context';
 
 export class UnsupportedDropInError extends Error {

diff --git a/src/system.config.ts b/src/system.config.ts
@@ -61,12 +61,10 @@ getScripts(prefix, scripts, function () {
       'demo': {defaultExtension: 'js'},
 
       'components/angular2-modal': {main: 'index.js', defaultExtension: 'js'},
-
-      // Some internal directories in angular2-modal are barrel like (having index.ts)
-      // this works great with webpack, with systemJS it needs mapping.
       'components/angular2-modal/providers': {main: 'index.js', defaultExtension: 'js'},
-
-      // Plugins also need mappings.
+      'components/angular2-modal/overlay': {main: 'index.js', defaultExtension: 'js'},
+      'components/angular2-modal/components': {main: 'index.js', defaultExtension: 'js'},
+      'components/angular2-modal/platform-browser': {main: 'index.js', defaultExtension: 'js'},
       'components/angular2-modal/plugins/bootstrap': {main: 'index.js', defaultExtension: 'js'},
       'components/angular2-modal/plugins/vex': {main: 'index.js', defaultExtension: 'js'},
       'components/angular2-modal/plugins/js-native': {main: 'index.js', defaultExtension: 'js'}