From ea4065f33a39eb78d842cb86480b07da62f8528d Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 13 Dec 2018 10:43:34 +0100
Subject: [PATCH 1/5] Explicitly list what we want in our NPM package

Switch over to explicitly listing what we want to include, rather
than listing what we don't want to include. There is too much risk
of getting random junk from your working copy otherwise. This should
also hopefully complain if something is missing.
---
 .npmignore                                 | 37 ----------------------
 package.json                               | 11 +++++++
 vendor/browser-es-module-loader/.npmignore |  0
 3 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 .npmignore
 delete mode 100644 vendor/browser-es-module-loader/.npmignore

diff --git a/.npmignore b/.npmignore
deleted file mode 100644
index c335c338..00000000
--- a/.npmignore
+++ /dev/null
@@ -1,37 +0,0 @@
-# infra JS
-/build/
-/node_modules/
-/tests/
-/utils/
-/recordings/
-/vendor/sinon.js
-
-# noVNC application files
-/app
-/vendor/browser-es-module-loader
-/vendor/promise.js
-/vnc.html
-/vnc_lite.html
-
-# raw translation files
-/po
-
-# config files
-/.travis.yml
-/karma.conf.js
-
-# various other files
-/.gitmodules
-.*
-*~
-*.swp
-*.swo
-
-# documentation (except licenses)
-/docs/notes
-/docs/links
-/docs/release.txt
-/docs/rfb_notes
-/docs/*.pdf
-/docs/flash_policy.txt
-/CONTRIBUTING.md
diff --git a/package.json b/package.json
index 24cb763f..f9e23498 100644
--- a/package.json
+++ b/package.json
@@ -3,9 +3,20 @@
   "version": "1.0.0",
   "description": "An HTML5 VNC client",
   "directories": {
+    "lib": "lib",
     "doc": "docs",
     "test": "tests"
   },
+  "files": [
+    "lib",
+    "AUTHORS",
+    "VERSION",
+    "docs/API.md",
+    "docs/LIBRARY.md",
+    "docs/LICENSE*",
+    "core",
+    "vendor/pako"
+  ],
   "scripts": {
     "lint": "eslint app core po tests utils",
     "test": "karma start karma.conf.js",
diff --git a/vendor/browser-es-module-loader/.npmignore b/vendor/browser-es-module-loader/.npmignore
deleted file mode 100644
index e69de29b..00000000

From 6532b4d1b8a2e3b6b2be9126a18cb7fe570c8bd8 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 13 Dec 2018 10:44:52 +0100
Subject: [PATCH 2/5] List main entry point for our NPM config

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index f9e23498..ebd431b7 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
   "name": "@novnc/novnc",
   "version": "1.0.0",
   "description": "An HTML5 VNC client",
+  "browser": "lib/rfb",
   "directories": {
     "lib": "lib",
     "doc": "docs",

From 364849c67b233d287dfee5510121066ab1cd1393 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 13 Dec 2018 13:34:49 +0100
Subject: [PATCH 3/5] Avoid extra environment for Travis deploy stage

These are not needed, so keep things more clear by skipping them.
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e9c4767f..782867de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,8 @@ jobs:
     before_script:
     script: npm run lint
   - stage: deploy
+    env:
+    addons:
     script: skip
     before_script: skip
     deploy:

From 1ced5688b54703c9d226ae1b809b3635f767b9b1 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 20 Dec 2018 16:08:36 +0100
Subject: [PATCH 4/5] Change to Ossman's NPM authentication

Solly's doesn't seem to work anymore, so switch to mine.
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 782867de..f3084c0f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,9 +43,9 @@ jobs:
     before_script: skip
     deploy:
       provider: npm
-      email: directxman12+npm@gmail.com
+      email: ossman@cendio.se
       api_key:
-        secure: cIidkFmvkdmdwWsqBpxyPUCzBqgK8LhPiNxTrIfhwbUunMsJep9MiiBJtv8poVYG2Y4yfiZmqGn4nfetUdc/LDctd73j+/EM4Z/NUDexVAhJ+9/qCogvpJsSQ96VQo7yBceW4E1fBM3WCU0kcGToYIVSSrwvvRDtJfeYJf2Qqw0=
+        secure: "Qq2Mi9xQawO2zlAigzshzMu2QMHvu1IaN9l0ZIivE99wHJj7eS5f4miJ9wB+/mWRRgb3E8uj9ZRV24+Oc36drlBTU9sz+lHhH0uFMfAIseceK64wZV9sLAZm472fmPp2xdUeTCCqPaRy7g1XBqiJ0LyZvEFLsRijqcLjPBF+b8w="
       on:
         tags: true
         repo: novnc/noVNC

From 69a9fd60299e5cf62341ac5f64e5381a3ea9db6a Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 11 Jan 2019 12:37:18 +0100
Subject: [PATCH 5/5] Revert 'prepare' to 'prepublish'

Travis uses a so ancient version of npm that it doesn't support
'prepare', so we have to continue using 'prepublish' for now.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ebd431b7..0acf78ba 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "scripts": {
     "lint": "eslint app core po tests utils",
     "test": "karma start karma.conf.js",
-    "prepare": "node ./utils/use_require.js --as commonjs --clean"
+    "prepublish": "node ./utils/use_require.js --as commonjs --clean"
   },
   "repository": {
     "type": "git",