Merge pull request #111 from maxisam/fix/new-packaging2

fix: #100 packaging issue
maxisam · Jan 21, 2018 · 6a73bf3 · 6a73bf3
2 parents 8fa0305 + e6c5fbd
commit 6a73bf3
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/index.ts → ngx-clipboard.ts b/index.ts → ngx-clipboard.ts
@@ -1 +1 @@
-export { ClipboardModule, ClipboardDirective, ClipboardService } from './src/index';
+export { ClipboardModule, ClipboardDirective, ClipboardService } from './src/ngx-clipboard';
diff --git a/package.json b/package.json
@@ -2,7 +2,8 @@
   "name": "ngx-clipboard",
   "description": "angular 2 clipboard",
   "main": "./dist/bundles/ngxClipboard.umd.min.js",
-  "module": "./dist/index.js",
+  "module": "./dist/ngx-clipboard.js",
+  "typings": "./dist/ngx-clipboard.d.ts",
   "version": "0.0.0",
   "author": {
     "name": "Sam Lin",
@@ -95,11 +96,11 @@
     "README.md",
     "dist",
     "src",
-    "index.ts"
+    "ngx-clipboard.ts"
   ],
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
     }
   }
-}
+}
diff --git a/rollup.config.js b/rollup.config.js
@@ -1,5 +1,5 @@
 export default {
-    entry: './dist/index.js',
+    entry: './dist/ngx-clipboard.js',
     dest: './dist/bundles/ngxClipboard.umd.js',
     format: 'umd',
     // Global namespace.

diff --git a/src/clipboard.directive.spec.ts b/src/clipboard.directive.spec.ts
@@ -1,5 +1,5 @@
 import { ClipboardService } from './clipboard.service';
-import { ClipboardModule } from './index';
+import { ClipboardModule } from './ngx-clipboard';
 import { Component } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
@@ -49,7 +49,7 @@ describe('Directive: clipboard', () => {
       fixture = createTestComponent(template);
       clipboardService = fixture.debugElement.injector.get(ClipboardService);
       // Setup spy on the `copyText` method, somehow document.execCommand('copy') doesn't work in Karma
-      spy = spyOn(clipboardService, 'copyText' as keyof(ClipboardService));
+      spy = spyOn(clipboardService, 'copyText' as keyof (ClipboardService));
       fixture.detectChanges();
       button = fixture.debugElement.nativeElement.querySelector('button');
     });
@@ -103,7 +103,7 @@ describe('Directive: clipboard', () => {
       fixture = createTestComponent(template);
       clipboardService = fixture.debugElement.injector.get(ClipboardService);
       // Setup spy on the `copyText` method, somehow document.execCommand('copy') doesn't work in Karma
-      spy = spyOn(clipboardService, 'copyText' as keyof(ClipboardService));
+      spy = spyOn(clipboardService, 'copyText' as keyof (ClipboardService));
       fixture.detectChanges();
       button = fixture.debugElement.nativeElement.querySelector('button');
       input = fixture.debugElement.nativeElement.querySelector('input');

diff --git a/src/index.ts → src/ngx-clipboard.ts b/src/index.ts → src/ngx-clipboard.ts
diff --git a/tsconfig-build.json b/tsconfig-build.json
@@ -7,7 +7,7 @@
             "dom"
         ],
         "baseUrl": "./node_modules",
-       
+
         "module": "es2015",
         "moduleResolution": "node",
         "noEmitOnError": false,
@@ -24,7 +24,7 @@
     "exclude": [
         "node_modules",
         "demo",
-        "index.d.ts",
+        "ngx-clipboard.d.ts",
         "dist",
         "**/*.ngfactory.ts"
     ],

diff --git a/tsconfig.json b/tsconfig.json
@@ -8,7 +8,6 @@
         ],
         "mapRoot": "",
         "baseUrl": "./node_modules",
-
         "module": "es2015",
         "moduleResolution": "node",
         "noEmitOnError": false,
@@ -26,7 +25,7 @@
     "exclude": [
         "node_modules",
         "demo",
-        "index.d.ts",
+        "ngx-clipboard.d.ts",
         "dist",
         "**/*.ngfactory.ts"
     ],
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export { ClipboardModule, ClipboardDirective, ClipboardService } from './src/index';
		export { ClipboardModule, ClipboardDirective, ClipboardService } from './src/ngx-clipboard';