update to adaptive naming scheme, new webpack-dev-server again

ScalablyTyped · Jan 20, 2020 · e135fc5 · e135fc5
1 parent cfa6a74
commit e135fc5
Show file tree

Hide file tree

Showing 49 changed files with 2,051 additions and 19,864 deletions.
diff --git a/antd/src/main/scala/demo/App.scala b/antd/src/main/scala/demo/App.scala
@@ -7,9 +7,9 @@ import slinky.core.facade.{Hooks, ReactElement}
 import slinky.web.html._
 import typingsSlinky.antd.antdStrings
 import typingsSlinky.antd.components.{List => _, _}
-import typingsSlinky.antd.libIconMod.ThemeType
-import typingsSlinky.antd.libNotificationMod.{ArgsProps, default => Notification}
-import typingsSlinky.antd.libTableInterfaceMod.ColumnProps
+import typingsSlinky.antd.iconMod.ThemeType
+import typingsSlinky.antd.notificationMod.{ArgsProps, default => Notification}
+import typingsSlinky.antd.tableInterfaceMod.ColumnProps
 
 import scala.language.implicitConversions
 import scala.scalajs.js

diff --git a/antd/src/main/scala/demo/CoordinatedDemo.scala b/antd/src/main/scala/demo/CoordinatedDemo.scala
@@ -7,8 +7,8 @@ import slinky.core.{ExternalComponent, SyntheticEvent, TagMod}
 import slinky.web.html._
 import typingsSlinky.antd.antdStrings
 import typingsSlinky.antd.components._
-import typingsSlinky.antd.libFormFormMod.{FormCreateOption, GetFieldDecoratorOptions, ValidationRule, WrappedFormUtils}
-import typingsSlinky.antd.libGridColMod.ColProps
+import typingsSlinky.antd.formFormMod.{FormCreateOption, GetFieldDecoratorOptions, ValidationRule, WrappedFormUtils}
+import typingsSlinky.antd.gridColMod.ColProps
 
 import scala.scalajs.js
 import scala.scalajs.js.{|, JSON}
