Merge branch 'switch-to-es-module-publish-and-use-exports' of github.com:elikoga/noVNC

Author: CendioOssman

karma.conf.js renamed to karma.conf.cjs

@@ -2,24 +2,20 @@
   "name": "@novnc/novnc",
   "version": "1.6.0",
   "description": "An HTML5 VNC client",
-  "browser": "lib/rfb",
-  "directories": {
-    "lib": "lib",
-    "doc": "docs",
-    "test": "tests"
-  },
+  "type": "module",
   "files": [
-    "lib",
+    "core",
+    "vendor",
     "AUTHORS",
     "VERSION",
     "docs/API.md",
     "docs/LIBRARY.md",
     "docs/LICENSE*"
   ],
+  "exports": "./core/rfb.js",
   "scripts": {
     "lint": "eslint app core po/po2js po/xgettext-html tests utils",
-    "test": "karma start karma.conf.js",
-    "prepublish": "node ./utils/convert.js --clean"
+    "test": "karma start karma.conf.cjs"
   },
   "repository": {
     "type": "git",

package.json

@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-const { program } = require('commander');
-const fs = require('fs');
-const pofile = require("pofile");
+import { program } from 'commander';
+import fs from 'fs';
+import pofile from "pofile";
 
 program
     .argument('<input>')

po/po2js

@@ -5,9 +5,9 @@
  * Licensed under MPL 2.0 (see LICENSE.txt)
  */
 
-const { program } = require('commander');
-const jsdom = require("jsdom");
-const fs = require("fs");
+import { program } from 'commander';
+import jsdom from 'jsdom';
+import fs from 'fs';
 
 program
     .argument('<INPUT...>')
@@ -106,7 +106,7 @@ let output = "";
 
 for (let str in strings) {
     output += "#:";
-    for (location in strings[str]) {
+    for (let location in strings[str]) {
         output += " " + location;
     }
     output += "\n";

po/xgettext-html

@@ -7,7 +7,7 @@
 
 "use strict";
 
-const fs = require('fs');
+import fs from 'fs';
 
 let showHelp = process.argv.length === 2;
 let filename;