Skip to content
This repository has been archived by the owner on Feb 10, 2023. It is now read-only.

Commit

Permalink
Merge pull request #171 from cquiroz/lib-updates
Browse files Browse the repository at this point in the history
Upgrade libraríes
  • Loading branch information
cquiroz authored Sep 4, 2020
2 parents 9faf624 + b155997 commit c38572c
Show file tree
Hide file tree
Showing 30 changed files with 469 additions and 449 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
uses: olafurpg/setup-scala@v2
with:
java-version: 1.8
- name: version
run: node --version
- name: Checking your code format
run: csbt scalafmtCheckAll
- name: Run tests
Expand Down
2 changes: 2 additions & 0 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ spaces.inImportCurlyBraces = true

continuationIndent.defnSite = 2

docstrings.style = Asterisk

rewrite.neverInfix.excludeFilters = [until
to
by
Expand Down
17 changes: 9 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ lazy val demo =
"react" -> reactJS,
"react-dom" -> reactJS,
"fomantic-ui-less" -> FUILess,
"create-react-context" -> "0.3.0",
"react-semantic-toasts" -> Toasts
),
// don't publish the demo
Expand All @@ -120,16 +121,16 @@ lazy val facade =
.settings(commonSettings: _*)
.settings(
name := "react-semantic-ui",
version in webpack := "4.43.0",
version in webpack := "4.44.1",
version in startWebpackDevServer := "3.11.0",
version in installJsdom := "16.2.2",
version in installJsdom := "16.4.0",
// Requires the DOM for tests
requireJsDomEnv in Test := true,
// Remove the following when a new scalajs-bundler is released.
// See https://github.com/scalacenter/scalajs-bundler/issues/332
Test / jsEnv := new build.JSDOMNodeJSEnv(
build.JSDOMNodeJSEnv.Config((Test / installJsdom).value)
),
// Test / jsEnv := new build.JSDOMNodeJSEnv(
// build.JSDOMNodeJSEnv.Config((Test / installJsdom).value)
// ),
// Compile tests to JS using fast-optimisation
// scalaJSStage in Test := FastOptStage,
npmDependencies in Compile ++= Seq(
Expand All @@ -142,9 +143,9 @@ lazy val facade =
"com.github.japgolly.scalajs-react" %%% "core" % scalaJsReact,
"com.github.japgolly.scalajs-react" %%% "extra" % scalaJsReact,
"com.github.japgolly.scalajs-react" %%% "test" % scalaJsReact % Test,
"io.github.cquiroz.react" %%% "common" % "0.9.7",
"com.lihaoyi" %%% "utest" % "0.7.4" % Test,
"org.typelevel" %%% "cats-core" % "2.1.1" % Test
"io.github.cquiroz.react" %%% "common" % "0.9.8",
"com.lihaoyi" %%% "utest" % "0.7.5" % Test,
"org.typelevel" %%% "cats-core" % "2.2.0" % Test
),
webpackConfigFile in Test := Some(baseDirectory.value / "test.webpack.config.js"),
testFrameworks += new TestFramework("utest.runner.Framework")
Expand Down
50 changes: 32 additions & 18 deletions demo/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
dependencies:
regenerator-runtime "^0.12.0"

"@babel/runtime@^7.10.5":
version "7.11.2"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
dependencies:
regenerator-runtime "^0.13.4"

"@babel/runtime@^7.7.2":
version "7.9.6"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
Expand Down Expand Up @@ -1275,10 +1282,6 @@ class-utils@^0.3.5:
isobject "^3.0.0"
static-extend "^0.1.1"

classnames@^2.2.6:
version "2.2.6"
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"

clean-css@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
Expand Down Expand Up @@ -1330,6 +1333,11 @@ cloneable-readable@^1.0.0:
process-nextick-args "^2.0.0"
readable-stream "^2.3.5"

clsx@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==

coa@~2.0.1:
version "2.0.2"
resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
Expand Down Expand Up @@ -1563,7 +1571,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
safe-buffer "^5.0.1"
sha.js "^2.4.8"

create-react-context@^0.3.0:
create-react-context@0.3.0, create-react-context@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.3.0.tgz#546dede9dc422def0d3fc2fe03afe0bc0f4f7d8c"
integrity sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==
Expand Down Expand Up @@ -3513,9 +3521,10 @@ jsprim@^1.2.2:
json-schema "0.2.3"
verror "1.10.0"

keyboard-key@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/keyboard-key/-/keyboard-key-1.0.4.tgz#52d8fa07b7e17757072aa22a67fb4ae85e4c46b0"
keyboard-key@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/keyboard-key/-/keyboard-key-1.1.0.tgz#6f2e8e37fa11475bb1f1d65d5174f1b35653f5b7"
integrity sha512-qkBzPTi3rlAKvX7k0/ub44sqOfXeLc/jcnGGmj5c7BJpU8eDrEVPyhCvNYAaoubbsLm9uGWwQJO1ytQK1a9/dQ==

killable@^1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -3682,6 +3691,11 @@ lodash@^4.17.14, lodash@^4.17.15:
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==

lodash@^4.17.19:
version "4.17.20"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==

loglevel@^1.6.8:
version "1.6.8"
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
Expand Down Expand Up @@ -5244,7 +5258,7 @@ react-is@^16.8.1:
version "16.8.6"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"

react-popper@^1.3.4:
react-popper@^1.3.7:
version "1.3.7"
resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.7.tgz#f6a3471362ef1f0d10a4963673789de1baca2324"
integrity sha512-nmqYTx7QVjCm3WUZLeuOomna138R1luC4EqkW3hxJUrAe+3eNz3oFCLYdnPwILfn0mX1Ew2c3wctrjlUMYYUww==
Expand Down Expand Up @@ -5562,21 +5576,21 @@ selfsigned@^1.10.7:
dependencies:
node-forge "0.9.0"

semantic-ui-react@0.88.2:
version "0.88.2"
resolved "https://registry.yarnpkg.com/semantic-ui-react/-/semantic-ui-react-0.88.2.tgz#3d4b54f8b799769b412435c8531475fd34aa4149"
integrity sha512-+02kN2z8PuA/cMdvDUsHhbJmBzxxgOXVHMFr9XK7zGb0wkW9A6OPQMFokWz7ozlVtKjN6r7zsb+Qvjk/qq1OWw==
semantic-ui-react@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/semantic-ui-react/-/semantic-ui-react-1.2.0.tgz#5bc62003b28701c5b923a0290bd17be43336d031"
integrity sha512-9tNL94nEy16RdupTQNiURyemWUIxtTpQgFimCbOOHRBOe1ApsFz3FWFsrGjv9zFtE7dQMslLYov9BQOelTCVwA==
dependencies:
"@babel/runtime" "^7.1.2"
"@babel/runtime" "^7.10.5"
"@semantic-ui-react/event-stack" "^3.1.0"
"@stardust-ui/react-component-event-listener" "~0.38.0"
"@stardust-ui/react-component-ref" "~0.38.0"
classnames "^2.2.6"
keyboard-key "^1.0.4"
lodash "^4.17.15"
clsx "^1.1.1"
keyboard-key "^1.1.0"
lodash "^4.17.19"
prop-types "^15.7.2"
react-is "^16.8.6"
react-popper "^1.3.4"
react-popper "^1.3.7"
shallowequal "^1.1.0"

semver@^5.3.0, semver@^5.5.0:
Expand Down
20 changes: 10 additions & 10 deletions facade/src/main/scala/react/semanticui/addons/confirm/Confirm.scala
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@ object Confirm {
var confirmButton: js.UndefOr[suiraw.SemanticShorthandItemS[Button.ButtonProps]] = js.native

/**
* Called when the Modal is closed without clicking confirm.
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props.
*/
* Called when the Modal is closed without clicking confirm.
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props.
*/
var onCancel: js.UndefOr[RawOnCancel] = js.native

/**
* Called when the OK button is clicked.
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props.
*/
* Called when the OK button is clicked.
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props.
*/
var onConfirm: js.UndefOr[RawOnCancel] = js.native

}
Expand Down
48 changes: 24 additions & 24 deletions facade/src/main/scala/react/semanticui/addons/portal/Portal.scala
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ object Portal {
var closeOnEscape: js.UndefOr[Boolean] = js.undefined

/**
* Controls whether or not the portal should close when mousing out of the portal.
* NOTE: This will prevent `closeOnTriggerMouseLeave` when mousing over the
* gap from the trigger to the portal.
*/
* Controls whether or not the portal should close when mousing out of the portal.
* NOTE: This will prevent `closeOnTriggerMouseLeave` when mousing over the
* gap from the trigger to the portal.
*/
var closeOnPortalMouseLeave: js.UndefOr[Boolean] = js.undefined

/** Controls whether or not the portal should close on blur of the trigger. */
Expand Down Expand Up @@ -103,35 +103,35 @@ object Portal {
var mouseLeaveDelay: js.UndefOr[JsNumber] = js.undefined

/**
* Called when a close event happens
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props.
*/
* Called when a close event happens
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props.
*/
var onClose: js.UndefOr[RawOnClose] = js.undefined

/**
* Called when the portal is mounted on the DOM
*
* @param {null}
* @param {object} data - All props.
*/
* Called when the portal is mounted on the DOM
*
* @param {null}
* @param {object} data - All props.
*/
var onMount: js.UndefOr[RawOnMount] = js.native

/**
* Called when an open event happens
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props.
*/
* Called when an open event happens
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props.
*/
var onOpen: js.UndefOr[RawOnOpen] = js.undefined

/**
* Called when the portal is unmounted from the DOM
*
* @param {null}
* @param {object} data - All props.
*/
* Called when the portal is unmounted from the DOM
*
* @param {null}
* @param {object} data - All props.
*/
var onUnmount: js.UndefOr[RawOnUnmount]

/** Controls whether or not the portal is displayed. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@ object PortalInner {
// var mountNode?: any

/**
* Called when the PortalInner is mounted on the DOM.
*
* @param {null}
* @param {object} data - All props.
*/
* Called when the PortalInner is mounted on the DOM.
*
* @param {null}
* @param {object} data - All props.
*/
var onMount: js.UndefOr[RawOnMount] = js.native

/**
* Called when the PortalInner is unmounted from the DOM.
*
* @param {null}
* @param {object} data - All props.
*/
* Called when the PortalInner is unmounted from the DOM.
*
* @param {null}
* @param {object} data - All props.
*/
var onUnmount: js.UndefOr[RawOnUnmount]
}

Expand Down
40 changes: 20 additions & 20 deletions facade/src/main/scala/react/semanticui/addons/radio/Radio.scala
Original file line number Diff line number Diff line change
Expand Up @@ -97,35 +97,35 @@ object Radio {
var name: js.UndefOr[String] = js.native

/**
* Called when the user attempts to change the checked state.
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props and proposed checked/indeterminate state.
*/
* Called when the user attempts to change the checked state.
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props and proposed checked/indeterminate state.
*/
var onChange: js.UndefOr[RawEvent] = js.native

/**
* Called when the checkbox or label is clicked.
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props and current checked/indeterminate state.
*/
* Called when the checkbox or label is clicked.
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props and current checked/indeterminate state.
*/
var onClick: js.UndefOr[RawEvent] = js.native

/**
* Called when the user presses down on the mouse.
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props and current checked/indeterminate state.
*/
* Called when the user presses down on the mouse.
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props and current checked/indeterminate state.
*/
var onMouseDown: js.UndefOr[RawEvent] = js.native

/**
* Called when the user releases the mouse.
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props and current checked/indeterminate state.
*/
* Called when the user releases the mouse.
*
* @param {SyntheticEvent} event - React's original SyntheticEvent.
* @param {object} data - All props and current checked/indeterminate state.
*/
var onMouseUp: js.UndefOr[RawEvent] = js.native

/** Format as a radio element. This means it is an exclusive option. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,19 @@ object TextArea {
var as: js.UndefOr[AsT] = js.native

/**
* Called on change.
*
* @param {SyntheticEvent} event - The React SyntheticEvent object
* @param {object} data - All props and the event value.
*/
* Called on change.
*
* @param {SyntheticEvent} event - The React SyntheticEvent object
* @param {object} data - All props and the event value.
*/
var onChange: js.UndefOr[RawEvent] = js.undefined

/**
* Called on input.
*
* @param {SyntheticEvent} event - The React SyntheticEvent object
* @param {object} data - All props and the event value.
*/
* Called on input.
*
* @param {SyntheticEvent} event - The React SyntheticEvent object
* @param {object} data - All props and the event value.
*/
var onInput: js.UndefOr[RawEvent] = js.undefined

/** Indicates row count for a TextArea. */
Expand Down
Loading

0 comments on commit c38572c

Please sign in to comment.