@@ -21,7 +21,7 @@ object CoordinatedDemo {
 
   object Facade {
 
-    import typingsSlinky.antd.libFormFormMod.default.{create => createForm}
+    import typingsSlinky.antd.formFormMod.default.{create => createForm}
 
     /**
       * This is an example of something a bit more complicated than just rewriting component types, and which a manually

diff --git a/antd/yarn.lock b/antd/yarn.lock
diff --git a/build.sbt b/build.sbt
@@ -5,6 +5,21 @@ import org.scalajs.core.tools.linker.ModuleKind
 
 import scala.sys.process.Process
 
+onLoad in Global := {
+  println("""
+      |Welcome to ScalablyTyped demos!
+      |
+      |These demos demonstrate the Slinky flavour of ScalablyTyped.
+      |
+      |For documentation see https://scalablytyped.org .
+      |
+      |Note that compiling all the demos at once can be computationally quite
+      | expensive, so you might have a better experience running `<project>/start`
+      | than starting all with `start` (though you can!)
+      |""".stripMargin)
+  (onLoad in Global).value
+}
+
 /**
   * Custom task to start demo with webpack-dev-server, use as `<project>/start`.
   * Just `start` also works, and starts all frontend demos
@@ -227,7 +242,7 @@ lazy val scalajsBundler: Project => Project =
   _.enablePlugins(ScalaJSBundlerPlugin)
     .settings(
       /* Specify current versions and modes */
-      startWebpackDevServer / version := "3.1.11",
+      startWebpackDevServer / version := "3.10.0",
       webpack / version := "4.26.1",
       Compile / fastOptJS / webpackExtraArgs += "--mode=development",
       Compile / fullOptJS / webpackExtraArgs += "--mode=production",
@@ -258,13 +273,13 @@ lazy val browserProject: Project => Project =
     start := {
       (Compile / fastOptJS / startWebpackDevServer).value
       val indexFrom = baseDirectory.value / "assets/index.html"
-      val indexTo   = (Compile / fastOptJS / crossTarget).value / "index.html"
+      val indexTo = (Compile / fastOptJS / crossTarget).value / "index.html"
       Files.copy(indexFrom.toPath, indexTo.toPath, REPLACE_EXISTING)
     },
     dist := {
-      val artifacts      = (Compile / fullOptJS / webpack).value
+      val artifacts = (Compile / fullOptJS / webpack).value
       val artifactFolder = (Compile / fullOptJS / crossTarget).value
-      val distFolder     = (ThisBuild / baseDirectory).value / "docs" / moduleName.value
+      val distFolder = (ThisBuild / baseDirectory).value / "docs" / moduleName.value
 
       distFolder.mkdirs()
       artifacts.foreach { artifact =>
@@ -277,7 +292,7 @@ lazy val browserProject: Project => Project =
       }
 
       val indexFrom = baseDirectory.value / "assets/index.html"
-      val indexTo   = distFolder / "index.html"
+      val indexTo = distFolder / "index.html"
 
       val indexPatchedContent = {
         import collection.JavaConverters._

diff --git a/docs/antd/antd-opt-bundle.js b/docs/antd/antd-opt-bundle.js
diff --git a/docs/material-ui/index.html b/docs/material-ui/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Material-ui demo</title>
+</head>
+<body>
+<div id="container"></div>
+
+<script type="text/javascript" src="material-ui-opt-bundle.js"></script>
+</body>
+</html>
diff --git a/docs/material-ui/material-ui-opt-bundle.js b/docs/material-ui/material-ui-opt-bundle.js
diff --git a/docs/react-big-calendar/react-big-calendar-opt-bundle.js b/docs/react-big-calendar/react-big-calendar-opt-bundle.js
diff --git a/docs/react-mobx/react-mobx-opt-bundle.js b/docs/react-mobx/react-mobx-opt-bundle.js
diff --git a/docs/react-router-dom/react-router-dom-opt-bundle.js b/docs/react-router-dom/react-router-dom-opt-bundle.js
diff --git a/docs/react-slick/react-slick-opt-bundle.js b/docs/react-slick/react-slick-opt-bundle.js
diff --git a/docs/semantic-ui-react/semantic-ui-react-opt-bundle.js b/docs/semantic-ui-react/semantic-ui-react-opt-bundle.js
diff --git a/docs/storybook-react/iframe.html b/docs/storybook-react/iframe.html
@@ -70,4 +70,4 @@
   }</script><style>#root[hidden],
       #docs-root[hidden] {
         display: none !important;
-      }</style></head><body><div class="sb-nopreview sb-wrapper"><div class="sb-nopreview_main"><h1 class="sb-nopreview_heading sb-heading">No Preview</h1><p>Sorry, but you either have no stories or none are selected somehow.</p><ul><li>Please check the Storybook config.</li><li>Try reloading the page.</li></ul><p>If the problem persists, check the browser console, or the terminal you've run Storybook from.</p></div></div><div class="sb-errordisplay sb-wrapper"><pre id="error-message" class="sb-heading"></pre><pre class="sb-errordisplay_code"><code id="error-stack"></code></pre></div><div id="root"></div><div id="docs-root"></div><script src="runtime~main.841118c09633e6bc5aae.bundle.js"></script><script src="vendors~main.841118c09633e6bc5aae.bundle.js"></script><script src="main.841118c09633e6bc5aae.bundle.js"></script></body></html>
+      }</style></head><body><div class="sb-nopreview sb-wrapper"><div class="sb-nopreview_main"><h1 class="sb-nopreview_heading sb-heading">No Preview</h1><p>Sorry, but you either have no stories or none are selected somehow.</p><ul><li>Please check the Storybook config.</li><li>Try reloading the page.</li></ul><p>If the problem persists, check the browser console, or the terminal you've run Storybook from.</p></div></div><div class="sb-errordisplay sb-wrapper"><pre id="error-message" class="sb-heading"></pre><pre class="sb-errordisplay_code"><code id="error-stack"></code></pre></div><div id="root"></div><div id="docs-root"></div><script src="runtime~main.2e49a3ee47566fccc925.bundle.js"></script><script src="vendors~main.2e49a3ee47566fccc925.bundle.js"></script><script src="main.2e49a3ee47566fccc925.bundle.js"></script></body></html>
diff --git a/...react/main.841118c09633e6bc5aae.bundle.js → ...react/main.2e49a3ee47566fccc925.bundle.js b/...react/main.841118c09633e6bc5aae.bundle.js → ...react/main.2e49a3ee47566fccc925.bundle.js
diff --git a/docs/storybook-react/main.2e49a3ee47566fccc925.bundle.js.map b/docs/storybook-react/main.2e49a3ee47566fccc925.bundle.js.map
diff --git a/docs/storybook-react/main.841118c09633e6bc5aae.bundle.js.map b/docs/storybook-react/main.841118c09633e6bc5aae.bundle.js.map
diff --git a/...ntime~main.841118c09633e6bc5aae.bundle.js → ...ntime~main.2e49a3ee47566fccc925.bundle.js b/...ntime~main.841118c09633e6bc5aae.bundle.js → ...ntime~main.2e49a3ee47566fccc925.bundle.js
diff --git a/...e~main.841118c09633e6bc5aae.bundle.js.map → ...e~main.2e49a3ee47566fccc925.bundle.js.map b/...e~main.841118c09633e6bc5aae.bundle.js.map → ...e~main.2e49a3ee47566fccc925.bundle.js.map
diff --git a/...ndors~main.841118c09633e6bc5aae.bundle.js → ...ndors~main.2e49a3ee47566fccc925.bundle.js b/...ndors~main.841118c09633e6bc5aae.bundle.js → ...ndors~main.2e49a3ee47566fccc925.bundle.js
diff --git a/...s~main.841118c09633e6bc5aae.bundle.js.map → ...s~main.2e49a3ee47566fccc925.bundle.js.map b/...s~main.841118c09633e6bc5aae.bundle.js.map → ...s~main.2e49a3ee47566fccc925.bundle.js.map
diff --git a/material-ui/src/main/scala/demo/Demo.scala b/material-ui/src/main/scala/demo/Demo.scala
@@ -6,11 +6,11 @@ import slinky.core.annotations.react
 import slinky.core.facade.{Hooks, ReactElement}
 import slinky.web.ReactDOM
 import slinky.web.html._
-import typingsSlinky.atMaterialDashUiCore.stylesCreateMuiThemeMod.Theme
-import typingsSlinky.atMaterialDashUiCore.stylesWithStylesMod.CSSProperties
-import typingsSlinky.atMaterialDashUiCore.textFieldTextFieldMod.StandardTextFieldProps
-import typingsSlinky.atMaterialDashUiCore.{atMaterialDashUiCoreStrings => MuiStrings, components => Mui}
-import typingsSlinky.react.Anon_Children
+import typingsSlinky.materialUiCore.createMuiThemeMod.Theme
+import typingsSlinky.materialUiCore.withStylesMod.CSSProperties
+import typingsSlinky.materialUiCore.textFieldTextFieldMod.StandardTextFieldProps
+import typingsSlinky.materialUiCore.{materialUiCoreStrings => MuiStrings, components => Mui}
+import typingsSlinky.react.AnonChildren
 
 import scala.scalajs.js
 import scala.scalajs.js.|
@@ -141,14 +141,14 @@ object ButtonTest {
 //object StyledFC {
 //  import scala.language.higherKinds
 //
-//  @inline private def stylesMod = typingsSlinky.atMaterialDashUiCore.stylesMod.asInstanceOf[js.Dynamic]
+//  @inline private def stylesMod = typingsSlinky.atMaterialUiCore.stylesMod.asInstanceOf[js.Dynamic]
 //
 //  trait GeneratedClassNames[Styles[_] <: js.Object] extends js.Object {
 //    val classes: Styles[String]
 //  }
 //
 //  @inline def apply[Styles[_] <: js.Object, P <: js.Object](
 //      styles: Styles[CSSProperties] | js.Function1[Theme, Styles[CSSProperties]]
-//  )(f:        js.Function1[P with Anon_Children with GeneratedClassNames[Styles], ReactNode]): FC[P] =
+//  )(f:        js.Function1[P with AnonChildren with GeneratedClassNames[Styles], ReactNode]): FC[P] =
 //    stylesMod.withStyles(styles.asInstanceOf[js.Any])(f).asInstanceOf[FC[P]]
 //}