Breaking: switch from UMD to CommonJS

Leonya · Leonya · commit fdb3bad0ef88 · 2021-06-04T15:20:55.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -22,6 +22,8 @@ subprojects {
 
         tasks.withType<KotlinJsCompile>().configureEach {
             kotlinOptions {
+                moduleKind = "commonjs"
+
                 if (name == "compileKotlinJs") {
                     outputFile = jsOutputFile
                     sourceMapEmbedSources = "always"
diff --git a/examples/src/main/kotlin/example/AxiosSearch.kt b/examples/src/main/kotlin/example/AxiosSearch.kt
@@ -15,7 +15,6 @@ import react.dom.*
 import kotlin.js.*
 
 @JsModule("axios")
-@JsNonModule
 external fun <T> axios(config: AxiosConfigSettings): Promise<AxiosResponse<T>>
 
 // Type definition
diff --git a/examples/src/main/kotlin/example/Quill.kt b/examples/src/main/kotlin/example/Quill.kt
@@ -11,7 +11,6 @@ import react.*
 import react.dom.*
 
 @JsModule("react-quill")
-@JsNonModule
 external val reactQuill: RClass<ReactQuillProps>
 
 external interface ReactQuillProps : RProps {
diff --git a/kotlin-react-dom/src/main/kotlin/react/dom/Imports.kt b/kotlin-react-dom/src/main/kotlin/react/dom/Imports.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react-dom")
-@file:JsNonModule
 
 package react.dom
 
diff --git a/kotlin-react-dom/src/main/kotlin/react/dom/server/Imports.kt b/kotlin-react-dom/src/main/kotlin/react/dom/server/Imports.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react-dom/server")
-@file:JsNonModule
 
 package react.dom.server
 
diff --git a/kotlin-react-redux/src/main/kotlin/react/redux/Imports.kt b/kotlin-react-redux/src/main/kotlin/react/redux/Imports.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react-redux")
-@file:JsNonModule
 
 package react.redux
 
diff --git a/kotlin-react-router-dom/src/main/kotlin/react/router/dom/imports.kt b/kotlin-react-router-dom/src/main/kotlin/react/router/dom/imports.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react-router-dom")
-@file:JsNonModule
 
 package react.router.dom
 
diff --git a/kotlin-react-router-dom/src/main/kotlin/react/router/dom/routing.kt b/kotlin-react-router-dom/src/main/kotlin/react/router/dom/routing.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react-router-dom")
-@file:JsNonModule
 
 package react.router.dom
 
diff --git a/kotlin-react-table/src/main/kotlin/react/table/ColumnOrder.kt b/kotlin-react-table/src/main/kotlin/react/table/ColumnOrder.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react-table")
-@file:JsNonModule
 
 @file:Suppress("NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE")
 
diff --git a/kotlin-react-table/src/main/kotlin/react/table/Expanded.kt b/kotlin-react-table/src/main/kotlin/react/table/Expanded.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react-table")
-@file:JsNonModule
 
 @file:Suppress("NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE")
 
diff --git a/kotlin-react-table/src/main/kotlin/react/table/GroupBy.kt b/kotlin-react-table/src/main/kotlin/react/table/GroupBy.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react-table")
-@file:JsNonModule
 
 @file:Suppress("NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE")
 
diff --git a/kotlin-react-table/src/main/kotlin/react/table/Pagination.kt b/kotlin-react-table/src/main/kotlin/react/table/Pagination.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react-table")
-@file:JsNonModule
 
 @file:Suppress("NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE")
 
diff --git a/kotlin-react-table/src/main/kotlin/react/table/RowSelect.kt b/kotlin-react-table/src/main/kotlin/react/table/RowSelect.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react-table")
-@file:JsNonModule
 
 @file:Suppress("NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE")
 
diff --git a/kotlin-react-table/src/main/kotlin/react/table/RowState.kt b/kotlin-react-table/src/main/kotlin/react/table/RowState.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react-table")
-@file:JsNonModule
 
 @file:Suppress("NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE")
 
diff --git a/kotlin-react-table/src/main/kotlin/react/table/SortBy.kt b/kotlin-react-table/src/main/kotlin/react/table/SortBy.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react-table")
-@file:JsNonModule
 
 @file:Suppress("NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE")
 
diff --git a/kotlin-react-table/src/main/kotlin/react/table/Table.kt b/kotlin-react-table/src/main/kotlin/react/table/Table.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react-table")
-@file:JsNonModule
 
 @file:Suppress("NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE")
 
diff --git a/kotlin-react/src/main/kotlin/react/Imports.kt b/kotlin-react/src/main/kotlin/react/Imports.kt
@@ -1,5 +1,4 @@
 @file:JsModule("react")
-@file:JsNonModule
 
 package react
 
diff --git a/kotlin-redux/src/main/kotlin/redux/Imports.kt b/kotlin-redux/src/main/kotlin/redux/Imports.kt
@@ -1,5 +1,4 @@
 @file:JsModule("redux")
-@file:JsNonModule
 
 package redux
 
diff --git a/kotlin-styled/src/main/kotlin/styled/CssInJsUtils.kt b/kotlin-styled/src/main/kotlin/styled/CssInJsUtils.kt
@@ -1,5 +1,4 @@
 @file:JsModule("css-in-js-utils")
-@file:JsNonModule
 
 package styled
 
diff --git a/kotlin-styled/src/main/kotlin/styled/InlineStylePrefixer.kt b/kotlin-styled/src/main/kotlin/styled/InlineStylePrefixer.kt
@@ -1,5 +1,4 @@
 @file:JsModule("inline-style-prefixer")
-@file:JsNonModule
 
 package styled
 
diff --git a/kotlin-styled/src/main/kotlin/styled/StyledComponents.kt b/kotlin-styled/src/main/kotlin/styled/StyledComponents.kt
@@ -169,7 +169,6 @@ fun injectGlobal(string: String) {
 }
 
 @JsModule("react")
-@JsNonModule
 external object ReactModule
 
 private fun <T> devOverrideUseRef(action: () -> T): T {
diff --git a/kotlin-styled/src/main/kotlin/styled/styled-components.kt b/kotlin-styled/src/main/kotlin/styled/styled-components.kt
@@ -1,5 +1,4 @@
 @file:JsModule("styled-components")
-@file:JsNonModule
 
 package styled
 
diff --git a/kotlin-styled/src/main/kotlin/styled/styled.kt b/kotlin-styled/src/main/kotlin/styled/styled.kt
@@ -1,7 +1,6 @@
 package styled
 
 @JsModule("styled-components")
-@JsNonModule
 private external object StyledComponents
 
 fun rawStyled(target: dynamic): Styler =

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`@file:JsModule("react-dom")`
`2`		`-@file:JsNonModule`
`3`	`2`
`4`	`3`	`package react.dom`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`@file:JsModule("react-dom/server")`
`2`		`-@file:JsNonModule`
`3`	`2`
`4`	`3`	`package react.dom.server`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`@file:JsModule("react-redux")`
`2`		`-@file:JsNonModule`
`3`	`2`
`4`	`3`	`package react.redux`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`@file:JsModule("react-router-dom")`
`2`		`-@file:JsNonModule`
`3`	`2`
`4`	`3`	`package react.router.dom`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`@file:JsModule("react-table")`
`2`		`-@file:JsNonModule`
`3`	`2`
`4`	`3`	`@file:Suppress("NON_EXTERNAL_DECLARATION_IN_INAPPROPRIATE_FILE")`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`@file:JsModule("react")`
`2`		`-@file:JsNonModule`
`3`	`2`
`4`	`3`	`package react`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`@file:JsModule("redux")`
`2`		`-@file:JsNonModule`
`3`	`2`
`4`	`3`	`package redux`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`@file:JsModule("css-in-js-utils")`
`2`		`-@file:JsNonModule`
`3`	`2`
`4`	`3`	`package styled`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`@file:JsModule("inline-style-prefixer")`
`2`		`-@file:JsNonModule`
`3`	`2`
`4`	`3`	`package styled`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,6 @@ fun injectGlobal(string: String) {`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`@JsModule("react")`
`172`		`-@JsNonModule`
`173`	`172`	`external object ReactModule`
`174`	`173`
`175`	`174`	`private fun <T> devOverrideUseRef(action: () -> T): T {`