Add web main support

.gitignore

@@ -5,4 +5,12 @@ build
 **/.DS_Store
 *.hprof
 local.properties
-.kotlin
+.kotlin
+
+xcuserdata
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcodeproj/project.xcworkspace/
+!*.xcworkspace/contents.xcworkspacedata
+**/xcshareddata/WorkspaceSettings.xcsettings

build-logic/convention/src/main/kotlin/org/publicvalue/convention/config/Multiplatform.kt

@@ -22,7 +22,7 @@ fun KotlinMultiplatformExtension.configureAndroidTarget() {
 @OptIn(ExperimentalWasmDsl::class)
 fun KotlinMultiplatformExtension.configureWasmTarget(baseName: String? = null) {
     wasmJs {
-        outputModuleName.set(baseName ?: project.path.substring(1).replace(":","-").replace("-","_"))
+        outputModuleName.set(baseName ?: project.path.substring(1).replace(":", "-").replace("-", "_"))
         browser {
             commonWebpackConfig {
                 outputFileName = "$baseName.js"
@@ -31,6 +31,7 @@ fun KotlinMultiplatformExtension.configureWasmTarget(baseName: String? = null) {
                         // Serve sources to debug inside browser
                         add(project.projectDir.path)
                         add(project.projectDir.path + "/commonMain/")
+                        add(project.projectDir.path + "/webMain/")
                         add(project.projectDir.path + "/wasmJsMain/")
                     }
                 }
@@ -39,6 +40,13 @@ fun KotlinMultiplatformExtension.configureWasmTarget(baseName: String? = null) {
     }
 }
 
+fun KotlinMultiplatformExtension.configureJsTarget() {
+    js(IR) {
+        browser()
+        binaries.library()
+    }
+}
+
 fun KotlinMultiplatformExtension.configureIosTargets(baseName: String? = null) {
     listOf(
         iosX64(),

oidc-appsupport/build.gradle.kts

@@ -1,12 +1,9 @@
-import com.android.build.gradle.internal.tasks.factory.dependsOn
 import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.publicvalue.convention.config.configureIosTargets
+import org.publicvalue.convention.config.configureJsTarget
 import org.publicvalue.convention.config.configureWasmTarget
 import org.publicvalue.convention.config.exportKdoc
-import java.nio.file.Files
-import java.util.stream.Collectors.toList
-import kotlin.io.path.name
 
 plugins {
     id("org.publicvalue.convention.android.library")
@@ -27,6 +24,7 @@ kotlin {
     jvm()
     configureIosTargets(baseName = "OpenIdConnectClient")
     configureWasmTarget(baseName = "OpenIdConnectClient")
+    configureJsTarget()
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -58,7 +56,7 @@ kotlin {
             }
         }
 
-        val wasmJsMain by getting {
+        val webMain by getting {
             dependencies {
                 implementation(libs.kotlinx.browser)
             }

oidc-appsupport/src/wasmJsMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.wasmJs.kt → oidc-appsupport/src/webMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/PlatformCodeAuthFlow.web.kt

@@ -4,7 +4,6 @@ import org.publicvalue.multiplatform.oidc.ExperimentalOpenIdConnect
 import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
 import org.publicvalue.multiplatform.oidc.flows.CodeAuthFlow
 import org.publicvalue.multiplatform.oidc.flows.EndSessionFlow
-import org.publicvalue.multiplatform.oidc.flows.EndSessionResponse
 import org.publicvalue.multiplatform.oidc.preferences.Preferences
 import org.publicvalue.multiplatform.oidc.types.AuthCodeRequest
 import org.publicvalue.multiplatform.oidc.types.EndSessionRequest

oidc-appsupport/src/wasmJsMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/WasmCodeAuthFlowFactory.kt → oidc-appsupport/src/webMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/WebCodeAuthFlowFactory.kt

@@ -4,17 +4,16 @@ import kotlinx.browser.window
 import org.publicvalue.multiplatform.oidc.ExperimentalOpenIdConnect
 import org.publicvalue.multiplatform.oidc.OpenIdConnectClient
 import org.publicvalue.multiplatform.oidc.flows.EndSessionFlow
-import org.publicvalue.multiplatform.oidc.preferences.PREFERENCES_FILENAME
 import org.publicvalue.multiplatform.oidc.preferences.PreferencesFactory
 
 @ExperimentalOpenIdConnect
-class WasmCodeAuthFlowFactory(
+class WebCodeAuthFlowFactory(
     private val windowTarget: String = "",
     private val windowFeatures: String = "width=1000,height=800,resizable=yes,scrollbars=yes",
     private val redirectOrigin: String = window.location.origin,
     /** factory used to create preferences to save session information during login process. **/
     private val preferencesFactory: PreferencesFactory = PreferencesFactory()
-): CodeAuthFlowFactory {
+) : CodeAuthFlowFactory {
     override fun createAuthFlow(client: OpenIdConnectClient): PlatformCodeAuthFlow {
         val preferences = preferencesFactory.create()
         return PlatformCodeAuthFlow(windowTarget, windowFeatures, redirectOrigin, client, preferences)

oidc-appsupport/src/wasmJsMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/WebPopupFlow.kt → oidc-appsupport/src/webMain/kotlin/org/publicvalue/multiplatform/oidc/appsupport/WebPopupFlow.kt

@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalWasmJsInterop::class)
+
 package org.publicvalue.multiplatform.oidc.appsupport
 
 import io.ktor.http.*
@@ -12,14 +14,16 @@ import org.w3c.dom.Window
 import org.w3c.dom.events.Event
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
+import kotlin.js.ExperimentalWasmJsInterop
+import kotlin.js.js
 
 @ExperimentalOpenIdConnect
 internal class WebPopupFlow(
     private val windowTarget: String = "",
     private val windowFeatures: String = "width=1000,height=800,resizable=yes,scrollbars=yes",
     private val redirectOrigin: String,
     private val preferences: Preferences,
-): WebAuthenticationFlow {
+) : WebAuthenticationFlow {
 
     private class WindowHolder(var window: Window?)
 

oidc-core/build.gradle.kts

@@ -1,4 +1,5 @@
 import org.publicvalue.convention.config.configureIosTargets
+import org.publicvalue.convention.config.configureJsTarget
 import org.publicvalue.convention.config.configureWasmTarget
 import org.publicvalue.convention.config.exportKdoc
 
@@ -15,6 +16,7 @@ kotlin {
     jvm()
     configureIosTargets()
     configureWasmTarget()
+    configureJsTarget()
     sourceSets {
         commonMain {
             dependencies {

oidc-crypto/build.gradle.kts

@@ -1,5 +1,5 @@
-import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 import org.publicvalue.convention.config.configureIosTargets
+import org.publicvalue.convention.config.configureJsTarget
 import org.publicvalue.convention.config.configureWasmTarget
 import org.publicvalue.convention.config.exportKdoc
 
@@ -16,6 +16,7 @@ kotlin {
     jvm()
     configureIosTargets()
     configureWasmTarget()
+    configureJsTarget()
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -34,7 +35,7 @@ kotlin {
             }
         }
 
-        val wasmJsMain by getting {
+        val webMain by getting {
             dependencies {
                 implementation(project.dependencies.platform(libs.kotlincrypto.hash.bom))
                 implementation(libs.kotlincrypto.hash.sha2)

oidc-ktor/build.gradle.kts

@@ -1,4 +1,5 @@
 import org.publicvalue.convention.config.configureIosTargets
+import org.publicvalue.convention.config.configureJsTarget
 import org.publicvalue.convention.config.configureWasmTarget
 
 plugins {
@@ -14,6 +15,7 @@ kotlin {
     jvm()
     configureIosTargets()
     configureWasmTarget()
+    configureJsTarget()
     sourceSets {
         val commonMain by getting {
             dependencies {

oidc-preferences/build.gradle.kts

@@ -1,4 +1,5 @@
 import org.publicvalue.convention.config.configureIosTargets
+import org.publicvalue.convention.config.configureJsTarget
 import org.publicvalue.convention.config.configureWasmTarget
 import org.publicvalue.convention.config.exportKdoc
 
@@ -16,6 +17,7 @@ kotlin {
     jvm()
     configureIosTargets()
     configureWasmTarget()
+    configureJsTarget()
     sourceSets {
         commonMain {
             dependencies {
@@ -26,23 +28,22 @@ kotlin {
             }
         }
 
-        wasmJsMain {
+        webMain {
             dependencies {
                 implementation(libs.kotlinx.browser)
             }
         }
 
-        val nonWasmJsMain by creating {
+        val nonWebMain by creating {
             dependsOn(commonMain.get())
             dependencies {
                 implementation(libs.androidx.datastore.core)
             }
         }
 
-        jvmMain.get().dependsOn(nonWasmJsMain)
-        iosMain.get().dependsOn(nonWasmJsMain)
-        androidMain.get().dependsOn(nonWasmJsMain)
-
+        jvmMain.get().dependsOn(nonWebMain)
+        iosMain.get().dependsOn(nonWebMain)
+        androidMain.get().dependsOn(nonWebMain)
     }
 
     exportKdoc()

oidc-tokenstore/build.gradle.kts

@@ -1,4 +1,5 @@
 import org.publicvalue.convention.config.configureIosTargets
+import org.publicvalue.convention.config.configureJsTarget
 import org.publicvalue.convention.config.configureWasmTarget
 
 plugins {
@@ -14,6 +15,7 @@ kotlin {
     jvm()
     configureIosTargets()
     configureWasmTarget()
+    configureJsTarget()
     sourceSets {
         val commonMain by getting {
             dependencies {

sample-app/kotlin-js-store/wasm/yarn.lock

@@ -0,0 +1,18 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@js-joda/[email protected]":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-3.2.0.tgz#3e61e21b7b2b8a6be746df1335cf91d70db2a273"
+  integrity sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg==
+
+format-util@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271"
+  integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==
+
+[email protected]:
+  version "8.18.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
+  integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==