Merge branch '1.0.1'

.editorconfig

@@ -1,4 +1,4 @@
-# http://editorconfig.org
+# Editor configuration, see http://editorconfig.org
 root = true
 
 [*]

.gitignore

@@ -4,7 +4,6 @@
 /dist
 /tmp
 /out-tsc
-src/app/ng-select/dist
 
 # dependencies
 /node_modules
@@ -17,9 +16,6 @@ src/app/ng-select/dist
 *.launch
 .settings/
 *.sublime-workspace
-*.orig
-*.swp
-*.tgz
 
 # IDE - VSCode
 .vscode/*
@@ -38,10 +34,6 @@ yarn-error.log
 testem.log
 /typings
 
-# e2e
-/e2e/*.js
-/e2e/*.map
-
 # System Files
 .DS_Store
 Thumbs.db

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+<a name="1.0.2"></a>
+## [1.0.2](https://github.com/basvandenberg/ng-select/compare/1.0.1...1.0.2) (2019-..-..)
+
+
+
+<a name="1.0.1"></a>
+## [1.0.1](https://github.com/basvandenberg/ng-select/compare/1.0.0...1.0.1) (2018-11-11)
+
+### Features
+- Changed peer dependencies to include Angular 7 (#312).
+- Upgrade dependencies.
+
+
+
 <a name="1.0.0"></a>
 ## [1.0.0](https://github.com/basvandenberg/ng-select/compare/1.0.0-rc.5...1.0.0) (2018-06-27)
 

PUBLISH.md

@@ -1,8 +1,7 @@
 Bump version in:
 - package.json
-- src/app/ng-select/package.json
-- demo/package.json
-- demo/src/app/components/home.compenent.ts
+- projects/ng-select/package.json
+- src/app/components/home.compenent.ts
 
 Build with:
 ```bash
@@ -11,6 +10,6 @@ yarn run build-lib
 
 Publish from dist directory:
 ```bash
-cd src/app/ng-select/dist
+cd dist/ng-select
 npm publish
 ```

README.md

@@ -9,18 +9,15 @@ A select component for angular, based on the [select2] JQuery plugin. See the
 
 Make sure that `yarn` is installed.
 
-After clone the repository, run the test app with:
+After cloning the repository, install dependencies with:
 ```bash
 $ yarn install
-$ ng serve
 ```
 
-To install and run the ng-select demo/documentation web site on your local 
-machine, enter the `demo` folder and run:
+To run the ng-select demo web site on your local machine, run:
+
 ```bash
-$ cd demo
-$ yarn install
-$ ng serve
+$ yarn run serve-demo
 ```
 
 To build the ng-select module, run:

angular.json

@@ -3,30 +3,45 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "ng-select": {
+    "ng-select-demo": {
       "root": "",
       "sourceRoot": "src",
       "projectType": "application",
+      "prefix": "app",
+      "schematics": {
+        "@schematics/angular:component": {
+          "styleext": "sass"
+        }
+      },
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist",
+            "outputPath": "dist/ng-select-demo",
             "index": "src/index.html",
             "main": "src/main.ts",
-            "tsConfig": "src/tsconfig.app.json",
             "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.app.json",
             "assets": [
-              "src/assets",
-              "src/favicon.ico"
+              "src/favicon.ico",
+              "src/assets"
             ],
             "styles": [
-              "src/styles.css"
+              "src/styles.css",
+              "src/style/base.scss"
             ],
-            "scripts": []
+            "scripts": [
+              "lib/highlight/highlight.pack.js"
+            ]
           },
           "configurations": {
             "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -36,10 +51,11 @@
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
-              "fileReplacements": [
+              "budgets": [
                 {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
                 }
               ]
             }
@@ -48,34 +64,34 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "ng-select:build"
+            "browserTarget": "ng-select-demo:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "ng-select:build:production"
+              "browserTarget": "ng-select-demo:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "ng-select:build"
+            "browserTarget": "ng-select-demo:build"
           }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
             "main": "src/test.ts",
-            "karmaConfig": "./karma.conf.js",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.spec.json",
-            "scripts": [],
+            "karmaConfig": "src/karma.conf.js",
             "styles": [
               "src/styles.css"
             ],
+            "scripts": [],
             "assets": [
-              "src/assets",
-              "src/favicon.ico"
+              "src/favicon.ico",
+              "src/assets"
             ]
           }
         },
@@ -93,23 +109,61 @@
         }
       }
     },
-    "ng-select-e2e": {
-      "root": "",
-      "sourceRoot": "",
+    "ng-select-demo-e2e": {
+      "root": "e2e/",
       "projectType": "application",
+      "prefix": "",
       "architect": {
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
-            "protractorConfig": "./protractor.conf.js",
-            "devServerTarget": "ng-select:serve"
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "ng-select-demo:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "ng-select-demo:serve:production"
+            }
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "ng-select": {
+      "root": "projects/ng-select",
+      "sourceRoot": "projects/ng-select/src",
+      "projectType": "library",
+      "prefix": "lib",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
+          "options": {
+            "tsConfig": "projects/ng-select/tsconfig.lib.json",
+            "project": "projects/ng-select/ng-package.json"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "projects/ng-select/src/test.ts",
+            "tsConfig": "projects/ng-select/tsconfig.spec.json",
+            "karmaConfig": "projects/ng-select/karma.conf.js"
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "e2e/tsconfig.e2e.json"
+              "projects/ng-select/tsconfig.lib.json",
+              "projects/ng-select/tsconfig.spec.json"
             ],
             "exclude": [
               "**/node_modules/**"
@@ -119,14 +173,5 @@
       }
     }
   },
-  "defaultProject": "ng-select",
-  "schematics": {
-    "@schematics/angular:component": {
-      "prefix": "app",
-      "styleext": "css"
-    },
-    "@schematics/angular:directive": {
-      "prefix": "app"
-    }
-  }
-}
+  "defaultProject": "ng-select-demo"
+}

copy_to_demo.sh

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