Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use webpack worker-loader instead of homegrown hack #17963

Merged
merged 3 commits into from Jul 14, 2021
Merged

Use webpack worker-loader instead of homegrown hack #17963

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66ada58
Use webpack worker-loader to load the IndexedDB worker instead of hom…
t3chguy Jul 12, 2021
80bc659
Merge branch 'develop' of github.com:vector-im/element-web into t3chg…
t3chguy Jul 14, 2021
7aca548
Add missing stylelint dependencies and run i18n
t3chguy Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -146,7 +146,8 @@
"typescript": "^4.1.3",
"webpack": "^4.46.0",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.2"
"webpack-dev-server": "^3.11.2",
"worker-loader": "^2.0.0"
},
"jest": {
"testEnvironment": "jest-environment-jsdom-sixteen",
Expand Down
13 changes: 0 additions & 13 deletions src/vector/app.tsx
View file
Open in desktop
Expand Up @@ -30,7 +30,6 @@ import AutoDiscoveryUtils from 'matrix-react-sdk/src/utils/AutoDiscoveryUtils';
import { AutoDiscovery } from "matrix-js-sdk/src/autodiscovery";
import * as Lifecycle from "matrix-react-sdk/src/Lifecycle";
import type MatrixChatType from "matrix-react-sdk/src/components/structures/MatrixChat";
import { MatrixClientPeg } from 'matrix-react-sdk/src/MatrixClientPeg';
import SdkConfig from "matrix-react-sdk/src/SdkConfig";

import { parseQs, parseQsFromFragment } from './url_utils';
Expand Down Expand Up @@ -129,18 +128,6 @@ function onTokenLoginCompleted() {
}

export async function loadApp(fragParams: {}) {
// XXX: the way we pass the path to the worker script from webpack via html in body's dataset is a hack
// but alternatives seem to require changing the interface to passing Workers to js-sdk
const vectorIndexeddbWorkerScript = document.body.dataset.vectorIndexeddbWorkerScript;
if (!vectorIndexeddbWorkerScript) {
// If this is missing, something has probably gone wrong with
// the bundling. The js-sdk will just fall back to accessing
// indexeddb directly with no worker script, but we want to
// make sure the indexeddb script is present, so fail hard.
throw newTranslatableError(_td("Missing indexeddb worker script!"));
}
MatrixClientPeg.setIndexedDbWorkerScript(vectorIndexeddbWorkerScript);

window.addEventListener('hashchange', onHashChange);

const platform = PlatformPeg.get();
Expand Down
1 change: 0 additions & 1 deletion src/vector/index.html
View file
Open in desktop
Expand Up @@ -60,7 +60,6 @@
</head>
<body
style="height: 100%; margin: 0;"
data-vector-indexeddb-worker-script="<%= htmlWebpackPlugin.files.js.find(entry => entry.includes("indexeddb-worker.js")) %>"
data-vector-recorder-worklet-script="<%= htmlWebpackPlugin.files.js.find(entry => entry.includes("recorder-worklet.js")) %>"
>
<noscript>Sorry, Element requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
Expand Down
21 changes: 0 additions & 21 deletions src/vector/indexeddb-worker.ts
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion webpack.config.js
View file
Open in desktop
Expand Up @@ -55,7 +55,6 @@ module.exports = (env, argv) => {

entry: {
"bundle": "./src/vector/index.ts",
"indexeddb-worker": "./src/vector/indexeddb-worker.ts",
"mobileguide": "./src/vector/mobile_guide/index.ts",
"jitsi": "./src/vector/jitsi/index.ts",
"usercontent": "./node_modules/matrix-react-sdk/src/usercontent/index.js",
Expand Down Expand Up @@ -151,6 +150,10 @@ module.exports = (env, argv) => {
/olm[\\/](javascript[\\/])?olm\.js$/,
],
rules: [
{
test: /\.worker\.ts$/,
t3chguy marked this conversation as resolved.
Show resolved Hide resolved
loader: "worker-loader",
},
{
test: /\.(ts|js)x?$/,
include: (f) => {
Expand Down