diff --git a/keyserver/src/responders/website-responders.js b/keyserver/src/responders/website-responders.js --- a/keyserver/src/responders/website-responders.js +++ b/keyserver/src/responders/website-responders.js @@ -95,7 +95,6 @@ +fontsURL: string, +cssInclude: string, +olmFilename: string, - +sqljsFilename: string, +commQueryExecutorFilename: string, +opaqueURL: string, }; @@ -111,7 +110,6 @@ fontsURL, cssInclude: '', olmFilename: '', - sqljsFilename: '', commQueryExecutorFilename: '', opaqueURL: 'http://localhost:8080/opaque-ke.wasm', }; @@ -136,7 +134,6 @@ /> `, olmFilename: manifest['olm.wasm'], - sqljsFilename: webworkersManifest['sql-wasm.wasm'], commQueryExecutorFilename: webworkersManifest['comm_query_executor.wasm'], opaqueURL: `compiled/${manifest['comm_opaque2_wasm_bg.wasm']}`, }; @@ -503,7 +500,6 @@ fontsURL, cssInclude, olmFilename, - sqljsFilename, opaqueURL, commQueryExecutorFilename, } = await assetInfoPromise; @@ -615,7 +611,6 @@ ; var baseURL = "${baseURL}"; var olmFilename = "${olmFilename}"; - var sqljsFilename = "${sqljsFilename}"; var commQueryExecutorFilename = "${commQueryExecutorFilename}"; var opaqueURL = "${opaqueURL}"; diff --git a/web/database/database-module-provider.js b/web/database/database-module-provider.js --- a/web/database/database-module-provider.js +++ b/web/database/database-module-provider.js @@ -10,7 +10,6 @@ type WorkerResponseMessage, } from '../types/worker-types.js'; -declare var sqljsFilename: string; declare var commQueryExecutorFilename: string; declare var preloadedState: AppState; @@ -58,7 +57,6 @@ await this.workerProxy.scheduleOnWorker({ type: workerRequestMessageTypes.INIT, sqljsFilePath: `${origin}${SQLJS_FILE_PATH}`, - sqljsFilename, encryptionKey, commQueryExecutorFilename, }); diff --git a/web/database/worker/db-worker.js b/web/database/worker/db-worker.js --- a/web/database/worker/db-worker.js +++ b/web/database/worker/db-worker.js @@ -52,7 +52,6 @@ async function initDatabase( sqljsFilePath: string, - sqljsFilename: ?string, commQueryExecutorFilename: ?string, encryptionKeyJWK?: ?SubtleCrypto$JsonWebKey, ) { @@ -203,7 +202,6 @@ if (message.type === workerRequestMessageTypes.INIT) { await initDatabase( message.sqljsFilePath, - message.sqljsFilename, message.commQueryExecutorFilename, message.encryptionKey, ); diff --git a/web/types/worker-types.js b/web/types/worker-types.js --- a/web/types/worker-types.js +++ b/web/types/worker-types.js @@ -35,7 +35,6 @@ export type InitWorkerRequestMessage = { +type: 1, +sqljsFilePath: string, - +sqljsFilename: ?string, +commQueryExecutorFilename: ?string, +encryptionKey?: ?SubtleCrypto$JsonWebKey, }; diff --git a/web/webpack.config.cjs b/web/webpack.config.cjs --- a/web/webpack.config.cjs +++ b/web/webpack.config.cjs @@ -137,14 +137,6 @@ }; const devWebWorkersPlugins = [ - new CopyPlugin({ - patterns: [ - { - from: 'node_modules/sql.js/dist/sql-wasm.wasm', - to: path.join(__dirname, 'dist', 'webworkers'), - }, - ], - }), new CopyPlugin({ patterns: [ { @@ -156,19 +148,6 @@ ]; const prodWebWorkersPlugins = [ - new CopyPlugin({ - patterns: [ - { - from: 'node_modules/sql.js/dist/sql-wasm.wasm', - to: path.join( - __dirname, - 'dist', - 'webworkers', - 'sql-wasm.[contenthash:12].wasm', - ), - }, - ], - }), new CopyPlugin({ patterns: [ {