build: use ng-packagr to create build package

Summary: - use ng-packagr to create build - added - src/ng-package.json -> contains the ng-packagr settings - src/public_api.ts -> same as the old src/index.js, but it is ng-packagr convention - moved the demo app out from the src folder to the root - deleted the old build settings - npm scripts - scripts/release.js - rollup.config.js - tsconfig.release.js
softsimon · Mar 16, 2018 · 21aa385 · 21aa385
1 parent 37a68dd
commit 21aa385
Show file tree

Hide file tree

Showing 42 changed files with 1,682 additions and 1,783 deletions.
diff --git a/.angular-cli.json b/.angular-cli.json
@@ -5,8 +5,8 @@
   },
   "apps": [
     {
-      "root": "src/demo/src",
-      "outDir": "dist/demo",
+      "root": "demo/src",
+      "outDir": "dist",
       "assets": [
         "assets",
         "favicon.ico"

diff --git a/src/demo/.editorconfig → demo/.editorconfig b/src/demo/.editorconfig → demo/.editorconfig
diff --git a/src/demo/.gitignore → demo/.gitignore b/src/demo/.gitignore → demo/.gitignore
diff --git a/src/demo/README.md → demo/README.md b/src/demo/README.md → demo/README.md
diff --git a/src/demo/e2e/app.e2e-spec.ts → demo/e2e/app.e2e-spec.ts b/src/demo/e2e/app.e2e-spec.ts → demo/e2e/app.e2e-spec.ts
diff --git a/src/demo/e2e/app.po.ts → demo/e2e/app.po.ts b/src/demo/e2e/app.po.ts → demo/e2e/app.po.ts
diff --git a/src/demo/e2e/tsconfig.e2e.json → demo/e2e/tsconfig.e2e.json b/src/demo/e2e/tsconfig.e2e.json → demo/e2e/tsconfig.e2e.json
diff --git a/src/demo/karma.conf.js → demo/karma.conf.js b/src/demo/karma.conf.js → demo/karma.conf.js
diff --git a/src/demo/protractor.conf.js → demo/protractor.conf.js b/src/demo/protractor.conf.js → demo/protractor.conf.js
diff --git a/src/demo/src/app/app.component.css → demo/src/app/app.component.css b/src/demo/src/app/app.component.css → demo/src/app/app.component.css
diff --git a/src/demo/src/app/app.component.html → demo/src/app/app.component.html b/src/demo/src/app/app.component.html → demo/src/app/app.component.html
diff --git a/src/demo/src/app/app.component.spec.ts → demo/src/app/app.component.spec.ts b/src/demo/src/app/app.component.spec.ts → demo/src/app/app.component.spec.ts
diff --git a/src/demo/src/app/app.component.ts → demo/src/app/app.component.ts b/src/demo/src/app/app.component.ts → demo/src/app/app.component.ts
diff --git a/src/demo/src/app/app.module.ts → demo/src/app/app.module.ts b/src/demo/src/app/app.module.ts → demo/src/app/app.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { FormsModule } from '@angular/forms';
 
-import { MultiselectDropdownModule } from '../../..';
+import { MultiselectDropdownModule } from '../../../src';
 import { AppComponent } from './app.component';
 import { DataService } from './data.service';
 import { DummyComponent } from './dummy.component';

diff --git a/src/demo/src/app/data-model.ts → demo/src/app/data-model.ts b/src/demo/src/app/data-model.ts → demo/src/app/data-model.ts
@@ -1,4 +1,4 @@
-import { IMultiSelectOption } from '../../../';
+import { IMultiSelectOption } from '../../../src';
 
 export interface DataModel {
   options: IMultiSelectOption[];

diff --git a/src/demo/src/app/data.service.ts → demo/src/app/data.service.ts b/src/demo/src/app/data.service.ts → demo/src/app/data.service.ts
diff --git a/src/demo/src/app/dummy.component.html → demo/src/app/dummy.component.html b/src/demo/src/app/dummy.component.html → demo/src/app/dummy.component.html
diff --git a/src/demo/src/app/dummy.component.ts → demo/src/app/dummy.component.ts b/src/demo/src/app/dummy.component.ts → demo/src/app/dummy.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 
-import { IMultiSelectSettings } from '../../../..';
+import { IMultiSelectSettings } from '../../../src';
 import { DataModel } from './data-model';
 
 @Component({

diff --git a/src/demo/src/app/util.ts → demo/src/app/util.ts b/src/demo/src/app/util.ts → demo/src/app/util.ts
@@ -1,4 +1,4 @@
-import { IMultiSelectOption } from '../../../';
+import { IMultiSelectOption } from '../../../src';
 
 export const generateItem = (id: number): IMultiSelectOption => {
   return {id, name: `Item #${id}`};

diff --git a/src/demo/src/assets/.gitkeep → demo/src/assets/.gitkeep b/src/demo/src/assets/.gitkeep → demo/src/assets/.gitkeep
diff --git a/...demo/src/environments/environment.prod.ts → demo/src/environments/environment.prod.ts b/...demo/src/environments/environment.prod.ts → demo/src/environments/environment.prod.ts
diff --git a/src/demo/src/environments/environment.ts → demo/src/environments/environment.ts b/src/demo/src/environments/environment.ts → demo/src/environments/environment.ts
diff --git a/src/demo/src/favicon.ico → demo/src/favicon.ico b/src/demo/src/favicon.ico → demo/src/favicon.ico
diff --git a/src/demo/src/index.html → demo/src/index.html b/src/demo/src/index.html → demo/src/index.html
diff --git a/src/demo/src/main.ts → demo/src/main.ts b/src/demo/src/main.ts → demo/src/main.ts
diff --git a/src/demo/src/polyfills.ts → demo/src/polyfills.ts b/src/demo/src/polyfills.ts → demo/src/polyfills.ts
diff --git a/src/demo/src/styles.css → demo/src/styles.css b/src/demo/src/styles.css → demo/src/styles.css
diff --git a/src/demo/src/test.ts → demo/src/test.ts b/src/demo/src/test.ts → demo/src/test.ts
diff --git a/src/demo/src/tsconfig.app.json → demo/src/tsconfig.app.json b/src/demo/src/tsconfig.app.json → demo/src/tsconfig.app.json
diff --git a/src/demo/src/tsconfig.spec.json → demo/src/tsconfig.spec.json b/src/demo/src/tsconfig.spec.json → demo/src/tsconfig.spec.json
diff --git a/src/demo/src/typings.d.ts → demo/src/typings.d.ts b/src/demo/src/typings.d.ts → demo/src/typings.d.ts
diff --git a/src/demo/tsconfig.json → demo/tsconfig.json b/src/demo/tsconfig.json → demo/tsconfig.json
diff --git a/src/demo/tslint.json → demo/tslint.json b/src/demo/tslint.json → demo/tslint.json
diff --git a/package.json b/package.json
@@ -1,23 +1,14 @@
 {
   "name": "angular-2-dropdown-multiselect",
-  "version": "1.7.1",
+  "version": "0.0.0-development",
   "description": "Customizable dropdown multiselect in Angular 2 with bootstrap css.",
   "main": "dist/bundles/dropdown.umd.js",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
     "start": "ng serve",
     "prebuild": "rimraf dist",
-    "build": "npm-run-all -s build:*",
-    "postbuild": "npm run prepare-package",
-    "build:main": "npm run ng-copy && npm run ng-inline && npm run ngc",
-    "postbuild:main": "rimraf dist/tmp",
-    "build:umd": "rollup -c rollup.config.js",
-    "postbuild:umd": "uglifyjs -c --screw-ie8 --comments -o dist/bundles/dropdown.umd.min.js dist/bundles/dropdown.umd.js",
-    "ng-copy": "copyup src/index.ts dist/tmp && ncp src dist/tmp",
-    "ng-inline": "ng2-inline -u 1 -o dist/tmp -r src/**/*.component.ts",
-    "prepare-package": "node scripts/release.js",
-    "ngc": "ngc -p tsconfig.release.json"
+    "build": "ng-packagr -p src/ng-package.json"
   },
   "repository": {
     "type": "git",
@@ -37,13 +28,6 @@
     "url": "https://github.com/softsimon/angular-2-dropdown-multiselect/issues"
   },
   "homepage": "http://softsimon.github.io/angular-2-dropdown-multiselect",
-  "dependencies": {},
-  "peerDependencies": {
-    "@angular/common": "^5.2.9",
-    "@angular/core": "^5.2.9",
-    "@angular/forms": "^5.2.9",
-    "tslib": "^1.6.1"
-  },
   "devDependencies": {
     "@angular/cli": "^1.7.3",
     "@angular/common": "^5.2.9",
@@ -59,21 +43,12 @@
     "@angular/router": "^5.2.9",
     "@types/core-js": "^0.9.41",
     "@types/jasmine": "^2.5.47",
-    "@types/node": "^7.0.15",
-    "angular2-inline-template-style": "^1.1.0",
-    "chokidar": "^1.6.1",
-    "codelyzer": "^2.0.0",
-    "copyfiles": "^1.2.0",
-    "ncp": "^2.0.0",
-    "npm-run-all": "^4.0.2",
+    "ng-packagr": "^2.2.0",
     "rimraf": "^2.6.1",
-    "rollup": "^0.41.6",
-    "rollup-globals-regex": "^0.0.3",
-    "rollup-plugin-node-resolve": "^3.0.0",
     "rxjs": "^5.1.0",
     "tslib": "^1.6.1",
-    "typescript": "^2.2.2",
-    "uglifyjs": "^2.4.10",
-    "zone.js": "^0.7.6"
+    "tsickle": "^0.27.2",
+    "typescript": "2.6.2",
+    "zone.js": "^0.8.4"
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
diff --git a/scripts/release.js b/scripts/release.js
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1 @@
-export * from './dropdown/types';
-export * from './dropdown/search-filter.pipe';
-export * from './dropdown/dropdown.module';
-export * from './dropdown/dropdown.component';
+export * from './public_api'
diff --git a/src/ng-package.json b/src/ng-package.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "./node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "public_api.ts",
+    "languageLevel": ["dom", "es2017"]
+  },
+  "dest": "../dist"
+}
diff --git a/src/package.json b/src/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "angular-2-dropdown-multiselect",
+  "version": "1.7.1",
+  "description": "Customizable dropdown multiselect in Angular 2 with bootstrap css.",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/softsimon/angular-2-dropdown-multiselect.git"
+  },
+  "keywords": [
+    "angular 2",
+    "dropdown",
+    "multi select"
+  ],
+  "author": "Simon Lindh",
+  "contributors": [
+    "Alex Malkevich <[email protected]>"
+  ],
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/softsimon/angular-2-dropdown-multiselect/issues"
+  },
+  "homepage": "http://softsimon.github.io/angular-2-dropdown-multiselect",
+  "peerDependencies": {
+    "@angular/common": "^5.2.9",
+    "@angular/core": "^5.2.9",
+    "@angular/forms": "^5.2.9",
+    "tslib": "^1.6.1"
+  }
+}
diff --git a/src/public_api.ts b/src/public_api.ts
@@ -0,0 +1,4 @@
+export * from './dropdown/types';
+export * from './dropdown/search-filter.pipe';
+export * from './dropdown/dropdown.module';
+export * from './dropdown/dropdown.component';
diff --git a/tsconfig.release.json b/tsconfig.release.json