diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index f948f70..bedf826 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -13,6 +13,12 @@ "commands": [ "femto" ] + }, + "paket": { + "version": "7.1.5", + "commands": [ + "paket" + ] } } } \ No newline at end of file diff --git a/.gitignore b/.gitignore index de7e784..8c45230 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,10 @@ public/ +# Paket dependency manager +.paket/ +paket-files/ + + # Node node_modules/ .pnpm-store/ @@ -204,4 +209,4 @@ out .vs .ionide *.fs.js -*.fs.js.map \ No newline at end of file +*.fs.js.map diff --git a/CrosswordFable.sln b/CrosswordFable.sln index 5c8c1a3..e31a33b 100644 --- a/CrosswordFable.sln +++ b/CrosswordFable.sln @@ -2,6 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29418.71 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{A215D0C0-3947-42A6-B158-C2BEC1D22CE5}" + ProjectSection(SolutionItems) = preProject + paket.dependencies = paket.dependencies + EndProjectSection +EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "App", "src\App.fsproj", "{E5DEFC96-37CF-4844-9C9E-CFA0A9A8AED3}" EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Tests", "tests\Tests.fsproj", "{7821B727-268F-44AD-8136-B300B323F578}" diff --git a/NuGet.Config b/NuGet.Config deleted file mode 100644 index 502d4af..0000000 --- a/NuGet.Config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/justfile b/justfile index 5057c76..53adca1 100644 --- a/justfile +++ b/justfile @@ -5,6 +5,7 @@ serve: setup: dotnet tool restore + dotnet paket restore npm i -g pnpm || echo 'pnpm already installed' pnpm i dotnet femto ./src diff --git a/package.json b/package.json index f1074b4..9b611c1 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "date-fns": "^2.16.1", - "react": "^17.0.1", - "react-dom": "^17.0.1" + "react": "18.1.0", + "react-dom": "18.1.0" }, "devDependencies": { "sass": "^1.51.0", diff --git a/paket.dependencies b/paket.dependencies new file mode 100644 index 0000000..58d06cd --- /dev/null +++ b/paket.dependencies @@ -0,0 +1,10 @@ +source https://api.nuget.org/v3/index.json + +nuget Fable.DateFunctions ~> 3 +nuget Fable.Fetch ~> 2 +nuget Fable.Mocha ~> 2 +nuget Feliz ~> 1 +nuget Feliz.Router ~> 3 +nuget FSharp.Core ~> 6 +nuget Thoth.Json ~> 7 +nuget Zanaptak.TypedCssClasses ~> 1 diff --git a/paket.lock b/paket.lock new file mode 100644 index 0000000..21cf841 --- /dev/null +++ b/paket.lock @@ -0,0 +1,69 @@ +NUGET + remote: https://api.nuget.org/v3/index.json + Fable.AST (3.1.1) - restriction: >= netstandard2.0 + Fable.Browser.Blob (1.2) - restriction: >= netstandard2.0 + Fable.Core (>= 3.0) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Fable.Browser.Dom (2.10) - restriction: >= netstandard2.0 + Fable.Browser.Blob (>= 1.2) - restriction: >= netstandard2.0 + Fable.Browser.Event (>= 1.5) - restriction: >= netstandard2.0 + Fable.Browser.WebStorage (>= 1.1) - restriction: >= netstandard2.0 + Fable.Core (>= 3.2.8) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Fable.Browser.Event (1.5) - restriction: >= netstandard2.0 + Fable.Browser.Gamepad (>= 1.1) - restriction: >= netstandard2.0 + Fable.Core (>= 3.0) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Fable.Browser.Gamepad (1.1) - restriction: >= netstandard2.0 + Fable.Core (>= 3.0) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Fable.Browser.WebStorage (1.1) - restriction: >= netstandard2.0 + Fable.Browser.Event (>= 1.5) - restriction: >= netstandard2.0 + Fable.Core (>= 3.0) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Fable.Core (3.7) - restriction: >= netstandard2.0 + Fable.DateFunctions (3.9) + Fable.Core (>= 3.1.6) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Fable.Elmish (3.1) - restriction: >= netstandard2.0 + Fable.Core (>= 3.0) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.6.2) - restriction: >= netstandard2.0 + Fable.Fetch (2.4) + Fable.Browser.Blob (>= 1.1.4) - restriction: >= netstandard2.0 + Fable.Core (>= 3.1.5) - restriction: >= netstandard2.0 + Fable.Promise (>= 2.2.2) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Fable.Mocha (2.15) + Fable.Core (>= 3.0) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7) - restriction: >= netstandard2.0 + Fable.Promise (3.1.3) - restriction: >= netstandard2.0 + Fable.Core (>= 3.1.5) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Fable.React (8.0.1) - restriction: >= netstandard2.0 + Fable.Browser.Dom (>= 2.4.4) - restriction: >= netstandard2.0 + Fable.Core (>= 3.2.7) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Feliz (1.64) + Fable.Core (>= 3.1.5) - restriction: >= netstandard2.0 + Fable.React (>= 7.4) - restriction: >= netstandard2.0 + Feliz.CompilerPlugins (>= 1.9) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Feliz.CompilerPlugins (1.9) - restriction: >= netstandard2.0 + Fable.AST (>= 3.0) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Feliz.Router (3.8) + Fable.Core (>= 3.1.6) - restriction: >= netstandard2.0 + Fable.Elmish (>= 3.1) - restriction: >= netstandard2.0 + Feliz (>= 1.28) - restriction: >= netstandard2.0 + Feliz.UseListener (>= 0.6.3) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Feliz.UseListener (0.6.3) - restriction: >= netstandard2.0 + Fable.Core (>= 3.1.6 < 4.0) + Feliz (>= 1.17 < 2.0) + FSharp.Core (>= 4.7.2) + FSharp.Core (6.0.4) + Thoth.Json (7.0) + Fable.Core (>= 3.1.6) - restriction: >= netstandard2.0 + FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0 + Zanaptak.TypedCssClasses (1.0) + FSharp.Core (>= 4.3.4) - restriction: >= netstandard2.0 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cd29e4b..804fb17 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,21 +1,58 @@ -lockfileVersion: 5.3 +lockfileVersion: 5.4 specifiers: date-fns: ^2.16.1 - react: ^17.0.1 - react-dom: ^17.0.1 + react: 18.1.0 + react-dom: 18.1.0 + sass: ^1.51.0 vite: ^2.9.6 dependencies: date-fns: 2.28.0 - react: 17.0.2 - react-dom: 17.0.2_react@17.0.2 + react: 18.1.0 + react-dom: 18.1.0_react@18.1.0 devDependencies: - vite: 2.9.6 + sass: 1.51.0 + vite: 2.9.6_sass@1.51.0 packages: + /anymatch/3.1.2: + resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==} + engines: {node: '>= 8'} + dependencies: + normalize-path: 3.0.0 + picomatch: 2.3.1 + dev: true + + /binary-extensions/2.2.0: + resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} + engines: {node: '>=8'} + dev: true + + /braces/3.0.2: + resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} + engines: {node: '>=8'} + dependencies: + fill-range: 7.0.1 + dev: true + + /chokidar/3.5.3: + resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} + engines: {node: '>= 8.10.0'} + dependencies: + anymatch: 3.1.2 + braces: 3.0.2 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.2 + dev: true + /date-fns/2.28.0: resolution: {integrity: sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==} engines: {node: '>=0.11'} @@ -229,6 +266,13 @@ packages: esbuild-windows-arm64: 0.14.38 dev: true + /fill-range/7.0.1: + resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} + engines: {node: '>=8'} + dependencies: + to-regex-range: 5.0.1 + dev: true + /fsevents/2.3.2: resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -241,6 +285,13 @@ packages: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} dev: true + /glob-parent/5.1.2: + resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} + engines: {node: '>= 6'} + dependencies: + is-glob: 4.0.3 + dev: true + /has/1.0.3: resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} engines: {node: '>= 0.4.0'} @@ -248,12 +299,40 @@ packages: function-bind: 1.1.1 dev: true + /immutable/4.0.0: + resolution: {integrity: sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==} + dev: true + + /is-binary-path/2.1.0: + resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} + engines: {node: '>=8'} + dependencies: + binary-extensions: 2.2.0 + dev: true + /is-core-module/2.9.0: resolution: {integrity: sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==} dependencies: has: 1.0.3 dev: true + /is-extglob/2.1.1: + resolution: {integrity: sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=} + engines: {node: '>=0.10.0'} + dev: true + + /is-glob/4.0.3: + resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} + engines: {node: '>=0.10.0'} + dependencies: + is-extglob: 2.1.1 + dev: true + + /is-number/7.0.0: + resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} + engines: {node: '>=0.12.0'} + dev: true + /js-tokens/4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} dev: false @@ -271,10 +350,10 @@ packages: hasBin: true dev: true - /object-assign/4.1.1: - resolution: {integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=} + /normalize-path/3.0.0: + resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} - dev: false + dev: true /path-parse/1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} @@ -284,6 +363,11 @@ packages: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} dev: true + /picomatch/2.3.1: + resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} + engines: {node: '>=8.6'} + dev: true + /postcss/8.4.12: resolution: {integrity: sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==} engines: {node: ^10 || ^12 || >=14} @@ -293,25 +377,30 @@ packages: source-map-js: 1.0.2 dev: true - /react-dom/17.0.2_react@17.0.2: - resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==} + /react-dom/18.1.0_react@18.1.0: + resolution: {integrity: sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w==} peerDependencies: - react: 17.0.2 + react: ^18.1.0 dependencies: loose-envify: 1.4.0 - object-assign: 4.1.1 - react: 17.0.2 - scheduler: 0.20.2 + react: 18.1.0 + scheduler: 0.22.0 dev: false - /react/17.0.2: - resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==} + /react/18.1.0: + resolution: {integrity: sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==} engines: {node: '>=0.10.0'} dependencies: loose-envify: 1.4.0 - object-assign: 4.1.1 dev: false + /readdirp/3.6.0: + resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} + engines: {node: '>=8.10.0'} + dependencies: + picomatch: 2.3.1 + dev: true + /resolve/1.22.0: resolution: {integrity: sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==} hasBin: true @@ -329,11 +418,20 @@ packages: fsevents: 2.3.2 dev: true - /scheduler/0.20.2: - resolution: {integrity: sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==} + /sass/1.51.0: + resolution: {integrity: sha512-haGdpTgywJTvHC2b91GSq+clTKGbtkkZmVAb82jZQN/wTy6qs8DdFm2lhEQbEwrY0QDRgSQ3xDurqM977C3noA==} + engines: {node: '>=12.0.0'} + hasBin: true + dependencies: + chokidar: 3.5.3 + immutable: 4.0.0 + source-map-js: 1.0.2 + dev: true + + /scheduler/0.22.0: + resolution: {integrity: sha512-6QAm1BgQI88NPYymgGQLCZgvep4FyePDWFpXVK+zNSUgHwlqpJy8VEh8Et0KxTACS4VWwMousBElAZOH9nkkoQ==} dependencies: loose-envify: 1.4.0 - object-assign: 4.1.1 dev: false /source-map-js/1.0.2: @@ -346,7 +444,14 @@ packages: engines: {node: '>= 0.4'} dev: true - /vite/2.9.6: + /to-regex-range/5.0.1: + resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} + engines: {node: '>=8.0'} + dependencies: + is-number: 7.0.0 + dev: true + + /vite/2.9.6_sass@1.51.0: resolution: {integrity: sha512-3IffdrByHW95Yjv0a13TQOQfJs7L5dVlSPuTt432XLbRMriWbThqJN2k/IS6kXn5WY4xBLhK9XoaWay1B8VzUw==} engines: {node: '>=12.2.0'} hasBin: true @@ -366,6 +471,7 @@ packages: postcss: 8.4.12 resolve: 1.22.0 rollup: 2.70.2 + sass: 1.51.0 optionalDependencies: fsevents: 2.3.2 dev: true diff --git a/src/App.fsproj b/src/App.fsproj index c136c31..28cca54 100644 --- a/src/App.fsproj +++ b/src/App.fsproj @@ -1,23 +1,16 @@ + - - net6.0 - - - - - - - - - - - - - - - - - - - + + net6.0 + + + + + + + + + + + \ No newline at end of file diff --git a/src/paket.references b/src/paket.references new file mode 100644 index 0000000..982b9e9 --- /dev/null +++ b/src/paket.references @@ -0,0 +1,5 @@ +Fable.Fetch +Feliz.Router +Fable.DateFunctions +Thoth.Json +Zanaptak.TypedCssClasses \ No newline at end of file diff --git a/tests/Tests.fsproj b/tests/Tests.fsproj index 71b7d93..ef185ff 100644 --- a/tests/Tests.fsproj +++ b/tests/Tests.fsproj @@ -1,14 +1,13 @@ + - - net5.0 - - - - - - - - - - + + net6.0 + + + + + + + + \ No newline at end of file diff --git a/tests/paket.references b/tests/paket.references new file mode 100644 index 0000000..e531ad4 --- /dev/null +++ b/tests/paket.references @@ -0,0 +1,2 @@ +Fable.Mocha +Feliz \ No newline at end of file