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.

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

point at ofps-capable sqlite #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import org.w3c.dom.Worker

fun todoDatabaseDriver(): Single<SqlDriver> =
singleFromCoroutine {
val worker = Worker(js("""new URL("sqlite.worker.js", import.meta.url)""").unsafeCast<String>())
val worker = Worker(js("""new URL("sqldelight-sqlite-wasm-worker/sqlitewasm.worker.js", import.meta.url)""").unsafeCast<String>())
val driver: SqlDriver = WebWorkerDriver(worker)

// val driver = WebWorkerDriver(
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ arkivanov-mvikotlin = "4.0.0"
arkivanov-decompose = "3.1.0"
arkivanov-essenty = "2.1.0"
badoo-reaktive = "2.2.0"
sqldelight = "2.0.2"
sqldelight = "2.1.0-local"
kotlin-serialization = "1.7.1"

[libraries]
Expand Down
2,968 changes: 0 additions & 2,968 deletions kotlin-js-store/yarn.lock

This file was deleted.

38 changes: 38 additions & 0 deletions wasmWeb/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
plugins {
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.compose)
}

kotlin {
js {
browser {
useCommonJs()
binaries.executable()
}
}

sourceSets {
wasmMain.dependencies {
implementation(compose.runtime)
implementation(compose.html.core)
implementation(project(":common:utils"))
implementation(project(":common:database"))
implementation(project(":common:root"))
implementation(project(":common:main"))
implementation(project(":common:edit"))
implementation(libs.arkivanov.decompose)
implementation(libs.arkivanov.mvikotlin)
implementation(libs.arkivanov.mvikotlin.main)
implementation(libs.badoo.reaktive)

implementation(libs.squareup.sqldelight.webworker.driver)

implementation(npm("@sqlite.org/sqlite-wasm", "3.47.2-build1"))
implementation(npm("sqldelight-sqlite-wasm-worker", "1.0.8"))

implementation(npm("copy-webpack-plugin", "11.0.0"))
implementation(npm("@material-ui/icons", "4.11.2"))
}
}
}
Empty file added wasmWeb/src/main.kt
Empty file.
9 changes: 9 additions & 0 deletions wasmWeb/webpack.config.d/fs.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// As per https://cashapp.github.io/sqldelight/js_sqlite/

config.resolve = {
fallback: {
fs: false,
path: false,
crypto: false
}
}
7 changes: 7 additions & 0 deletions wasmWeb/webpack.config.d/opfs.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
config.devServer = {
...config.devServer,
headers: {
"Cross-Origin-Embedder-Policy": "require-corp",
"Cross-Origin-Opener-Policy": "same-origin",
}
}
14 changes: 14 additions & 0 deletions wasmWeb/webpack.config.d/wasm.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// As per https://cashapp.github.io/sqldelight/js_sqlite/

var CopyWebpackPlugin = require('copy-webpack-plugin');
config.plugins.push(
new CopyWebpackPlugin(
{
patterns: [
"../../node_modules/@sqlite.org/sqlite-wasm/sqlite-wasm/jswasm/sqlite3.js",
"../../node_modules/@sqlite.org/sqlite-wasm/sqlite-wasm/jswasm/sqlite3.wasm",
"../../node_modules/@sqlite.org/sqlite-wasm/sqlite-wasm/jswasm/sqlite3-opfs-async-proxy.js",
]
}
)
);
6 changes: 5 additions & 1 deletion web/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,12 @@ kotlin {
implementation(libs.arkivanov.mvikotlin)
implementation(libs.arkivanov.mvikotlin.main)
implementation(libs.badoo.reaktive)

implementation(libs.squareup.sqldelight.webworker.driver)
implementation(npm("@sqlite.org/sqlite-wasm", "3.43.2-build1"))

implementation(npm("@sqlite.org/sqlite-wasm", "3.47.2-build1"))
implementation(npm("sqldelight-sqlite-wasm-worker", "1.0.5"))

implementation(npm("copy-webpack-plugin", "11.0.0"))
implementation(npm("@material-ui/icons", "4.11.2"))
}
Expand Down
59 changes: 0 additions & 59 deletions web/src/jsMain/resources/sqlite.worker.js

This file was deleted.