switched to ECMAScript modules

6 years ago · f22a1dfd5e
parent 2f6dc13f76
commit f22a1dfd5e
7 changed files with 12 additions and 17 deletions
--- a/example/daemon/www/index.html
+++ b/example/daemon/www/index.html
@ -3,11 +3,7 @@
    <title>LWS Example</title>
    <meta charset="UTF-8">
    <link rel="stylesheet" type="text/css" href="style/main.css">
-    <script type="text/javascript" src="js/connection.js"></script>
-    <script type="text/javascript" src="js/connection_view.js"></script>
-    <script type="text/javascript" src="js/filesystem.js"></script>
-    <script type="text/javascript" src="js/filesystem_handler.js"></script>
-    <script type="text/javascript" src="js/startup.js"></script>
+    <script type="module" src="js/startup.js"></script>
 </head>
 <body>

--- a/example/daemon/www/js/.eslintrc.js
+++ b/example/daemon/www/js/.eslintrc.js
@ -9,7 +9,8 @@ module.exports = {
        "SharedArrayBuffer": "readonly"
    },
    "parserOptions": {
-        "ecmaVersion": 2018
+        "ecmaVersion": 2018,
+        "sourceType": "module"
    },
    "rules": {
        "accessor-pairs": "error",
--- a/example/daemon/www/js/connection.js
+++ b/example/daemon/www/js/connection.js
@ -1,6 +1,4 @@
-/* exported Connection */
-
-class Connection {
+export class Connection {

    constructor() {
        this.ws = null;
--- a/example/daemon/www/js/connection_view.js
+++ b/example/daemon/www/js/connection_view.js
@ -1,6 +1,4 @@
-/* exported ConnectionView */
-
-class ConnectionView {
+export class ConnectionView {
    constructor(connection) {
        this.connection = connection;
        this.connection.onclose = () => { this.onConnectionClosed(); };
--- a/example/daemon/www/js/filesystem.js
+++ b/example/daemon/www/js/filesystem.js
@ -1,7 +1,6 @@
-/* exported FileSystem */
 /* eslint no-unused-vars: ["error", { "argsIgnorePattern": "^_" }] */

-class FileSystem {
+export class FileSystem {
    static get GOOD() { return 0; }
    static get BAD()  { return 1; }

--- a/example/daemon/www/js/filesystem_handler.js
+++ b/example/daemon/www/js/filesystem_handler.js
@ -1,7 +1,6 @@
-/* exported FileSystemHandler */
 /* eslint no-console: "off" */

-class FileSystemHandler {
+export class FileSystemHandler {

    constructor(filesystem, connection) {
        this._fs = filesystem;
--- a/example/daemon/www/js/startup.js
+++ b/example/daemon/www/js/startup.js
@ -1,4 +1,8 @@
-/* global Connection, ConnectionView, FileSystem, FileSystemHandler */
+import { Connection } from "./connection.js";
+import { ConnectionView } from "./connection_view.js";
+import { FileSystem } from "./filesystem.js";
+import { FileSystemHandler } from "./filesystem_handler.js";
+

 function mode(value) {
    return parseInt(value, 8);