Merge pull request #77 from abraham/update

Update Nutmeg and lit-html

Author: abraham

package.json

@@ -38,10 +38,10 @@
   },
   "dependencies": {
     "@abraham/remotedata": "0.8.0",
-    "@nutmeg/seed": "0.13.0",
-    "lit-html": "0.10.2"
+    "@nutmeg/seed": "0.17.0",
+    "lit-html": "1.1.2"
   },
   "devDependencies": {
-    "@nutmeg/cli": "0.15.0"
+    "@nutmeg/cli": "0.17.0"
   }
 }

src/api.ts

@@ -9,7 +9,7 @@ export class Api {
       const data = await response.json();
       return data;
     } else {
-      throw response.text();
+      throw await response.text();
     }
   }
 

src/node-package.ts

@@ -1,10 +1,10 @@
 import { Failure, fold, Initialized, Pending, RemoteData, Success } from '@abraham/remotedata';
-import { html, Property, Seed, svg, TemplateResult } from '@nutmeg/seed';
+import { html, property, Seed, svg, TemplateResult } from '@nutmeg/seed';
 import { Api } from './api';
-import { Pkg, InstallSource, DEFAULT_INSTALL_SOURCE } from './pkg';
-import { SuccessView } from './success.view';
 import { FailureView } from './failure.view';
 import { PendingView } from './pending.view';
+import { DEFAULT_INSTALL_SOURCE, InstallSource, Pkg } from './pkg';
+import { SuccessView } from './success.view';
 
 interface SuccessData {
   pkg: Pkg,
@@ -14,8 +14,8 @@ interface SuccessData {
 type State = RemoteData<string, SuccessData>;
 
 export class NodePackage extends Seed {
-  @Property() public global: boolean = false;
-  @Property() public name?: string;
+  @property({ type: Boolean }) public global: boolean = false;
+  @property({ type: String }) public name?: string;
 
   private api = new Api();
   private state: State = new Initialized();

src/success.view.ts

@@ -1,5 +1,5 @@
 import { html, svg, TemplateResult } from '@nutmeg/seed';
-import { repeat } from 'lit-html/lib/repeat';
+import { repeat } from 'lit-html/directives/repeat';
 import { NodePackage } from './node-package';
 import { InstallCommand, InstallSource, Pkg } from './pkg';
 
@@ -63,8 +63,8 @@ export class SuccessView {
   private installTab(command: InstallCommand): TemplateResult {
     const classes = `item tab ${this.selectedInstallCommand === command.id ? 'selected' : ''}`;
     return html`
-      <a class$="${classes}" href="#" on-click=${(event: MouseEvent) => this.selectInstallCommand(event, command)}>
-        <label for$="${command.id}">
+      <a class="${classes}" href="#" @click=${(event: MouseEvent) => this.selectInstallCommand(event, command)}>
+        <label for="${command.id}">
           ${command.id}
         </label>
       </a>
@@ -73,7 +73,7 @@ export class SuccessView {
 
   private installCommand(command: InstallCommand): TemplateResult {
     return html`
-      <input id="${command.id}" class$="command fixed-width ellipsis item ${this.selectedInstallCommand !== command.id ? 'hidden' : ''}" readonly value$="${command.command}">
+      <input id="${command.id}" class="command fixed-width ellipsis item ${this.selectedInstallCommand !== command.id ? 'hidden' : ''}" readonly value="${command.command}">
     `;
   }
 
@@ -86,7 +86,7 @@ export class SuccessView {
         <div id="commands" class="row-horizontal">
           ${repeat(this.pkg.installCommands(this.component.global), command => command.id, (command, _index) => this.installCommand(command))}
           <div class="item">
-            <a id="copy" href="#" title="Copy command" on-click=${(event: MouseEvent) => this.copyInstallCommand(event)}>${this.copy}</a>
+            <a id="copy" href="#" title="Copy command" @click=${(event: MouseEvent) => this.copyInstallCommand(event)}>${this.copy}</a>
           </div>
         </div>
       </div>

tsconfig.json

@@ -2,6 +2,6 @@
   "extends": "./tsconfig.production",
   "include": [
     "src",
-    "test",
-  ],
+    "test"
+  ]
 }

tsconfig.production.json

@@ -16,13 +16,13 @@
     "sourceMap": true,
     "sourceRoot": "src",
     "strict": true,
-    "target": "esnext",
+    "target": "esnext"
   },
-  "exclude": [
-    "node_modules",
-    "dist",
-  ],
   "include": [
-    "src",
+    "src"
   ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
 }