fix: systemJS not working due to barrel imports and relative paths

gulpfile.js

@@ -58,4 +58,8 @@ gulp.task('replace-core-relative-imports', function(){
     gulp.src(['./dist/build/demo/**/*.js'])
         .pipe(transform( { visitCallExpression: visitCallExpression } ))
         .pipe(gulp.dest('./dist/build/demo'));
+
+    gulp.src(['./dist/build/components/angular2-modal/plugins/**/*.js'])
+      .pipe(transform( { visitCallExpression: visitCallExpression } ))
+      .pipe(gulp.dest('./dist/build/components/angular2-modal/plugins'));
 });

package.json

@@ -1,7 +1,7 @@
 {
   "name": "angular2-modal",
   "description": "Angular2 Modal (dialog) window.",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/shlomiassaf/angular2-modal.git"

scripts/build_release.sh

@@ -42,24 +42,12 @@ mv ./dist/build/index.SystemJS.html ./dist/build/index.html
 # Inline the css and html into the component ts files.
 ./node_modules/gulp/bin/gulp.js inline-resources
 
+./node_modules/gulp/bin/gulp.js replace-core-relative-imports
+
 # ./dist/commonjs will hold ES5 compiled artifacts from the TypeScript compilation.
 mkdir ./dist/commonjs
 
 # Copy all components/ to ./dist/commonjs/
 cp -R ./dist/build/components/angular2-modal/* ./dist/commonjs/
 
-./node_modules/gulp/bin/gulp.js replace-core-relative-imports
-
-# Create a SystemJS bundle for all components and core.
-mkdir ./dist/commonjs_all
-cp -R ./dist/commonjs/* ./dist/commonjs_all/
-rm ./dist/commonjs_all/angular2-modal.js
-rm ./dist/commonjs_all/angular2-modal.js.map
-rm ./dist/commonjs_all/angular2-modal.d.ts
-mv ./dist/commonjs_all/angular2-modal.all.js ./dist/commonjs_all/angular2-modal.js
-mv ./dist/commonjs_all/angular2-modal.all.js.map ./dist/commonjs_all/angular2-modal.js.map
-mv ./dist/commonjs_all/angular2-modal.all.d.ts ./dist/commonjs_all/angular2-modal.d.ts
-node make.js
-rm -rf ./dist/commonjs_all
-
 cp ./README.md ./dist/commonjs

src/components/angular2-modal/angular2-modal.module.ts

@@ -1,8 +1,10 @@
 import { NgModule, ModuleWithProviders } from '@angular/core';
 
 import { EVENT_MANAGER_PLUGINS } from '@angular/platform-browser';
+
 import { DOMOutsideEventPlugin } from './providers';
-import { ModalRenderer, DOMModalRenderer } from '../angular2-modal';
+import { ModalRenderer } from './models/tokens';
+import { DOMModalRenderer } from './providers/dom-modal-renderer';
 
 @NgModule({
 })

src/components/angular2-modal/angular2-modal.ts

@@ -1,29 +1,2 @@
-import { Modal } from './providers';
-
-export * from './framework/fluent-assign';
-export { createComponent } from './framework/createComponent';
-
-export { DialogRef } from './models/dialog-ref';
-
-export {
-    DROP_IN_TYPE,
-    ModalDropInFactory,
-    ModalBackdropComponent,
-    ModalComponent,
-    ModalCompileConfig,
-    ModalRenderer
-} from './models/tokens';
-
-export { Modal, DOMModalRenderer } from './providers';
-
-export {
-    DEFAULT_VALUES,
-    ModalContext,
-    ModalContextBuilder,
-    ModalControllingContextBuilder
-} from './models/modal-context';
-
-export { ModalOpenContext, ModalOpenContextBuilder } from './models/modal-open-context';
-
-
-export { ModalModule } from './angular2-modal.module';
+// WEBPACK development runtime helper.
+export * from './angular2-modal';

src/components/angular2-modal/index.ts

@@ -1,2 +1,30 @@
-// WEBPACK development runtime helper.
-export * from './angular2-modal';
+
+import { Modal } from './providers';
+
+export * from './framework/fluent-assign';
+export { createComponent } from './framework/createComponent';
+
+export { DialogRef } from './models/dialog-ref';
+
+export {
+  DROP_IN_TYPE,
+  ModalDropInFactory,
+  ModalBackdropComponent,
+  ModalComponent,
+  ModalCompileConfig,
+  ModalRenderer
+} from './models/tokens';
+
+export { Modal, DOMModalRenderer } from './providers';
+
+export {
+  DEFAULT_VALUES,
+  ModalContext,
+  ModalContextBuilder,
+  ModalControllingContextBuilder
+} from './models/modal-context';
+
+export { ModalOpenContext, ModalOpenContextBuilder } from './models/modal-open-context';
+
+
+export { ModalModule } from './angular2-modal.module';

src/components/angular2-modal/package.json

@@ -1,7 +1,7 @@
 {
   "name": "angular2-modal",
   "description": "Angular2 Modal (dialog) window.",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/shlomiassaf/angular2-modal.git"

src/components/angular2-modal/plugins/bootstrap/bootstrap.module.ts

@@ -15,7 +15,7 @@ import {
   Modal as BaseModal,
   ModalBackdropComponent,
   ModalDropInFactory
-} from '../../angular2-modal';
+} from '../../../../components/angular2-modal';
 
 function getProviders(): any[] {
   return [

src/components/angular2-modal/plugins/bootstrap/message-modal.ts

@@ -1,6 +1,6 @@
 import { Component, ViewEncapsulation } from '@angular/core';
 
-import { DialogRef, ModalComponent } from '../../angular2-modal';
+import { DialogRef, ModalComponent } from '../../../../components/angular2-modal';
 import { BSModalFooter, FooterButtonClickEvent } from './modal-footer';
 import { MessageModalPreset } from'./presets/message-modal-preset';
 

src/components/angular2-modal/plugins/bootstrap/modal-backdrop.ts

@@ -10,7 +10,7 @@ import {
   transition
 } from '@angular/core';
 
-import { DialogRef } from '../../angular2-modal';
+import { DialogRef } from '../../../../components/angular2-modal';
 import { BSModalContext } from './modal-context';
 
 let dialogRefCount = 0;

src/components/angular2-modal/plugins/bootstrap/modal-container.ts

@@ -14,7 +14,7 @@ import {
   transition
 } from '@angular/core';
 
-import { createComponent, DialogRef, ModalCompileConfig } from '../../angular2-modal';
+import { createComponent, DialogRef, ModalCompileConfig } from '../../../../components/angular2-modal';
 
 import { Modal } from './modal';
 import { supportsKey } from '../../framework/utils';