repo stringlengths 5 53 | pr_number int32 1 321k | task_type stringclasses 2
values | issue_text stringlengths 0 81.2k | pr_title stringlengths 1 319 | pr_body stringlengths 0 105k | base_sha stringlengths 40 40 | head_sha stringlengths 40 40 | gold_diff stringlengths 0 202M | changed_files listlengths 0 100 | review_threads listlengths 0 100 | test_patch stringlengths 0 23.4M | merged bool 1
class |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
SAFE-Stack/SAFE-BookStore | 364 | issue_to_patch | fixed elmish link | like it says on the tin | 99a624aba2620d555963a2241ca797722c96343b | b6695ce50c89ebcf479b12d2a2271dd012f5eae7 | diff --git a/README.md b/README.md
index ddc13575..ec99a8b3 100644
--- a/README.md
+++ b/README.md
@@ -264,7 +264,7 @@ If you are new to Freya, you can find an introduction at:
### React/Elmish client
-The client is [React](https://facebook.github.io/react/) single page application that uses [fable-elmish](https:/... | [
"README.md"
] | [] | true | ||
SAFE-Stack/SAFE-BookStore | 363 | issue_to_patch | Add serverside rendering for /login | 729fa2dfd9b7fe9a056cdcd8f252cb008d08ba43 | e5f254c9bcdcc1825bfbdb799075e61f5f999287 | diff --git a/src/Client/App.fs b/src/Client/App.fs
index 9689939a..f3396ea9 100644
--- a/src/Client/App.fs
+++ b/src/Client/App.fs
@@ -51,19 +51,36 @@ let saveUserCmd user =
let deleteUserCmd =
Cmd.ofFunc BrowserLocalStorage.delete "user" (fun _ -> LoggedOut) StorageFailure
-let init result =
+
+let hydrateMode... | [
"src/Client/App.fs",
"src/Server/Pages.fs",
"src/Server/Shared/ServerUrls.fs",
"src/Server/WebServer.fs"
] | [] | true | |||
SAFE-Stack/SAFE-BookStore | 362 | issue_to_patch | Paket update | 5bbea2ebdf797a282c2611250eee0e237c3330a8 | cdcae657103f9d853465b512348020f4ce84e1ac | diff --git a/paket.lock b/paket.lock
index 33088d71..35ddfc9c 100644
--- a/paket.lock
+++ b/paket.lock
@@ -43,7 +43,7 @@ NUGET
Fable.PowerPack (>= 1.3.2) - restriction: >= netstandard1.6
Fable.React (>= 2.0) - restriction: >= netstandard1.6
FSharp.Core (>= 4.2.3) - restriction: >= netstandard1.6
- ... | [
"paket.lock",
"src/Server/Auth.fs",
"src/Server/WishList.fs"
] | [] | true | |||
SAFE-Stack/SAFE-BookStore | 360 | issue_to_patch | update .NET Sdk to 2.1.401 | 96ec415871009f543743cd61a5b90a76836d1688 | 9f81179b192b6d18fcc646512ee0cdb4c8063778 | diff --git a/global.json b/global.json
index 5e096325..47b8aebc 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "2.1.302"
+ "version": "2.1.401"
}
}
| [
"global.json"
] | [] | true | |||
SAFE-Stack/SAFE-BookStore | 355 | issue_to_patch | fix symlinks | See https://github.com/SAFE-Stack/SAFE-template/pull/133 | 15beaf131eea5afd1a5f27b6ee1c4903c86c0319 | 4b884e4a99de4ea9769ec739b41e3a1fda0c47af | diff --git a/src/Client/webpack.config.js b/src/Client/webpack.config.js
index 7ac19d3a..c9532b08 100644
--- a/src/Client/webpack.config.js
+++ b/src/Client/webpack.config.js
@@ -33,6 +33,7 @@ module.exports = {
filename: "bundle.js"
},
resolve: {
+ symlinks: false,
modules: [ resolve("../../node_mod... | [
"src/Client/webpack.config.js"
] | [] | true | ||
SAFE-Stack/SAFE-BookStore | 350 | issue_to_patch | yarn: use https for all packages | I noticed this because our firewall only has https://registry.npmjs.org whitelisted | 0a04d53104ecb647ab97ec05727a943935b7b13f | c03331d605a23dc5703815c1882a6704920287c5 | diff --git a/yarn.lock b/yarn.lock
index fcf14f59..b7490660 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1155,7 +1155,7 @@ compressible@~2.0.13:
compression@^1.5.2:
version "1.7.2"
- resolved "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz#aaffbcd6aaf854b44ebb280353d5ad1651f59a69"
+ resolved "https... | [
"yarn.lock"
] | [] | true | ||
SAFE-Stack/SAFE-BookStore | 346 | issue_to_patch | Update README.md | Fixed the file names in the first half of the readme example on adding a tomato page - makes it a little easier for people to get started. | b253b456ae8a8ab7d20ec8459581389ae8317692 | ca63770850fac48b50a4997587fa2704800ea319 | diff --git a/README.md b/README.md
index 1e46b955..d1390900 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ The following document describes the [SAFE-Stack](https://safe-stack.github.io/)
SAFE is a technology stack that brings together several technologies into a single, coherent stack for typesafe,
flexible ... | [
"README.md"
] | [] | true | ||
SAFE-Stack/SAFE-BookStore | 357 | issue_to_patch | Update deps | 15beaf131eea5afd1a5f27b6ee1c4903c86c0319 | 70df2174418d8333815212a82e9347d14c14c998 | diff --git a/.gitignore b/.gitignore
index 4fa800bb..fc307fd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -193,3 +193,4 @@ docs/tools/FSharp.Formatting.svclog
node_modules
src/Client/public/
deploy
+/.ionide
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
index e12083c1..6be03acb 100644
--- ... | [
".gitignore",
".paket/Paket.Restore.targets",
"README.md",
"global.json",
"package.json",
"paket.dependencies",
"paket.lock",
"src/Client/webpack.config.js",
"yarn.lock"
] | [] | true | |||
SAFE-Stack/SAFE-BookStore | 353 | issue_to_patch | Getting started instructions in README are different from the actual code
### Description
*Getting started* instructions in README are out of sync with the actual code. For example, `PageModel` type is no longer in `src/Client/App.fs` but moved to `src/Client/Shared.fs` etc.
### Repro steps
Follow *Getting st... | Bring README in sync with current version of the code | fixes #352
Changing README Getting started instructions to reflect the current version of the code. | 0a04d53104ecb647ab97ec05727a943935b7b13f | 87350c5134f50886c4bf7269601c1cf83873e61b | diff --git a/README.md b/README.md
index e7f4f711..28f3d9ce 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ This topic will guide you through creating a new page. After every section you s
#### Minimal setup
Let's say we want to call our new page *Tomato*
-1. Adjust the `src/Client/Pages.fs` and register o... | [
"README.md"
] | [] | true | |
SAFE-Stack/SAFE-BookStore | 351 | issue_to_patch | New Elmish.Bridge API | Not optimal, but working as expected. | e12c60d7eaf2fc1e76b398d7b181202c5fdb748a | d158c80283d7fad8dfa76d1a4564041f1496ba28 | diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
index 55292f31..e12083c1 100644
--- a/.paket/Paket.Restore.targets
+++ b/.paket/Paket.Restore.targets
@@ -71,7 +71,10 @@
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '$(PaketRestoreCachedHash)' ">false</PaketRestoreReq... | [
".paket/Paket.Restore.targets",
"README.md",
"global.json",
"package.json",
"paket.dependencies",
"paket.lock",
"src/Client/App.fs",
"src/Client/Shared.fs",
"src/Client/pages/Login.fs",
"src/Client/pages/WishList.fs",
"src/Client/paket.references",
"src/Server/Remote.fs",
"src/Server/paket.r... | [] | diff --git a/test/UITests/App.config b/test/UITests/App.config
index b7107605..5a295bef 100644
--- a/test/UITests/App.config
+++ b/test/UITests/App.config
@@ -8,6 +8,6 @@
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
- ... | true | |
SAFE-Stack/SAFE-BookStore | 342 | issue_to_patch | Elmish.Remoting version | Communicates with the server through messages via websockets.
Uses a similar `update` function on the server and client to keep a single mindset when designing the application. | b247174ca0a9237325b5179990fca6da8b680d64 | b468c50747c20b70fa55706410bd954c37c5626f | diff --git a/paket.dependencies b/paket.dependencies
index d6b3fc70..e2fec8ff 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -17,6 +17,8 @@ nuget Fable.React
nuget Fable.Elmish
nuget Fable.Elmish.React
nuget Fable.Elmish.Browser
+nuget Fable.Elmish.Remoting.Giraffe
+nuget Fable.Elmish.Remoting.Client
n... | [
"paket.dependencies",
"paket.lock",
"src/Client/App.fs",
"src/Client/Shared.fs",
"src/Client/pages/Login.fs",
"src/Client/pages/WishList.fs",
"src/Client/paket.references",
"src/Client/webpack.config.js",
"src/Server/Auth.fs",
"src/Server/Program.fs",
"src/Server/Remote.fs",
"src/Server/Server... | [] | diff --git a/test/UITests/App.config b/test/UITests/App.config
index a76fead9..b7107605 100644
--- a/test/UITests/App.config
+++ b/test/UITests/App.config
@@ -3,7 +3,7 @@
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
-
+
<runtime><assemblyBinding xmlns="urn:sc... | true | |
SAFE-Stack/SAFE-BookStore | 348 | issue_to_patch | Added section about freya branch | df46fdedee567e05ead5ce33e385d1bffb2b7149 | e5df7b043a3c9554b2ce78f8eff5514796b63673 | diff --git a/README.md b/README.md
index faae6f85..e7f4f711 100644
--- a/README.md
+++ b/README.md
@@ -249,6 +249,15 @@ The webserver backend is running as a [Giraffe](https://github.com/giraffe-fshar
In development mode the server is automatically restarted whenever a file in `src/Server` is saved.
+### Freya on ... | [
"README.md"
] | [] | true | |||
SAFE-Stack/SAFE-BookStore | 335 | issue_to_patch | Freya implementation | Initial attempt to replace Giraffe with Freya. See #199 | fb74bdf6e4fcc3c9b9365ce95e92cc1698210898 | d073461e2dd7752e58f7d3bea483b4b6d9b7d9eb | diff --git a/.gitignore b/.gitignore
index 4fa800bb..8b1a8354 100644
--- a/.gitignore
+++ b/.gitignore
@@ -193,3 +193,5 @@ docs/tools/FSharp.Formatting.svclog
node_modules
src/Client/public/
deploy
+
+.idea/
\ No newline at end of file
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
index e7... | [
".gitignore",
".paket/Paket.Restore.targets",
"build.fsx",
"global.json",
"paket.dependencies",
"paket.lock",
"src/Server/Auth.fs",
"src/Server/KestrelInterop.fs",
"src/Server/Pages.fs",
"src/Server/Program.fs",
"src/Server/Represent.fs",
"src/Server/Server.fsproj",
"src/Server/Storage/WebJo... | [] | true | ||
SAFE-Stack/SAFE-BookStore | 347 | issue_to_patch | Update everything | b253b456ae8a8ab7d20ec8459581389ae8317692 | 08a5476416df980b6737e56e3d3052bde4fd8f61 | diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
index 55292f31..e12083c1 100644
--- a/.paket/Paket.Restore.targets
+++ b/.paket/Paket.Restore.targets
@@ -71,7 +71,10 @@
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '$(PaketRestoreCachedHash)' ">false</PaketRestoreReq... | [
".paket/Paket.Restore.targets",
"package.json",
"paket.lock",
"test/UITests/App.config",
"yarn.lock"
] | [] | diff --git a/test/UITests/App.config b/test/UITests/App.config
index a76fead9..79b65997 100644
--- a/test/UITests/App.config
+++ b/test/UITests/App.config
@@ -8,6 +8,6 @@
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
- ... | true | ||
SAFE-Stack/SAFE-BookStore | 345 | issue_to_patch | Update global.json | b247174ca0a9237325b5179990fca6da8b680d64 | a42d0fe53a1fb48e8452e6220e819c58b472a672 | diff --git a/global.json b/global.json
index 6f416a4d..7034665e 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "2.1.300"
+ "version": "2.1.301"
}
}
| [
"global.json"
] | [] | true | |||
SAFE-Stack/SAFE-BookStore | 339 | issue_to_patch | Watcher tools removed. Read me updated for .Net Core SDK | @forki here you go.
it Fixes #334 . I have also updated Readme file. | 37f6eac2eb82e2eed1cbb520fe164a1763897996 | 25dd04c6fb45a2553344897836a1d771a5977aab | diff --git a/README.md b/README.md
index 57609e46..faae6f85 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ You can see it running on Microsoft Azure at http://fable-suave.azurewebsites.ne
- [.NET Framework 4.6.2](https://support.microsoft.com/en-us/help/3151800/the--net-framework-4-6-2-offline-installer-for-... | [
"README.md",
"paket.dependencies",
"paket.lock",
"src/Server/paket.references",
"test/ServerTests/paket.references"
] | [] | diff --git a/test/ServerTests/paket.references b/test/ServerTests/paket.references
index 0bed3ba1..415ca94b 100644
--- a/test/ServerTests/paket.references
+++ b/test/ServerTests/paket.references
@@ -1,4 +1,3 @@
group ServerTests
-Microsoft.DotNet.Watcher.Tools
FSharp.Core
Expecto
| true | |
SAFE-Stack/SAFE-BookStore | 337 | issue_to_patch | ASP.NET Core 2.1 | 50819dae534461d9f8cd1e9edf5e866b769c5e0b | 74dcb7fb85d67bf166e93c6bf112ccbed368f08c | diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
index e77c1505..55292f31 100644
--- a/.paket/Paket.Restore.targets
+++ b/.paket/Paket.Restore.targets
@@ -60,6 +60,9 @@
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
</Exec>
+ <!-- Debug whats go... | [
".paket/Paket.Restore.targets",
"build.fsx",
"package.json",
"paket.lock",
"test/ServerTests/ServerTests.fsproj",
"yarn.lock"
] | [] | diff --git a/test/ServerTests/ServerTests.fsproj b/test/ServerTests/ServerTests.fsproj
index ba33425a..4c2ae8bc 100644
--- a/test/ServerTests/ServerTests.fsproj
+++ b/test/ServerTests/ServerTests.fsproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetF... | true | ||
SAFE-Stack/SAFE-template | 664 | issue_to_patch | Default configuration for Tailwind updated to NOT scan node_modules for content. | This pull request removes the directory node_modules from tailwind content scan.
As a bonus it also removes the 3 error lines when running the template that the tailwind. configuration should be altered to remove node_modules.
| dbe4599be40cd589e44c83da70bfc40c92040ab5 | 9cd24e84213054fa819fddb1a60d1c37ddc1d0c0 | diff --git a/Content/default/src/Client/tailwind.config.js b/Content/default/src/Client/tailwind.config.js
index a9c22a79..06153802 100644
--- a/Content/default/src/Client/tailwind.config.js
+++ b/Content/default/src/Client/tailwind.config.js
@@ -4,6 +4,7 @@ module.exports = {
content: [
"./index.html",
... | [
"Content/default/src/Client/tailwind.config.js"
] | [] | true | ||
SAFE-Stack/SAFE-template | 662 | issue_to_patch | Update packages | 9b7fe734ac90fd84762e5e7a76b034b9b39412d5 | 0a19ce555a9268b4760ce3103d2781da00d4826b | diff --git a/Content/default/paket.lock b/Content/default/paket.lock
index 7c2abcd1..8b2abbee 100644
--- a/Content/default/paket.lock
+++ b/Content/default/paket.lock
@@ -9,7 +9,7 @@ NUGET
Fable.Browser.Blob (1.4)
Fable.Core (>= 3.2.8)
FSharp.Core (>= 4.7.2)
- Fable.Browser.Dom (2.18.1)
+ Fable... | [
"Content/default/paket.lock",
"Content/default/src/Client/package-lock.json",
"tests/Tests.fs"
] | [
{
"comment": "```suggestion\r\n //Fable.Remoting fails if there is no JSON body, so we add an empty one\r\n```",
"path": "tests/Tests.fs",
"hunk": "@@ -98,9 +98,19 @@ let waitAndRetry seconds times (func: unit -> 'result) =\n sleepDurationProvider = (fun _ _ -> TimeSpan.FromSeconds se... | diff --git a/tests/Tests.fs b/tests/Tests.fs
index 5ce6475b..5229a27c 100644
--- a/tests/Tests.fs
+++ b/tests/Tests.fs
@@ -98,9 +98,19 @@ let waitAndRetry seconds times (func: unit -> 'result) =
sleepDurationProvider = (fun _ _ -> TimeSpan.FromSeconds seconds))
.Execute(func)
-let get (url: stri... | true | ||
SAFE-Stack/SAFE-template | 662 | comment_to_fix | Update packages | ```suggestion
//Fable.Remoting fails if there is no JSON body, so we add an empty one
``` | 9b7fe734ac90fd84762e5e7a76b034b9b39412d5 | 0a19ce555a9268b4760ce3103d2781da00d4826b | diff --git a/tests/Tests.fs b/tests/Tests.fs
index 5ce6475b..5229a27c 100644
--- a/tests/Tests.fs
+++ b/tests/Tests.fs
@@ -98,9 +98,19 @@ let waitAndRetry seconds times (func: unit -> 'result) =
sleepDurationProvider = (fun _ _ -> TimeSpan.FromSeconds seconds))
.Execute(func)
-let get (url: stri... | [
"tests/Tests.fs"
] | [
{
"comment": "```suggestion\r\n //Fable.Remoting fails if there is no JSON body, so we add an empty one\r\n```",
"path": "tests/Tests.fs",
"hunk": "@@ -98,9 +98,19 @@ let waitAndRetry seconds times (func: unit -> 'result) =\n sleepDurationProvider = (fun _ _ -> TimeSpan.FromSeconds se... | true | ||
SAFE-Stack/SAFE-template | 660 | issue_to_patch | Bump vite from 5.4.18 to 5.4.19 in /Content/default/src/Client | Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.18 to 5.4.19.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/vitejs/vite/releases">vite's releases</a>.</em></p>
<blockquote>
<h2>v5.4.19</h2>
<p>Please refer to <a href="https://github.com/vitejs/v... | 78e617fd3b4bd33e29e06f8e7f6c2e79bb088d50 | b171c8e8bff6a13f15abfa7c5b7481b6ebead855 | diff --git a/Content/default/src/Client/package-lock.json b/Content/default/src/Client/package-lock.json
index 18350332..84643240 100644
--- a/Content/default/src/Client/package-lock.json
+++ b/Content/default/src/Client/package-lock.json
@@ -16,7 +16,7 @@
"postcss": "^8.4.31",
"sass":... | [
"Content/default/src/Client/package-lock.json",
"Content/default/src/Client/package.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 658 | issue_to_patch | move `package.json` and `package-lock.json` to `/src/Client` | Implements #656 | f7bf579d55970d47d1033ea386ee26729e1850fa | 99198b22c72cdd2f9dbdff2db868f6945c9ede38 | diff --git a/Content/default/Build.fs b/Content/default/Build.fs
index 2cce1da3..03ffe0e2 100644
--- a/Content/default/Build.fs
+++ b/Content/default/Build.fs
@@ -20,7 +20,7 @@ Target.create "Clean" (fun _ ->
run dotnet [ "fable"; "clean"; "--yes" ] clientPath // Delete *.fs.js files created by Fable
)
-Target.... | [
"Content/default/Build.fs",
"Content/default/src/Client/package-lock.json",
"Content/default/src/Client/package.json",
"Content/default/tests/Client/package.json",
"Content/minimal/src/Client/package-lock.json",
"Content/minimal/src/Client/package.json",
"tests/Tests.fs"
] | [] | diff --git a/Content/default/tests/Client/package.json b/Content/default/tests/Client/package.json
index 96ae6e57..1bb58ebe 100644
--- a/Content/default/tests/Client/package.json
+++ b/Content/default/tests/Client/package.json
@@ -1,3 +1,23 @@
{
- "type": "module"
+ "private": true,
+ "type": "module",
+ "engine... | true | |
SAFE-Stack/SAFE-template | 655 | issue_to_patch | Fix release notes error | Remove dead code that seems to cause an issue in pipeline runs since we started automatically writing release notes to RELEASE_NOTES.md in a slightly different format than expected by FAKE | 14e1c461bbe6933272a1b9c1ba448ff1bb466bce | c7c78c2868003a72f23e4999f7b1c3e3f6f36a21 | diff --git a/Build.fs b/Build.fs
index cfee2269..419f98e2 100644
--- a/Build.fs
+++ b/Build.fs
@@ -9,7 +9,6 @@ let execContext = Context.FakeExecutionContext.Create false "build.fsx" [ ]
Context.setExecutionContext (Context.RuntimeContext.Fake execContext)
let skipTests = Environment.hasEnvironVar "yolo"
-let relea... | [
"Build.fs"
] | [
{
"comment": "Nit, remove leading space on \"file\":\r\n\r\n```suggestion\r\n System.IO.File.WriteAllText(file, releaseNote)\r\n```\r\n",
"path": "Build.fs",
"hunk": "@@ -112,7 +107,7 @@ Target.create \"UpdateReleaseNotes\" (fun _ ->\n {existingContent}\n \"\"\"\n \n- System.IO.File.WriteA... | true | ||
SAFE-Stack/SAFE-template | 655 | comment_to_fix | Fix release notes error | Nit, remove leading space on "file":
```suggestion
System.IO.File.WriteAllText(file, releaseNote)
```
| 14e1c461bbe6933272a1b9c1ba448ff1bb466bce | c7c78c2868003a72f23e4999f7b1c3e3f6f36a21 | diff --git a/Build.fs b/Build.fs
index cfee2269..419f98e2 100644
--- a/Build.fs
+++ b/Build.fs
@@ -9,7 +9,6 @@ let execContext = Context.FakeExecutionContext.Create false "build.fsx" [ ]
Context.setExecutionContext (Context.RuntimeContext.Fake execContext)
let skipTests = Environment.hasEnvironVar "yolo"
-let relea... | [
"Build.fs"
] | [
{
"comment": "Nit, remove leading space on \"file\":\r\n\r\n```suggestion\r\n System.IO.File.WriteAllText(file, releaseNote)\r\n```\r\n",
"path": "Build.fs",
"hunk": "@@ -112,7 +107,7 @@ Target.create \"UpdateReleaseNotes\" (fun _ ->\n {existingContent}\n \"\"\"\n \n- System.IO.File.WriteA... | true | ||
SAFE-Stack/SAFE-template | 630 | issue_to_patch | Bump vite from 5.0.13 to 5.4.8 in /Content/default | Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.13 to 5.4.8.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/vitejs/vite/releases">vite's releases</a>.</em></p>
<blockquote>
<h2>create-vite@5.4.0</h2>
<p>Please refer to <a href="https://github.com... | 1afdd26452a14c96755ecc79130a814e5a8095c7 | 79078addd6aa8001e8fa01897237af310ccb0f59 | diff --git a/Content/default/package-lock.json b/Content/default/package-lock.json
index be1b3b67..18350332 100644
--- a/Content/default/package-lock.json
+++ b/Content/default/package-lock.json
@@ -16,7 +16,7 @@
"postcss": "^8.4.31",
"sass": "^1.69.5",
"tailwindcss": ... | [
"Content/default/package-lock.json",
"Content/default/package.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 652 | issue_to_patch | update packages | fe7af6a20fcc5d4d57fa83699b43d1e0724b0521 | 810cae4bacfccee1d055793f83a5b4d5e5f13d01 | diff --git a/Content/default/paket.lock b/Content/default/paket.lock
index 5b4e8342..7c2abcd1 100644
--- a/Content/default/paket.lock
+++ b/Content/default/paket.lock
@@ -32,7 +32,7 @@ NUGET
Fable.Core (>= 3.2.8)
FSharp.Core (>= 4.7.2)
Fable.Core (4.5)
- Fable.Elmish (4.2)
+ Fable.Elmish (4.3)
... | [
"Content/default/paket.lock"
] | [] | true | |||
SAFE-Stack/SAFE-template | 649 | issue_to_patch | Node 22 support | Modified version of Casper Bollen's changes to support the current LTS version of Node (v22) without losing support for Node v20 | d078b0ea5648b235ed51c0b36c4266cd24d19339 | 4cd0ff596a5d1567795a5b366ea88eedc8525706 | diff --git a/Content/default/package-lock.json b/Content/default/package-lock.json
index 4ec4d874..be1b3b67 100644
--- a/Content/default/package-lock.json
+++ b/Content/default/package-lock.json
@@ -19,7 +19,7 @@
"vite": "^5.0.13"
},
"engines": {
- "node": "~18 ... | [
"Content/default/package-lock.json",
"Content/default/package.json",
"Content/minimal/package-lock.json",
"Content/minimal/package.json"
] | [
{
"comment": "Node 18 will lose support later this year. I would suggest changing this to 20 || 22 to make sure we only support current LTS versions",
"path": "Content/default/package.json",
"hunk": "@@ -1,7 +1,7 @@\n {\n \"private\": true,\n \"engines\": {\n- \"node\": \"~18 || ~20\",\n+... | true | ||
SAFE-Stack/SAFE-template | 649 | comment_to_fix | Node 22 support | Node 18 will lose support later this year. I would suggest changing this to 20 || 22 to make sure we only support current LTS versions | d078b0ea5648b235ed51c0b36c4266cd24d19339 | 4cd0ff596a5d1567795a5b366ea88eedc8525706 | diff --git a/Content/default/package.json b/Content/default/package.json
index be1cd396..a7201cdf 100644
--- a/Content/default/package.json
+++ b/Content/default/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"engines": {
- "node": "~18 || ~20",
+ "node": "~18 || ~20 || ~22",
"npm": "... | [
"Content/default/package.json"
] | [
{
"comment": "Node 18 will lose support later this year. I would suggest changing this to 20 || 22 to make sure we only support current LTS versions",
"path": "Content/default/package.json",
"hunk": "@@ -1,7 +1,7 @@\n {\n \"private\": true,\n \"engines\": {\n- \"node\": \"~18 || ~20\",\n+... | true | ||
SAFE-Stack/SAFE-template | 648 | issue_to_patch | run dotnet paket install to remove redundant dependency | 8ae9efbb8ba789e0705a03982cd985476afd26bb | 4a99204954e46ca2d7b82191b2d625077eaed868 | diff --git a/Content/default/paket.lock b/Content/default/paket.lock
index 09d6a830..5b4e8342 100644
--- a/Content/default/paket.lock
+++ b/Content/default/paket.lock
@@ -185,5 +185,4 @@ NUGET
Microsoft.IdentityModel.JsonWebTokens (>= 7.7.1)
Microsoft.IdentityModel.Tokens (>= 7.7.1)
System.Reactive (... | [
"Content/default/paket.lock"
] | [] | true | |||
SAFE-Stack/SAFE-template | 642 | issue_to_patch | Bumping node version to restriction latest 22 | When using the latest stable node version, the template cannot be used. Updated the restriction on the node version to 22. | 8ae9efbb8ba789e0705a03982cd985476afd26bb | 331a9d849bc1f4d494380ff1c8281f57d3c1abba | diff --git a/Content/default/package.json b/Content/default/package.json
index be1cd396..cbf6336f 100644
--- a/Content/default/package.json
+++ b/Content/default/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"engines": {
- "node": "~18 || ~20",
+ "node": "~18 || ~22",
"npm": "~9 || ~... | [
"Content/default/package.json",
"Content/minimal/package-lock.json",
"Content/minimal/package.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 647 | issue_to_patch | update dependencies | ef578a91615e2af5f544ddb010e88bfb2fba9ad7 | ca2ed7a5073b3510dc1636d594539d87683d5b01 | diff --git a/Content/default/Build.fsproj b/Content/default/Build.fsproj
index fb57c7a7..bd26ebd9 100644
--- a/Content/default/Build.fsproj
+++ b/Content/default/Build.fsproj
@@ -11,8 +11,8 @@
<None Include="paket.dependencies" />
<None Include="paket.references" />
</ItemGroup>
- <Import Project=".paket\... | [
"Content/default/Build.fsproj",
"Content/default/paket.lock"
] | [] | true | |||
SAFE-Stack/SAFE-template | 645 | issue_to_patch | [feat]: Improved UI for todo app to enhance user experience and first impressions | what changed?: improve the ui for todo app
why?: not very ux friendly. after react series blog post being published there is a need to give a good first impression to those testing SAFE stack for the first time.
effect?: tailwind changes
There were quite a lot of problems with the old UI.
- Background image bled... | 49eab7111a7c362bc0fe555c0a1635a1e6dbaca1 | 8636595bf2194ac6da8572bd1be8aa34e9f605da | diff --git a/Content/default/src/Client/Index.fs b/Content/default/src/Client/Index.fs
index debc0243..a5dddd7a 100644
--- a/Content/default/src/Client/Index.fs
+++ b/Content/default/src/Client/Index.fs
@@ -56,7 +56,7 @@ module ViewComponents =
prop.children [
Html.input [
... | [
"Content/default/src/Client/Index.fs"
] | [] | true | ||
SAFE-Stack/SAFE-template | 644 | issue_to_patch | Automated relase note file update | * automatically write release notes after release | 25571f3dae846a7ae625ac9f6f33b99eedcd5bfd | e7349e1df27e2f9968cf2907ebb2aaaea82994d5 | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index beb80a88..b120e10a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,6 +11,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
... | [
".github/workflows/release.yml",
"Build.fs"
] | [
{
"comment": "It is unfortunate that our changelog has the newest changes at the top because prepending to a file is more of a pain than appending.\r\n\r\nObviously with this small text file it is fine but in 1000 years when the changelog is trillions of GB it won't be a good idea to slurp up the whole file int... | true | ||
SAFE-Stack/SAFE-template | 644 | comment_to_fix | Automated relase note file update | It is unfortunate that our changelog has the newest changes at the top because prepending to a file is more of a pain than appending.
Obviously with this small text file it is fine but in 1000 years when the changelog is trillions of GB it won't be a good idea to slurp up the whole file into memory (I suppose by the... | 25571f3dae846a7ae625ac9f6f33b99eedcd5bfd | e7349e1df27e2f9968cf2907ebb2aaaea82994d5 | diff --git a/Build.fs b/Build.fs
index 7eac3dbe..cfee2269 100644
--- a/Build.fs
+++ b/Build.fs
@@ -98,6 +98,23 @@ Target.create "Release" (fun _ ->
let result = DotNet.exec (fun x -> { x with DotNetCliPath = "dotnet"; WorkingDirectory = nupkgDir }) "nuget" nugetArgs
if not result.OK then failwithf "`dotnet %s... | [
"Build.fs"
] | [
{
"comment": "It is unfortunate that our changelog has the newest changes at the top because prepending to a file is more of a pain than appending.\r\n\r\nObviously with this small text file it is fine but in 1000 years when the changelog is trillions of GB it won't be a good idea to slurp up the whole file int... | true | ||
SAFE-Stack/SAFE-template | 643 | issue_to_patch | [docs]: Updated release notes | what changed?: updated release notes to be up to date
why?: was not updated in a while
effect?: seems like we moved over from using a md file to log release notes to using built in github release notes | 9385567ee490eba8dc4d6c88d5b1a77cc056dbc6 | 5df1d1c5bc22053d950fe72f3ef9c14fefb41ef9 | diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index fea37f2b..484df2d1 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,42 @@
+#### 5.0.9 - 29.11.2024
+
+* Fix error caused by restore on running tests + build solution before run, instead of just restore by @Larocceau in https://github.com/SAFE-Stack... | [
"RELEASE_NOTES.md"
] | [] | true | ||
SAFE-Stack/SAFE-template | 639 | issue_to_patch | Update dependencies | * run dotnet paket update --keep-major
* run npm update on both templates | d91c3bb348c1884988733d3861d73703ce6b31d9 | 2b6dc512415dc3393cb8d3d376e5607b4cd60893 | diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
index e230bb21..c66062b2 100644
--- a/.paket/Paket.Restore.targets
+++ b/.paket/Paket.Restore.targets
@@ -1,322 +1,325 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <!-- Prevent dotnet template engine to parse this ... | [
".paket/Paket.Restore.targets",
"Content/default/package-lock.json",
"Content/default/paket.lock",
"Content/minimal/package-lock.json",
"paket.lock"
] | [] | true | ||
SAFE-Stack/SAFE-template | 640 | issue_to_patch | Fix error caused by restore on running tests + build solution before run, instead of just restore | * Remove dotnet restore action before running the watcher
* instead of building just the shared path, build the full solution
* Use `no-restore` when running server tests
* restore full solution before running any tests
addresses what is left of #626 after partial fix in #634 | d91c3bb348c1884988733d3861d73703ce6b31d9 | ad1467932403f0684275c5dce379c55ea96e1c2e | diff --git a/Content/default/Build.fs b/Content/default/Build.fs
index 02349d29..2cce1da3 100644
--- a/Content/default/Build.fs
+++ b/Content/default/Build.fs
@@ -44,31 +44,27 @@ Target.create "Azure" (fun _ ->
deployment |> Deploy.execute "SAFE-App" Deploy.NoParameters |> ignore)
-Target.create "Run" (fun _ -... | [
"Content/default/Build.fs"
] | [
{
"comment": "Could you merge this with the Run pipeline below?",
"path": "Content/default/Build.fs",
"hunk": "@@ -78,6 +74,10 @@ Target.create \"Format\" (fun _ -> run dotnet [ \"fantomas\"; \".\" ] \".\")\n open Fake.Core.TargetOperators\n \n let dependencies = [\n+ \"Build\" ==> \"RunTestsHeadless... | true | ||
SAFE-Stack/SAFE-template | 634 | issue_to_patch | Restore as a standalone operation and remove from watch | This implements @isaacabraham's suggestion in #626 | 364e690604e52b8357a3c529c66973b6e2c55654 | 123f6a303f657e037bbb0de706304022e3b45a4f | diff --git a/Content/default/SAFE.App.sln b/Content/default/Application.sln
similarity index 100%
rename from Content/default/SAFE.App.sln
rename to Content/default/Application.sln
diff --git a/Content/default/Build.fs b/Content/default/Build.fs
index 42bf08ff..02349d29 100644
--- a/Content/default/Build.fs
+++ b/Conte... | [
"Content/default/Application.sln",
"Content/default/Build.fs",
"tests/Tests.fs"
] | [
{
"comment": "Have you tested this when creating a new project from the template? I assume that this will break in most cases as the sln won't be called SAFE.App.sln",
"path": "Content/default/Build.fs",
"hunk": "@@ -45,11 +45,12 @@ Target.create \"Azure\" (fun _ ->\n deployment |> Deploy.execute \"... | diff --git a/tests/Tests.fs b/tests/Tests.fs
index c4959040..1b79f5a7 100644
--- a/tests/Tests.fs
+++ b/tests/Tests.fs
@@ -45,10 +45,10 @@ let run exe arg dir =
CreateProcess.fromRawCommandLine exe arg
|> CreateProcess.withWorkingDirectory dir
- |> CreateProcess.ensureExitCode
|> CreateProcess.redir... | true | |
SAFE-Stack/SAFE-template | 632 | issue_to_patch | Upgrade to Meta v 5.1.0
We released meta 5.1.0 last week, so the dependency can be updated.
We should have a good look at implementing the updated RemoteData type correctly:
* Use the StartLoading function when refreshing, so existing data is not erased
* Use ToOption to extract the data when displaying, so there... | upgrade to Safe.Meta 5.1.0 | Upgrade to use [SAFE.Meta 5.1.0](https://github.com/SAFE-Stack/SAFE.Meta/releases/tag/5.1.0)
Closes #631 | 59cc8e0fe3d38232320bb8d3ec8c2da941581bbf | 9b5e199d41993ce727cc443f6282371dd4e25274 | diff --git a/Content/default/.paket/Paket.Restore.targets b/Content/default/.paket/Paket.Restore.targets
index e230bb21..c66062b2 100644
--- a/Content/default/.paket/Paket.Restore.targets
+++ b/Content/default/.paket/Paket.Restore.targets
@@ -1,322 +1,325 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbui... | [
"Content/default/.paket/Paket.Restore.targets",
"Content/default/paket.lock",
"Content/default/src/Client/Index.fs"
] | [
{
"comment": "You don't need to change these lines. `~>` means \"compatible with\", so `~> 5` is fine.\r\n\r\nSee https://fsprojects.github.io/Paket/nuget-dependencies.html#Pessimistic-version-constraint.",
"path": "Content/default/paket.dependencies",
"hunk": "",
"resolving_sha": "9b5e199d41993ce72... | true | |
SAFE-Stack/SAFE-template | 628 | issue_to_patch | Bump rollup from 4.21.3 to 4.22.4 in /Content/minimal | Bumps [rollup](https://github.com/rollup/rollup) from 4.21.3 to 4.22.4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/rollup/rollup/releases">rollup's releases</a>.</em></p>
<blockquote>
<h2>v4.22.4</h2>
<h2>4.22.4</h2>
<p><em>2024-09-21</em></p>
<h3>Bug Fixes</h3>
<ul>
<li>... | ad1f829bf6e54e43a6cf5ee5fa23f6e04f716b95 | 8bac2f9ace9d446f73456e5eaea762420eb7c1be | diff --git a/Content/minimal/package-lock.json b/Content/minimal/package-lock.json
index ff94160a..f86a89c2 100644
--- a/Content/minimal/package-lock.json
+++ b/Content/minimal/package-lock.json
@@ -783,9 +783,9 @@
}
},
"node_modules/@rollup/rollup-android-arm-eabi": {
- "versi... | [
"Content/minimal/package-lock.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 627 | issue_to_patch | Bump vite from 5.0.13 to 5.4.6 in /Content/minimal | Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.13 to 5.4.6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/vitejs/vite/releases">vite's releases</a>.</em></p>
<blockquote>
<h2>create-vite@5.4.0</h2>
<p>Please refer to <a href="https://github.com... | 1f1c37a18a061713d08878f8fd4c6748b0421f72 | c350efa55abc3fd3fefbf32e240e2cb76b792bbc | diff --git a/Content/minimal/package-lock.json b/Content/minimal/package-lock.json
index 9420bc7b..ff94160a 100644
--- a/Content/minimal/package-lock.json
+++ b/Content/minimal/package-lock.json
@@ -7,7 +7,7 @@
"devDependencies": {
"@types/node": "^20.10.0",
"@vitejs/plugi... | [
"Content/minimal/package-lock.json",
"Content/minimal/package.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 625 | issue_to_patch | Hide project / output / cache files from VS Code | Relates to #617.
After some discussion we thought that ignoring some files is a good idea, but hiding files as a tree under other files could be confusing. Most of the files which were proposed for hiding in a tree were config files which are more likely to need to be edited so we opted not to nest them. | dc30e0380ffac6b37fd68cac62aceb4f9f540e8f | 6db302993aeb3b7fc9933badc5c19f24079c2ddf | diff --git a/Content/default/.vscode/settings.json b/Content/default/.vscode/settings.json
index 78dfcf82..fe2ebde9 100644
--- a/Content/default/.vscode/settings.json
+++ b/Content/default/.vscode/settings.json
@@ -5,5 +5,26 @@
"tailwindCSS.experimental.classRegex": [
"\\.className\\s+\"([^\"]*)\"",
... | [
"Content/default/.vscode/settings.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 624 | issue_to_patch | Change the api to return full TODO list after adding todo | Addresses #615 in a more conclusive manner:
* Test failed because it lacked loading the initial data; because the added todo was mapped into a RemoteData type, data disappeared quietly when that RemoteData object was not in the Finished state yet.
* Solution: Make the API return the full todo list, so you can fully... | 304f192c844fcbde08d4bdd46997e845bcd069d7 | 0c4071a2d7bd69569098479d0b7517921ea68e94 | diff --git a/Content/default/src/Client/Index.fs b/Content/default/src/Client/Index.fs
index d521350f..bc381cf0 100644
--- a/Content/default/src/Client/Index.fs
+++ b/Content/default/src/Client/Index.fs
@@ -12,7 +12,7 @@ type Model = {
type Msg =
| SetInput of string
| LoadTodos of ApiCall<unit, Todo list>
-... | [
"Content/default/src/Client/Index.fs",
"Content/default/src/Server/Server.fs",
"Content/default/src/Shared/Shared.fs",
"Content/default/tests/Client/Client.Tests.fs"
] | [] | diff --git a/Content/default/tests/Client/Client.Tests.fs b/Content/default/tests/Client/Client.Tests.fs
index c1a83d42..4d897da5 100644
--- a/Content/default/tests/Client/Client.Tests.fs
+++ b/Content/default/tests/Client/Client.Tests.fs
@@ -12,8 +12,7 @@ let client =
<| fun _ ->
let newTodo = To... | true | |
SAFE-Stack/SAFE-template | 623 | issue_to_patch | Run project tests as part of template testing | * Add build action in default project to run tests one-off using mocha test runner (instead of in browser)
* Add build action in template build script to run these tests | 41c524f0111f2d04b7578c820f923a6f1c048bdf | 088f59ada1f9d874827230e86b263a80b1f81770 | diff --git a/Build.fs b/Build.fs
index 165a1f33..7eac3dbe 100644
--- a/Build.fs
+++ b/Build.fs
@@ -12,6 +12,7 @@ let skipTests = Environment.hasEnvironVar "yolo"
let release = ReleaseNotes.load "RELEASE_NOTES.md"
let templatePath = "./Content/.template.config/template.json"
+let defaultTemplatePath = "./Content/def... | [
"Build.fs",
"Content/default/Build.fs",
"Content/default/Helpers.fs",
"Content/default/README.md",
"Content/default/package-lock.json",
"Content/default/package.json",
"Content/default/tests/Client/package.json",
"azure-pipelines.yml"
] | [
{
"comment": "What's the reason for changing to double quotes?",
"path": "azure-pipelines.yml",
"hunk": "",
"resolving_sha": "088f59ada1f9d874827230e86b263a80b1f81770",
"resolving_diff": "diff --git a/azure-pipelines.yml b/azure-pipelines.yml\nindex efeb8088..34ebbacb 100644\n--- a/azure-pipelin... | diff --git a/Content/default/tests/Client/package.json b/Content/default/tests/Client/package.json
new file mode 100644
index 00000000..96ae6e57
--- /dev/null
+++ b/Content/default/tests/Client/package.json
@@ -0,0 +1,3 @@
+{
+ "type": "module"
+}
\ No newline at end of file
| true | |
SAFE-Stack/SAFE-template | 623 | comment_to_fix | Run project tests as part of template testing | What's the reason for changing to double quotes? | 41c524f0111f2d04b7578c820f923a6f1c048bdf | 088f59ada1f9d874827230e86b263a80b1f81770 | diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index efeb8088..34ebbacb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,10 +2,10 @@ pool:
vmImage: 'ubuntu-latest'
steps:
-- task: UseDotNet@2
- inputs:
- version: '8.0.100'
-- script: |
- dotnet tool restore
- dotnet run --project... | [
"azure-pipelines.yml"
] | [
{
"comment": "What's the reason for changing to double quotes?",
"path": "azure-pipelines.yml",
"hunk": "",
"resolving_sha": "088f59ada1f9d874827230e86b263a80b1f81770",
"resolving_diff": "diff --git a/azure-pipelines.yml b/azure-pipelines.yml\nindex efeb8088..34ebbacb 100644\n--- a/azure-pipelin... | true | ||
SAFE-Stack/SAFE-template | 623 | comment_to_fix | Run project tests as part of template testing | ```suggestion
let npm : seq<string> -> string -> CreateProcess<ProcessResult<unit>> =
```
Formatting nitpick. Perhaps worth running fantomas? | 41c524f0111f2d04b7578c820f923a6f1c048bdf | 088f59ada1f9d874827230e86b263a80b1f81770 | diff --git a/Content/default/Helpers.fs b/Content/default/Helpers.fs
index afa0ddbe..0ca5b2e9 100644
--- a/Content/default/Helpers.fs
+++ b/Content/default/Helpers.fs
@@ -77,16 +77,20 @@ let createProcess exe args dir =
let dotnet args dir = createProcess "dotnet" args dir
-let npm args dir =
- let npmPath =
- ... | [
"Content/default/Helpers.fs"
] | [
{
"comment": "```suggestion\r\nlet npm : seq<string> -> string -> CreateProcess<ProcessResult<unit>> = \r\n```\r\n\r\nFormatting nitpick. Perhaps worth running fantomas?",
"path": "Content/default/Helpers.fs",
"hunk": "@@ -77,16 +77,22 @@ let createProcess exe args dir =\n \n let dotnet args dir = creat... | true | ||
SAFE-Stack/SAFE-template | 623 | comment_to_fix | Run project tests as part of template testing | Why bother with the type annotations? | 41c524f0111f2d04b7578c820f923a6f1c048bdf | 088f59ada1f9d874827230e86b263a80b1f81770 | diff --git a/Content/default/Helpers.fs b/Content/default/Helpers.fs
index afa0ddbe..0ca5b2e9 100644
--- a/Content/default/Helpers.fs
+++ b/Content/default/Helpers.fs
@@ -77,16 +77,20 @@ let createProcess exe args dir =
let dotnet args dir = createProcess "dotnet" args dir
-let npm args dir =
- let npmPath =
- ... | [
"Content/default/Helpers.fs"
] | [
{
"comment": "Why bother with the type annotations?",
"path": "Content/default/Helpers.fs",
"hunk": "",
"resolving_sha": "088f59ada1f9d874827230e86b263a80b1f81770",
"resolving_diff": "diff --git a/Content/default/Helpers.fs b/Content/default/Helpers.fs\nindex afa0ddbe..0ca5b2e9 100644\n--- a/Con... | true | ||
SAFE-Stack/SAFE-template | 623 | comment_to_fix | Run project tests as part of template testing | ```suggestion
"RestoreClientDependencies" ==> "Tests"
``` | 41c524f0111f2d04b7578c820f923a6f1c048bdf | 088f59ada1f9d874827230e86b263a80b1f81770 | diff --git a/Content/default/Build.fs b/Content/default/Build.fs
index ee1b4b31..42bf08ff 100644
--- a/Content/default/Build.fs
+++ b/Content/default/Build.fs
@@ -53,8 +53,18 @@ Target.create "Run" (fun _ ->
]
|> runParallel)
-Target.create "RunTests" (fun _ ->
- run dotnet [ "build" ] sharedTestsPath
+l... | [
"Content/default/Build.fs"
] | [
{
"comment": "```suggestion\r\n \"RestoreClientDependencies\" ==> \"Tests\"\r\n```",
"path": "Content/default/Build.fs",
"hunk": "@@ -71,6 +81,7 @@ let dependencies = [\n \n \"Clean\" ==> \"RestoreClientDependencies\" ==> \"Run\"\n \n+ \"restoreClientDependencies\" ==> \"Tests\"",
"resolvi... | true | ||
SAFE-Stack/SAFE-template | 623 | comment_to_fix | Run project tests as part of template testing | I'm not sure that the terminology is quite precise enough here. I'd go for "default _template_ tests" and "template _execution_ tests". | 41c524f0111f2d04b7578c820f923a6f1c048bdf | 088f59ada1f9d874827230e86b263a80b1f81770 | diff --git a/Build.fs b/Build.fs
index 165a1f33..7eac3dbe 100644
--- a/Build.fs
+++ b/Build.fs
@@ -12,6 +12,7 @@ let skipTests = Environment.hasEnvironVar "yolo"
let release = ReleaseNotes.load "RELEASE_NOTES.md"
let templatePath = "./Content/.template.config/template.json"
+let defaultTemplatePath = "./Content/def... | [
"Build.fs"
] | [
{
"comment": "I'm not sure that the terminology is quite precise enough here. I'd go for \"default _template_ tests\" and \"template _execution_ tests\".",
"path": "Build.fs",
"hunk": "",
"resolving_sha": "088f59ada1f9d874827230e86b263a80b1f81770",
"resolving_diff": "diff --git a/Build.fs b/Buil... | true | ||
SAFE-Stack/SAFE-template | 622 | issue_to_patch | Update dependencies | Just a simple
`dotnet tool update`
`dotnet paket update --keep-major` | 91ab66b5bb79d6f577a35c6ab200e7c537d11a9b | 6be2ef5843261fe0995d1f8076c2b9683295c6ca | diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index c76dd425..b9052bc0 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,10 +3,10 @@
"isRoot": true,
"tools": {
"paket": {
- "version": "8.0.0",
+ "version": "8.0.3",
"commands": [
"paket... | [
".config/dotnet-tools.json",
"Content/default/.config/dotnet-tools.json",
"Content/default/Build.fsproj",
"Content/default/paket.lock"
] | [] | true | ||
SAFE-Stack/SAFE-template | 619 | issue_to_patch | Use npm ci in the build script so package.lock cannot get updated there | addresses #618
* NPM ci only installs packages according to package.json and package.lock, failing if they don't line up. CI is faster and will prevent unexpected changes to package.lock until the developer explicitly uses NPM install | ad4448605680236001e32c65a1eaea377d141c5e | 90f8f284f1672b7646b987605674e16afc88c0b9 | diff --git a/Content/default/Build.fs b/Content/default/Build.fs
index 47d2cb0e..ee1b4b31 100644
--- a/Content/default/Build.fs
+++ b/Content/default/Build.fs
@@ -20,7 +20,7 @@ Target.create "Clean" (fun _ ->
run dotnet [ "fable"; "clean"; "--yes" ] clientPath // Delete *.fs.js files created by Fable
)
-Target.... | [
"Content/default/Build.fs"
] | [
{
"comment": "Rename to RestoreCLientPackages",
"path": "Content/default/Build.fs",
"hunk": "@@ -20,7 +20,7 @@ Target.create \"Clean\" (fun _ ->\n run dotnet [ \"fable\"; \"clean\"; \"--yes\" ] clientPath // Delete *.fs.js files created by Fable\n )\n \n-Target.create \"InstallClient\" (fun _ -> run... | true | ||
SAFE-Stack/SAFE-template | 619 | comment_to_fix | Use npm ci in the build script so package.lock cannot get updated there | Rename to RestoreCLientPackages | ad4448605680236001e32c65a1eaea377d141c5e | 90f8f284f1672b7646b987605674e16afc88c0b9 | diff --git a/Content/default/Build.fs b/Content/default/Build.fs
index 47d2cb0e..ee1b4b31 100644
--- a/Content/default/Build.fs
+++ b/Content/default/Build.fs
@@ -20,7 +20,7 @@ Target.create "Clean" (fun _ ->
run dotnet [ "fable"; "clean"; "--yes" ] clientPath // Delete *.fs.js files created by Fable
)
-Target.... | [
"Content/default/Build.fs"
] | [
{
"comment": "Rename to RestoreCLientPackages",
"path": "Content/default/Build.fs",
"hunk": "@@ -20,7 +20,7 @@ Target.create \"Clean\" (fun _ ->\n run dotnet [ \"fable\"; \"clean\"; \"--yes\" ] clientPath // Delete *.fs.js files created by Fable\n )\n \n-Target.create \"InstallClient\" (fun _ -> run... | true | ||
SAFE-Stack/SAFE-template | 616 | issue_to_patch | Fix bug issue #615 in Client.Tests.fs | Fix bug issue #615
Helping Copilot to explain the fix, **ex-post**.
> giuliohome: explain why adding line "let model, _ = update (LoadTodos (Finished [])) model" fix a bug so that the test does not fail now
>GitHub Copilot: The line `let model, _ = update (LoadTodos (Finished [])) model` is loading an empty li... | d6ce051c838492a6ea4d836aa88d165a442c0ef5 | 7b17072ffcb14b82e42d456b02d849f2eea19e79 | [
"Content/default/tests/Client/Client.Tests.fs"
] | [] | diff --git a/Content/default/tests/Client/Client.Tests.fs b/Content/default/tests/Client/Client.Tests.fs
index 7dbc6d65..c1a83d42 100644
--- a/Content/default/tests/Client/Client.Tests.fs
+++ b/Content/default/tests/Client/Client.Tests.fs
@@ -12,7 +12,7 @@ let client =
<| fun _ ->
let newTodo = To... | true | ||
SAFE-Stack/SAFE-template | 614 | issue_to_patch | Bump braces from 3.0.2 to 3.0.3 in /Content/default | Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/micromatch/braces/commit/74b2db2938fad48a2ea54a9c8bf27a37a62c350d"><code>74b2db2</code></a> 3.0.3</li>
<li><a href="https://github.com/micromatch/braces/commit/88f1429a0f47... | d6ce051c838492a6ea4d836aa88d165a442c0ef5 | 76daee7d9aada64e0d45687f0a654d0ca2320af1 | diff --git a/Content/default/package-lock.json b/Content/default/package-lock.json
index bbb70547..ec74116f 100644
--- a/Content/default/package-lock.json
+++ b/Content/default/package-lock.json
@@ -1140,12 +1140,12 @@
}
},
"node_modules/braces": {
- "version": "3.0.2",
- ... | [
"Content/default/package-lock.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 613 | issue_to_patch | Do `dotnet tool restore` automatically in build target | By adding a target in Build.fsproj to run `dotnet tool restore`, we can remove the step that requires users to do it manually.
Should we go ahead with this? Discussion welcome. | e8677f329079b5741f587289526b9fe18f00675b | e7cabacd18b0f433bae22f7ac780f1c2c4faa920 | diff --git a/Build.fsproj b/Build.fsproj
index cc6868c5..9c19ff44 100644
--- a/Build.fsproj
+++ b/Build.fsproj
@@ -12,4 +12,7 @@
</ItemGroup>
<Import Project=".paket\Paket.Restore.targets" />
+ <Target Name="DotNetToolRestore" BeforeTargets="PaketRestore">
+ <Exec Command="dotnet tool restore" />
+ </Targe... | [
"Build.fsproj",
"Content/default/Build.fsproj",
"Content/default/README.md"
] | [] | true | ||
SAFE-Stack/SAFE-template | 610 | issue_to_patch | Fix build script failing on publish because of incorrect dotnet command | - "dotnet nuget push..." instead of "dotnet new push..."
- Publish from the package containing the nupkgs | 8a69ed13bc037043c8b60355e1ccc6a4262190c8 | b3547605fe10c49c4efea12e0590f503c56300f4 | diff --git a/Build.fs b/Build.fs
index aadba444..165a1f33 100644
--- a/Build.fs
+++ b/Build.fs
@@ -87,7 +87,7 @@ Target.create "Tests" (fun _ ->
Target.create "Release" (fun _ ->
let nugetApiKey = Environment.environVarOrFail "NUGET_API_KEY"
let nugetArgs = $"""push "*.nupkg" --api-key {nugetApiKey} --source... | [
"Build.fs"
] | [] | true | ||
SAFE-Stack/SAFE-template | 609 | issue_to_patch | non-beta Meta packages | dbe6b1c6e3d62f432f4287079096053124df8047 | d6bab27e35377632b32ed8a90ac7c46500f739f8 | diff --git a/Content/default/paket.dependencies b/Content/default/paket.dependencies
index 8c2aecee..29662ce1 100644
--- a/Content/default/paket.dependencies
+++ b/Content/default/paket.dependencies
@@ -3,8 +3,8 @@ framework: net8.0
storage: none
nuget Expecto ~> 9
-nuget SAFE.Server ~> 5-beta
-nuget SAFE.Client ~>... | [
"Content/default/paket.dependencies",
"Content/default/paket.lock"
] | [] | true | |||
SAFE-Stack/SAFE-template | 608 | issue_to_patch | Fix HMR | ## Why was HMR broken?
Example sequence of events:
1. Change made to e.g. `Index.fs`
2. Fable **and Vite** notice a change to the file...
- Vite doesn't know how to hot reload a `.fs` file, so it does a full refresh, just in case.
- Fable does a recompile
3. Vite sees the new `.js` files from Fable reco... | 4efa8d19c7b45c4ad8ac3c6badd3436879642410 | b9d77a7355301872cc1821693f5280195587aba1 | diff --git a/Content/default/src/Client/vite.config.mts b/Content/default/src/Client/vite.config.mts
index 3208494d..61487f1b 100644
--- a/Content/default/src/Client/vite.config.mts
+++ b/Content/default/src/Client/vite.config.mts
@@ -18,6 +18,9 @@ export default defineConfig({
target: proxyTarget,
... | [
"Content/default/src/Client/vite.config.mts",
"Content/minimal/src/Client/vite.config.mts"
] | [] | true | ||
SAFE-Stack/SAFE-template | 605 | issue_to_patch | Upgrade to beta5 | 8d08484c3031c70329ed5dfc8d2688e02569aef8 | 206b4a4ce7504a0b0cd76d764ead7cf8a6544699 | diff --git a/Content/default/paket.lock b/Content/default/paket.lock
index 777d81ff..94aa85ad 100644
--- a/Content/default/paket.lock
+++ b/Content/default/paket.lock
@@ -5,7 +5,7 @@ NUGET
Expecto (9.0.4)
FSharp.Core (>= 4.6)
Mono.Cecil (>= 0.11.3)
- Fable.AST (4.3)
+ Fable.AST (4.4)
Fable... | [
"Content/default/paket.lock",
"Content/default/src/Client/Index.fs",
"Content/default/src/Server/Server.fs",
"Content/default/src/Shared/Shared.fs",
"Content/default/tests/Client/Client.Tests.fs"
] | [
{
"comment": "Don't indent these comments. It breaks the tests. See https://github.com/SAFE-Stack/SAFE-template/pull/581/files.\r\n\r\nPerhaps it's worth a regular comment to say that?",
"path": "Content/default/tests/Client/Client.Tests.fs",
"hunk": "@@ -12,19 +13,28 @@ let client =\n let n... | diff --git a/Content/default/tests/Client/Client.Tests.fs b/Content/default/tests/Client/Client.Tests.fs
index 31b6e3d4..7dbc6d65 100644
--- a/Content/default/tests/Client/Client.Tests.fs
+++ b/Content/default/tests/Client/Client.Tests.fs
@@ -4,6 +4,7 @@ open Fable.Mocha
open Index
open Shared
+open SAFE
let cli... | true | ||
SAFE-Stack/SAFE-template | 605 | comment_to_fix | Upgrade to beta5 | Don't indent these comments. It breaks the tests. See https://github.com/SAFE-Stack/SAFE-template/pull/581/files.
Perhaps it's worth a regular comment to say that? | 8d08484c3031c70329ed5dfc8d2688e02569aef8 | 206b4a4ce7504a0b0cd76d764ead7cf8a6544699 | diff --git a/Content/default/tests/Client/Client.Tests.fs b/Content/default/tests/Client/Client.Tests.fs
index 31b6e3d4..7dbc6d65 100644
--- a/Content/default/tests/Client/Client.Tests.fs
+++ b/Content/default/tests/Client/Client.Tests.fs
@@ -4,6 +4,7 @@ open Fable.Mocha
open Index
open Shared
+open SAFE
let cli... | [
"Content/default/tests/Client/Client.Tests.fs"
] | [
{
"comment": "Don't indent these comments. It breaks the tests. See https://github.com/SAFE-Stack/SAFE-template/pull/581/files.\r\n\r\nPerhaps it's worth a regular comment to say that?",
"path": "Content/default/tests/Client/Client.Tests.fs",
"hunk": "@@ -12,19 +13,28 @@ let client =\n let n... | true | ||
SAFE-Stack/SAFE-template | 605 | comment_to_fix | Upgrade to beta5 | I think that `Async.toApiCallCmd` might be a better name than `Async.toCmdUnsafe`. The current function implies to me more generic async behaviour than the specific `ApiCall` behaviour it actually represents.
In what sense is the function unsafe? | 8d08484c3031c70329ed5dfc8d2688e02569aef8 | 206b4a4ce7504a0b0cd76d764ead7cf8a6544699 | diff --git a/Content/default/src/Client/Index.fs b/Content/default/src/Client/Index.fs
index b12504ab..d521350f 100644
--- a/Content/default/src/Client/Index.fs
+++ b/Content/default/src/Client/Index.fs
@@ -5,89 +5,95 @@ open SAFE
open Shared
type Model = {
- Todos: Deferred<Todo list>
+ Todos: RemoteData<Tod... | [
"Content/default/src/Client/Index.fs"
] | [
{
"comment": "I think that `Async.toApiCallCmd` might be a better name than `Async.toCmdUnsafe`. The current function implies to me more generic async behaviour than the specific `ApiCall` behaviour it actually represents.\r\n\r\nIn what sense is the function unsafe?",
"path": "Content/default/src/Client/In... | true | ||
SAFE-Stack/SAFE-template | 605 | comment_to_fix | Upgrade to beta5 | In these situation in general, I personally prefer to use pipeline:
```fs
Start
|> LoadTodos
|> Cmd.ofMsg
// Real world example
Router.OrderRoute.Index
|> Router.AuthRoute.Orders
|> Router.Route.Auth
|> Router.newUrl
``` | 8d08484c3031c70329ed5dfc8d2688e02569aef8 | 206b4a4ce7504a0b0cd76d764ead7cf8a6544699 | diff --git a/Content/default/src/Client/Index.fs b/Content/default/src/Client/Index.fs
index b12504ab..d521350f 100644
--- a/Content/default/src/Client/Index.fs
+++ b/Content/default/src/Client/Index.fs
@@ -5,89 +5,95 @@ open SAFE
open Shared
type Model = {
- Todos: Deferred<Todo list>
+ Todos: RemoteData<Tod... | [
"Content/default/src/Client/Index.fs"
] | [
{
"comment": "In these situation in general, I personally prefer to use pipeline:\r\n\r\n```fs\r\nStart\r\n|> LoadTodos\r\n|> Cmd.ofMsg\r\n\r\n// Real world example\r\n\r\nRouter.OrderRoute.Index\r\n|> Router.AuthRoute.Orders\r\n|> Router.Route.Auth\r\n|> Router.newUrl\r\n```",
"path": "Content/default/src/... | true | ||
SAFE-Stack/SAFE-template | 607 | issue_to_patch | Bump vite from 5.0.12 to 5.0.13 in /Content/default | Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.12 to 5.0.13.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/vitejs/vite/blob/v5.0.13/packages/vite/CHANGELOG.md">vite's changelog</a>.</em></p>
<blockquote>
<h2><!-- raw HTML omitted -->5.0.13 (2024-03... | 8d08484c3031c70329ed5dfc8d2688e02569aef8 | d45b2161885f4971e1bc31394b464cddc7a34531 | diff --git a/Content/default/package-lock.json b/Content/default/package-lock.json
index 8b2ac43c..bbb70547 100644
--- a/Content/default/package-lock.json
+++ b/Content/default/package-lock.json
@@ -15,7 +15,7 @@
"postcss": "^8.4.31",
"sass": "^1.69.5",
"tailwindcss": ... | [
"Content/default/package-lock.json",
"Content/default/package.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 606 | issue_to_patch | Bump vite from 5.0.12 to 5.0.13 in /Content/minimal | Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.12 to 5.0.13.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/vitejs/vite/blob/v5.0.13/packages/vite/CHANGELOG.md">vite's changelog</a>.</em></p>
<blockquote>
<h2><!-- raw HTML omitted -->5.0.13 (2024-03... | 8d08484c3031c70329ed5dfc8d2688e02569aef8 | fb47fe2e703b58cb792f734be45ccd5c5935eff1 | diff --git a/Content/minimal/package-lock.json b/Content/minimal/package-lock.json
index e0aab9d9..9420bc7b 100644
--- a/Content/minimal/package-lock.json
+++ b/Content/minimal/package-lock.json
@@ -7,7 +7,7 @@
"devDependencies": {
"@types/node": "^20.10.0",
"@vitejs/plugi... | [
"Content/minimal/package-lock.json",
"Content/minimal/package.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 600 | issue_to_patch | Use Github actions to automate the release process | - Add a Github action that is triggered on Github release
- Automation of release notes process that is generated using the PR's merged since last release
- Version is driven from the version in the Github release
- Release notes in the Nuget package is now a link to the Github release notes
- Nuget secret is now a... | 8d08484c3031c70329ed5dfc8d2688e02569aef8 | 413f74415861e51bc292653677f8bda1daf07b19 | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..beb80a88
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,24 @@
+name: SAFE Template release
+
+on:
+ release:
+ types: [published]
+
+jobs:
+ release:
+ runs-on: ubuntu-latest
+
+ step... | [
".github/workflows/release.yml",
"Build.fs",
"Content/.template.config/template.json",
"SAFE.Template.proj"
] | [
{
"comment": "We probably need `dotnet tool restore` back here.",
"path": ".github/workflows/release.yml",
"hunk": "@@ -0,0 +1,21 @@\n+name: SAFE Template release\n+\n+on:\n+ release:\n+ types: [published]\n+\n+jobs:\n+ release:\n+ runs-on: ubuntu-latest\n+\n+ steps:\n+ - name: Checkout\... | true | ||
SAFE-Stack/SAFE-template | 600 | comment_to_fix | Use Github actions to automate the release process | We probably need `dotnet tool restore` back here. | 8d08484c3031c70329ed5dfc8d2688e02569aef8 | 413f74415861e51bc292653677f8bda1daf07b19 | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..beb80a88
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,24 @@
+name: SAFE Template release
+
+on:
+ release:
+ types: [published]
+
+jobs:
+ release:
+ runs-on: ubuntu-latest
+
+ step... | [
".github/workflows/release.yml"
] | [
{
"comment": "We probably need `dotnet tool restore` back here.",
"path": ".github/workflows/release.yml",
"hunk": "@@ -0,0 +1,21 @@\n+name: SAFE Template release\n+\n+on:\n+ release:\n+ types: [published]\n+\n+jobs:\n+ release:\n+ runs-on: ubuntu-latest\n+\n+ steps:\n+ - name: Checkout\... | true | ||
SAFE-Stack/SAFE-template | 586 | issue_to_patch | update fable version | Update fable
* Ran into issue where did not compile F# 8 nested record update and replace syntax; newer fable version fixes this | eb6451cfe5de2a0f3a43346c0b07d1b4f39d6de1 | 8a8e665fdfb23cf6143267a722bf47d775822a38 | diff --git a/Content/default/.config/dotnet-tools.json b/Content/default/.config/dotnet-tools.json
index 1bc6f28b..cb727877 100644
--- a/Content/default/.config/dotnet-tools.json
+++ b/Content/default/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
]
},
"fable": {
- "version": "4.1.4",
+ "version":... | [
"Content/default/.config/dotnet-tools.json",
"Content/minimal/.config/dotnet-tools.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 603 | issue_to_patch | remove fable modules from source control | 2dc336ec4c7a41a717339e80d94b06150e931154 | b6c26b9b552c97404eb993cca61fc97230781589 | diff --git a/Content/minimal/.gitignore b/Content/minimal/.gitignore
index bcc62c93..7902b816 100644
--- a/Content/minimal/.gitignore
+++ b/Content/minimal/.gitignore
@@ -1,4 +1,5 @@
.fable/
+fable_modules/
.fake/
.farmer/
.idea/
diff --git a/Content/minimal/src/Client/fable_modules/Fable.Fetch.2.4.0/Fable.Fetch.fa... | [
"Content/minimal/.gitignore",
"Content/minimal/src/Client/fable_modules/Fable.Fetch.2.4.0/Fable.Fetch.fableproj",
"Content/minimal/src/Client/fable_modules/Fable.Fetch.2.4.0/Fetch.fs",
"Content/minimal/src/Client/fable_modules/Fable.Promise.2.2.2/Fable.Promise.fableproj",
"Content/minimal/src/Client/fable_m... | [] | true | |||
SAFE-Stack/SAFE-template | 604 | issue_to_patch | the `remotedev` dependency has a security vulnerability
In the root of your safe stack application, run `npm audit fix`:
```bash
$ npm audit fix
up to date, audited 235 packages in 552ms
38 packages are looking for funding
run `npm fund` for details
# npm audit report
ws 2.0.0 - 3.3.0
Severity: hi... | Remove Elmish.Debugger | * Remove elmish debugger, as it depends on un-maintained package https://github.com/zalmoxisus/remotedev
* Resolves #602 | 2b7162fc5f44aa4a83ed38536e2aa4c07ce7375f | ccdd434fc73e08da133cab24bfef2ee53273fb28 | diff --git a/Content/default/package-lock.json b/Content/default/package-lock.json
index 9f501fb2..8b2ac43c 100644
--- a/Content/default/package-lock.json
+++ b/Content/default/package-lock.json
@@ -13,7 +13,6 @@
"@vitejs/plugin-react": "^4.2.0",
"autoprefixer": "^10.4.16",
... | [
"Content/default/package-lock.json",
"Content/default/package.json",
"Content/default/src/Client/App.fs",
"Content/default/src/Client/index.html",
"Content/minimal/src/Client/index.html"
] | [] | true | |
SAFE-Stack/SAFE-template | 598 | issue_to_patch | Review declared dependencies of libraries that SAFE Template depends on
Triggered by discussion in #553.
We've had a few cases where upgrading packages causes problems because they don't declare the packages that they depend on tightly enough. In this case, Paket (or npm) upgrades packages to versions that it think... | Upgrade to use metapackages | Closes #557. This PR introduces dependencies on two NuGet [metapackages](https://github.com/SAFE-Stack/SAFE.Meta), SAFE.Server and SAFE.Client. They contain the dependencies required for SAFE Stack applications as well as some nice helper types and functions.
* Only one dependency required for both Client and Server... | 822e91d1d2ce5d7cab72e9b09b2a464ea5ac4bae | 62853d1549c9933bc1d93c7c51ed5870babe2ed8 | diff --git a/Content/default/paket.dependencies b/Content/default/paket.dependencies
index 302c3da0..8c2aecee 100644
--- a/Content/default/paket.dependencies
+++ b/Content/default/paket.dependencies
@@ -2,19 +2,9 @@ source https://api.nuget.org/v3/index.json
framework: net8.0
storage: none
-nuget FSharp.Core ~> 8
-... | [
"Content/default/paket.dependencies",
"Content/default/paket.lock",
"Content/default/src/Client/Index.fs",
"Content/default/src/Client/paket.references",
"Content/default/src/Server/Server.fs",
"Content/default/src/Server/paket.references"
] | [
{
"comment": "I would prefer Route.builder to be a required parameter, or for there to be an overload accepting it",
"path": "Content/default/src/Server/Server.fs",
"hunk": "@@ -32,11 +30,7 @@ let todosApi = {\n }\n }\n \n-let webApp =\n- Remoting.createApi ()\n- |> Remoting.withRouteBuild... | true | |
SAFE-Stack/SAFE-template | 598 | comment_to_fix | Upgrade to use metapackages | I would prefer Route.builder to be a required parameter, or for there to be an overload accepting it | 822e91d1d2ce5d7cab72e9b09b2a464ea5ac4bae | 62853d1549c9933bc1d93c7c51ed5870babe2ed8 | diff --git a/Content/default/src/Server/Server.fs b/Content/default/src/Server/Server.fs
index 20f76a34..e6f2ca7f 100644
--- a/Content/default/src/Server/Server.fs
+++ b/Content/default/src/Server/Server.fs
@@ -1,9 +1,7 @@
module Server
-open Fable.Remoting.Server
-open Fable.Remoting.Giraffe
+open SAFE
open Saturn... | [
"Content/default/src/Server/Server.fs"
] | [
{
"comment": "I would prefer Route.builder to be a required parameter, or for there to be an overload accepting it",
"path": "Content/default/src/Server/Server.fs",
"hunk": "@@ -32,11 +30,7 @@ let todosApi = {\n }\n }\n \n-let webApp =\n- Remoting.createApi ()\n- |> Remoting.withRouteBuild... | true | ||
SAFE-Stack/SAFE-template | 598 | comment_to_fix | Upgrade to use metapackages | It seems weird to me for `Map` to be a method rather than a function in the `Deferred` module. | 822e91d1d2ce5d7cab72e9b09b2a464ea5ac4bae | 62853d1549c9933bc1d93c7c51ed5870babe2ed8 | diff --git a/Content/default/src/Client/Index.fs b/Content/default/src/Client/Index.fs
index f6b74262..b12504ab 100644
--- a/Content/default/src/Client/Index.fs
+++ b/Content/default/src/Client/Index.fs
@@ -1,43 +1,46 @@
module Index
open Elmish
-open Fable.Remoting.Client
+open SAFE
open Shared
-type Model = { ... | [
"Content/default/src/Client/Index.fs"
] | [
{
"comment": "It seems weird to me for `Map` to be a method rather than a function in the `Deferred` module.",
"path": "Content/default/src/Client/Index.fs",
"hunk": "@@ -1,43 +1,46 @@\n module Index\n \n open Elmish\n-open Fable.Remoting.Client\n+open SAFE\n open Shared\n \n-type Model = { Todos: Todo ... | true | ||
SAFE-Stack/SAFE-template | 591 | issue_to_patch | Bump vite from 5.0.5 to 5.0.12 in /Content/minimal | Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.5 to 5.0.12.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/vitejs/vite/blob/v5.0.12/packages/vite/CHANGELOG.md">vite's changelog</a>.</em></p>
<blockquote>
<h2><!-- raw HTML omitted -->5.0.12 (2024-01-... | 353b30ed0f9720bd8e63fee49f6fede6603cb176 | 4da5e14044568d2c032ede2009002cc1e989796f | diff --git a/Content/minimal/package-lock.json b/Content/minimal/package-lock.json
index ec79d68f..e0aab9d9 100644
--- a/Content/minimal/package-lock.json
+++ b/Content/minimal/package-lock.json
@@ -7,7 +7,7 @@
"devDependencies": {
"@types/node": "^20.10.0",
"@vitejs/plugi... | [
"Content/minimal/package-lock.json",
"Content/minimal/package.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 590 | issue_to_patch | Bump vite from 5.0.5 to 5.0.12 in /Content/default | Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.5 to 5.0.12.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/vitejs/vite/blob/v5.0.12/packages/vite/CHANGELOG.md">vite's changelog</a>.</em></p>
<blockquote>
<h2><!-- raw HTML omitted -->5.0.12 (2024-01-... | 353b30ed0f9720bd8e63fee49f6fede6603cb176 | d627a4b9f65a60e72d5bd51cd97ccdf279a14724 | diff --git a/Content/default/package-lock.json b/Content/default/package-lock.json
index c12f2a4e..9f501fb2 100644
--- a/Content/default/package-lock.json
+++ b/Content/default/package-lock.json
@@ -16,7 +16,7 @@
"remotedev": "^0.2.9",
"sass": "^1.69.5",
"tailwindcss":... | [
"Content/default/package-lock.json",
"Content/default/package.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 587 | issue_to_patch | Resolve security vulnerabilities | This fixes some warnings I've seen around the Microsoft JWT dependencies. | df5cfda5e7788b73b14fdac45b2aaa2eb0ecc886 | 52b93eb7f861ef1dee3899b8fd071570b86c8b4e | diff --git a/Content/default/paket.lock b/Content/default/paket.lock
index cb541a76..6f14a3fc 100644
--- a/Content/default/paket.lock
+++ b/Content/default/paket.lock
@@ -9,7 +9,7 @@ NUGET
Fable.Browser.Blob (1.3)
Fable.Core (>= 3.0)
FSharp.Core (>= 4.7.2)
- Fable.Browser.Dom (2.14)
+ Fable.Bro... | [
"Content/default/paket.lock"
] | [] | true | ||
SAFE-Stack/SAFE-template | 585 | issue_to_patch | Bump vite from 5.0.0 to 5.0.5 in /Content/default | Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.0 to 5.0.5.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md">vite's changelog</a>.</em></p>
<blockquote>
<h2><!-- raw HTML omitted -->5.0.5 (2023-12-04)<!... | 8e88ae84dfc72a6eca7ba267019f632dcc107f5f | f21474bbf4626b13355f696a3991422cc955bf52 | diff --git a/Content/default/package-lock.json b/Content/default/package-lock.json
index 2f06f9f5..c12f2a4e 100644
--- a/Content/default/package-lock.json
+++ b/Content/default/package-lock.json
@@ -16,7 +16,7 @@
"remotedev": "^0.2.9",
"sass": "^1.69.5",
"tailwindcss":... | [
"Content/default/package-lock.json",
"Content/default/package.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 584 | issue_to_patch | Bump vite from 5.0.0 to 5.0.5 in /Content/minimal | Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.0 to 5.0.5.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md">vite's changelog</a>.</em></p>
<blockquote>
<h2><!-- raw HTML omitted -->5.0.5 (2023-12-04)<!... | 8e88ae84dfc72a6eca7ba267019f632dcc107f5f | 2702fc3c1d3d2db3e9f5082198c46fa15d81eaf4 | diff --git a/Content/minimal/package-lock.json b/Content/minimal/package-lock.json
index 56225541..ec79d68f 100644
--- a/Content/minimal/package-lock.json
+++ b/Content/minimal/package-lock.json
@@ -7,7 +7,7 @@
"devDependencies": {
"@types/node": "^20.10.0",
"@vitejs/plugi... | [
"Content/minimal/package-lock.json",
"Content/minimal/package.json"
] | [] | true | ||
SAFE-Stack/SAFE-template | 582 | issue_to_patch | updated sln reference, readme | first small PR. :)
in regards to issue #580 i discovered also the following.
1. webpack config was still in default sln file
2. travis.yml still referenced net 6
3. updated readme.md files to reflect used net8 and updated npm, node versions | 8e88ae84dfc72a6eca7ba267019f632dcc107f5f | 6e30bb9bab5268d7f32db0a2a990a94cccfc4256 | diff --git a/.travis.yml b/.travis.yml
index 868a3237..f0d5dc06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
language: csharp
-dotnet: 6.0.101
+dotnet: 8.0.100
mono: none
os:
- linux
@@ -12,4 +12,4 @@ before_install:
script:
- dotnet tool restore
- dotnet paket restore
- - dotnet run --proje... | [
".travis.yml",
"Build.fs",
"Build.fsproj",
"Content/default/.gitignore",
"Content/default/Build.fsproj",
"Content/default/README.md",
"Content/default/SAFE.App.sln",
"Content/default/src/Client/Client.fsproj",
"Content/minimal/.gitignore",
"Content/minimal/README.md",
"Content/minimal/SAFE.App.s... | [
{
"comment": "I'm not sure that this additional section is required - it's just standard `dotnet tool` information.",
"path": "Content/default/README.md",
"hunk": "@@ -17,6 +18,15 @@ Before you run the project **for the first time only** you must install dotnet \"\n dotnet tool restore\n ```\n \n+To che... | diff --git a/tests/tests.fsproj b/tests/Tests.fsproj
similarity index 100%
rename from tests/tests.fsproj
rename to tests/Tests.fsproj
| true | |
SAFE-Stack/SAFE-template | 582 | comment_to_fix | updated sln reference, readme | I'm not sure that this additional section is required - it's just standard `dotnet tool` information. | 8e88ae84dfc72a6eca7ba267019f632dcc107f5f | 6e30bb9bab5268d7f32db0a2a990a94cccfc4256 | diff --git a/Content/default/README.md b/Content/default/README.md
index bec6a25b..b07afe03 100644
--- a/Content/default/README.md
+++ b/Content/default/README.md
@@ -6,8 +6,9 @@ This template can be used to generate a full-stack web application using the [SA
You'll need to install the following pre-requisites in or... | [
"Content/default/README.md"
] | [
{
"comment": "I'm not sure that this additional section is required - it's just standard `dotnet tool` information.",
"path": "Content/default/README.md",
"hunk": "@@ -17,6 +18,15 @@ Before you run the project **for the first time only** you must install dotnet \"\n dotnet tool restore\n ```\n \n+To che... | true | ||
SAFE-Stack/SAFE-template | 582 | comment_to_fix | updated sln reference, readme | Ditto above comment. | 8e88ae84dfc72a6eca7ba267019f632dcc107f5f | 6e30bb9bab5268d7f32db0a2a990a94cccfc4256 | diff --git a/Content/minimal/README.md b/Content/minimal/README.md
index 96674d62..655283dc 100644
--- a/Content/minimal/README.md
+++ b/Content/minimal/README.md
@@ -6,8 +6,9 @@ This template can be used to generate a full-stack web application using the [SA
You'll need to install the following pre-requisites in or... | [
"Content/minimal/README.md"
] | [
{
"comment": "Ditto above comment.",
"path": "Content/minimal/README.md",
"hunk": "@@ -26,6 +27,15 @@ dotnet tool restore\n dotnet fable watch src/Client --run npm run start\n ```\n \n+To check for updates, use",
"resolving_sha": "6e30bb9bab5268d7f32db0a2a990a94cccfc4256",
"resolving_diff": "dif... | true | ||
SAFE-Stack/SAFE-template | 582 | comment_to_fix | updated sln reference, readme | Definitely want this. | 8e88ae84dfc72a6eca7ba267019f632dcc107f5f | 6e30bb9bab5268d7f32db0a2a990a94cccfc4256 | diff --git a/.travis.yml b/.travis.yml
index 868a3237..f0d5dc06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
language: csharp
-dotnet: 6.0.101
+dotnet: 8.0.100
mono: none
os:
- linux
@@ -12,4 +12,4 @@ before_install:
script:
- dotnet tool restore
- dotnet paket restore
- - dotnet run --proje... | [
".travis.yml"
] | [
{
"comment": "Definitely want this.",
"path": ".travis.yml",
"hunk": "@@ -1,5 +1,5 @@\n language: csharp\n-dotnet: 6.0.101\n+dotnet: 8.0.100",
"resolving_sha": "6e30bb9bab5268d7f32db0a2a990a94cccfc4256",
"resolving_diff": "diff --git a/.travis.yml b/.travis.yml\nindex 868a3237..f0d5dc06 100644\n... | true | ||
SAFE-Stack/SAFE-template | 582 | comment_to_fix | updated sln reference, readme | We probably want `fs.js` in both minimal and full. | 8e88ae84dfc72a6eca7ba267019f632dcc107f5f | 6e30bb9bab5268d7f32db0a2a990a94cccfc4256 | diff --git a/Content/minimal/.gitignore b/Content/minimal/.gitignore
index df9550ed..bcc62c93 100644
--- a/Content/minimal/.gitignore
+++ b/Content/minimal/.gitignore
@@ -13,5 +13,6 @@ node_modules/
release.cmd
release.sh
*.orig
+*.fsproj.user
*.DotSettings.user
-*.fs.js
\ No newline at end of file
+*.fs.js
| [
"Content/minimal/.gitignore"
] | [
{
"comment": "We probably want `fs.js` in both minimal and full.",
"path": "Content/minimal/.gitignore",
"hunk": "@@ -13,5 +13,6 @@ node_modules/\n release.cmd\n release.sh\n *.orig\n+*.fsproj.user\n *.DotSettings.user\n-*.fs.js\n\\ No newline at end of file\n+*.fs.js",
"resolving_sha": "6e30bb9bab5... | true | ||
SAFE-Stack/SAFE-template | 582 | comment_to_fix | updated sln reference, readme | Yes, remove this - not required (in fact, it's wrong to have it there).. | 8e88ae84dfc72a6eca7ba267019f632dcc107f5f | 6e30bb9bab5268d7f32db0a2a990a94cccfc4256 | diff --git a/Content/default/SAFE.App.sln b/Content/default/SAFE.App.sln
index ba890c83..8ef3926e 100644
--- a/Content/default/SAFE.App.sln
+++ b/Content/default/SAFE.App.sln
@@ -5,12 +5,12 @@ VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}"... | [
"Content/default/SAFE.App.sln"
] | [
{
"comment": "Yes, remove this - not required (in fact, it's wrong to have it there)..",
"path": "Content/default/SAFE.App.sln",
"hunk": "@@ -9,7 +9,6 @@ Project(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\") = \"Solution Items\", \"Solution\n \t\tpaket.lock = paket.lock\n \t\tpackage-lock.json = package-l... | true | ||
SAFE-Stack/SAFE-template | 581 | issue_to_patch | Fix default template client test | a74bfd4c4cc0cded30d5e24bc4a38139e0e5351c | 599f9a9aa05aa27f85fc6a2974be03c4713296ac | [
"Content/default/tests/Client/Client.Tests.fs"
] | [] | diff --git a/Content/default/tests/Client/Client.Tests.fs b/Content/default/tests/Client/Client.Tests.fs
index 96b52adf..31b6e3d4 100644
--- a/Content/default/tests/Client/Client.Tests.fs
+++ b/Content/default/tests/Client/Client.Tests.fs
@@ -20,11 +20,11 @@ let client =
let all =
testList "All" [
- //-:... | true | |||
SAFE-Stack/SAFE-template | 579 | issue_to_patch | Release script fixes | 36e8a5e306fdcb8587108cf6de71b91a7eb01b07 | 04816214d45903c344d44ebee06eecd50bdaf7d7 | diff --git a/Build.fs b/Build.fs
index 656fec6e..9fbe7f46 100644
--- a/Build.fs
+++ b/Build.fs
@@ -8,13 +8,14 @@ open Fake.Tools
let execContext = Context.FakeExecutionContext.Create false "build.fsx" [ ]
Context.setExecutionContext (Context.RuntimeContext.Fake execContext)
+let skipTests = Environment.hasEnvironVa... | [
"Build.fs",
"CONTRIBUTING.md"
] | [] | true | |||
SAFE-Stack/SAFE-template | 577 | issue_to_patch | used className attribute for styles in Index.fs | fb3481cb34bc4d6102df3d34634843b75fe8f4e0 | cee1acc173842259261066be7510359902a55803 | diff --git a/Content/default/src/Client/Index.fs b/Content/default/src/Client/Index.fs
index caae751e..f6b74262 100644
--- a/Content/default/src/Client/Index.fs
+++ b/Content/default/src/Client/Index.fs
@@ -43,22 +43,11 @@ open Feliz
let private todoAction model dispatch =
Html.div [
- prop.classes [ "fl... | [
"Content/default/src/Client/Index.fs"
] | [
{
"comment": "Not sure how this was working before - does className have an overload to accept a list?",
"path": "Content/default/src/Client/Index.fs",
"hunk": "@@ -92,18 +68,10 @@ let private todoAction model dispatch =\n \n let private todoList model dispatch =\n Html.div [\n- prop.classes ... | true | |||
SAFE-Stack/SAFE-template | 578 | issue_to_patch | Update .editorconfig | Just remove unnecessary obsolete Fantomas config. | fb3481cb34bc4d6102df3d34634843b75fe8f4e0 | 1cecac90612d063d5e31fdcbbe911374cbe2866c | diff --git a/Content/default/.editorconfig b/Content/default/.editorconfig
index 4ecaa992..14bd6eda 100644
--- a/Content/default/.editorconfig
+++ b/Content/default/.editorconfig
@@ -10,7 +10,3 @@ insert_final_newline = false
[*.fs]
fsharp_multiline_bracket_style = stroustrup
fsharp_newline_before_multiline_computat... | [
"Content/default/.editorconfig"
] | [] | true | ||
SAFE-Stack/SAFE-template | 575 | issue_to_patch | Remove unnecessary type annotations on main files. | Pretty self explanatory. Most IDEs do sufficiently well to provide annotations hints that they aren't required e.g. in VSCode with Ionide:
| 574d42b850f5c21e97c760d790d9bcca0404086b | 3b9ee95d8e5a7fca752846691ac7d7cbc05b4eaa | diff --git a/Content/default/src/Client/Index.fs b/Content/default/src/Client/Index.fs
index 41a8dff8..caae751e 100644
--- a/Content/default/src/Client/Index.fs
+++ b/Content/default/src/Client/Index.fs
@@ -17,14 +17,12 @@ let todosApi =
|> Remoting.withRouteBuilder Route.builder
|> Remoting.buildProxy<ITodos... | [
"Content/default/src/Client/Index.fs",
"Content/default/src/Server/Server.fs"
] | [] | true | ||
SFML/SFML | 3,717 | issue_to_patch | More network tests shold be marked as requiring internet access
### Prerequisite Checklist
- [x] I searched for [existing issues](https://github.com/search?q=repo%3ASFML%2FSFML&type=issues) to prevent duplicates
- [x] I searched for [existing discussions on the forum](https://www.google.com/search?q=site%3Ahttps%3A%2... | Fixed network tests inadvertently causing network access | Fixed network tests inadvertently causing network access even when network access is disabled via configuration.
See #3709 for the problem description.
This change fixes the issues reported in #3709 by moving test blocks that do require access to the network into guarded test cases and fixing blocks that shouldn'... | bc85ba177da9e4687e5e99d51020243366929cc4 | 36378d2b9617079de66a459214a9ef2e956c385e | [
"test/Network/Dns.test.cpp",
"test/Network/Http.test.cpp",
"test/Network/IpAddress.test.cpp",
"test/Network/Sftp.test.cpp"
] | [] | diff --git a/test/Network/Dns.test.cpp b/test/Network/Dns.test.cpp
index 7cafd1ca73..75a5dfe32c 100644
--- a/test/Network/Dns.test.cpp
+++ b/test/Network/Dns.test.cpp
@@ -7,6 +7,89 @@
using namespace std::string_literals;
using namespace std::string_view_literals;
+TEST_CASE("[Network] sf::Dns (Invalid hosts)")
+{
... | true | |
SFML/SFML | 3,711 | issue_to_patch | Ensure that input element is still valid | ## Description
The following report highlighted a potential issue where the input element could be invalid and we're not performing any checks for it: https://github.com/Lorenzooone/cc3dsfs/issues/38
There's no guarantee that `IOHIDDeviceGetValue` can handle `nullptr` references.
## Tasks
- [ ] Tested on ... | 8efe42859dccf81b1720406998162dcff9398d56 | 440fd86edba0b2bb29a60490dc1df1afc3c5a3ee | diff --git a/src/SFML/Window/macOS/HIDInputManager.mm b/src/SFML/Window/macOS/HIDInputManager.mm
index f1ddffd092..475448bc79 100644
--- a/src/SFML/Window/macOS/HIDInputManager.mm
+++ b/src/SFML/Window/macOS/HIDInputManager.mm
@@ -979,6 +979,15 @@
IOHIDValueRef value = nil;
IOHIDDeviceRef device = I... | [
"src/SFML/Window/macOS/HIDInputManager.mm",
"src/SFML/Window/macOS/JoystickImpl.cpp"
] | [] | true | ||
SFML/SFML | 3,712 | issue_to_patch | Fix documentation to show that scroll lock is not supported on macOS | ## Description
Fixes the documentation as pointed out by @kimci86 in https://github.com/SFML/SFML/pull/3238#pullrequestreview-4222972776
## How to test this PR?
CI should pass | 34fe23f80f2002bfd032f7842d4ef6dbf7561ed3 | 8b07d5293170542dc9125e653fb8159eb637fd3a | diff --git a/include/SFML/Window/Event.hpp b/include/SFML/Window/Event.hpp
index de0a4abe6f..7f72caeee7 100644
--- a/include/SFML/Window/Event.hpp
+++ b/include/SFML/Window/Event.hpp
@@ -106,8 +106,8 @@ class Event
bool shift{}; //!< Is the Shift key pressed?
bool syst... | [
"include/SFML/Window/Event.hpp"
] | [] | true | ||
SFML/SFML | 3,238 | issue_to_patch | Add CapsLock, NumLock and ScrollLock support for Events | ## Description
This adds support for getting CapsLock, NumLock and ScrollLock modifier/state information on the events.
If this is accepted, once could also look into adding some functions to `sf::Keyboard`.
This came up as discussion on Discord, which originated from a TGUI issue: https://github.com/texus/TGU... | 8efe42859dccf81b1720406998162dcff9398d56 | eca31990f816f61a95129af8cd60a88cca2fea1f | diff --git a/include/SFML/Window/Event.hpp b/include/SFML/Window/Event.hpp
index 109ef2be4a..de0a4abe6f 100644
--- a/include/SFML/Window/Event.hpp
+++ b/include/SFML/Window/Event.hpp
@@ -99,12 +99,15 @@ class Event
////////////////////////////////////////////////////////////
struct KeyPressed
{
- ... | [
"include/SFML/Window/Event.hpp",
"src/SFML/Window/Android/WindowImplAndroid.cpp",
"src/SFML/Window/DRM/InputImpl.cpp",
"src/SFML/Window/Unix/WindowImplX11.cpp",
"src/SFML/Window/Win32/WindowImplWin32.cpp",
"src/SFML/Window/macOS/SFKeyboardModifiersHelper.mm",
"test/Window/Event.test.cpp"
] | [
{
"comment": "```suggestion\r\n event.capsLock = (LOWORD(GetKeyState(VK_CAPITAL)) & 1) != 0;\r\n event.numLock = (LOWORD(GetKeyState(VK_NUMLOCK)) & 1) != 0;\r\n event.scrollLock = (LOWORD(GetKeyState(VK_SCROLL)) & 1) != 0;\r\n```\r\n\r\nYou need LOWORD instead o... | diff --git a/test/Window/Event.test.cpp b/test/Window/Event.test.cpp
index 33ab25864f..d450d58549 100644
--- a/test/Window/Event.test.cpp
+++ b/test/Window/Event.test.cpp
@@ -88,7 +88,7 @@ TEST_CASE("[Window] sf::Event")
const auto& textEntered = *event.getIf<sf::Event::TextEntered>();
CHECK(textEnter... | true | |
SFML/SFML | 3,238 | comment_to_fix | Add CapsLock, NumLock and ScrollLock support for Events | ```suggestion
event.capsLock = (LOWORD(GetKeyState(VK_CAPITAL)) & 1) != 0;
event.numLock = (LOWORD(GetKeyState(VK_NUMLOCK)) & 1) != 0;
event.scrollLock = (LOWORD(GetKeyState(VK_SCROLL)) & 1) != 0;
```
You need LOWORD instead of HIWORD to get the toggled state ... | 8efe42859dccf81b1720406998162dcff9398d56 | eca31990f816f61a95129af8cd60a88cca2fea1f | diff --git a/src/SFML/Window/Win32/WindowImplWin32.cpp b/src/SFML/Window/Win32/WindowImplWin32.cpp
index 731deee313..b7d68df495 100644
--- a/src/SFML/Window/Win32/WindowImplWin32.cpp
+++ b/src/SFML/Window/Win32/WindowImplWin32.cpp
@@ -887,12 +887,15 @@ void WindowImplWin32::processEvent(UINT message, WPARAM wParam, LPA... | [
"src/SFML/Window/Win32/WindowImplWin32.cpp"
] | [
{
"comment": "```suggestion\r\n event.capsLock = (LOWORD(GetKeyState(VK_CAPITAL)) & 1) != 0;\r\n event.numLock = (LOWORD(GetKeyState(VK_NUMLOCK)) & 1) != 0;\r\n event.scrollLock = (LOWORD(GetKeyState(VK_SCROLL)) & 1) != 0;\r\n```\r\n\r\nYou need LOWORD instead o... | true | ||
SFML/SFML | 3,238 | comment_to_fix | Add CapsLock, NumLock and ScrollLock support for Events | Looking at the implementation, it looks like macOS supports num lock but not scroll lock, contrary to the documentation. | 8efe42859dccf81b1720406998162dcff9398d56 | eca31990f816f61a95129af8cd60a88cca2fea1f | diff --git a/include/SFML/Window/Event.hpp b/include/SFML/Window/Event.hpp
index 109ef2be4a..de0a4abe6f 100644
--- a/include/SFML/Window/Event.hpp
+++ b/include/SFML/Window/Event.hpp
@@ -99,12 +99,15 @@ class Event
////////////////////////////////////////////////////////////
struct KeyPressed
{
- ... | [
"include/SFML/Window/Event.hpp"
] | [
{
"comment": "Looking at the implementation, it looks like macOS supports num lock but not scroll lock, contrary to the documentation.",
"path": "include/SFML/Window/Event.hpp",
"hunk": "@@ -99,12 +99,15 @@ class Event\n ////////////////////////////////////////////////////////////\n struct KeyPr... | true | ||
SFML/SFML | 3,617 | issue_to_patch | Gamepad visuals for joystick example | ## Description
Changes the joystick example to use a visual indicator of the buttons/axis which makes it clearer how the state relates to a real gamepad
While it may not be much use currently, as it's a crapshoot whether the layout matches whatever controller you use, it should help for future improvements to hav... | f69e6e25a49510a2f8512a75dd8a575cdf08fd40 | 4d0e9c0a5804c0064037807034623e887b0717bc | diff --git a/examples/joystick/Joystick.cpp b/examples/joystick/Joystick.cpp
index 6ce8cd619c..c716adb82b 100644
--- a/examples/joystick/Joystick.cpp
+++ b/examples/joystick/Joystick.cpp
@@ -3,173 +3,444 @@
////////////////////////////////////////////////////////////
#include <SFML/Graphics.hpp>
-#include <algorith... | [
"examples/joystick/Joystick.cpp"
] | [
{
"comment": "Display should also be updated, otherwise the label might just read \"No Joystick\" after a new gamepad is detected.\n\n```suggestion\n updateDisplay();\n updateIndicators();\n```\n\n<img width=\"800\" height=\"600\" alt=\"Image\" src=\"https://github.com/user-attachm... | true | ||
SFML/SFML | 3,617 | comment_to_fix | Gamepad visuals for joystick example | Display should also be updated, otherwise the label might just read "No Joystick" after a new gamepad is detected.
```suggestion
updateDisplay();
updateIndicators();
```
<img width="800" height="600" alt="Image" src="https://github.com/user-attachments/assets/68416945-6b11-4b27-a28d-73... | f69e6e25a49510a2f8512a75dd8a575cdf08fd40 | 4d0e9c0a5804c0064037807034623e887b0717bc | diff --git a/examples/joystick/Joystick.cpp b/examples/joystick/Joystick.cpp
index 6ce8cd619c..c716adb82b 100644
--- a/examples/joystick/Joystick.cpp
+++ b/examples/joystick/Joystick.cpp
@@ -3,173 +3,444 @@
////////////////////////////////////////////////////////////
#include <SFML/Graphics.hpp>
-#include <algorith... | [
"examples/joystick/Joystick.cpp"
] | [
{
"comment": "Display should also be updated, otherwise the label might just read \"No Joystick\" after a new gamepad is detected.\n\n```suggestion\n updateDisplay();\n updateIndicators();\n```\n\n<img width=\"800\" height=\"600\" alt=\"Image\" src=\"https://github.com/user-attachm... | true | ||
SFML/SFML | 3,699 | issue_to_patch | Fix `target_link_options` for Android. | The [earlier PR](https://github.com/SFML/SFML/pull/3697) introduced syntax that did not work for others.
Later, [it was revealed](https://discord.com/channels/175298431294636032/477173543281491968/1490583954829479936) that I misinterpretted the `target_link_options`'s `LINK:<expr>` syntax and it required a comma.
T... | 765d790f4ccdad20ca7aef5ad4d8588a4629a4b5 | fe49f60c3bade2b3827aa77423cbd75f39eca751 | diff --git a/src/SFML/Main/CMakeLists.txt b/src/SFML/Main/CMakeLists.txt
index d536646f0f..d0f27df4cc 100644
--- a/src/SFML/Main/CMakeLists.txt
+++ b/src/SFML/Main/CMakeLists.txt
@@ -30,7 +30,7 @@ if(SFML_OS_ANDROID)
target_link_libraries(sfml-main PRIVATE android)
# Ensure this method is not stripped
- ... | [
"src/SFML/Main/CMakeLists.txt"
] | [] | true | ||
SFML/SFML | 3,705 | issue_to_patch | Update the development version to 3.2.0 | ## Description
After the release is before the release 😅 | 8835b6b955c96fa1ad1278a8dae6f05c4143effc | d8c80f654c22a39d27010ee92536b171f15db369 | diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f6f9b5bef..09c6af62b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,9 +25,9 @@ sfml_set_option(CMAKE_BUILD_TYPE Release STRING "Choose the type of build (Debug
sfml_set_option(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" STRING "The minimal iOS version that will be a... | [
"CMakeLists.txt",
"include/SFML/Config.hpp",
"test/install/CMakeLists.txt"
] | [] | diff --git a/test/install/CMakeLists.txt b/test/install/CMakeLists.txt
index 6cff70a638..7b8355ff56 100644
--- a/test/install/CMakeLists.txt
+++ b/test/install/CMakeLists.txt
@@ -7,7 +7,7 @@ if(PROJECT_IS_TOP_LEVEL)
set(SFML_STATIC_LIBRARIES ON)
endif()
- find_package(SFML 3.1.0 EXACT CONFIG REQUIRED... | true | |
SFML/SFML | 3,698 | issue_to_patch | Prepare SFML 3.1 Release | ## Description
- Write changelog for SFML 3.1
- Mark version as official release
## How to test this PR?
- CI should pass
- Test all the things! | 4a454047d4102b0393c0fc2a2bf48854e57253ea | 5842aad230bbcf5fe24b19e40782689e49390b63 | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 36487af4ca..d2ad6564ce 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,17 +60,12 @@ jobs:
- name: Get CMake and Ninja
uses: lukka/get-cmake@latest
with:
- cmakeVersion: '3.25'... | [
".github/workflows/release.yml",
"CMakeLists.txt",
"changelog.md",
"include/SFML/Config.hpp",
"migration.md"
] | [] | true | ||
SFML/SFML | 3,497 | issue_to_patch | Feature: Android joystick support | <!--
Thanks a lot for making a contribution to SFML! 🙂
Please make sure you are targetting the correct branch. No more features are planned for the 2.x branches! (See [the readme](https://github.com/SFML/SFML#state-of-development))
Before creating the pull request, we ask you to check the following boxes: (For ... | 3577f199477afadb547d6088b26d971023db998a | 9d185f2160182c63dec9339365ce446775a2c730 | diff --git a/src/SFML/System/Android/Activity.hpp b/src/SFML/System/Android/Activity.hpp
index 965888e5ca..b8d02c097d 100644
--- a/src/SFML/System/Android/Activity.hpp
+++ b/src/SFML/System/Android/Activity.hpp
@@ -29,6 +29,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Window/EglCon... | [
"src/SFML/System/Android/Activity.hpp",
"src/SFML/Window/Android/JniHelper.cpp",
"src/SFML/Window/Android/JniHelper.hpp",
"src/SFML/Window/Android/JniHelper.inl",
"src/SFML/Window/Android/JoystickButton.hpp",
"src/SFML/Window/Android/JoystickImpl.cpp",
"src/SFML/Window/Android/JoystickImpl.hpp",
"src/... | [
{
"comment": "TODO: remove this include",
"path": "src/SFML/System/Android/Activity.hpp",
"hunk": "@@ -40,6 +41,7 @@\n #include <string>\n #include <unordered_map>\n #include <vector>\n+#include <map>",
"resolving_sha": "9d185f2160182c63dec9339365ce446775a2c730",
"resolving_diff": "diff --git a/... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.