Thanks to visit codestin.com
Credit goes to github.com

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

Vite2 #239

Merged
merged 4 commits into from
Mar 17, 2021
Merged

Vite2 #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7d3f13
vite2
cquiroz Mar 15, 2021
444d154
Include self signed certs
cquiroz Mar 17, 2021
3c988b9
Enable build for production
cquiroz Mar 17, 2021
3d7fcb4
Update build action
cquiroz Mar 17, 2021
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
4 changes: 3 additions & 1 deletion .github/workflows/scala.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ jobs:
- name: Checking your code format
run: csbt scalafmtCheckAll
- name: Run tests
run: csbt facade/test demo/fastOptJS::webpack
run: |
csbt facade/test demo/fullLinkJS
cd demo; npm install; npm run build
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,7 @@ yarn.lock
.vscode/

# Hydra
.hydra/
.hydra/
demo/public/
demo/build/
demo/dist/
87 changes: 37 additions & 50 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.scalajs.linker.interface.ModuleSplitStyle

val reactJS = "16.13.1"
val scalaJsReact = "1.7.7"
val FUILess = "2.8.7"
Expand All @@ -10,11 +12,6 @@ cancelable in Global := true

resolvers in Global += Resolver.sonatypeRepo("public")

addCommandAlias(
"restartWDS",
"; demo/fastOptJS::stopWebpackDevServer; demo/fastOptJS::startWebpackDevServer; ~demo/fastOptJS"
)

ThisBuild / turbo := true

