Merge branch '1.0.0-rc.3'

.angular-cli.json

@@ -0,0 +1,60 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "project": {
+    "name": "ng-select"
+  },
+  "apps": [
+    {
+      "root": "src",
+      "outDir": "dist",
+      "assets": [
+        "assets",
+        "favicon.ico"
+      ],
+      "index": "index.html",
+      "main": "main.ts",
+      "polyfills": "polyfills.ts",
+      "test": "test.ts",
+      "tsconfig": "tsconfig.app.json",
+      "testTsconfig": "tsconfig.spec.json",
+      "prefix": "app",
+      "styles": [
+        "styles.css"
+      ],
+      "scripts": [],
+      "environmentSource": "environments/environment.ts",
+      "environments": {
+        "dev": "environments/environment.ts",
+        "prod": "environments/environment.prod.ts"
+      }
+    }
+  ],
+  "e2e": {
+    "protractor": {
+      "config": "./protractor.conf.js"
+    }
+  },
+  "lint": [
+    {
+      "project": "src/tsconfig.app.json",
+      "exclude": "**/node_modules/**"
+    },
+    {
+      "project": "src/tsconfig.spec.json",
+      "exclude": "**/node_modules/**"
+    },
+    {
+      "project": "e2e/tsconfig.e2e.json",
+      "exclude": "**/node_modules/**"
+    }
+  ],
+  "test": {
+    "karma": {
+      "config": "./karma.conf.js"
+    }
+  },
+  "defaults": {
+    "styleExt": "css",
+    "component": {}
+  }
+}

.editorconfig

@@ -1,5 +1,4 @@
 # http://editorconfig.org
-
 root = true
 
 [*]
@@ -9,3 +8,7 @@ indent_size = 4
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

.gitignore

@@ -1,12 +1,47 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
 /dist
-/node_modules
-/docs/*.map
+/tmp
+/out-tsc
+src/app/ng-select/dist
 
-npm-debug.log
-yarn-error.log
-.vscode
+# dependencies
+/node_modules
 
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
 *.orig
 *.swp
 *.tgz
-*.idea
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+# System Files
+.DS_Store
+Thumbs.db

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 node_js:
-    - "6"
+    - "8"
 cache: yarn
 before_script:
-    - yarn global add gulp
-script: gulp
+    - yarn global add angular-cli
+script: ng build --prod

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+<a name="1.0.0-rc.3"></a>
+## [1.0.0-rc.3](https://github.com/basvandenberg/ng-select/compare/1.0.0-rc.2...1.0.0-rc.3) (2017-11-02)
+
+Changed build process from Gulp to angular-cli and ng-packagr.
+
+<a name="1.0.0-rc.2"></a>
+## [1.0.0-rc.2](https://github.com/basvandenberg/ng-select/compare/1.0.0-rc.1...1.0.0-rc.2) (2017-11-02)
+
 <a name="1.0.0-rc.1"></a>
 ## [1.0.0-rc.1](https://github.com/basvandenberg/ng-select/compare/1.0.0-beta.6...1.0.0-rc.1) (2017-11-02)
 

README.md

@@ -7,26 +7,26 @@ A select component for angular, based on the [select2] JQuery plugin. See the
 
 ## Develop
 
-Make sure that `gulp` and `yarn` are installed.
+Make sure that `yarn` is installed.
 
-Clone the repository and run:
+After clone the repository, run the test app with:
 ```bash
 $ yarn install
-$ gulp build
+$ ng serve
 ```
 
-To install and run the ng-select web site on your local machine, run the following in the demo
-folder:
+To build the ng-select module, run:
 ```bash
-$ yarn install
-$ ng serve
+$ yarn run build-lib
 ```
 
-For manual testing, pack and install a modified version of the ng-select component to ng-select web 
-site with the script:
+To install and run the ng-select demo/documentation web site on your local 
+machine, enter the demo folder and run:
 ```bash
-$ ./copy_to_demo.sh
+$ yarn install
+$ ng serve
 ```
+
 [ng-select]: https://basvandenberg.github.io/ng-select
 [select2]: https://select2.github.io
 [plunker]: https://plnkr.co/edit/vxwV6zxEwZGVUVR5V6tg?p=preview

copy_to_demo.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
-rm -v ng-select-*.tgz
+rm -v src/app/ng-select/dist/ng-select-*.tgz
 rm -rv demo/node_modules/ng-select/*
 
-npm pack
+npm pack src/app/ng-select/dist
 tar -xzvf ng-select-*.tgz
 mv -v package/* demo/node_modules/ng-select/
 

demo/package.json

@@ -27,7 +27,7 @@
     "core-js": "^2.4.1",
     "famfamfam-flags": "^1.0.0",
     "hammerjs": "^2.0.8",
-    "ng-select": "1.0.0-rc.2",
+    "ng-select": "1.0.0-rc.3",
     "normalize.css": "^7.0.0",
     "rxjs": "^5.4.1",
     "web-animations-js": "^2.2.5",

demo/src/app/components/home.component.ts

@@ -8,7 +8,7 @@ import {OptionService} from '../services/option.service';
 })
 export class Home {
 
-    version: string = '1.0.0-rc.1';
+    version: string = '1.0.0-rc.3';
 
     countries: Array<IOption> = this.optionService.getCountries();
     singleSelectValue: string = 'NL';

demo/yarn.lock

@@ -3601,9 +3601,9 @@ negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
-ng-select@1.0.0-rc.2:
-  version "1.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/ng-select/-/ng-select-1.0.0-rc.2.tgz#aed08b91473a0132d0d607510bdfe8d9310e9929"
+ng-select@1.0.0-rc.3:
+  version "1.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/ng-select/-/ng-select-1.0.0-rc.3.tgz#0d6ca53a475a0301e6d01e0c0a5568e183cb7a0d"
 
 no-case@^2.2.0:
   version "2.3.2"

e2e/app.e2e-spec.ts

@@ -0,0 +1,14 @@
+import { AppPage } from './app.po';
+
+describe('ng-select App', () => {
+  let page: AppPage;
+
+  beforeEach(() => {
+    page = new AppPage();
+  });
+
+  it('should display welcome message', () => {
+    page.navigateTo();
+    expect(page.getParagraphText()).toEqual('Welcome to app!');
+  });
+});

e2e/app.po.ts

@@ -0,0 +1,11 @@
+import { browser, by, element } from 'protractor';
+
+export class AppPage {
+  navigateTo() {
+    return browser.get('/');
+  }
+
+  getParagraphText() {
+    return element(by.css('app-root h1')).getText();
+  }
+}

e2e/tsconfig.e2e.json

@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/e2e",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "target": "es5",
+    "types": [
+      "jasmine",
+      "jasminewd2",
+      "node"
+    ]
+  }
+}