diff --git a/package.json b/package.json
index b391a3c0..562b6c7b 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
"lint": "eslint --cache src/",
"lint-ts": "eslint src/ -c .ts-eslintrc.js --ext .ts",
"lint-ci": "eslint src/",
- "test": "impunity --entry-point src/main.js --force-esm-dirs lib/ src/",
+ "test": "impunity --entry-point src/platform/web/main.js --force-esm-dirs lib/ src/",
"start": "snowpack dev --port 3000",
"build": "node --experimental-modules scripts/build.mjs",
"postinstall": "node ./scripts/post-install.js"
@@ -66,6 +66,7 @@
"dompurify": "^2.3.0",
"es6-promise": "https://github.com/bwindels/es6-promise.git#bwindels/expose-flush",
"rollup": "^2.26.4",
- "text-encoding": "^0.7.0"
+ "text-encoding": "^0.7.0",
+ "vite": "^2.6.3"
}
}
diff --git a/assets/config.json b/src/platform/web/assets/config.json
similarity index 100%
rename from assets/config.json
rename to src/platform/web/assets/config.json
diff --git a/assets/download-sandbox.html b/src/platform/web/assets/download-sandbox.html
similarity index 100%
rename from assets/download-sandbox.html
rename to src/platform/web/assets/download-sandbox.html
diff --git a/assets/icon-maskable.png b/src/platform/web/assets/icon-maskable.png
similarity index 100%
rename from assets/icon-maskable.png
rename to src/platform/web/assets/icon-maskable.png
diff --git a/assets/icon-maskable.svg b/src/platform/web/assets/icon-maskable.svg
similarity index 100%
rename from assets/icon-maskable.svg
rename to src/platform/web/assets/icon-maskable.svg
diff --git a/assets/icon.png b/src/platform/web/assets/icon.png
similarity index 100%
rename from assets/icon.png
rename to src/platform/web/assets/icon.png
diff --git a/assets/icon.svg b/src/platform/web/assets/icon.svg
similarity index 100%
rename from assets/icon.svg
rename to src/platform/web/assets/icon.svg
diff --git a/assets/manifest.json b/src/platform/web/assets/manifest.json
similarity index 100%
rename from assets/manifest.json
rename to src/platform/web/assets/manifest.json
diff --git a/src/platform/web/docroot/index.html b/src/platform/web/index.html
similarity index 62%
rename from src/platform/web/docroot/index.html
rename to src/platform/web/index.html
index 16f164ae..397aae66 100644
--- a/src/platform/web/docroot/index.html
+++ b/src/platform/web/index.html
@@ -9,11 +9,11 @@
-
+
-
-
-
+
+
+
diff --git a/src/main.js b/src/platform/web/main.js
similarity index 91%
rename from src/main.js
rename to src/platform/web/main.js
index 0754b2ab..34522ea8 100644
--- a/src/main.js
+++ b/src/platform/web/main.js
@@ -16,9 +16,9 @@ limitations under the License.
*/
// import {RecordRequester, ReplayRequester} from "./matrix/net/request/replay.js";
-import {SessionContainer} from "./matrix/SessionContainer.js";
-import {RootViewModel} from "./domain/RootViewModel.js";
-import {createNavigation, createRouter} from "./domain/navigation/index.js";
+import {SessionContainer} from "../../matrix/SessionContainer.js";
+import {RootViewModel} from "../../domain/RootViewModel.js";
+import {createNavigation, createRouter} from "../../domain/navigation/index.js";
// Don't use a default export here, as we use multiple entries during legacy build,
// which does not support default exports,
// see https://github.com/rollup/plugins/tree/master/packages/multi-entry
diff --git a/src/platform/web/sdk/paths/vite.ts b/src/platform/web/sdk/paths/vite.ts
new file mode 100644
index 00000000..eca08827
--- /dev/null
+++ b/src/platform/web/sdk/paths/vite.ts
@@ -0,0 +1,14 @@
+import _downloadSandboxPath from "../../assets/download-sandbox.html?url";
+import _workerPath from "../../worker/main.js?url";
+import olmWasmPath from "@matrix-org/olm/olm.wasm?url";
+import olmJsPath from "@matrix-org/olm/olm.js?url";
+import olmLegacyJsPath from "@matrix-org/olm/olm_legacy.js?url";
+
+export const olmPaths = {
+ wasm: olmWasmPath,
+ legacyBundle: olmLegacyJsPath,
+ wasmBundle: olmJsPath,
+};
+
+export const downloadSandboxPath = _downloadSandboxPath;
+export const workerPath = _workerPath;
diff --git a/src/platform/web/docroot/sw.js b/src/platform/web/sw.js
similarity index 100%
rename from src/platform/web/docroot/sw.js
rename to src/platform/web/sw.js
diff --git a/src/sdk/paths/vite.ts b/src/sdk/paths/vite.ts
deleted file mode 100644
index e38648eb..00000000
--- a/src/sdk/paths/vite.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import _downloadSandboxPath from "../../../assets/download-sandbox.html?url";
-import olmWasmPath from "../../../lib/olm/olm.wasm?url";
-import olmJsPath from "../../../lib/olm/olm.js?url";
-import olmLegacyJsPath from "../../../lib/olm/olm_legacy.js?url";
-
-export const olmPaths = {
- wasm: olmWasmPath,
- legacyBundle: olmLegacyJsPath,
- wasmBundle: olmJsPath,
-};
-
-export const downloadSandboxPath = _downloadSandboxPath;
diff --git a/src/platform/web/ui/view-gallery.html b/view-gallery.html
similarity index 100%
rename from src/platform/web/ui/view-gallery.html
rename to view-gallery.html
diff --git a/vite.config.js b/vite.config.js
new file mode 100644
index 00000000..d27d8a3a
--- /dev/null
+++ b/vite.config.js
@@ -0,0 +1,7 @@
+export default {
+ public: false,
+ root: "src/platform/web",
+ server: {
+ hmr: false
+ }
+};
diff --git a/yarn.lock b/yarn.lock
index fc159a40..93747878 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2293,6 +2293,61 @@ es-module-lexer@^0.6.0:
version "4.2.8"
resolved "https://github.com/bwindels/es6-promise.git#112f78f5829e627055b0ff56a52fecb63f6003b1"
+esbuild-android-arm64@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.4.tgz#5178a20d2b7aba741a31c19609f9e67b346996b9"
+ integrity sha512-elDJt+jNyoHFId0/dKsuVYUPke3EcquIyUwzJCH17a3ERglN3A9aMBI5zbz+xNZ+FbaDNdpn0RaJHCFLbZX+fA==
+
+esbuild-darwin-64@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.4.tgz#7a3e66c8e1271b650541b25eed65c84f3564a69d"
+ integrity sha512-zJQGyHRAdZUXlRzbN7W+7ykmEiGC+bq3Gc4GxKYjjWTgDRSEly98ym+vRNkDjXwXYD3gGzSwvH35+MiHAtWvLA==
+
+esbuild-darwin-arm64@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.4.tgz#793feca6032b2a57ef291eb9b2d33768d60a49d6"
+ integrity sha512-r8oYvAtqSGq8HNTZCAx4TdLE7jZiGhX9ooGi5AQAey37MA6XNaP8ZNlw9OCpcgpx3ryU2WctXwIqPzkHO7a8dg==
+
+esbuild-freebsd-64@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.4.tgz#294aec3c2cf4b41fb6900212fc9c33dd8fbbb4a2"
+ integrity sha512-u9DRGkn09EN8+lCh6z7FKle7awi17PJRBuAKdRNgSo5ZrH/3m+mYaJK2PR2URHMpAfXiwJX341z231tSdVe3Yw==
+
+esbuild-freebsd-arm64@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.4.tgz#09fe66c751c12f9b976976b1d83f3de594cb2787"
+ integrity sha512-q3B2k68Uf6gfjATjcK16DqxvjqRQkHL8aPoOfj4op+lSqegdXvBacB1d8jw8PxbWJ8JHpdTLdAVUYU80kotQXA==
+
+esbuild-linux-32@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.13.4.tgz#a9f0793d7bcc9cef4f4ffa4398c525877fba5839"
+ integrity sha512-UUYJPHSiKAO8KoN3Ls/iZtgDLZvK5HarES96aolDPWZnq9FLx4dIHM/x2z4Rxv9IYqQ/DxlPoE2Co1UPBIYYeA==
+
+esbuild-linux-64@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.13.4.tgz#c0d0b4c9d62e3bbf8bdf2cece37403aa6d60fc2e"
+ integrity sha512-+RnohAKiiUW4UHLGRkNR1AnENW1gCuDWuygEtd4jxTNPIoeC7lbXGor7rtgjj9AdUzFgOEvAXyNNX01kJ8NueQ==
+
+esbuild-linux-arm64@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.4.tgz#1292d97bfa64a08d12728f8a7837bf92776c779b"
+ integrity sha512-+A188cAdd6QuSRxMIwRrWLjgphQA0LDAQ/ECVlrPVJwnx+1i64NjDZivoqPYLOTkSPIKntiWwMhhf0U5/RrPHQ==
+
+esbuild-linux-arm@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.13.4.tgz#186cd9b8885ac132b9953a4a0afe668168debd10"
+ integrity sha512-BH5gKve4jglS7UPSsfwHSX79I5agC/lm4eKoRUEyo8lwQs89frQSRp2Xup+6SFQnxt3md5EsKcd2Dbkqeb3gPA==
+
+esbuild-linux-mips64le@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.4.tgz#42049bf72bc586817b4a51cc9e32148d13e5e807"
+ integrity sha512-0xkwtPaUkG5xMTFGaQPe1AadSe5QAiQuD4Gix1O9k5Xo/U8xGIkw9UFUTvfEUeu71vFb6ZgsIacfP1NLoFjWNw==
+
+esbuild-linux-ppc64le@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.4.tgz#adf1ce2ef2302757c4383887da6ac4dd25be9d4f"
+ integrity sha512-E1+oJPP7A+j23GPo3CEpBhGwG1bni4B8IbTA3/3rvzjURwUMZdcN3Fhrz24rnjzdLSHmULtOE4VsbT42h1Om4Q==
+
esbuild-node-loader@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/esbuild-node-loader/-/esbuild-node-loader-0.3.1.tgz#fa761e020eff316549ddc3c51a25ec9ffc159ff2"
@@ -2300,11 +2355,58 @@ esbuild-node-loader@^0.3.1:
dependencies:
esbuild "^0.12.6"
+esbuild-openbsd-64@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.4.tgz#1c8122101898c52a20c8786935cf3eb7a19b83b4"
+ integrity sha512-xEkI1o5HYxDzbv9jSox0EsDxpwraG09SRiKKv0W8pH6O3bt+zPSlnoK7+I7Q69tkvONkpIq5n2o+c55uq0X7cw==
+
+esbuild-sunos-64@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.13.4.tgz#4ec95faa14a60f295fe485bebffefff408739337"
+ integrity sha512-bjXUMcODMnB6hQicLBBmmnBl7OMDyVpFahKvHGXJfDChIi5udiIRKCmFUFIRn+AUAKVlfrofRKdyPC7kBsbvGQ==
+
+esbuild-windows-32@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.13.4.tgz#3182c380487b797b04d0ec2c80c2945666869080"
+ integrity sha512-z4CH07pfyVY0XF98TCsGmLxKCl0kyvshKDbdpTekW9f2d+dJqn5mmoUyWhpSVJ0SfYWJg86FoD9nMbbaMVyGdg==
+
+esbuild-windows-64@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.13.4.tgz#b9e995f92d81f433a04f33611e603e82f9232e69"
+ integrity sha512-uVL11vORRPjocGLYam67rwFLd0LvkrHEs+JG+1oJN4UD9MQmNGZPa4gBHo6hDpF+kqRJ9kXgQSeDqUyRy0tj/Q==
+
+esbuild-windows-arm64@0.13.4:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.4.tgz#fb239532f07b764d158f4cc787178ef4c6fadb5c"
+ integrity sha512-vA6GLvptgftRcDcWngD5cMlL4f4LbL8JjU2UMT9yJ0MT5ra6hdZNFWnOeOoEtY4GtJ6OjZ0i+81sTqhAB0fMkg==
+
esbuild@^0.12.6:
version "0.12.20"
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.20.tgz#4d3c9d83c99a4031e027b42a4c398c23b6827cb0"
integrity sha512-u7+0qTo9Z64MD9PhooEngCmzyEYJ6ovFhPp8PLNh3UasR5Ihjv6HWVXqm8uHmasdQlpsAf0IsY4U0YVUfCpt4Q==
+esbuild@^0.13.2:
+ version "0.13.4"
+ resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.13.4.tgz#ce2deb56c4fb360938311cbfc67f8e467bb6841b"
+ integrity sha512-wMA5eUwpavTBiNl+It6j8OQuKVh69l6z4DKDLzoTIqC+gChnPpcmqdA8WNHptUHRnfyML+mKEQPlW7Mybj8gHg==
+ optionalDependencies:
+ esbuild-android-arm64 "0.13.4"
+ esbuild-darwin-64 "0.13.4"
+ esbuild-darwin-arm64 "0.13.4"
+ esbuild-freebsd-64 "0.13.4"
+ esbuild-freebsd-arm64 "0.13.4"
+ esbuild-linux-32 "0.13.4"
+ esbuild-linux-64 "0.13.4"
+ esbuild-linux-arm "0.13.4"
+ esbuild-linux-arm64 "0.13.4"
+ esbuild-linux-mips64le "0.13.4"
+ esbuild-linux-ppc64le "0.13.4"
+ esbuild-openbsd-64 "0.13.4"
+ esbuild-sunos-64 "0.13.4"
+ esbuild-windows-32 "0.13.4"
+ esbuild-windows-64 "0.13.4"
+ esbuild-windows-arm64 "0.13.4"
+
esbuild@~0.9.0:
version "0.9.7"
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.9.7.tgz#ea0d639cbe4b88ec25fbed4d6ff00c8d788ef70b"
@@ -3683,6 +3785,11 @@ nanoid@^3.1.23:
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+nanoid@^3.1.28:
+ version "3.1.28"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.28.tgz#3c01bac14cb6c5680569014cc65a2f26424c6bd4"
+ integrity sha512-gSu9VZ2HtmoKYe/lmyPFES5nknFrHa+/DT9muUFWFMi6Jh9E1I7bkvlQ8xxf1Kos9pi9o8lBnIOkatMhKX/YUw==
+
natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -4105,6 +4212,11 @@ periscopic@^2.0.3:
estree-walker "^2.0.2"
is-reference "^1.1.4"
+picocolors@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
+ integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
+
picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
@@ -4271,6 +4383,15 @@ postcss@^8.3.5:
nanoid "^3.1.23"
source-map-js "^0.6.2"
+postcss@^8.3.8:
+ version "8.3.9"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.9.tgz#98754caa06c4ee9eb59cc48bd073bb6bd3437c31"
+ integrity sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==
+ dependencies:
+ nanoid "^3.1.28"
+ picocolors "^0.2.1"
+ source-map-js "^0.6.2"
+
prelude-ls@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -4602,6 +4723,13 @@ rollup@^2.26.4:
optionalDependencies:
fsevents "~2.1.2"
+rollup@^2.57.0:
+ version "2.58.0"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.58.0.tgz#a643983365e7bf7f5b7c62a8331b983b7c4c67fb"
+ integrity sha512-NOXpusKnaRpbS7ZVSzcEXqxcLDOagN6iFS8p45RkoiMqPHDLwJm758UF05KlMoCRbLBTZsPOIa887gZJ1AiXvw==
+ optionalDependencies:
+ fsevents "~2.3.2"
+
rollup@~2.37.1:
version "2.37.1"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.37.1.tgz#aa7aadffd75c80393f9314f9857e851b0ffd34e7"
@@ -5239,6 +5367,18 @@ verror@1.10.0:
core-util-is "1.0.2"
extsprintf "^1.2.0"
+vite@^2.6.3:
+ version "2.6.3"
+ resolved "https://registry.yarnpkg.com/vite/-/vite-2.6.3.tgz#5bbc1d3fcff6bfee9c5e3c0d0a689b18e5974b38"
+ integrity sha512-mLiN4WR8zpmn04khhBf7YvC3FHrGhZt9S6xm53uDWgtYcUVNtV5LXHLI2Sc4SpL8jd/dsSIHzRxj7JTIu+MTDQ==
+ dependencies:
+ esbuild "^0.13.2"
+ postcss "^8.3.8"
+ resolve "^1.20.0"
+ rollup "^2.57.0"
+ optionalDependencies:
+ fsevents "~2.3.2"
+
vm2@^3.9.2:
version "3.9.3"
resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.3.tgz#29917f6cc081cc43a3f580c26c5b553fd3c91f40"