Global / onChangedBuildSource := ReloadOnSourceChanges
Expand Down Expand Up @@ -57,54 +54,44 @@ val root =
lazy val demo =
project
.in(file("demo"))
.enablePlugins(ScalaJSBundlerPlugin)
.enablePlugins(ScalaJSPlugin)
.settings(commonSettings: _*)
.settings(
webpack / version := "4.44.1",
startWebpackDevServer / version := "3.11.0",
webpackConfigFile in fastOptJS := Some(
baseDirectory.value / "webpack" / "dev.webpack.config.js"
),
webpackConfigFile in fullOptJS := Some(
baseDirectory.value / "webpack" / "prod.webpack.config.js"
),
webpackMonitoredDirectories += (resourceDirectory in Compile).value,
webpackResources := (baseDirectory.value / "webpack") * "*.js",
includeFilter in webpackMonitoredFiles := "*",
useYarn := true,
webpackBundlingMode in fastOptJS := BundlingMode.LibraryOnly(),
webpackBundlingMode in fullOptJS := BundlingMode.Application,
test := {},
scalaJSLinkerConfig in (Compile, fastOptJS) ~= { _.withSourceMap(false) },
scalaJSLinkerConfig in (Compile, fullOptJS) ~= { _.withSourceMap(false) },
// NPM libs for development, mostly to let webpack do its magic
npmDevDependencies in Compile ++= Seq(
"postcss-loader" -> "3.0.0",
"autoprefixer" -> "9.7.6",
"url-loader" -> "4.1.0",
"file-loader" -> "6.0.0",
"css-loader" -> "3.5.3",
"style-loader" -> "1.2.1",
"less" -> "3.11.1",
"less-loader" -> "6.1.0",
"webpack-merge" -> "4.2.2",
"mini-css-extract-plugin" -> "0.9.0",
"webpack-dev-server-status-bar" -> "1.1.2",
"cssnano" -> "4.1.10",
"uglifyjs-webpack-plugin" -> "2.2.0",
"html-webpack-plugin" -> "4.3.0",
"optimize-css-assets-webpack-plugin" -> "5.0.3",
"favicons-webpack-plugin" -> "3.0.1",
"why-did-you-update" -> "1.0.8"
),
npmDependencies in Compile ++= Seq(
"react" -> reactJS,
"react-dom" -> reactJS,
"fomantic-ui-less" -> FUILess,
"create-react-context" -> "0.3.0",
"prop-types" -> "15.7.2",
"react-semantic-toasts" -> Toasts
),
scalaJSLinkerConfig in (Compile, fastLinkJS) ~= { _.withSourceMap(false) },
scalaJSLinkerConfig in (Compile, fullLinkJS) ~= { _.withSourceMap(false) },
scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.ESModule) },
Compile / fastLinkJS / scalaJSLinkerConfig ~= (_.withModuleSplitStyle(ModuleSplitStyle.SmallestModules)),
Compile / fullLinkJS / scalaJSLinkerConfig ~= (_.withModuleSplitStyle(ModuleSplitStyle.FewestModules)),
publish / skip := true,
// // NPM libs for development, mostly to let webpack do its magic
// npmDevDependencies in Compile ++= Seq(
// "postcss-loader" -> "3.0.0",
// "autoprefixer" -> "9.7.6",
// "url-loader" -> "4.1.0",
// "file-loader" -> "6.0.0",
// "css-loader" -> "3.5.3",
// "style-loader" -> "1.2.1",
// "less" -> "3.11.1",
// "less-loader" -> "6.1.0",
// "webpack-merge" -> "4.2.2",
// "mini-css-extract-plugin" -> "0.9.0",
// "webpack-dev-server-status-bar" -> "1.1.2",
// "cssnano" -> "4.1.10",
// "uglifyjs-webpack-plugin" -> "2.2.0",
// "html-webpack-plugin" -> "4.3.0",
// "optimize-css-assets-webpack-plugin" -> "5.0.3",
// "favicons-webpack-plugin" -> "3.0.1",
// "why-did-you-update" -> "1.0.8"
// ),
// npmDependencies in Compile ++= Seq(
// "react" -> reactJS,
// "react-dom" -> reactJS,
// "fomantic-ui-less" -> FUILess,
// "create-react-context" -> "0.3.0",
// "prop-types" -> "15.7.2",
// "react-semantic-toasts" -> Toasts
// ),
// don't publish the demo
publish := {},
publishLocal := {},
Expand Down
24 changes: 24 additions & 0 deletions demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "demo",
"version": "1.0.0",
"main": "index.js",
"license": "MIT",
"dependencies": {
"fomantic-ui-less": "^2.8.7",
"react": "^16.3.1",
"react-dom": "16.3.1",
"react-semantic-toasts": "^0.6.5",
"semantic-ui-react": "^2.0.3"
},
"devDependencies": {
"@vitejs/plugin-react-refresh": "^1.1.0",
"less": "3.9.0",
"less-watch-compiler": "1.14.6",
"vite": "^2.1.0"
},
"scripts": {
"dev": "vite",
"build": "vite build",
"serve": "vite preview"
}
}
17 changes: 17 additions & 0 deletions demo/server.cert
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
-----BEGIN CERTIFICATE-----
MIICzDCCAbQCCQCgR3wYU5S5YDANBgkqhkiG9w0BAQsFADAoMQswCQYDVQQGEwJV
UzEZMBcGA1UEAwwQbG9jYWwubHVjdW1hLnh5ejAeFw0yMTAzMTYxOTU3MDZaFw0y
MTA0MTUxOTU3MDZaMCgxCzAJBgNVBAYTAlVTMRkwFwYDVQQDDBBsb2NhbC5sdWN1
bWEueHl6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArOchTBfRQ2Fv
3Ku4tEjM9IeA0QhwVMGqYPDrcGjP1TOACmJQ3Nf8RaTJbvdy0+cFGX5oQVvbAK6B
Q2URe+zaE+1vSxRhUNGUR+VXjX6I0BRQlQHU21hjtESPScvRHGLynn4NLMQ/Z3v2
WfRv4TGuKmvpoOs01sjixWuWSZK85xelSmkunXyyRkrk9mxCsJ+WGUjmKOz1m3So
I9SpupkVLUpGpaBr0gtbs9KmaPlkApPR349uRLlYOaFE2QZoxy8+pWauoQ/638Lw
iNH9DLexraBTsSRiKN8kRUAS1JkBznzdeyTFL3Q+iS4kQD2Nt2uHKhtFrFtkJ40b
TzwBQ36mKQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBTa7o/na15DPmLuobeB31b
1VaPcrhdlDooLeFOZE5tGfrTU7jfeJptSlvK8t6m3vYgpH9SRLQ+8CAoJEFWSI4r
Gr/AUdu+qywV+b6w4+nIIwjL40hWFfPOy4mrrM+BkhPDOGFVr3rN6JMa5QKkXD2T
HrxEfh4dwp8zv70bMApeG/KODvZ3Z7QYNfkniipYxDg1L0XbOooNtAhcQCUi87iP
441HCixYxVH36lW565ju3pFNKzQ8GvkRaFl6O6FwG0Jrmb9whlFrEMbuSlsHFwrr
PlY3G8bkxvnY3xmey47kWN66tA+aGjoHdenRmTjIJneqa8eqZ3wT5lwfy1CVStOq
-----END CERTIFICATE-----
28 changes: 28 additions & 0 deletions demo/server.key
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
-----BEGIN PRIVATE KEY-----
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCs5yFMF9FDYW/c
q7i0SMz0h4DRCHBUwapg8OtwaM/VM4AKYlDc1/xFpMlu93LT5wUZfmhBW9sAroFD
ZRF77NoT7W9LFGFQ0ZRH5VeNfojQFFCVAdTbWGO0RI9Jy9EcYvKefg0sxD9ne/ZZ
9G/hMa4qa+mg6zTWyOLFa5ZJkrznF6VKaS6dfLJGSuT2bEKwn5YZSOYo7PWbdKgj
1Km6mRUtSkaloGvSC1uz0qZo+WQCk9Hfj25EuVg5oUTZBmjHLz6lZq6hD/rfwvCI
0f0Mt7GtoFOxJGIo3yRFQBLUmQHOfN17JMUvdD6JLiRAPY23a4cqG0WsW2QnjRtP
PAFDfqYpAgMBAAECggEBAJJeCvL2iqDmwCJngDGmG1K5ztOluCoX1BrCeBytrZrH
QRIJTnjVomp2aEs20I8P12JQfwMtNkTqdOTPjzCAPdB2xCsjsooPEN6YCDjwr/Kt
79VkOoQA3E6DZ2VKU9ga71Y6UP7flukMqGxYH8ncG5svxRQDaLSWVFpZjFz2ClH5
bts4xC27UQ0Nmi49x5Nu5H//4jQ/VkVBPT5XUIzJn4ROKp+L8DtCFMOnCq8i4cp2
jA0LUALLA5zEi41yAgKK1jbTd6SsbEQMvctQ4jYsiwTVfHuKL8yJo5Q5+pZ2Rp87
IoOKVGptt2JdzVvBqT4iELJNzxf3YRn6zcFWDzqZEQ0CgYEA26mZZUJyEAeoYtgF
KHbgErtk0CHkEFGH7ja6o+cJp2U9FvAuYBnrASQXZSwA5Xa3n2i+0Y+3G9rWRBBZ
GYGsF8z6a1nFQWI/jm5NvgKRJ2DpuUPHAF605jYhA69S8PmKEfW/TeXBsygo4YZB
olJcnH1hUuM6RkbMfW0VWLoKHfcCgYEAyYFTNMx1ztAkFm35Eb0hbO/WNIJjTWnl
LyIAsMBB8p60JeU18wuczrl7qtwp1zIfhwiKDcD1teishOXLreQamck4VdPaq3Xg
XP7Gy/UQZk9/f0H7aueCo58pGwChtzuEew/fvMktfrGYenl/kTG43BUYoOoEsSOQ
a8VUoOuS1N8CgYAS+WJrscKiidbMuvYvGZ2fYJqDs/m8Qx6nwAh9Me7Oi9ssCREo
cfSvw4tVzOhC6e9QkL6y4WQivtN1S6g2oNHZuHYFIdr9G9x7lCGZASXCrgdiXm1p
JcUggZp2dAWJFTUM+hpNQ0RpElX9rRgsSkr/pYDrpP8apPDzAKIwaNmI3wKBgQCi
SNpnQmd6uVznB4i5hZWe84WTYpNxLGDc1ciykRRLvw8dGf2aEXcncnCryYaU/pQv
n2v36bi52XrfyWaBVJ0rz8fkL6wDvPqGStZ2OpcLnujy54QBtBQdjLiBO8ACHxfy
OHWbyHYwe/1uXd2kZOQZs4/TQMWomBjfAtzGgRMPBwKBgBcBK7TXeYWp/Y2d238L
XATQpZ4aqZ8CmbTbo0jCcXS3hwwQNc8TI/PCWLZfaylvZfdJH7zMQYaw0j1W7Ehc
zMZWsX2MgyKr592pijopp5DAz0vzTjhpL2L9hr4z1a5N1Wd9StABs95aDuFPgKSn
mjMio3FsrAcaAfX72WR0XOgO
-----END PRIVATE KEY-----
19 changes: 0 additions & 19 deletions demo/src/main/resources/dev.js
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions demo/src/main/resources/prod.js
View file
Open in desktop

This file was deleted.

159 changes: 0 additions & 159 deletions demo/src/main/resources/theme/semantic.less
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion demo/src/main/scala/react/semanticui/demo/Layout.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import japgolly.scalajs.react.extra.router._
import scala.scalajs.js
import js.annotation._

@JSImport("resources/images/logo.png", JSImport.Default)
@JSImport("/images/logo.png", JSImport.Default)
@js.native
object Logo extends js.Object

Expand Down
Loading