Fix package inclusion logic. Bump version.

package.json

@@ -1,15 +1,16 @@
 {
   "name": "tilmeld-client",
-  "version": "1.0.0-beta.15",
+  "version": "1.0.0-beta.16",
   "description": "Nymph user and group management with access controls.",
-  "main": "lib/umd/index.js",
+  "main": "lib/umd/tilmeld-client.js",
+  "browser": "lib/es/tilmeld-client.js",
   "directories": {
     "lib": "lib/umd"
   },
   "scripts": {
     "build-components": "svelte compile src/Components -o lib/es/Components",
     "build-entities": "cp -a src/Entities lib/es/",
-    "build-index": "cp src/index.js lib/es/",
+    "build-index": "cp src/tilmeld-client.js lib/es/",
     "transpile": "babel -d lib/umd/ lib/es/",
     "build": "npm run build-components && npm run build-entities && npm run build-index && npm run transpile",
     "prepare": "npm run lint && npm run build",
@@ -18,8 +19,7 @@
   },
   "files": [
     "lib",
-    "src",
-    "make.js"
+    "src"
   ],
   "repository": {
     "type": "git",
@@ -42,7 +42,7 @@
   },
   "homepage": "https://github.com/sciactive/tilmeld-client#readme",
   "dependencies": {
-    "nymph-client": "^3.0.5",
+    "nymph-client": "^4.0.0-beta.1",
     "pform": "^3.3"
   },
   "devDependencies": {
@@ -62,6 +62,6 @@
     "eslint-plugin-standard": "^3.0.1",
     "svelte": "^2.1.1",
     "svelte-cli": "^3.0.0",
-    "umailphp": "^2.2"
+    "umailphp": "^2.3"
   }
 }

src/Components/TilmeldChangePassword.html

@@ -81,7 +81,7 @@ <h2 class="change-password-dialog-title">{compactText}</h2>
 {/if}
 
 <script>
-  import User from 'User';
+  import User from '../Entities/User';
 
   export default {
     oncreate () {

src/Components/TilmeldLogin.html

@@ -216,8 +216,8 @@ <h2 class="login-dialog-title">{compactText}</h2>
 {/if}
 
 <script>
-  import User from 'User';
-  import TilmeldRecover from './TilmeldRecover.html';
+  import User from '../Entities/User';
+  import TilmeldRecover from './TilmeldRecover';
 
   export default {
     oncreate () {

src/Components/TilmeldRecover.html

@@ -105,7 +105,7 @@ <h2 class="recovery-dialog-title">Account Recovery</h2>
 {/if}
 
 <script>
-  import User from 'User';
+  import User from '../Entities/User';
 
   export default {
     oncreate () {

src/Entities/Group.js

@@ -1,7 +1,6 @@
-import Nymph from 'Nymph';
-import Entity from 'NymphEntity';
+import {Nymph, Entity} from 'nymph-client';
 
-export default class Group extends Entity {
+export class Group extends Entity {
   // === Constructor ===
 
   constructor (id) {
@@ -59,4 +58,5 @@ Group.etype = 'tilmeld_group';
 Group.class = 'Tilmeld\\Entities\\Group';
 
 Nymph.setEntityClass(Group.class, Group);
-export {Group};
+
+export default Group;

src/Entities/User.js

@@ -1,7 +1,6 @@
-import Nymph from 'Nymph';
-import Entity from 'NymphEntity';
+import {Nymph, Entity} from 'nymph-client';
 
-export default class User extends Entity {
+export class User extends Entity {
   // === Constructor ===
 
   constructor (id) {
@@ -127,4 +126,5 @@ User.loginCallbacks = [];
 User.logoutCallbacks = [];
 
 Nymph.setEntityClass(User.class, User);
-export {User};
+
+export default User;

src/index.js → src/tilmeld-client.js

@@ -2,7 +2,7 @@ import TilmeldChangePassword from './Components/TilmeldChangePassword';
 import TilmeldLogin from './Components/TilmeldLogin';
 import TilmeldRecover from './Components/TilmeldRecover';
 
-import User from './Entities/User';
-import Group from './Entities/Group';
+import {User} from './Entities/User';
+import {Group} from './Entities/Group';
 
 export {TilmeldChangePassword, TilmeldLogin, TilmeldRecover, User, Group};